[Andspidclient-commit] SF.net SVN: andspidclient:[202] trunk/src

[<chr...@us...>]

Revision: 202
          http://sourceforge.net/p/andspidclient/code/202
Author:   chris-trapani
Date:     2018-11-21 04:43:12 +0000 (Wed, 21 Nov 2018)
Log Message:
-----------
set area for geolocation correctly.
remove unused global on test class

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
    trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java

Modified: trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java	2018-11-20 23:25:44 UTC (rev 201)
+++ trunk/src/main/java/au/csiro/doiclient/business/GeoLocation.java	2018-11-21 04:43:12 UTC (rev 202)
@@ -44,16 +44,14 @@
      *            East
      * @param w
      *            West
-     * @param locationType
-     *            The location type
      */
-    public GeoLocation(String n, String s, String e, String w, LocationType locationType)
+    public GeoLocation(String n, String s, String e, String w)
     {
         this.north = n;
         this.east = e;
         this.south = s;
         this.west = w;
-        this.locationType = locationType;
+        this.locationType = LocationType.AREA;
     }
 
     /**
@@ -63,14 +61,12 @@
      *            The latitude
      * @param longitude
      *            The longitude
-     * @param locationType
-     *            The location type
      */
-    public GeoLocation(String latitude, String longitude, LocationType locationType)
+    public GeoLocation(String latitude, String longitude)
     {
         this.latitude = latitude;
         this.longitude = longitude;
-        this.locationType = locationType;
+        this.locationType = LocationType.POINT;
     }
 
     public LocationType getLocationType()

Modified: trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
===================================================================
--- trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java	2018-11-20 23:25:44 UTC (rev 201)
+++ trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java	2018-11-21 04:43:12 UTC (rev 202)
@@ -74,9 +74,6 @@
      * Constant giving the xPath of the subject type
      */
     private static final String SUBJECT_XPATH = "/xsi:resource/xsi:subjects/xsi:subject";
-    
-    /** Constant giving the path to the meta-data template **/
-    String metadataTemplatePath = "DoiMetadataTemplate.xml";
 
     /**
      * Populates a DTO with values that will passed on the DOIMetaDataTemplate.
@@ -114,14 +111,14 @@
 
         // add geo points
         List<GeoLocation> geoLocations = new ArrayList<>();
-        GeoLocation gl = new GeoLocation("-35.307380", "149.098210", GeoLocation.LocationType.POINT);
+        GeoLocation gl = new GeoLocation("-35.307380", "149.098210");
         geoLocations.add(gl);
 
-        GeoLocation gl1 = new GeoLocation("-37.307380", "155.098210", GeoLocation.LocationType.POINT);
+        GeoLocation gl1 = new GeoLocation("-37.307380", "155.098210");
         geoLocations.add(gl1);
 
         // add geo area
-        GeoLocation gl2 = new GeoLocation("-16.0", "-22.0", "145.0", "139.7", GeoLocation.LocationType.AREA);
+        GeoLocation gl2 = new GeoLocation("-16.0", "-22.0", "145.0", "139.7");
         geoLocations.add(gl2);
         doiDTO.setGeoLocations(geoLocations);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.