From e0a1f1ae85e468f78c9989f40a34d1ae1d54b5da Mon Sep 17 00:00:00 2001 From: Justin Smethie Date: Fri, 19 Jun 2015 12:52:58 -0600 Subject: [PATCH] -Various bug fixes --- .../com/runwaysdk/geodashboard/Dashboard.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/geodashboard-server/src/main/java-gen/stub/com/runwaysdk/geodashboard/Dashboard.java b/geodashboard-server/src/main/java-gen/stub/com/runwaysdk/geodashboard/Dashboard.java index 7d943ecd5..29dfb7ba8 100644 --- a/geodashboard-server/src/main/java-gen/stub/com/runwaysdk/geodashboard/Dashboard.java +++ b/geodashboard-server/src/main/java-gen/stub/com/runwaysdk/geodashboard/Dashboard.java @@ -66,6 +66,7 @@ import com.runwaysdk.system.gis.geo.GeoEntity; import com.runwaysdk.system.gis.geo.GeoEntityQuery; import com.runwaysdk.system.gis.geo.GeoNode; +import com.runwaysdk.system.gis.geo.GeoNodeQuery; import com.runwaysdk.system.gis.geo.Universal; import com.runwaysdk.system.metadata.MdAttribute; import com.runwaysdk.system.metadata.MdClass; @@ -916,24 +917,18 @@ public GeoNode[] getGeoNodes(MdAttributeDAOIF thematicAttribute) MetadataGeoNodeQuery mgQuery = new MetadataGeoNodeQuery(factory); mgQuery.WHERE(mgQuery.getParent().EQ(mwQuery)); - OIterator iterator = mgQuery.getIterator(); + GeoNodeQuery gnQuery = new GeoNodeQuery(factory); + gnQuery.WHERE(gnQuery.EQ(mgQuery.getChild())); - Set nodes = new TreeSet(new Comparator() - { + OIterator iterator = gnQuery.getIterator(); - @Override - public int compare(GeoNode o1, GeoNode o2) - { - return o1.getId().compareTo(o2.getId()); - } - }); + List nodes = new LinkedList(); try { while (iterator.hasNext()) { - MetadataGeoNode metadata = iterator.next(); - GeoNode geoNode = metadata.getChild(); + GeoNode geoNode = iterator.next(); nodes.add(geoNode); }