Changeset 2381 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

Timestamp:

2009-11-02T07:51:28+01:00 (14 years ago)

Author:

jttt

Message:

Change most occurrences of Dataset.nodes/ways/relations with getNodes()/../.. or addPrimitive

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -147 +147 @@
     protected int getNumRelations() {
         if (Main.main.getCurrentDataSet() == null) return 0;
-        return Main.main.getCurrentDataSet().relations.size();
+        return Main.main.getCurrentDataSet().getRelations().size();
     }
 
@@ -158 +158 @@
      */
     protected ArrayList<Relation> getDisplayedRelationsInSortOrder(DataSet ds) {
-        ArrayList<Relation> relations = new ArrayList<Relation>(ds.relations.size());
-        for (Relation r: ds.relations ){
+        ArrayList<Relation> relations = new ArrayList<Relation>(ds.getRelations().size());
+        for (Relation r : ds.getRelations()) {
             if (!r.isUsable() || !r.isVisible()) {
                 continue;
@@ -170 +170 @@
                 new Comparator<Relation>() {
                     NameFormatter formatter = DefaultNameFormatter.getInstance();
+
                     public int compare(Relation r1, Relation r2) {
                         return r1.getDisplayName(formatter).compareTo(r2.getDisplayName(formatter));