Index: /applications/editors/josm/plugins/mapdust/build.xml =================================================================== --- /applications/editors/josm/plugins/mapdust/build.xml (revision 30499) +++ /applications/editors/josm/plugins/mapdust/build.xml (revision 30500) @@ -69,5 +69,5 @@ - + Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java (revision 30500) @@ -49,12 +49,12 @@ /** * Defines the JPanel which displays the Help. - * + * * @author Bea */ public class MapdustHelpPanel extends JPanel implements HyperlinkListener { - + /** The serial version UID */ private static final long serialVersionUID = 8366853437915060878L; - + /** * Builds a MapdustDescriptionPanel object @@ -70,10 +70,11 @@ txtHelp.setText(txt); txtHelp.addHyperlinkListener(this); - JScrollPane cmpDescription = ComponentUtil.createJScrollPane(txtHelp, - null, Color.white, true, true); + JScrollPane cmpDescription = + ComponentUtil.createJScrollPane(txtHelp, null, Color.white, + true, true); cmpDescription.setPreferredSize(new Dimension(100, 100)); add(cmpDescription, BorderLayout.CENTER); } - + @Override public void hyperlinkUpdate(HyperlinkEvent event) { @@ -89,33 +90,34 @@ } } - + /** * Builds the text of the Help panel. This text contains general information * related to the MapDust plugin. - * + * * @return a string containing the text which will be displayed on the Help * tab */ private String buildText() { - Integer version = Integer.decode(Main.pref.get("mapdust.version")); - Integer localVersion = Integer.decode(Main.pref.get("mapdust.localVersion")); - String txt = ""; - txt += ""; - txt += "You are using MapDust version "; - txt += ""; - if (version <= localVersion) { - txt += version + ".
"; + String version = Main.pref.get("mapdust.version"); + String localVersion = Main.pref.get("mapdust.localVersion"); + StringBuilder sb = new StringBuilder(""); + sb.append(""); + sb.append("You are using MapDust version "); + sb.append(""); + if (version.equals(localVersion)) { + sb.append(version).append(".
"); } else { - txt += localVersion + ". There is an update available. "; - txt += "Please update to version "; - txt += "" + version; - txt += " to benefit from the latest improvements.
"; + sb.append(localVersion); + sb.append(". There is an update available. "); + sb.append("Please update to version "); + sb.append(""); + sb.append(version); + sb.append(" to benefit from the latest improvements.
"); } - txt += "To add bugs on the map you need to activate "; - txt += "the MapDust layer in the Layer List Dialog."; - txt += "Click here for more help."; - txt += ""; - return txt; + sb.append("To add bugs on the map you need to activate "); + sb.append("the MapDust layer in the Layer List Dialog."); + sb.append("Click here for more help."); + sb.append(""); + return sb.toString(); } - } Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/MapdustConverter.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/MapdustConverter.java (revision 30500) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/MapdustConverter.java (revision 30500) @@ -0,0 +1,267 @@ +/* Copyright (c) 2010, skobbler GmbH + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package org.openstreetmap.josm.plugins.mapdust.service; + + +import java.util.ArrayList; +import java.util.List; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.plugins.mapdust.service.connector.response.Geometry; +import org.openstreetmap.josm.plugins.mapdust.service.connector.response.MapdustBugContent; +import org.openstreetmap.josm.plugins.mapdust.service.connector.response.MapdustBugProperties; +import org.openstreetmap.josm.plugins.mapdust.service.connector.response.MapdustCommentProperties; +import org.openstreetmap.josm.plugins.mapdust.service.connector.response.MapdustGetBugResponse; +import org.openstreetmap.josm.plugins.mapdust.service.connector.response.MapdustGetBugsResponse; +import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug; +import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustComment; +import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustRelevance; +import org.openstreetmap.josm.plugins.mapdust.service.value.Status; +import org.openstreetmap.josm.plugins.mapdust.service.value.BugType; + + +/** + * The MapdustConverter object. Builds a MapdustBug, list of + * MapdustBug based on the given response object. + * + * @author Bea + * + */ +class MapdustConverter { + + /** + * Builds a MapdustBug object from the given + * MapdustGetBugResponse object. + * + * @param bugResponse A MapdustGetBugResponse object. + * @return A MapdustBug object. + */ + static MapdustBug buildMapdustBug(MapdustGetBugResponse bugResponse) { + MapdustBug bug = new MapdustBug(); + if (bugResponse != null) { + /* sets the id */ + bug.setId(bugResponse.getId()); + /* sets the coordinates */ + Geometry geometry = bugResponse.getGeometry(); + LatLon latLon = null; + if (geometry != null && geometry.getCoordinates() != null + && geometry.getCoordinates().length == 2) { + Double longitude = geometry.getCoordinates()[0]; + Double latitude = geometry.getCoordinates()[1]; + latLon = new LatLon(latitude, longitude); + } + bug.setLatLon(latLon); + /* sets the properties of the bug */ + MapdustBugProperties bugProperties = bugResponse.getProperties(); + if (bugProperties != null) { + /* sets the address */ + bug.setAddress(bugProperties.getAddress()); + /* sets the status */ + Status status = Status.getStatus(bugProperties.getStatus()); + bug.setStatus(status); + /* sets the type */ + BugType type = BugType.getType(bugProperties.getType()); + bug.setType(type); + /* sets the relevance */ + MapdustRelevance relevance = + MapdustRelevance.getMapdustRelevance(bugProperties + .getRelevance()); + bug.setRelevance(relevance); + /* sets the creation date */ + bug.setDateCreated(bugProperties.getDateCreated()); + /* sets the update date */ + bug.setDateUpdated(bugProperties.getDateUpdated()); + /* sets the description */ + bug.setDescription(bugProperties.getDescription()); + /* sets the isDefaultDescription */ + boolean isDefDescr = + bugProperties.getIsDefaultDescription() == 1 ? Boolean.TRUE + : Boolean.FALSE; + bug.setIsDefaultDescription(isDefDescr); + /* sets the skobbler user id */ + bug.setSkoUid(bugProperties.getSkoUid()); + /* sets the external user id */ + bug.setExtUid(bugProperties.getExtUid()); + /* sets the nickname */ + bug.setNickname(bugProperties.getNickname()); + /* sets the source */ + bug.setSource(bugProperties.getSource()); + /* sets the kml url */ + bug.setKmlUrl(bugProperties.getKmlUrl()); + /* sets the number of comments */ + bug.setNumberOfComments(bugProperties.getNumberOfComments()); + /* sets the comments */ + MapdustCommentProperties[] commentProperties = + bugProperties.getComments(); + MapdustComment[] commentArray = + buildMapdustCommentArray(bug.getId(), commentProperties); + bug.setComments(commentArray); + } + } + return bug; + } + + /** + * Builds a list of MapdustBug objects based on the given + * MapdustGetBugsResponse object. + * + * @param bugsResponse A MapdustGetBugsResponse object + * @return A list of MapdustBug objects + */ + static List buildMapdustBugList( + MapdustGetBugsResponse bugsResponse) { + List bugsList = new ArrayList(); + if (bugsResponse != null) { + MapdustBugContent[] bugContent = bugsResponse.getFeatures(); + if (bugContent != null) { + for (MapdustBugContent obj : bugContent) { + MapdustBug bug = buildMapdustBug(obj); + bugsList.add(bug); + } + } + } + return bugsList; + } + + /** + * Builds a MapdustBug object from the given + * MapdustBugContent object. + * + * @param bugContent A MapdustBugContent object + * @return A MapdustBug object. + */ + private static MapdustBug buildMapdustBug(MapdustBugContent bugContent) { + MapdustBug bug = new MapdustBug(); + if (bugContent != null) { + /* set the id */ + bug.setId(bugContent.getId()); + /* set the coordinates */ + Geometry geometry = bugContent.getGeometry(); + LatLon latLon = null; + if (geometry != null && geometry.getCoordinates() != null + && geometry.getCoordinates().length == 2) { + Double longitude = geometry.getCoordinates()[0]; + Double latitude = geometry.getCoordinates()[1]; + latLon = new LatLon(latitude, longitude); + } + bug.setLatLon(latLon); + /* set the bug properties */ + MapdustBugProperties bugProperties = bugContent.getProperties(); + if (bugProperties != null) { + /* sets the address */ + bug.setAddress(bugProperties.getAddress()); + /* sets the status */ + Status status = Status.getStatus(bugProperties.getStatus()); + bug.setStatus(status); + /* sets the type */ + BugType type = BugType.getType(bugProperties.getType()); + bug.setType(type); + /* sets the relevance */ + MapdustRelevance relevance = + MapdustRelevance.getMapdustRelevance(bugProperties + .getRelevance()); + bug.setRelevance(relevance); + /* sets the creation date */ + bug.setDateCreated(bugProperties.getDateCreated()); + /* sets the update date */ + bug.setDateUpdated(bugProperties.getDateUpdated()); + /* sets the description */ + bug.setDescription(bugProperties.getDescription()); + /* sets the skobbler user id */ + bug.setSkoUid(bugProperties.getSkoUid()); + /* sets the external user id */ + bug.setExtUid(bugProperties.getExtUid()); + /* sets the nickname */ + bug.setNickname(bugProperties.getNickname()); + /* sets the source */ + bug.setSource(bugProperties.getSource()); + /* sets the kml url */ + bug.setKmlUrl(bugProperties.getKmlUrl()); + /* sets the number of comments */ + bug.setNumberOfComments(bugProperties.getNumberOfComments()); + /* sets the comments */ + MapdustCommentProperties[] commentProperties = + bugProperties.getComments(); + MapdustComment[] commentArray = + buildMapdustCommentArray(bug.getId(), commentProperties); + bug.setComments(commentArray); + } + } + return bug; + } + + /** + * Builds a MapdustComment object based on the given arguments. + * + * @param bugId The id of the bug + * @param commentProperties The MapdustCommentProperties + * object. + * @return A MapdustComment object + */ + private static MapdustComment buildMapdustComment(Long bugId, + MapdustCommentProperties commentProperties) { + MapdustComment comment = new MapdustComment(); + if (bugId != null) { + comment.setBugId(bugId); + } + if (commentProperties != null) { + comment.setDateCreated(commentProperties.getDateCreated()); + comment.setCommentText(commentProperties.getComment()); + comment.setExtUid(commentProperties.getExtUid()); + comment.setNickname(commentProperties.getNickname()); + comment.setSkoUid(commentProperties.getSkoUid()); + comment.setSource(commentProperties.getSource()); + } + return comment; + } + + /** + * Builds an array of MapdustComment objects based on the given + * arguments. + * + * @param bugId the if of the bug + * @param commentProperties The array of + * MapdusrCommentProperties objects + * @return An array of MapdustComment object + */ + private static MapdustComment[] buildMapdustCommentArray(Long bugId, + MapdustCommentProperties[] commentProperties) { + List commentList = new ArrayList(); + if (bugId != null) { + if (commentProperties != null) { + for (MapdustCommentProperties obj : commentProperties) { + MapdustComment comment = buildMapdustComment(bugId, obj); + commentList.add(comment); + } + } + } + MapdustComment[] commentArray = + commentList.toArray(new MapdustComment[0]); + return commentArray; + } + +} Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/MapdustServiceHandler.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/MapdustServiceHandler.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/MapdustServiceHandler.java (revision 30500) @@ -35,5 +35,4 @@ import org.openstreetmap.josm.plugins.mapdust.service.connector.response.MapdustGetBugsResponse; import org.openstreetmap.josm.plugins.mapdust.service.connector.response.MapdustPostResponse; -import org.openstreetmap.josm.plugins.mapdust.service.converter.MapdustConverter; import org.openstreetmap.josm.plugins.mapdust.service.value.BoundingBox; import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug; Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/MapdustConnector.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/MapdustConnector.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/MapdustConnector.java (revision 30500) @@ -35,6 +35,4 @@ import java.util.List; import java.util.Map; -import org.openstreetmap.josm.plugins.mapdust.service.connector.parser.MapdustParser; -import org.openstreetmap.josm.plugins.mapdust.service.connector.parser.MapdustParserException; import org.openstreetmap.josm.plugins.mapdust.service.connector.response.MapdustGetBugResponse; import org.openstreetmap.josm.plugins.mapdust.service.connector.response.MapdustGetBugsResponse; @@ -50,4 +48,8 @@ import org.openstreetmap.josm.plugins.mapdust.util.http.HttpResponse; import org.openstreetmap.josm.plugins.mapdust.util.retry.RetrySetup; +import com.google.gson.FieldNamingPolicy; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; @@ -56,15 +58,14 @@ * and executes the following Mapdust service methods: getBug, getBugs, addBug, * commentBug and changeBugStatus. - * + * * @author Bea */ public class MapdustConnector { - + /** The HttpConnector object */ private final HttpConnector httpConnector; - - /** The MapdustParser object */ - private final MapdustParser parser; - + + private Gson gson; + /** * Builds a MapdustConnector object with the default settings. @@ -72,19 +73,14 @@ public MapdustConnector() { httpConnector = new HttpConnector(RetrySetup.DEFAULT); - parser = new MapdustParser(); - } - - /** - * Builds a MapdustConnector object based on the given - * arguments. - * - * @param httpConnector The HttpConnector object. - * @param parser The MapdustParser object. - */ - public MapdustConnector(HttpConnector httpConnector, MapdustParser parser) { - this.httpConnector = httpConnector; - this.parser = parser; - } - + gson = buildGson(); + } + + private Gson buildGson() { + GsonBuilder builder = new GsonBuilder(); + builder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + builder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES); + return builder.create(); + } + /** * Searches for the OSM MapDust bugs in the given bounding box. The method @@ -94,5 +90,5 @@ * if the response code is not 200,201 or 204, a corresponding exception * will be thrown. - * + * * @param bBox The bounding box where the bugs are searched. * @param filter The MapDust bug filter. The bugs can be filtered based on @@ -109,8 +105,4 @@ try { httpResponse = executeGetBugs(bBox, filter); - } catch (MalformedURLException e) { - throw new MapdustConnectorException(e.getMessage(), e); - } catch (IOException e) { - throw new MapdustConnectorException(e.getMessage(), e); } catch (Exception e) { throw new MapdustConnectorException(e.getMessage(), e); @@ -121,15 +113,13 @@ /* verify status codes */ handleStatusCode(httpResponse); - result = (MapdustGetBugsResponse) getParser().parseResponse( - httpResponse.getContent(),MapdustGetBugsResponse.class); + result = parseResponse(httpResponse.getContent(), + MapdustGetBugsResponse.class); } catch (MapdustConnectorException e) { throw new MapdustConnectorException(e.getMessage(), e); - } catch (MapdustParserException e) { - throw new MapdustConnectorException(e.getMessage(), e); } return result; } - - + + /** * Returns the OSM bug with the given id. If the Paging object @@ -138,9 +128,9 @@ * response object and return a MapdustGetBugResponse object. * In the case if the response code is not 2 - * + * * @param id The id of the object * @param paging The Paging object * @return A MapdustGetBugResponse object. - * + * * @throws MapdustConnectorException In the case of an error. */ @@ -150,8 +140,4 @@ try { httpResponse = executeGetBug(id, paging); - } catch (MalformedURLException e) { - throw new MapdustConnectorException(e.getMessage(), e); - } catch (IOException e) { - throw new MapdustConnectorException(e.getMessage(), e); } catch (Exception e) { throw new MapdustConnectorException(e.getMessage(), e); @@ -161,14 +147,12 @@ try { handleStatusCode(httpResponse); - result = (MapdustGetBugResponse) getParser().parseResponse( - httpResponse.getContent(), MapdustGetBugResponse.class); + result = parseResponse(httpResponse.getContent(), + MapdustGetBugResponse.class); } catch (MapdustConnectorException e) { throw new MapdustConnectorException(e.getMessage(), e); - } catch (MapdustParserException e) { - throw new MapdustConnectorException(e.getMessage(), e); } return result; } - + /** * Creates a new OSM bug with the specified arguments. The method executes @@ -177,9 +161,9 @@ * the created comment. In the case if the response code is not 200,201 or * 204, a corresponding exception will be thrown. - * + * * @param bug A MapdustBug object * @return A MapdustPostResponse object which contains the id * of the created object. - * + * * @throws MapdustConnectorException In the case of an error */ @@ -189,26 +173,20 @@ try { httpResponse = executeAddBug(bug); - } catch (MalformedURLException e) { - throw new MapdustConnectorException(e.getMessage(), e); - } catch (IOException e) { - throw new MapdustConnectorException(e.getMessage(), e); } catch (Exception e) { throw new MapdustConnectorException(e.getMessage(), e); } - + /* parse result */ MapdustPostResponse result = null; try { handleStatusCode(httpResponse); - result = (MapdustPostResponse) getParser().parseResponse( - httpResponse.getContent(), MapdustPostResponse.class); + result = parseResponse(httpResponse.getContent(), + MapdustPostResponse.class); } catch (MapdustConnectorException e) { throw new MapdustConnectorException(e.getMessage(), e); - } catch (MapdustParserException e) { - throw new MapdustConnectorException(e.getMessage(), e); } return result; } - + /** * Creates a new comment for the given bug. The method executes the @@ -217,5 +195,5 @@ * the created comment. In the case if the response code is not 200,201 or * 204, a corresponding exception will be thrown. - * + * * @param comment A MapdustComment object * @return A MapdustPostResponse object which contains the id @@ -228,8 +206,4 @@ try { httpResponse = executeCommentBug(comment); - } catch (MalformedURLException e) { - throw new MapdustConnectorException(e.getMessage(), e); - } catch (IOException e) { - throw new MapdustConnectorException(e.getMessage(), e); } catch (Exception e) { throw new MapdustConnectorException(e.getMessage(), e); @@ -239,14 +213,12 @@ try { handleStatusCode(httpResponse); - result = (MapdustPostResponse) getParser().parseResponse( - httpResponse.getContent(), MapdustPostResponse.class); + result = parseResponse(httpResponse.getContent(), + MapdustPostResponse.class); } catch (MapdustConnectorException e) { throw new MapdustConnectorException(e.getMessage(), e); - } catch (MapdustParserException e) { - throw new MapdustConnectorException(e.getMessage(), e); } return result; } - + /** * Changes the status of a given bug. The method executes the @@ -255,5 +227,5 @@ * the id of the created comment. In the case if the response code is not * 200,201 or 204, a corresponding exception will be thrown. - * + * * @param statusId The new value for the status. Possible values are: 1, 2 * or 3. @@ -268,8 +240,4 @@ try { httpResponse = executeChangeBugStatus(statusId, comment); - } catch (MalformedURLException e) { - throw new MapdustConnectorException(e.getMessage(), e); - } catch (IOException e) { - throw new MapdustConnectorException(e.getMessage(), e); } catch (Exception e) { throw new MapdustConnectorException(e.getMessage(), e); @@ -279,17 +247,15 @@ try { handleStatusCode(httpResponse); - result = (MapdustPostResponse) getParser().parseResponse( - httpResponse.getContent(), MapdustPostResponse.class); + result = parseResponse(httpResponse.getContent(), + MapdustPostResponse.class); } catch (MapdustConnectorException e) { throw new MapdustConnectorException(e.getMessage(), e); - } catch (MapdustParserException e) { - throw new MapdustConnectorException(e.getMessage(), e); } return result; } - + /** * Executes the 'getBugs' MapDust service method. - * + * * @param bBox The bounding box where the bugs are searched. This parameter * it is a required parameter. @@ -333,9 +299,9 @@ } if (filter.getMinRelevance() != null) { - int min=filter.getMinRelevance().getRange().getLowerValue(); + int min = filter.getMinRelevance().getRange().getLowerValue(); urlString += "&minr=" + min; } if (filter.getMaxRelevance() != null) { - int max= filter.getMaxRelevance().getRange().getUpperValue(); + int max = filter.getMaxRelevance().getRange().getUpperValue(); urlString += "&maxr=" + max; } @@ -345,17 +311,17 @@ if (urlString != null) { url = new URL(urlString); - httpResponse = getHttpConnector().executeGET(url); + httpResponse = httpConnector.executeGET(url); } return httpResponse; } - + /** * Executes the 'getBug' MapDust service method. - * + * * @param id The id of the object * @param paging The Paging object * @return A HttpResponse containing the JSON response of the * Mapdust method. - * + * * @throws MalformedURLException In the case if the format of the URL is * invalid @@ -384,16 +350,16 @@ if (urlString != null) { url = new URL(urlString); - httpResponse = getHttpConnector().executeGET(url); + httpResponse = httpConnector.executeGET(url); } return httpResponse; } - + /** * Executes the 'addBug' MapDust service method. - * + * * @param bug A MapdustBug object * @return A HttpResponse containing the JSON response of the * MapDust method. - * + * * @throws MalformedURLException In the case if the format of the URL is * invalid @@ -421,13 +387,13 @@ if (urlString != null) { url = new URL(urlString); - httpResponse = getHttpConnector().executePOST(url, null, - requestParameters); + httpResponse = + httpConnector.executePOST(url, null, requestParameters); } return httpResponse; } - + /** * Executes the 'commentBug' MapDust service method. - * + * * @param comment The MapdustComment object * @return A HttpResponse containing the JSON response of the @@ -455,18 +421,18 @@ if (urlString != null) { url = new URL(urlString); - httpResponse = getHttpConnector().executePOST(url, null, - requestParameters); + httpResponse = + httpConnector.executePOST(url, null, requestParameters); } return httpResponse; } - + /** * Executes the 'changeBugStatus' MapDust service method. - * + * * @param statusId The id of the status. * @param comment A MapdustComment object. * @return A HttpResponse containing the JSON response of the * MapDust method. - * + * * @throws MalformedURLException In the case if the format of the URL is * invalid @@ -492,15 +458,15 @@ if (urlString != null) { url = new URL(urlString); - httpResponse = getHttpConnector().executePOST(url, null, - requestParameters); + httpResponse = + httpConnector.executePOST(url, null, requestParameters); } return httpResponse; } - + /** * Builds a string containing the elements of the given list. The elements * will be separated by a comma. If the list does not contains any element * the returned result will be an empty string. - * + * * @param list The list of objects. * @return a string @@ -515,5 +481,5 @@ return sb.substring(0, sb.length() - 1); } - + /** * Handles the response codes of the given HttpResponse object. @@ -521,5 +487,5 @@ * exception. Otherwise a MapdustConnectorException will be * thrown with an appropriate message. - * + * * @param httpResponse The HttpResponse method. * @throws MapdustConnectorException In the case if the status code is not @@ -578,22 +544,15 @@ } } - - /** - * Returns the HttpConnector - * - * @return the httpConnector - */ - public HttpConnector getHttpConnector() { - return httpConnector; - } - - /** - * Sets the MapdustParser - * - * @return the parser - */ - public MapdustParser getParser() { - return parser; - } - + + + private T parseResponse(String httpResponse, Class responseType) + throws MapdustConnectorException { + T result; + try { + result = gson.fromJson(httpResponse, responseType); + } catch (JsonSyntaxException e) { + throw new MapdustConnectorException(e.getMessage(), e); + } + return result; + } } Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/GeneralContent.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/GeneralContent.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/GeneralContent.java (revision 30500) @@ -31,21 +31,21 @@ /** * Defines a general content, containing a given id. - * + * * @author Bea - * + * */ public class GeneralContent { - + /** The id */ private Long id; - + /** * Builds a GeneralContent object. */ public GeneralContent() {} - + /** * Builds a GeneralContent object. - * + * * @param id The id of the object */ @@ -53,21 +53,8 @@ this.id = id; } - - /** - * Returns the id - * @return the id - */ + + public Long getId() { return id; } - - /** - * Sets the id - * - * @param id the id to set - */ - public void setId(Long id) { - this.id = id; - } - } Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/Geometry.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/Geometry.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/Geometry.java (revision 30500) @@ -31,21 +31,21 @@ /** * Defines the attributes of the geometry object. - * + * * @author Bea - * + * */ public class Geometry { - + /** The array of coordinates */ private Double coordinates[]; - + /** * Builds a Geometry object */ public Geometry() {} - + /** * Builds a Geometry object - * + * * @param coordinates An array of coordinates. */ @@ -53,22 +53,9 @@ this.coordinates = coordinates; } - - /** - * Returns the coordinates - * - * @return the coordinates - */ + + public Double[] getCoordinates() { return coordinates; } - - /** - * Returns the coordinates - * - * @param coordinates the coordinates to set - */ - public void setCoordinates(Double[] coordinates) { - this.coordinates = coordinates; - } - + } Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugContent.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugContent.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugContent.java (revision 30500) @@ -31,26 +31,26 @@ /** * Defines the attributes of the MapdustBugContent object. - * + * * @author Bea - * + * */ public class MapdustBugContent extends GeneralContent { - + /** The Geometry object */ private Geometry geometry; - + /** The MapdustBugProperties object */ private MapdustBugProperties properties; - + /** * Builds a MapdustBugContent object. - * + * */ public MapdustBugContent() {} - + /** * Builds a MapdustBugContent object based on the given * arguments. - * + * * @param geometry A Geometry object * @param properties A MapdustBugProperties object @@ -60,40 +60,12 @@ this.properties = properties; } - - /** - * Returns the geometry - * - * @return the geometry - */ + + public Geometry getGeometry() { return geometry; } - - /** - * Sets the geometry - * - * @param geometry the geometry to set - */ - public void setGeometry(Geometry geometry) { - this.geometry = geometry; - } - - /** - * Returns the MapDust bug properties - * - * @return the properties - */ + public MapdustBugProperties getProperties() { return properties; } - - /** - * Sets the MapDust bug properties - * - * @param properties the properties to set - */ - public void setProperties(MapdustBugProperties properties) { - this.properties = properties; - } - } Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugProperties.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugProperties.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugProperties.java (revision 30500) @@ -35,63 +35,63 @@ /** * Defines the attributes of the MapdustBugProperties object. - * + * * @author Bea - * + * */ public class MapdustBugProperties { - + /** The creation date */ private Date dateCreated; - + /** The update date */ private Date dateUpdated; - + /** The status of the bug */ private Integer status; - + /** The type of the bug */ private String type; - + /** The relevance value */ private Integer relevance; - + /** The description of the bug */ private String description; - + /** Flag indicating if the description is default or not */ - private boolean isDefaultDescription; - + private byte isDefaultDescription; + /** The nickname of the bug */ private String nickname; - + /** The skobbler user id */ private String skoUid; - + /** The external user id */ private String extUid; - + /** The source of the bug */ private String source; - + /** The url of the kml */ private String kmlUrl; - + /** The address of the bug */ private Address address; - + /** The number of comments */ private Integer numberOfComments; - + /** The bug comments */ private MapdustCommentProperties[] comments; - + /** * Builds a MapdustBugProperties object. */ public MapdustBugProperties() {} - + /** * Builds a MapdustBugProperties object. - * + * * @param dateCreated The creation date * @param dateUpdated The update date @@ -113,5 +113,5 @@ public MapdustBugProperties(Date dateCreated, Date dateUpdated, Integer status, String type, Integer relevance, String description, - boolean isDefaultDescription, String nickname, String skoUid, + byte isDefaultDescription, String nickname, String skoUid, String extUid, String source, String kmlUrl, Address address, Integer numberOfComments, MapdustCommentProperties[] comments) { @@ -132,281 +132,64 @@ this.comments = comments; } - - /** - * Returns the date created - * - * @return the dateCreated - */ + + public Date getDateCreated() { return dateCreated; } - - /** - * Sets the date created - * - * @param dateCreated the dateCreated to set - */ - public void setDateCreated(Date dateCreated) { - this.dateCreated = dateCreated; - } - - /** - * Returns the date updated - * - * @return the dateUpdated - */ + public Date getDateUpdated() { return dateUpdated; } - - /** - * Sets the date updated - * - * @param dateUpdated the dateUpdated to set - */ - public void setDateUpdated(Date dateUpdated) { - this.dateUpdated = dateUpdated; - } - - /** - * Returns the status id - * - * @return the status - */ + public Integer getStatus() { return status; } - - /** - * Sets the status id - * - * @param status the status to set - */ - public void setStatus(Integer status) { - this.status = status; - } - - /** - * Returns the type - * - * @return the type - */ + public String getType() { return type; } - - /** - * Sets the type - * - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } - - /** - * Returns the relevance - * - * @return the relevance - */ + public Integer getRelevance() { return relevance; } - - /** - * Sets the relevance - * - * @param relevance the relevance to set - */ - public void setRelevance(Integer relevance) { - this.relevance = relevance; - } - - /** - * @param isDefaultDescription the isDefaultDescription to set - */ - public void setDefaultDescription(boolean isDefaultDescription) { - this.isDefaultDescription = isDefaultDescription; - } - - /** - * Returns the description - * - * @return the description - */ + public String getDescription() { return description; } - - /** - * Sets the description - * - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * Returns the isDefaultDescription flag - * - * @return the isDefaultDescription - */ - public boolean getIsDefaultDescription() { + + public byte getIsDefaultDescription() { return isDefaultDescription; } - - /** - * Sets the isDefaultDescription flag - * - * @param isDefaultDescription the isDefaultDescription to set - */ - public void setIsDefaultDescription(boolean isDefaultDescription) { - this.isDefaultDescription = isDefaultDescription; - } - - /** - * Returns the nickname - * - * @return the nickname - */ + public String getNickname() { return nickname; } - - /** - * Sets the nickname - * - * @param nickname the nickname to set - */ - public void setNickname(String nickname) { - this.nickname = nickname; - } - - /** - * Returns the skobbler user id - * - * @return the skoUid - */ + public String getSkoUid() { return skoUid; } - - /** - * Sets the skobbler user id - * - * @param skoUid the skoUid to set - */ - public void setSkoUid(String skoUid) { - this.skoUid = skoUid; - } - - /** - * Returns the external user id - * - * @return the extUid - */ + public String getExtUid() { return extUid; } - - /** - * Sets the external user id - * - * @param extUid the erxtUid to set - */ - public void setExtUid(String extUid) { - this.extUid = extUid; - } - - /** - * Returns the source - * - * @return the source - */ + public String getSource() { return source; } - - /** - * Sets the source - * - * @param source the source to set - */ - public void setSource(String source) { - this.source = source; - } - - /** - * Returns the kml URL - * - * @return the kmlUrl - */ + public String getKmlUrl() { return kmlUrl; } - - /** - * Sets the kml URL - * - * @param kmlUrl the kmlUrl to set - */ - public void setKmlUrl(String kmlUrl) { - this.kmlUrl = kmlUrl; - } - - /** - * Returns the address - * - * @return the address - */ + public Address getAddress() { return address; } - - /** - * Sets the address - * - * @param address the address to set - */ - public void setAddress(Address address) { - this.address = address; - } - - /** - * Returns the number of the comments - * - * @return the numberOfComments - */ + public Integer getNumberOfComments() { return numberOfComments; } - - /** - * Sets the number of the comments - * - * @param numberOfComments the numberOfComments to set - */ - public void setNumberOfComments(Integer numberOfComments) { - this.numberOfComments = numberOfComments; - } - - /** - * Returns the comments - * - * @return the comments - */ + public MapdustCommentProperties[] getComments() { return comments; } - - /** - * Sets the comments - * - * @param comments the comments to set - */ - public void setComments(MapdustCommentProperties[] comments) { - this.comments = comments; - } - } Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustCommentProperties.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustCommentProperties.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustCommentProperties.java (revision 30500) @@ -83,111 +83,28 @@ } - /** - * Returns the date created - * - * @return the dateCreated - */ + public Date getDateCreated() { return dateCreated; } - - /** - * Sets the date created - * - * @param dateCreated the dateCreated to set - */ - public void setDateCreated(Date dateCreated) { - this.dateCreated = dateCreated; - } - - /** - * Returns the comment text - * - * @return the comment - */ + public String getComment() { return comment; } - /** - * Sets the comment text - * - * @param comment the comment to set - */ - public void setComment(String comment) { - this.comment = comment; - } - /** - * Returns the nickname - * - * @return the nickname - */ public String getNickname() { return nickname; } - /** - * Sets the nickname - * - * @param nickname the nickname to set - */ - public void setNickname(String nickname) { - this.nickname = nickname; - } - - /** - * Returns the skobbler user id - * - * @return the skoUid - */ public String getSkoUid() { return skoUid; } - /** - * Sets the skobbler user id - * - * @param skoUid the skoUid to set - */ - public void setSkoUid(String skoUid) { - this.skoUid = skoUid; - } - - /** - * Returns the external user id - * - * @return the extUid - */ public String getExtUid() { return extUid; } - /** - * Sets the external user id - * - * @param extUid the extUid to set - */ - public void setExtUid(String extUid) { - this.extUid = extUid; - } - - /** - * Returns the source - * - * @return the source - */ public String getSource() { return source; } - - /** - * Sets the source - * - * @param source the source to set - */ - public void setSource(String source) { - this.source = source; - } - } Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugResponse.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugResponse.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugResponse.java (revision 30500) @@ -66,57 +66,15 @@ } - /** - * Returns the Geometry object - * - * @return the geometry - */ + public Geometry getGeometry() { return geometry; } - - /** - * Sets the Geometry object - * - * @param geometry the geometry to set - */ - public void setGeometry(Geometry geometry) { - this.geometry = geometry; - } - - /** - * Returns the id - * - * @return the id - */ + public Long getId() { return id; } - /** - * Sets the id - * - * @param id the id to set - */ - public void setId(Long id) { - this.id = id; - } - - /** - * Returns the MapdustBugProperties properties - * - * @return the properties - */ public MapdustBugProperties getProperties() { return properties; } - - /** - * Sets the MapdustBugProperties object - * - * @param properties the properties to set - */ - public void setProperties(MapdustBugProperties properties) { - this.properties = properties; - } - } Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugsResponse.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugsResponse.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugsResponse.java (revision 30500) @@ -55,21 +55,8 @@ } - /** - * Returns the array of MapdustBugContent objects - * - * @return the features - */ + public MapdustBugContent[] getFeatures() { return features; } - /** - * Sets the array of MapdustBugContent objects - * - * @param features the features to set - */ - public void setFeatures(MapdustBugContent[] features) { - this.features = features; - } - } Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetResponse.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetResponse.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetResponse.java (revision 30500) @@ -59,21 +59,8 @@ } - /** - * Returns the Paging object - * - * @return the paging - */ + public Paging getPaging() { return paging; } - /** - * Sets the Paging object - * - * @param paging the paging to set - */ - public void setPaging(Paging paging) { - this.paging = paging; - } - } Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustPostResponse.java =================================================================== --- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustPostResponse.java (revision 30499) +++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustPostResponse.java (revision 30500) @@ -56,21 +56,7 @@ } - /** - * Returns the id - * - * @return the id - */ + public Long getId() { return id; } - - /** - * Sets the id - * - * @param id the id to set - */ - public void setId(Long id) { - this.id = id; - } - }