Changeset 4895 in josm for trunk/src/org/openstreetmap


Ignore:
Timestamp:
2012-02-02T19:39:16+01:00 (8 years ago)
Author:
stoecker
Message:

remove deprecation

Location:
trunk/src/org/openstreetmap/josm/data
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r4813 r4895  
    371371            if (e.getKey().startsWith(prefix)) {
    372372                all.put(e.getKey(), e.getValue());
     373            }
     374        }
     375        return all;
     376    }
     377
     378    synchronized public List<String> getAllPrefixKeys(final String prefix) {
     379        final List<String> all = new LinkedList<String>();
     380        for (final Entry<String,String> e : properties.entrySet()) {
     381            if (e.getKey().startsWith(prefix)) {
     382                all.add(e.getKey());
    373383            }
    374384        }
  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r4726 r4895  
    410410     * themselves for any dataset selection changes that occur, regardless of the current active
    411411     * dataset. (However, the selection does only change in the active layer)
    412      * @deprecated Use addSelectionListener/removeSelectionListener instead
    413      */
    414     @Deprecated
    415     public static final Collection<SelectionChangedListener> selListeners = new CopyOnWriteArrayList<SelectionChangedListener>();
     412     */
     413    private static final Collection<SelectionChangedListener> selListeners = new CopyOnWriteArrayList<SelectionChangedListener>();
    416414
    417415    public static void addSelectionListener(SelectionChangedListener listener) {
  • trunk/src/org/openstreetmap/josm/data/osm/Filter.java

    r3908 r4895  
    2727            boolean regexSearch, boolean allElements) {
    2828        super(text, mode, caseSensitive, regexSearch, allElements);
    29     }
    30 
    31     @Deprecated
    32     public Filter(String prefText) {
    33         super("", SearchMode.add, false, false, false);
    34         String[] prfs = prefText.split(";");
    35         if(prfs.length != 10 && !prfs[0].equals(version))
    36             throw new Error("Incompatible filter preferences");
    37         text = prfs[1];
    38         if(prfs[2].equals("replace")) {
    39             mode = SearchMode.replace;
    40         }
    41         if(prfs[2].equals("add")) {
    42             mode = SearchMode.add;
    43         }
    44         if(prfs[2].equals("remove")) {
    45             mode = SearchMode.remove;
    46         }
    47         if(prfs[2].equals("in_selection")) {
    48             mode = SearchMode.in_selection;
    49         }
    50         caseSensitive = Boolean.parseBoolean(prfs[3]);
    51         regexSearch = Boolean.parseBoolean(prfs[4]);
    52         enable = Boolean.parseBoolean(prfs[6]);
    53         hiding = Boolean.parseBoolean(prfs[7]);
    54         inverted = Boolean.parseBoolean(prfs[8]);
    5529    }
    5630
  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r4725 r4895  
    476476        return (((flags & FLAG_DISABLED) != 0) && ((flags & FLAG_HIDE_IF_DISABLED) != 0));
    477477    }
    478 
    479     @Deprecated
    480     public boolean isFiltered() {
    481         return isDisabledAndHidden();
    482     }
    483 
    484478
    485479    public boolean isSelectable() {
Note: See TracChangeset for help on using the changeset viewer.