From a0e2167a6670d22d99f5af9d645cef54a7f4da5d Mon Sep 17 00:00:00 2001
From: Michael Zangl <michael.zangl@student.kit.edu>
Date: Thu, 23 Jul 2015 10:56:30 +0200
Subject: [PATCH] Removed redundant code of StyledMapRenderer.
---
.../data/osm/visitor/paint/StyledMapRenderer.java | 54 +++++++++-------------
1 file changed, 23 insertions(+), 31 deletions(-)
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
index 5419763..c98ac6e 100644
a
|
b
|
public class StyledMapRenderer extends AbstractMapRenderer { |
1467 | 1467 | return null; |
1468 | 1468 | } |
1469 | 1469 | |
| 1470 | /** |
| 1471 | * Computes the flags for a given OSM primitive. |
| 1472 | * @param primitive The primititve to compute the flags for. |
| 1473 | * @param checkOuterMember <code>true</code> if we should also add {@link #FLAG_OUTERMEMBER_OF_SELECTED} |
| 1474 | * @return The flag. |
| 1475 | */ |
| 1476 | public static int computeFlags(OsmPrimitive primitive, boolean checkOuterMember) { |
| 1477 | if (primitive.isDisabled()) { |
| 1478 | return FLAG_DISABLED; |
| 1479 | } else if (primitive.isSelected()) { |
| 1480 | return FLAG_SELECTED; |
| 1481 | } else if (checkOuterMember && primitive.isOuterMemberOfSelected()) { |
| 1482 | return FLAG_OUTERMEMBER_OF_SELECTED; |
| 1483 | } else if (primitive.isMemberOfSelected()) { |
| 1484 | return FLAG_MEMBER_OF_SELECTED; |
| 1485 | } else { |
| 1486 | return FLAG_NORMAL; |
| 1487 | } |
| 1488 | } |
| 1489 | |
1470 | 1490 | private class ComputeStyleListWorker implements Callable<List<StyleRecord>>, Visitor { |
1471 | 1491 | private final List<? extends OsmPrimitive> input; |
1472 | 1492 | private final int from; |
… |
… |
public class StyledMapRenderer extends AbstractMapRenderer { |
1512 | 1532 | |
1513 | 1533 | @Override |
1514 | 1534 | public void visit(Node n) { |
1515 | | if (n.isDisabled()) { |
1516 | | add(n, FLAG_DISABLED); |
1517 | | } else if (n.isSelected()) { |
1518 | | add(n, FLAG_SELECTED); |
1519 | | } else if (n.isMemberOfSelected()) { |
1520 | | add(n, FLAG_MEMBER_OF_SELECTED); |
1521 | | } else { |
1522 | | add(n, FLAG_NORMAL); |
1523 | | } |
| 1535 | add(n, computeFlags(n, false)); |
1524 | 1536 | } |
1525 | 1537 | |
1526 | 1538 | @Override |
1527 | 1539 | public void visit(Way w) { |
1528 | | if (w.isDisabled()) { |
1529 | | add(w, FLAG_DISABLED); |
1530 | | } else if (w.isSelected()) { |
1531 | | add(w, FLAG_SELECTED); |
1532 | | } else if (w.isOuterMemberOfSelected()) { |
1533 | | add(w, FLAG_OUTERMEMBER_OF_SELECTED); |
1534 | | } else if (w.isMemberOfSelected()) { |
1535 | | add(w, FLAG_MEMBER_OF_SELECTED); |
1536 | | } else { |
1537 | | add(w, FLAG_NORMAL); |
1538 | | } |
| 1540 | add(w, computeFlags(w, true)); |
1539 | 1541 | } |
1540 | 1542 | |
1541 | 1543 | @Override |
1542 | 1544 | public void visit(Relation r) { |
1543 | | if (r.isDisabled()) { |
1544 | | add(r, FLAG_DISABLED); |
1545 | | } else if (r.isSelected()) { |
1546 | | add(r, FLAG_SELECTED); |
1547 | | } else if (r.isOuterMemberOfSelected()) { |
1548 | | add(r, FLAG_OUTERMEMBER_OF_SELECTED); |
1549 | | } else if (r.isMemberOfSelected()) { |
1550 | | add(r, FLAG_MEMBER_OF_SELECTED); |
1551 | | } else { |
1552 | | add(r, FLAG_NORMAL); |
1553 | | } |
| 1545 | add(r, computeFlags(r, true)); |
1554 | 1546 | } |
1555 | 1547 | |
1556 | 1548 | @Override |