Changeset 2165 in josm for trunk


Ignore:
Timestamp:
2009-09-20T11:05:58+02:00 (15 years ago)
Author:
stoecker
Message:

applied #3532 - path by Dave Hansen - infrastructure for faster data access

Location:
trunk/src/org/openstreetmap/josm
Files:
2 added
7 edited

Legend:

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

    r2141 r2165  
    1717
    1818import org.openstreetmap.josm.data.SelectionChangedListener;
     19import org.openstreetmap.josm.data.osm.QuadBuckets;
    1920
    2021/**
     
    3839     * conversion of the whole DataSet by iterating over this data structure.
    3940     */
    40     public Collection<Node> nodes = new LinkedList<Node>();
     41    public Collection<Node> nodes = new QuadBuckets();
    4142
    4243    /**
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

    r2039 r2165  
    879879        protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) {
    880880            if (adjustable == null)
    881                 throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "adjustable"));
     881                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
    882882
    883883            if (! synchronizedAdjustables.contains(adjustable))
     
    920920        protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalArgumentException, IllegalStateException {
    921921            if (adjustable == null)
    922                 throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "adjustable"));
     922                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
    923923            if (view == null)
    924                 throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "view"));
     924                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "view"));
    925925
    926926            if (! synchronizedAdjustables.contains(adjustable)) {
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

    r2070 r2165  
    3131    public void populate(Way my, Way their) {
    3232        if (my == null)
    33             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my"));
     33            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
    3434        if (their == null)
    35             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
     35            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
    3636        getMergedEntries().clear();
    3737        getMyEntries().clear();
     
    6565    public WayNodesConflictResolverCommand buildResolveCommand(Way my, Way their) {
    6666        if (my == null)
    67             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my"));
     67            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
    6868        if (their == null)
    69             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
     69            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
    7070        if (! isFrozen())
    7171            throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command"));
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

    r2083 r2165  
    7171    public void populate(Relation my, Relation their) {
    7272        if (my == null)
    73             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my"));
     73            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
    7474        if (their == null)
    75             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
     75            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
    7676
    7777        getMergedEntries().clear();
     
    114114    public RelationMemberConflictResolverCommand buildResolveCommand(Relation my, Relation their) {
    115115        if (my == null)
    116             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my"));
     116            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
    117117        if (their == null)
    118             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
     118            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
    119119        if (! isFrozen())
    120120            throw new IllegalArgumentException(tr("merged nodes not frozen yet. Can't build resolution command"));
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java

    r1954 r2165  
    3131    public TagMergeItem(String key, String myTagValue, String theirTagValue) {
    3232        if (key == null) {
    33             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "key"));
     33            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "key"));
    3434        }
    3535        this.key  = key;
     
    5050     */
    5151    public TagMergeItem(String key, OsmPrimitive my, OsmPrimitive their) {
    52         if (key == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "key"));
    53         if (my == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my"));
    54         if (their == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
     52        if (key == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "key"));
     53        if (my == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
     54        if (their == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
    5555        this.key = key;
    5656        myTagValue = my.get(key);
     
    6666     */
    6767    public void decide(MergeDecisionType decision) throws IllegalArgumentException {
    68         if (decision == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "decision"));
     68        if (decision == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "decision"));
    6969        this.mergeDecision = decision;
    7070    }
     
    9696     */
    9797    public void applyToMyPrimitive(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException {
    98         if (primitive == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "primitive"));
     98        if (primitive == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitive"));
    9999        if (mergeDecision == MergeDecisionType.UNDECIDED) {
    100100            throw new IllegalStateException(tr("cannot apply undecided tag merge item"));
  • trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java

    r1709 r2165  
    7676    protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) {
    7777        if (adjustable == null)
    78             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "adjustable"));
     78            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
    7979
    8080        if (! synchronizedAdjustables.contains(adjustable))
     
    117117    protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalArgumentException, IllegalStateException {
    118118        if (adjustable == null)
    119             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "adjustable"));
     119            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
    120120        if (view == null)
    121             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "view"));
     121            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "view"));
    122122
    123123        if (! synchronizedAdjustables.contains(adjustable)) {
  • trunk/src/org/openstreetmap/josm/io/OsmApi.java

    r2135 r2165  
    132132    protected OsmApi(String serverUrl)  {
    133133        if (serverUrl == null)
    134             throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "serverUrl"));
     134            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "serverUrl"));
    135135        this.serverUrl = serverUrl;
    136136    }
Note: See TracChangeset for help on using the changeset viewer.