Context Navigation

← Previous Change
Next Change →

Changeset 32787 in osm for applications/editors/josm/plugins/mapdust/src

Timestamp:

2016-08-09T01:06:50+02:00 (9 years ago)

Author:

donvip

Message:

checkstyle

Location:

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust

Files:

: 52 edited

MapdustLayer.java (modified) (2 diffs)
MapdustPlugin.java (modified) (1 diff)
gui/MapdustActionUploader.java (modified) (1 diff)
gui/MapdustGUI.java (modified) (1 diff)
gui/action/adapter/WindowClose.java (modified) (1 diff)
gui/action/execute/ExecuteCloseBug.java (modified) (1 diff)
gui/action/execute/ExecuteFilterBug.java (modified) (1 diff)
gui/action/execute/ExecuteRefresh.java (modified) (1 diff)
gui/action/execute/ExecuteWorkOffline.java (modified) (1 diff)
gui/action/show/ShowReOpenBugAction.java (modified) (1 diff)
gui/component/dialog/AbstractDialog.java (modified) (1 diff)
gui/component/dialog/CommentBugDialog.java (modified) (1 diff)
gui/component/dialog/FilterBugDialog.java (modified) (2 diffs)
gui/component/model/CommentListModel.java (modified) (1 diff)
gui/component/panel/MapdustActionPanel.java (modified) (1 diff)
gui/component/panel/MapdustBugListPanel.java (modified) (2 diffs)
gui/component/panel/MapdustHelpPanel.java (modified) (1 diff)
gui/component/renderer/BugListCellRenderer.java (modified) (4 diffs)
gui/component/renderer/ComboBoxRenderer.java (modified) (1 diff)
gui/component/slider/RelevanceSlider.java (modified) (2 diffs)
gui/component/slider/RelevanceSliderUI.java (modified) (2 diffs)
gui/component/util/ComponentUtil.java (modified) (1 diff)
gui/observer/MapdustActionObservable.java (modified) (4 diffs)
gui/observer/MapdustActionObserver.java (modified) (2 diffs)
gui/observer/MapdustBugDetailsObservable.java (modified) (4 diffs)
gui/observer/MapdustBugDetailsObserver.java (modified) (2 diffs)
gui/observer/MapdustBugObservable.java (modified) (4 diffs)
gui/observer/MapdustBugObserver.java (modified) (2 diffs)
gui/observer/MapdustUpdateObservable.java (modified) (4 diffs)
gui/observer/MapdustUpdateObserver.java (modified) (1 diff)
gui/value/MapdustPluginState.java (modified) (1 diff)
gui/value/MapdustRelevanceValue.java (modified) (1 diff)
gui/value/MapdustServiceCommand.java (modified) (2 diffs)
service/MapdustConverter.java (modified) (1 diff)
service/connector/MapdustConnector.java (modified) (1 diff)
service/connector/MapdustConnectorException.java (modified) (1 diff)
service/connector/response/GeneralContent.java (modified) (1 diff)
service/connector/response/Geometry.java (modified) (3 diffs)
service/connector/response/MapdustBugContent.java (modified) (1 diff)
service/connector/response/MapdustBugProperties.java (modified) (1 diff)
service/connector/response/MapdustCommentProperties.java (modified) (2 diffs)
service/connector/response/MapdustGetBugResponse.java (modified) (2 diffs)
service/connector/response/MapdustGetBugsResponse.java (modified) (1 diff)
service/connector/response/MapdustGetResponse.java (modified) (1 diff)
service/connector/response/MapdustPostResponse.java (modified) (2 diffs)
service/value/MapdustResponseStatusCode.java (modified) (1 diff)
service/value/RelevanceRange.java (modified) (1 diff)
util/Configuration.java (modified) (1 diff)
util/http/HttpConnector.java (modified) (3 diffs)
util/retry/RetryAgent.java (modified) (6 diffs)
util/retry/RetryMode.java (modified) (2 diffs)
util/retry/RetrySetup.java (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustLayer.java

-              r25828
+              r32787
         DateFormat df = DateFormat.getDateInstance(DateFormat.DEFAULT,
                 Locale.getDefault());
         String text = "<html><b>Type:</b> " + bug.getType().getValue() ;
+        String text = "<html><b>Type:</b> " + bug.getType().getValue();
         text += "<br/>";
         text += "<b>Status:</b> " + bug.getStatus().getValue() + "<br/>";
 …
         text += "<b>Created on:</b> " + df.format(bug.getDateCreated());
         text += "<br/>";
         text += "<b>Last modified on:</b> "+ df.format(bug.getDateUpdated()) ;
+        text += "<b>Last modified on:</b> "+ df.format(bug.getDateUpdated());
         text += "<br/>";
         text += "<b>Comments:</b> " + bug.getNumberOfComments();

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java

r32473	r32787
133	133	Main.pref.put("mapdust.showError", true);
134	134	Main.pref.put("mapdust.version", getPluginInformation().version);
135		Main.pref.put("mapdust.localVersion",getPluginInformation().localversion);
	135	Main.pref.put("mapdust.localVersion", getPluginInformation().localversion);
136	136	Main.pref.addPreferenceChangeListener(this);
137	137	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustActionUploader.java

r24514	r32787
42	42	* @version $Revision$
43	43	*/
44		public class MapdustActionUploader {
	44	public final class MapdustActionUploader {
45	45
46	46	/** The <code>MapdustActionUploader</code> instance */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustGUI.java

r30737	r32787
248	248	}
249	249	List<MapdustAction> actionList = actionPanel != null ?
250		actionPanel.getActionList() : new ArrayList<~~MapdustAction~~>();
	250	actionPanel.getActionList() : new ArrayList<>();
251	251
252	252	/* update panels */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/adapter/WindowClose.java

r30532	r32787
63	63	* @param btnPanel The button panel
64	64	*/
65		public WindowClose(AbstractDialog dialog, MapdustButtonPanel btnPanel ) {
	65	public WindowClose(AbstractDialog dialog, MapdustButtonPanel btnPanel) {
66	66	this.dialog = dialog;
67	67	this.btnPanel = btnPanel;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java

r30737	r32787
130	130	mapdustGUI.enableBtnPanel(true);
131	131	issueDialog.dispose();
132		if (getMapdustGUI().getActionPanel()!= null) {
	132	if (getMapdustGUI().getActionPanel() != null) {
133	133	notifyObservers(mapdustAction);
134	134	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteFilterBug.java

r30737	r32787
98	98	boolean descr = dialog.isDescrFilterChecked();
99	99	MapdustRelevance minValue = dialog.getSelectedMinRelevance();
100		MapdustRelevance maxValue= dialog.getSelectedMaxRelevance();
	100	MapdustRelevance maxValue = dialog.getSelectedMaxRelevance();
101	101	/* notifies the observers about the filters */
102	102	notifyObservers(new MapdustBugFilter(statuses, types, descr,

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteRefresh.java

r30737	r32787
58	58
59	59	/**
60		* Builds a <code>EexecuteRefresh<code> object
	60	* Builds a <code>EexecuteRefresh</code> object
61	61	*/
62	62	public ExecuteRefresh() {}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java

r30737	r32787
109	109	} catch (MapdustActionUploaderException e) {
110	110	String errorMessage = "There was a Mapdust service";
111		errorMessage+=" error.";
	111	errorMessage += " error.";
112	112	JOptionPane.showMessageDialog(Main.parent,
113	113	tr(errorMessage), tr("Error"),

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowReOpenBugAction.java

-              r25828
+              r32787
                 btn = (JToggleButton) event.getSource();
                 btn.setSelected(true);
+            } if (event.getSource() instanceof JMenuItem){
+            }
+            if (event.getSource() instanceof JMenuItem) {
                 getButtonPanel().getBtnReOpenBugReport().setSelected(true);
+            }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/AbstractDialog.java

r25591	r32787
71	71	this.firedButton = firedButton;
72	72	}
73
74	73	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/CommentBugDialog.java

r25828	r32787
244	244	return btnOk;
245	245	}
246
247	246	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/FilterBugDialog.java

-              r30737
+              r32787
  */
 public class FilterBugDialog extends AbstractDialog {
     org.openstreetmap.josm.plugins.mapdust.service.value.BugType ttt=org.openstreetmap.josm.plugins.mapdust.service.value.BugType.WRONG_TURN;
+    org.openstreetmap.josm.plugins.mapdust.service.value.BugType ttt = org.openstreetmap.josm.plugins.mapdust.service.value.BugType.WRONG_TURN;
     /** The serial version UID */
 …
 ));
         /* oneway_road type */
         filterTypes[2] =  new FilterCheckBox(BugType.MISSING_STREET.getKey(),
+        filterTypes[2] = new FilterCheckBox(BugType.MISSING_STREET.getKey(),
                 new Rectangle(110, 125, 20, 25), "dialogs/missing_street.png",
                 BugType.MISSING_STREET.getValue(), new Rectangle(130, 125, 150,

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/model/CommentListModel.java

r30532	r32787
90	90	@Override
91	91	public void addListDataListener(ListDataListener l) {}
92
93	92	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustActionPanel.java

-              r30532
+              r32787
      * @param mapdustPlugin The <code>MapdustPlugin</code> object
      */
+    private void addComponents(List<MapdustAction> list,
+            MapdustPlugin mapdustPlugin) {
+    private void addComponents(List<MapdustAction> list, MapdustPlugin mapdustPlugin) {
         /* create components */
+        AbstractAction action = new ExecuteActionList
+        (mapdustPlugin.getMapdustGUI());
+        AbstractAction action = new ExecuteActionList(mapdustPlugin.getMapdustGUI());
         JToggleButton btnUpload = ComponentUtil.createJButton("Upload list data",
                 null, null, action);

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugListPanel.java

-              r30737
+              r32787
             String text = " No bugs in the current view for the selected";
             text += " filters!";
             JList<String> textJList = new JList<>(new String[] { text });
+            JList<String> textJList = new JList<>(new String[] {text});
             textJList.setBorder(new LineBorder(Color.black, 1, false));
             textJList.setCellRenderer(new BugListCellRenderer());
 …
             String text = " No bugs in the current view for the selected";
             text += " filters!";
             JList<String> textJList = new JList<>(new String[] { text });
+            JList<String> textJList = new JList<>(new String[] {text});
             textJList.setBorder(new LineBorder(Color.black, 1, false));
             textJList.setCellRenderer(new BugListCellRenderer());

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java

-              r30502
+              r32787
     private String buildText() {
         Integer version;
+        try{
+        try {
             version = Integer.decode(Main.pref.get("mapdust.version"));
+        } catch (NumberFormatException e){
+        } catch (NumberFormatException e) {
             version = null;
+        }
         Integer localVersion;
+        try{
+            localVersion= Integer.decode(Main.pref.get("mapdust.localVersion"));
+        try {
+            localVersion = Integer.decode(Main.pref.get("mapdust.localVersion"));
         } catch (NumberFormatException e) {
             localVersion = null;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/renderer/BugListCellRenderer.java

-              r30532
+              r32787
     public Component getListCellRendererComponent(JList<?> list, Object value,
             int index, boolean isSelected, boolean hasFocus) {
+        JLabel label =(JLabel) super.getListCellRendererComponent(list, value,
+                index,isSelected, hasFocus);
+        JLabel label = (JLabel) super.getListCellRendererComponent(list, value,
+                index, isSelected, hasFocus);
         if (value instanceof MapdustBug) {
             /* show the MapdustBug in the list */
 …
             text += mapdustBug.getType().getValue();
             if (mapdustBug.getAddress() != null) {
                 String addressStr=mapdustBug.getAddress().toString();
+                String addressStr = mapdustBug.getAddress().toString();
                 if (!addressStr.trim().isEmpty()) {
                     text += " (" + mapdustBug.getAddress().toString() + " )";
 …
             DateFormat df = DateFormat.getDateInstance(DateFormat.DEFAULT,
                     Locale.getDefault());
+            text +=" last modified on ";
+            text += " last modified on ";
             text += df.format(mapdustBug.getDateUpdated());
             label.setText(text);
 …
             label.setSize(200, 20);
+        }
+        if (value instanceof String){
+        if (value instanceof String) {
             /* show default text in the list */
             String text=(String)value;
+            String text = (String) value;
             label.setText(text);
             label.setFont(new Font("Times New Roman", Font.BOLD, 12));

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/renderer/ComboBoxRenderer.java

r30532	r32787
68	68	label.setIcon(icon);
69	69	label.setText(text);
70		label.setFont( new Font("Times New Roman", Font.BOLD, 12));
	70	label.setFont(new Font("Times New Roman", Font.BOLD, 12));
71	71	return label;
72	72	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/slider/RelevanceSlider.java

-              r30737
+              r32787
      */
     public int getUpperValue() {
         if (upperValue<lowerValue){
             upperValue=lowerValue;
+        if (upperValue < lowerValue) {
+            upperValue = lowerValue;
+        }
         return upperValue;
 …
     public void setExtent(int extent) {
         super.setExtent(extent);
         this.upperValue=getLowerValue()+getExtent();
+        this.upperValue = getLowerValue()+getExtent();
+    }
+}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/slider/RelevanceSliderUI.java

r25828	r32787
261	261	incr = 1;
262	262	}
263		int delta = incr * ((direction > 0) ? POSITIVE_SCROLL
	263	int delta = incr * ((direction > 0) ? POSITIVE_SCROLL
264	264	: NEGATIVE_SCROLL);
265	265	if (isUpperSelected) {
…	…
599	599	}
600	600	}
601
602	601	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/util/ComponentUtil.java

-              r30532
+              r32787
  * @version $Revision$
  */
+public class ComponentUtil {
+public final class ComponentUtil {
+    private ComponentUtil() {
+        // Hide default constructor for utilities classes
+    }
     /**
      * Creates a <code>JLabel</code> object with the given properties.

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustActionObservable.java

-              r25591
+              r32787
 package org.openstreetmap.josm.plugins.mapdust.gui.observer;
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustAction;
 /**
 …
      * @param observer The <code>MapdustActionObserver</code> object
      */
     public void addObserver(MapdustActionObserver observer);
+    void addObserver(MapdustActionObserver observer);
     /**
 …
      * @param observer The <code>MapdustActionObserver</code> object
      */
     public void removeObserver(MapdustActionObserver observer);
+    void removeObserver(MapdustActionObserver observer);
     /**
 …
      * @param mapdustAction The <code>MapdustAction</code> object
      */
     public void notifyObservers(MapdustAction mapdustAction);
+    void notifyObservers(MapdustAction mapdustAction);
+}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustActionObserver.java

-              r25591
+              r32787
 package org.openstreetmap.josm.plugins.mapdust.gui.observer;
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustAction;
 /**
 …
      * @param mapdustAction The <code>MapdustAction</code> list
      */
     public void addAction(MapdustAction mapdustAction);
+    void addAction(MapdustAction mapdustAction);
+}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugDetailsObservable.java

-              r25591
+              r32787
 package org.openstreetmap.josm.plugins.mapdust.gui.observer;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
 /**
 …
      * @param observer The <code>MapdustBugDetailsObserver</code> object
      */
     public void addObserver(MapdustBugDetailsObserver observer);
+    void addObserver(MapdustBugDetailsObserver observer);
     /**
 …
      * @param observer The <code>MapdustBugDetailsObserver</code> object
      */
     public void removeObserver(MapdustBugDetailsObserver observer);
+    void removeObserver(MapdustBugDetailsObserver observer);
     /**
 …
      * @param mapdustBug The <code>MapdustBug</code> object
      */
+    public void notifyObservers(MapdustBug mapdustBug);
+    void notifyObservers(MapdustBug mapdustBug);
+}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugDetailsObserver.java

-              r25591
+              r32787
 package org.openstreetmap.josm.plugins.mapdust.gui.observer;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
 /**
 …
      * @param mapdustBug The <code>MapdustBug</code> object
      */
+    public void showDetails(MapdustBug mapdustBug);
+    void showDetails(MapdustBug mapdustBug);
+}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugObservable.java

-              r25591
+              r32787
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
 /**
  * The observable interface for the <code>MapdustBug</code> object. Observes the
 …
      * @param observer The <code>MapdustBugObserver</code> object
      */
     public void addObserver(MapdustBugObserver observer);
+    void addObserver(MapdustBugObserver observer);
     /**
 …
      * @param observer The <code>MapdustBugObserver</code> object
      */
     public void removeObserver(MapdustBugObserver observer);
+    void removeObserver(MapdustBugObserver observer);
     /**
 …
      * @param mapdustBug The <code>MapdustBug</code> object
      */
+    public void notifyObservers(MapdustBug mapdustBug);
+    void notifyObservers(MapdustBug mapdustBug);
+}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugObserver.java

-              r25591
+              r32787
 package org.openstreetmap.josm.plugins.mapdust.gui.observer;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
 /**
 …
      * @param mapdustBug A <code>MapdustBug</code> object
      */
+    public void changedData(MapdustBug mapdustBug);
+    void changedData(MapdustBug mapdustBug);
+}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustUpdateObservable.java

-              r25591
+              r32787
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBugFilter;
 /**
  * The observable interface for the MapDust bug update action.
 …
      * @param observer The <code>MapdustUpdateObserver</code> object
      */
     public void addObserver(MapdustUpdateObserver observer);
+    void addObserver(MapdustUpdateObserver observer);
     /**
 …
      * @param observer The <code>MapdustUpdateObserver</code> object
      */
     public void removeObserver(MapdustUpdateObserver observer);
+    void removeObserver(MapdustUpdateObserver observer);
     /**
 …
      * or not.
      */
+    public void notifyObservers(MapdustBugFilter filter, boolean initialUpdate);
+    void notifyObservers(MapdustBugFilter filter, boolean initialUpdate);
+}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustUpdateObserver.java

r25754	r32787
55	55	* or not.
56	56	*/
57		public void update(MapdustBugFilter filter, boolean initialUpdate);
58
	57	void update(MapdustBugFilter filter, boolean initialUpdate);
59	58	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/value/MapdustPluginState.java

r25591	r32787
51	51	* @param value The value of the object
52	52	*/
53		~~private~~ MapdustPluginState(String value) {
	53	MapdustPluginState(String value) {
54	54	this.value = value;
55	55	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/value/MapdustRelevanceValue.java

r30737	r32787
44	44	* @version $Revision$
45	45	*/
46		public class MapdustRelevanceValue {
	46	public final class MapdustRelevanceValue {
47	47
48	48	/** The low MapDust bug relevance value */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/value/MapdustServiceCommand.java

-              r25591
+              r32787
      * Builds a new <code>MapdustServiceCommand</code> object
      */
     private MapdustServiceCommand() {}
+    MapdustServiceCommand() {}
     /**
 …
      * @param value The value
      */
     private MapdustServiceCommand(String key, String value) {
+    MapdustServiceCommand(String key, String value) {
         this.key = key;
         this.value = value;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/MapdustConverter.java

-              r30737
+              r32787
+ *
  */
+class MapdustConverter {
+final class MapdustConverter {
+    private MapdustConverter() {
+        // Hide default constructor for utilities classes
+    }
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/MapdustConnector.java

r30737	r32787
544	544	}
545	545	}
546
547
	546
548	547	private <T> T parseResponse(String httpResponse, Class<T> responseType)
549	548	throws MapdustConnectorException {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/MapdustConnectorException.java

r25591	r32787
77	77	super(message, cause);
78	78	}
79
80	79	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/GeneralContent.java

-              r30500
+              r32787
         this.id = id;
+    }
     public Long getId() {
         return id;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/Geometry.java

-              r30500
+              r32787
 package org.openstreetmap.josm.plugins.mapdust.service.connector.response;
 /**
  * Defines the attributes of the geometry object.
 …
     /** The array of coordinates */
     private Double coordinates[];
+    private Double[] coordinates;
     /**
 …
         this.coordinates = coordinates;
+    }
     public Double[] getCoordinates() {
         return coordinates;
+    }
+}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugContent.java

-              r30500
+              r32787
         this.properties = properties;
+    }
     public Geometry getGeometry() {
         return geometry;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugProperties.java

-              r30500
+              r32787
         this.comments = comments;
+    }
     public Date getDateCreated() {
         return dateCreated;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustCommentProperties.java

r30500	r32787
82	82	this.source = source;
83	83	}
84
85	84
86	85	public Date getDateCreated() {
…	…
91	90	return comment;
92	91	}
93
94	92
95	93	public String getNickname() {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugResponse.java

-              r30500
+              r32787
      * Builds a <code>MapdustGetBugResponse</code> object
+     *
+     * @param geometry The <code>Geometry</code object
+     * @param geometry The <code>Geometry</code> object
      * @param id The id of the object
      * @param properties The <code>MapdustBugProperties</code> object
 …
         this.properties = properties;
+    }
     public Geometry getGeometry() {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugsResponse.java

r30500	r32787
54	54	this.features = features;
55	55	}
56
57	56
58	57	public MapdustBugContent[] getFeatures() {
59	58	return features;
60	59	}
61
62	60	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetResponse.java

r30500	r32787
58	58	this.paging = paging;
59	59	}
60
61	60
62	61	public Paging getPaging() {
63	62	return paging;
64	63	}
65
66	64	}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustPostResponse.java

-              r30500
+              r32787
 package org.openstreetmap.josm.plugins.mapdust.service.connector.response;
 /**
  * Represents a response object for the HTTP POST method.
 …
         this.id = id;
+    }
     public Long getId() {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/MapdustResponseStatusCode.java

r24514	r32787
88	88	* @param description The description of the response
89	89	*/
90		~~private~~ MapdustResponseStatusCode(Integer statusCode, Integer apiCode,
	90	MapdustResponseStatusCode(Integer statusCode, Integer apiCode,
91	91	String description) {
92	92	this.statusCode = statusCode;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/RelevanceRange.java

r30737	r32787
45	45	* @version $Revision$
46	46	*/
47		public class RelevanceRange implements Serializable, Comparable<RelevanceRange> {
	47	public final class RelevanceRange implements Serializable, Comparable<RelevanceRange> {
48	48
49	49	/** The serial version UID */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/Configuration.java

r24733	r32787
39	39	* @author Bea
40	40	*/
41		public class Configuration {
	41	public final class Configuration {
42	42
43	43	/** The instance of this singleton object type */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/http/HttpConnector.java

-              r30738
+              r32787
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 …
 import java.util.Map;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.mapdust.util.retry.RetryAgent;
 import org.openstreetmap.josm.plugins.mapdust.util.retry.RetrySetup;
 …
                 buf.append(key).append("=").append(URLEncoder.encode(
                         postParameters.get(key), "utf-8"));
+            } catch (java.io.UnsupportedEncodingException neverHappen) {}
+            } catch (UnsupportedEncodingException e) {
+                Main.error(e);
+            }
             i++;
+        }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetryAgent.java

-              r24514
+              r32787
 package org.openstreetmap.josm.plugins.mapdust.util.retry;
+import org.openstreetmap.josm.Main;
 /**
 …
  * the cleanup method.
+ *
+ * @author rrainn
  * @param <T> the type of the object returned by the target method
- * @author rrainn
  */
 public abstract class RetryAgent<T> {
 …
                         Thread.sleep(delay);
                     } catch (InterruptedException e1) {
                         // LOG.error(e1.getMessage(), e1);
+                        Main.error(e1);
                         // throw e;
+                    }
 …
                 } catch (Exception e) {
                     /* if it can't be cleaned up, there's nothing to do */
                     // LOG.error("Could not clean up", e);
+                    Main.error("Could not clean up", e);
+                }
+            }
 …
                         Thread.sleep(delay);
                     } catch (InterruptedException e1) {
                         // LOG.error(e1.getMessage(), e1);
+                        Main.error(e1);
                         throw e;
+                    }
 …
                 } catch (Exception e) {
                     /* if it can't be cleaned up, there's nothing to do */
                     // LOG.error("Could not clean up", e);
+                    Main.error("Could not clean up", e);
+                }
+            }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetryMode.java

-              r24514
+              r32787
 package org.openstreetmap.josm.plugins.mapdust.util.retry;
 /**
  * The mode in which the {@link RetryAgent} should work.
 …
      * @param name the name of the mode
      */
     private RetryMode(String name) {
+    RetryMode(String name) {
         this.name = name;
+    }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetrySetup.java

-              r25127
+              r32787
      * Returns the method for computing time intervals between attempts.
+     *
+     * @return the retry mode
      * @see RetryMode
-     * @return the retry mode
      */
     public RetryMode getMode() {

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 32787 in osm for applications/editors/josm/plugins/mapdust/src

Legend:

Download in other formats: