Ignore:
Timestamp:
2010-06-03T09:19:19+02:00 (14 years ago)
Author:
bastiK
Message:

see #4998 - Impossible to select nodes with filter

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r3210 r3300  
    485485     *-----------------------------------------------------*/
    486486
    487     public void setDisabled(OsmPrimitive... osm) {
    488         if (osm.length == 1 && osm[0] == null) {
    489             setDisabled();
    490             return;
    491         }
    492         clearDisabled(allPrimitives());
    493         for (OsmPrimitive o : osm)
    494             if (o != null) {
    495                 o.setDisabled(true);
    496             }
    497     }
    498 
    499     public void setDisabled(Collection<? extends OsmPrimitive> selection) {
    500         clearDisabled(nodes);
    501         clearDisabled(ways);
    502         clearDisabled(relations);
    503         for (OsmPrimitive osm : selection) {
    504             osm.setDisabled(true);
    505         }
    506     }
    507 
    508     /**
    509      * Remove the disabled parameter from every value in the collection.
    510      * @param list The collection to remove the disabled parameter from.
    511      */
    512     private void clearDisabled(Collection<? extends OsmPrimitive> list) {
    513         for (OsmPrimitive osm : list) {
    514             osm.setDisabled(false);
    515         }
    516     }
    517 
    518 
    519     public void setFiltered(Collection<? extends OsmPrimitive> selection) {
    520         clearFiltered(nodes);
    521         clearFiltered(ways);
    522         clearFiltered(relations);
    523         for (OsmPrimitive osm : selection) {
    524             osm.setFiltered(true);
    525         }
    526     }
    527 
    528     public void setFiltered(OsmPrimitive... osm) {
    529         if (osm.length == 1 && osm[0] == null) {
    530             setFiltered();
    531             return;
    532         }
    533         clearFiltered(nodes);
    534         clearFiltered(ways);
    535         clearFiltered(relations);
    536         for (OsmPrimitive o : osm)
    537             if (o != null) {
    538                 o.setFiltered(true);
    539             }
    540     }
    541 
    542     /**
    543      * Remove the filtered parameter from every value in the collection.
    544      * @param list The collection to remove the filtered parameter from.
    545      */
    546     private void clearFiltered(Collection<? extends OsmPrimitive> list) {
    547         if (list == null)
    548             return;
    549         for (OsmPrimitive osm : list) {
    550             osm.setFiltered(false);
    551         }
    552     }
     487    /**
     488     * TODO: can be removed if no longer needed
     489     *
     490     * Currently, the filter flags are updated directly for the primitives.
     491     * On the long run there might be listeners for filter changes,
     492     * so the control needs to be moved to this place again.
     493     */
     494
     495//    public void setDisabled(OsmPrimitive... osm) {
     496//        if (osm.length == 1 && osm[0] == null) {
     497//            setDisabled();
     498//            return;
     499//        }
     500//        clearDisabled(allPrimitives());
     501//        for (OsmPrimitive o : osm)
     502//            if (o != null) {
     503//                o.setDisabled(true);
     504//            }
     505//    }
     506//
     507//    public void setDisabled(Collection<? extends OsmPrimitive> selection) {
     508//        clearDisabled(nodes);
     509//        clearDisabled(ways);
     510//        clearDisabled(relations);
     511//        for (OsmPrimitive osm : selection) {
     512//            osm.setDisabled(true);
     513//        }
     514//    }
     515//
     516//    /**
     517//     * Remove the disabled parameter from every value in the collection.
     518//     * @param list The collection to remove the disabled parameter from.
     519//     */
     520//    private void clearDisabled(Collection<? extends OsmPrimitive> list) {
     521//        for (OsmPrimitive osm : list) {
     522//            osm.setDisabled(false);
     523//        }
     524//    }
     525//
     526//
     527//    public void setFiltered(Collection<? extends OsmPrimitive> selection) {
     528//        clearFiltered(nodes);
     529//        clearFiltered(ways);
     530//        clearFiltered(relations);
     531//        for (OsmPrimitive osm : selection) {
     532//            osm.setFiltered(true);
     533//        }
     534//    }
     535//
     536//    public void setFiltered(OsmPrimitive... osm) {
     537//        if (osm.length == 1 && osm[0] == null) {
     538//            setFiltered();
     539//            return;
     540//        }
     541//        clearFiltered(nodes);
     542//        clearFiltered(ways);
     543//        clearFiltered(relations);
     544//        for (OsmPrimitive o : osm)
     545//            if (o != null) {
     546//                o.setFiltered(true);
     547//            }
     548//    }
     549//
     550//    /**
     551//     * Remove the filtered parameter from every value in the collection.
     552//     * @param list The collection to remove the filtered parameter from.
     553//     */
     554//    private void clearFiltered(Collection<? extends OsmPrimitive> list) {
     555//        if (list == null)
     556//            return;
     557//        for (OsmPrimitive osm : list) {
     558//            osm.setFiltered(false);
     559//        }
     560//    }
    553561
    554562    @Override public DataSet clone() {
Note: See TracChangeset for help on using the changeset viewer.