Changeset 2466 in josm for trunk/src


Ignore:
Timestamp:
2009-11-16T20:49:05+01:00 (12 years ago)
Author:
jttt
Message:

Removed leftover code for viewId, Boolean -> boolean

Location:
trunk/src/org/openstreetmap/josm/data/osm/visitor
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

    r2460 r2466  
    7676    protected double dist;
    7777    protected Collection<String> regionalNameOrder;
    78     protected Boolean useStyleCache;
     78    protected boolean useStyleCache;
    7979    private static int paintid = 0;
    80     private static int viewid = 0;
    8180    private EastNorth minEN;
    8281    private EastNorth maxEN;
     
    250249    }
    251250
    252     public void drawWay(Way w, LineElemStyle l, Color color, Boolean selected) {
     251    public void drawWay(Way w, LineElemStyle l, Color color, boolean selected) {
    253252        /* show direction arrows, if draw.segment.relevant_directions_only is not set,
    254253           the way is tagged with a direction key
     
    388387        {
    389388            Way w = null;
    390             Boolean selected = false;
     389            boolean selected = false;
    391390            List<Node> n = null;
    392             Boolean joined = true;
     391            boolean joined = true;
    393392            while(joined && left != 0)
    394393            {
     
    487486    }
    488487
    489     public void drawSelectedMember(OsmPrimitive osm, ElemStyle style, Boolean area,
    490             Boolean areaselected)
     488    public void drawSelectedMember(OsmPrimitive osm, ElemStyle style, boolean area,
     489            boolean areaselected)
    491490    {
    492491        if(osm instanceof Way)
    493492        {
    494             Way w = (Way)osm;
    495493            if(style instanceof AreaElemStyle)
    496494            {
     
    520518
    521519    @Override
    522     public void visit(Relation r) {};
     520    public void visit(Relation r) {}
    523521    public void paintUnselectedRelation(Relation r) {
    524522
     
    648646            Node firstNode = viaWay.firstNode();
    649647            Node lastNode = viaWay.lastNode();
    650             Boolean onewayvia = false;
     648            boolean onewayvia = false;
    651649
    652650            String onewayviastr = viaWay.get("oneway");
     
    908906    }
    909907
    910     public Boolean drawMultipolygon(Relation r) {
     908    public boolean drawMultipolygon(Relation r) {
    911909        Collection<Way> inner = new LinkedList<Way>();
    912910        Collection<Way> outer = new LinkedList<Way>();
    913911        Collection<Way> innerclosed = new LinkedList<Way>();
    914912        Collection<Way> outerclosed = new LinkedList<Way>();
    915         Boolean incomplete = false;
    916         Boolean drawn = false;
     913        boolean incomplete = false;
     914        boolean drawn = false;
    917915
    918916        for (RelationMember m : r.getMembers())
     
    967965        if(wayStyle != null && wayStyle instanceof AreaElemStyle)
    968966        {
    969             Boolean zoomok = isZoomOk(wayStyle);
    970             Boolean visible = false;
     967            boolean zoomok = isZoomOk(wayStyle);
     968            boolean visible = false;
    971969            Collection<Way> outerjoin = new LinkedList<Way>();
    972970            Collection<Way> innerjoin = new LinkedList<Way>();
     
    12121210    }
    12131211
    1214     protected void drawNode(Node n, ImageIcon icon, boolean annotate, Boolean selected) {
     1212    protected void drawNode(Node n, ImageIcon icon, boolean annotate, boolean selected) {
    12151213        Point p = nc.getPoint(n);
    12161214        if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
     
    14591457
    14601458        ++paintid;
    1461         viewid = nc.getViewID();
    14621459
    14631460        //profilerVisibleNodes = 0;
     
    16221619        }
    16231620
     1621
    16241622        //if(profiler)
    16251623        //{
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

    r2450 r2466  
    105105    }
    106106
    107     protected void getSettings(Boolean virtual) {
     107    protected void getSettings(boolean virtual) {
    108108        showDirectionArrow = Main.pref.getBoolean("draw.segment.direction", true);
    109109        showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only", true);
     
    132132    public void visitAll(DataSet data, boolean virtual, Bounds bounds) {
    133133        this.ds = data;
    134         //boolean profiler = Main.pref.getBoolean("simplepaint.profiler",false);
     134        //boolean profiler = Main.pref.getboolean("simplepaint.profiler",false);
    135135        //long profilerStart = java.lang.System.currentTimeMillis();
    136136        //long profilerLast = profilerStart;
     
    264264    }
    265265
    266     public static Boolean isLargeSegment(Point p1, Point p2, int space)
     266    public static boolean isLargeSegment(Point p1, Point p2, int space)
    267267    {
    268268        int xd = p1.x-p2.x; if(xd < 0) {
Note: See TracChangeset for help on using the changeset viewer.