lastLayer;
-
+
public JumpToMarker(JumpToMarkerLayer layer, Shortcut shortcut) {
this.layer = (Layer) layer;
@@ -53,5 +53,5 @@
this.multikeyShortcut.setAccelerator(this);
}
-
+
protected final void setLastLayer(Layer l) {
lastLayer = new WeakReference<>(l);
@@ -89,5 +89,5 @@
return LayerListDialog.getLayerInfoByClass(JumpToMarkerLayer.class);
}
-
+
@Override
public MultikeyInfo getLastMultikeyAction() {
Index: trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 7509)
@@ -239,13 +239,13 @@
return autoDownloadEnabled;
}
-
+
public void setAutoDownload(boolean val) {
autoDownloadEnabled = val;
}
-
+
public boolean isAutoResolution() {
return autoResolutionEnabled;
}
-
+
public void setAutoResolution(boolean val) {
autoResolutionEnabled = val;
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 7509)
@@ -81,5 +81,5 @@
*/
public final boolean hasGpsTime() {
- return (tmp != null && tmp.gpsTime != null) || gpsTime != null;
+ return (tmp != null && tmp.gpsTime != null) || gpsTime != null;
}
@@ -96,5 +96,5 @@
return getDefensiveDate(exifTime);
}
-
+
/**
* Convenient way to determine if this entry has a EXIF time, without the cost of building a defensive copy.
@@ -103,7 +103,7 @@
*/
public final boolean hasExifTime() {
- return exifTime != null;
- }
-
+ return exifTime != null;
+ }
+
/**
* Returns the EXIF GPS time.
@@ -114,5 +114,5 @@
return getDefensiveDate(exifGpsTime);
}
-
+
/**
* Convenient way to determine if this entry has a EXIF GPS time, without the cost of building a defensive copy.
@@ -121,7 +121,7 @@
*/
public final boolean hasExifGpsTime() {
- return exifGpsTime != null;
- }
-
+ return exifGpsTime != null;
+ }
+
private static Date getDefensiveDate(Date date) {
if (date == null)
@@ -129,5 +129,5 @@
return new Date(date.getTime());
}
-
+
public LatLon getExifCoor() {
return exifCoor;
@@ -165,5 +165,5 @@
this.exifTime = getDefensiveDate(exifTime);
}
-
+
/**
* Sets the EXIF GPS time.
@@ -174,5 +174,5 @@
this.exifGpsTime = getDefensiveDate(exifGpsTime);
}
-
+
public void setGpsTime(Date gpsTime) {
this.gpsTime = getDefensiveDate(gpsTime);
@@ -250,5 +250,5 @@
/**
- * Indicates that the image has new GPS data.
+ * Indicates that the image has new GPS data.
* That flag is used e.g. by the photo_geotagging plugin to decide for which image
* file the EXIF GPS data needs to be (re-)written.
@@ -257,5 +257,5 @@
public void flagNewGpsData() {
isNewGpsData = true;
- // We need to set the GPS time to tell the system (mainly the photo_geotagging plug-in)
+ // We need to set the GPS time to tell the system (mainly the photo_geotagging plug-in)
// that the GPS data has changed. Check for existing GPS time and take EXIF time otherwise.
// This can be removed once isNewGpsData is used instead of the GPS time.
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java (revision 7509)
@@ -131,5 +131,5 @@
boolean timedMarkersOmitted = false;
boolean untimedMarkersOmitted = false;
- double snapDistance = Main.pref.getDouble("marker.audiofromuntimedwaypoints.distance", 1.0e-3);
+ double snapDistance = Main.pref.getDouble("marker.audiofromuntimedwaypoints.distance", 1.0e-3);
// about 25 m
WayPoint wayPointFromTimeStamp = null;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 7509)
@@ -112,5 +112,5 @@
return (T) String.format("#%06x%02x", ((Color) o).getRGB() & 0x00ffffff, alpha);
return (T) String.format("#%06x", ((Color) o).getRGB() & 0x00ffffff);
-
+
}
@@ -151,5 +151,5 @@
if (o instanceof float[])
return ((float[]) o).length != 0;
-
+
return null;
}
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java (revision 7509)
@@ -28,5 +28,5 @@
*/
public OsmPrimitive parent;
-
+
/**
* The same for parent selector. Only one of the 2 fields (parent or child) is not null in any environment.
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java (revision 7509)
@@ -12,8 +12,8 @@
/**
* Setting to customize a MapPaint style.
- *
- * Can be changed by the user in the right click menu of the mappaint style
+ *
+ * Can be changed by the user in the right click menu of the mappaint style
* dialog.
- *
+ *
* Defined in the MapCSS style, e.g.
*
@@ -23,5 +23,5 @@
* default: true;
* }
- *
+ *
* way[highway][setting("highway_casing")] {
* casing-width: 2;
@@ -33,7 +33,7 @@
void addMenuEntry(JMenu menu);
-
+
Object getValue();
-
+
/**
* A style setting for boolean value (yes / no).
@@ -71,5 +71,5 @@
menu.add(item);
}
-
+
public static BooleanStyleSetting create(Cascade c, StyleSource parentStyle, String key) {
String label = c.get("label", null, String.class);
@@ -83,5 +83,5 @@
return null;
}
- String prefKey = parentStyle.url + ":boolean:" + key;
+ String prefKey = parentStyle.url + ":boolean:" + key;
return new BooleanStyleSetting(parentStyle, prefKey, label, def);
}
@@ -93,5 +93,5 @@
return Boolean.parseBoolean(val);
}
-
+
}
}
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java (revision 7509)
@@ -171,5 +171,5 @@
return CSS_COLORS.get(key);
}
-
+
private CSSColors() {
// Hide default constructor for utils classes
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 7509)
@@ -171,5 +171,5 @@
return Arrays.asList(args);
}
-
+
/**
* Returns the number of elements in a list.
@@ -234,5 +234,5 @@
}
}
-
+
public static Color rgba(float r, float g, float b, float alpha) {
try {
@@ -606,5 +606,5 @@
return cs.getValue();
}
-
+
/**
* check if there is right-hand traffic at the current location
@@ -618,5 +618,5 @@
return RightAndLefthandTraffic.isRightHandTraffic(env.osm.getBBox().getCenter());
}
-
+
/**
* Prints the object to the command line (for debugging purpose).
@@ -641,5 +641,5 @@
return o;
}
-
+
/**
* Get the number of tags for the current primitive.
@@ -650,5 +650,5 @@
return env.osm.getNumKeys();
}
-
+
/**
* Get value of a setting.
@@ -784,5 +784,5 @@
* Separate implementation to support overloading for different
* argument types.
- *
+ *
* The use for calculating the length of a list is deprecated, use
* {@link Functions#count(java.util.List)} instead (see #10061).
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 7509)
@@ -72,9 +72,9 @@
private String css = null;
private ZipFile zipFile;
-
+
/**
* This lock prevents concurrent execution of {@link MapCSSRuleIndex#clear() } /
* {@link MapCSSRuleIndex#initIndex()} and {@link MapCSSRuleIndex#getRuleCandidates }.
- *
+ *
* For efficiency reasons, these methods are synchronized higher up the
* stack trace.
@@ -84,14 +84,14 @@
/**
* A collection of {@link MapCSSRule}s, that are indexed by tag key and value.
- *
+ *
* Speeds up the process of finding all rules that match a certain primitive.
- *
+ *
* Rules with a {@link SimpleKeyValueCondition} [key=value] are indexed by
* key and value in a HashMap. Now you only need to loop the tags of a
* primitive to retrieve the possibly matching rules.
- *
+ *
* Rules with no SimpleKeyValueCondition in the selector have to be
* checked separately.
- *
+ *
* The order of rules gets mixed up by this and needs to be sorted later.
*/
@@ -103,5 +103,5 @@
/* rules without SimpleKeyValueCondition */
public final Set remaining = new HashSet<>();
-
+
public void add(MapCSSRule rule) {
rules.add(rule);
@@ -110,5 +110,5 @@
/**
* Initialize the index.
- *
+ *
* You must own the write lock of STYLE_SOURCE_LOCK when calling this method.
*/
@@ -144,5 +144,5 @@
}
}
-
+
/**
* Get a subset of all rules that might match the primitive.
@@ -150,5 +150,5 @@
* @return a Collection of rules that filters out most of the rules
* that cannot match, based on the tags of the primitive
- *
+ *
* You must have a read lock of STYLE_SOURCE_LOCK when calling this method.
*/
@@ -166,9 +166,9 @@
Collections.sort(ruleCandidates);
return ruleCandidates;
- }
+ }
/**
* Clear the index.
- *
+ *
* You must own the write lock STYLE_SOURCE_LOCK when calling this method.
*/
@@ -298,5 +298,5 @@
}
}
-
+
@Override
public InputStream getSourceInputStream() throws IOException {
@@ -356,5 +356,5 @@
}
}
-
+
private void loadSettings() {
settings.clear();
@@ -448,5 +448,5 @@
}
}
-
+
// the declaration indices are sorted, so it suffices to save the
// last used index
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 7509)
@@ -26,14 +26,14 @@
/**
* MapCSS selector.
- *
+ *
* A rule has two parts, a selector and a declaration block
* e.g.
*
- * way[highway=residential]
- * { width: 10; color: blue; }
+ * way[highway=residential]
+ * { width: 10; color: blue; }
*
- *
+ *
* The selector decides, if the declaration block gets applied or not.
- *
+ *
* All implementing classes of Selector are immutable.
*/
@@ -49,18 +49,18 @@
*/
boolean matches(Environment env);
-
+
String getSubpart();
Range getRange();
-
+
/**
* Create an "optimized" copy of this selector that omits the base check.
- *
+ *
* For the style source, the list of rules is preprocessed, such that
* there is a separate list of rules for nodes, ways, ...
- *
+ *
* This means that the base check does not have to be performed
* for each rule, but only once for each primitive.
- *
+ *
* @return a selector that is identical to this object, except the base of the
* "rightmost" selector is not checked
@@ -380,5 +380,5 @@
return right.getRange();
}
-
+
@Override
public Selector optimizedBaseCheck() {
@@ -473,5 +473,5 @@
super(base, zoom, conds, subpart);
}
-
+
public boolean matchesConditions(Environment e) {
return super.matches(e);
@@ -488,5 +488,5 @@
}
}
-
+
public static class OptimizedGeneralSelector extends AbstractSelector {
public final String base;
@@ -510,5 +510,5 @@
this.subpart = subpart;
}
-
+
public OptimizedGeneralSelector(String base, Range range, List conds, String subpart) {
super(conds);
@@ -517,5 +517,5 @@
this.subpart = subpart;
}
-
+
public OptimizedGeneralSelector(GeneralSelector s) {
this(s.base, s.range, s.conds, s.subpart);
@@ -572,5 +572,5 @@
throw new UnsupportedOperationException();
}
-
+
public static Range fromLevel(int a, int b) {
if (a > b)
@@ -596,5 +596,5 @@
return 2.0 * Math.PI * R / Math.pow(2.0, lvl) / 2.56;
}
-
+
public static int scale2level(double scale) {
if (scale < 0)
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 7509)
@@ -80,5 +80,5 @@
@Override
- public Component getListCellRendererComponent(JList list, AuthorizationProcedure procedure,
+ public Component getListCellRendererComponent(JList list, AuthorizationProcedure procedure,
int idx, boolean isSelected, boolean hasFocus) {
renderColors(isSelected);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 7509)
@@ -69,5 +69,5 @@
*/
public final class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListener, ExpertModeChangeListener, ChangeListener {
-
+
/**
* Allows PreferenceSettings to do validation of entered values when ok was pressed.
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 7509)
@@ -1057,5 +1057,5 @@
control.repaint();
}
-
+
/**
* The method to add custom button on toolbar like search or preset buttons
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 7509)
@@ -115,5 +115,5 @@
}
@Override
- public Component getListCellRendererComponent(JList list, Locale l,
+ public Component getListCellRendererComponent(JList list, Locale l,
int index, boolean isSelected, boolean cellHasFocus) {
return dispatch.getListCellRendererComponent(list,
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 7509)
@@ -153,5 +153,5 @@
Main.main.menu.imageryMenu.refreshOffsetMenu();
OffsetBookmark.saveBookmarks();
-
+
DownloadDialog.getInstance().refreshTileSources();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java (revision 7509)
@@ -98,5 +98,5 @@
notification.setToolTipText(tr("When saving, display a small notification"));
panel.add(notification, GBC.eop());
-
+
ActionListener autosaveEnabled = new ActionListener(){
@Override
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java (revision 7509)
@@ -63,5 +63,5 @@
/**
* Return all projection codes supported by this projection choice.
- * @return all supported projection codes
+ * @return all supported projection codes
*/
String[] allCodes();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (revision 7509)
@@ -93,5 +93,5 @@
rbBasicAuthentication.setSelected(true);
pnlAuthenticationParameteters.add(pnlBasicAuthPreferences, BorderLayout.CENTER);
-
+
//-- the panel for messages preferences
gc.gridy = 2;
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 7509)
@@ -82,5 +82,5 @@
btn.setMargin(new Insets(0,0,0,0));
tagTable.addComponentNotStoppingCellEditing(btn);
-
+
// paste action
pnl.add(btn = new JButton(tagTable.getPasteAction()));
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 7509)
@@ -332,5 +332,5 @@
Relation relation = new Relation();
model.applyToPrimitive(relation);
-
+
String buf = Utils.getClipboardContent();
if (buf == null || buf.isEmpty() || buf.matches(CopyAction.CLIPBOARD_REGEXP)) {
@@ -355,5 +355,5 @@
}
}
-
+
protected final void updateEnabledState() {
setEnabled(TagTable.this.isEnabled());
@@ -365,5 +365,5 @@
}
}
-
+
/** the delete action */
private RunnableAction deleteAction = null;
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java (revision 7509)
@@ -20,5 +20,5 @@
private static TaggingPresetSearchDialog instance;
-
+
/**
* Returns the unique instance of {@code TaggingPresetSearchDialog}.
@@ -31,5 +31,5 @@
return instance;
}
-
+
private TaggingPresetSearchDialog() {
super(Main.parent, tr("Presets"), new String[] {tr("Select"), tr("Cancel")});
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 7509)
@@ -159,5 +159,5 @@
/**
* Constructs a new {@code AutoCompletingTextField}.
- * @param columns the number of columns to use to calculate the preferred width;
+ * @param columns the number of columns to use to calculate the preferred width;
* if columns is set to zero, the preferred width will be whatever naturally results from the component implementation
*/
Index: trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java (revision 7509)
@@ -23,5 +23,5 @@
addElement(new AutoCompletionListItem(s));
}
-
+
/**
* Adds or moves an element to the top of the history
Index: trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java (revision 7509)
@@ -79,5 +79,5 @@
setState(initial);
}
-
+
/**
* Constructs a new {@code QuadStateCheckBox}.
@@ -93,5 +93,5 @@
@Override
public void addMouseListener(MouseListener l) { }
-
+
/**
* Set the new state.
@@ -101,13 +101,13 @@
model.setState(state);
}
-
- /**
- * Return the current state, which is determined by the selection status of the model.
- * @return The current state
+
+ /**
+ * Return the current state, which is determined by the selection status of the model.
+ * @return The current state
*/
public State getState() {
return model.getState();
}
-
+
@Override
public void setSelected(boolean b) {
@@ -121,9 +121,9 @@
private final class QuadStateDecorator implements ButtonModel {
private final ButtonModel other;
-
+
private QuadStateDecorator(ButtonModel other) {
this.other = other;
}
-
+
private void setState(State state) {
if (state == State.NOT_SELECTED) {
@@ -149,5 +149,5 @@
}
}
-
+
/**
* The current state is embedded in the selection / armed
Index: trunk/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java (revision 7509)
@@ -51,5 +51,5 @@
* Constructs a new {@code UrlLabel} for the given URL and description.
* @param url The URL to use
- * @param description The description to display
+ * @param description The description to display
*/
public UrlLabel(String url, String description) {
@@ -60,5 +60,5 @@
* Constructs a new {@code UrlLabel} for the given URL, description and font increase.
* @param url The URL to use
- * @param description The description to display
+ * @param description The description to display
* @param fontPlus The font increase in 1/72 of an inch units.
*/
@@ -115,20 +115,20 @@
}
}
-
+
@Override
public void mousePressed(MouseEvent e) {
// Ignored
}
-
+
@Override
public void mouseEntered(MouseEvent e) {
// Ignored
}
-
+
@Override
public void mouseExited(MouseEvent e) {
// Ignored
}
-
+
@Override
public void mouseReleased(MouseEvent e) {
Index: trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java (revision 7509)
@@ -70,9 +70,9 @@
}
}
-
+
private static class GeometryPrimitiveVisitor implements PrimitiveVisitor {
-
+
private final JsonObjectBuilder geomObj;
-
+
public GeometryPrimitiveVisitor(JsonObjectBuilder geomObj) {
this.geomObj = geomObj;
Index: trunk/src/org/openstreetmap/josm/io/GpxReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 7509)
@@ -507,5 +507,5 @@
/**
- * Constructs a new {@code GpxReader}, which can later parse the input stream
+ * Constructs a new {@code GpxReader}, which can later parse the input stream
* and store the result in trackData and markerData
*
Index: trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java (revision 7509)
@@ -39,5 +39,5 @@
this.compression = compression;
}
-
+
public abstract T parse() throws OsmTransferException, IllegalDataException, IOException, SAXException;
}
@@ -120,5 +120,5 @@
}
}
-
+
protected class OsmChangeParser extends Parser {
protected OsmChangeParser(ProgressMonitor progressMonitor, Compression compression) {
@@ -140,5 +140,5 @@
super(progressMonitor, compression);
}
-
+
@Override
public GpxData parse() throws OsmTransferException, IllegalDataException, IOException, SAXException {
Index: trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (revision 7509)
@@ -112,5 +112,5 @@
userInfo.setLanguages(languages);
}
-
+
// -- messages
xmlNode = (Node)xpath.compile("/osm/user[1]/messages/received").evaluate(document, XPathConstants.NODE);
@@ -125,5 +125,5 @@
}
}
-
+
return userInfo;
} catch(XPathException e) {
Index: trunk/src/org/openstreetmap/josm/io/OsmTransferCanceledException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmTransferCanceledException.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/io/OsmTransferCanceledException.java (revision 7509)
@@ -11,5 +11,5 @@
*/
public OsmTransferCanceledException() {
-
+
}
Index: trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java (revision 7509)
@@ -12,5 +12,5 @@
*/
public final class UTFInputStreamReader extends InputStreamReader {
-
+
/**
* Creates a new {@link InputStreamReader} from the {@link InputStream} with UTF-8 as default encoding.
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 7509)
@@ -46,5 +46,5 @@
return new String[]{"way"};
}
-
+
@Override
public String[] getOptionalParams() {
@@ -64,5 +64,5 @@
};
}
-
+
@Override
protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException {
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenFileHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenFileHandler.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenFileHandler.java (revision 7509)
@@ -25,5 +25,5 @@
return new String[]{"filename"};
}
-
+
@Override
public String[] getOptionalParams() {
Index: trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (revision 7509)
@@ -74,5 +74,5 @@
case "exif-coordinates":
entry.setExifCoor(new LatLon(
- Double.parseDouble(attrElem.getAttribute("lat")),
+ Double.parseDouble(attrElem.getAttribute("lat")),
Double.parseDouble(attrElem.getAttribute("lon"))));
break;
Index: trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 7509)
@@ -40,5 +40,5 @@
*/
public static final String PLUGIN_MIME_TYPES = "application/java-archive, application/zip; q=0.9, application/octet-stream; q=0.5";
-
+
private final Collection toUpdate = new LinkedList<>();
private final Collection failed = new LinkedList<>();
Index: trunk/src/org/openstreetmap/josm/tools/Base64.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Base64.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/tools/Base64.java (revision 7509)
@@ -17,5 +17,5 @@
// Hide default constructor for utils classes
}
-
+
/** "base64": RFC 2045 default encoding */
private static String encDefault = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
Index: trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java (revision 7509)
@@ -7,17 +7,17 @@
/**
* Fast index to look up properties of the earth surface.
- *
+ *
* It is expected that there is a relatively slow method to look up the property
* for a certain coordinate and that there are larger areas with a uniform
* property.
- *
+ *
* This index tries to find rectangles with uniform property and caches them.
* Rectangles are subdivided, if there are different properties within.
* (Up to a maximum level, when the slow method is used again.)
- *
+ *
* @param the property (like land/water or nation)
*/
public class GeoPropertyIndex {
-
+
/**
* A method to look up a property of the earth surface.
@@ -45,5 +45,5 @@
private final GPLevel root;
private GPLevel lastLevelUsed;
-
+
private static final boolean DEBUG = false;
@@ -51,5 +51,5 @@
* Create new GeoPropertyIndex.
* @param geoProp the input property that should be made faster by this index
- * @param maxLevel
+ * @param maxLevel
*/
public GeoPropertyIndex(GeoProperty geoProp, int maxLevel) {
@@ -59,5 +59,5 @@
this.lastLevelUsed = root;
}
-
+
/**
* Look up the property for a certain point.
@@ -70,5 +70,5 @@
return lastLevelUsed.get(ll);
}
-
+
public static int index(LatLon ll, int level) {
long noParts = 1 << level;
@@ -102,5 +102,5 @@
return parent.get(ll);
}
-
+
private T getBounded(LatLon ll) {
if (DEBUG) System.err.print("GPLevel["+level+"]"+bbox+" ");
@@ -117,5 +117,5 @@
return owner.geoProp.get(ll);
}
-
+
if (children == null) {
@SuppressWarnings("unchecked")
@@ -123,10 +123,10 @@
this.children = tmp;
}
-
+
int idx = index(ll, level+1);
if (children[idx] == null) {
double lon1, lat1;
switch (idx) {
- case 0:
+ case 0:
lon1 = bbox.getTopLeftLon();
lat1 = bbox.getBottomRightLat();
@@ -136,9 +136,9 @@
lat1 = bbox.getTopLeftLat();
break;
- case 2:
+ case 2:
lon1 = bbox.getBottomRightLon();
lat1 = bbox.getBottomRightLat();
break;
- case 3:
+ case 3:
lon1 = bbox.getBottomRightLon();
lat1 = bbox.getTopLeftLat();
@@ -154,5 +154,5 @@
return children[idx].getBounded(ll);
}
-
+
/**
* Checks, if a point is inside this tile.
@@ -163,7 +163,7 @@
*/
boolean isInside(LatLon ll) {
- return bbox.getTopLeftLon() <= ll.lon() &&
- (ll.lon() < bbox.getBottomRightLon() || (ll.lon() == 180.0 && bbox.getBottomRightLon() == 180.0)) &&
- bbox.getBottomRightLat() <= ll.lat() &&
+ return bbox.getTopLeftLon() <= ll.lon() &&
+ (ll.lon() < bbox.getBottomRightLon() || (ll.lon() == 180.0 && bbox.getBottomRightLon() == 180.0)) &&
+ bbox.getBottomRightLat() <= ll.lat() &&
(ll.lat() < bbox.getTopLeftLat() || (ll.lat() == 90.0 && bbox.getTopLeftLat() == 90.0));
}
Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 7509)
@@ -469,5 +469,5 @@
return new Area(path);
}
-
+
/**
* Returns the Area of a polygon, from its list of nodes.
Index: trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java (revision 7509)
@@ -17,9 +17,9 @@
*/
public final class InputMapUtils {
-
+
private InputMapUtils() {
// Hide default constructor for utils classes
}
-
+
/**
* Unassign Ctrl-Shift/Alt-Shift Up/Down from the given component
Index: trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 7509)
@@ -5,9 +5,9 @@
public final class LanguageInfo {
-
+
private LanguageInfo() {
// Hide default constructor for utils classes
}
-
+
/**
* Type of the locale to use
@@ -126,5 +126,5 @@
return getJOSMLocaleCode()+".";
}
-
+
public static String getLanguageCodeManifest() {
return getJOSMLocaleCode()+"_";
Index: trunk/src/org/openstreetmap/josm/tools/Pair.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Pair.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/tools/Pair.java (revision 7509)
@@ -10,10 +10,10 @@
*/
public final class Pair {
-
+
/**
* The first item
*/
public A a;
-
+
/**
* The second item
@@ -65,5 +65,5 @@
/**
- * Convenient constructor method
+ * Convenient constructor method
* @param u The first item
* @param v The second item
Index: trunk/src/org/openstreetmap/josm/tools/Predicate.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Predicate.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/tools/Predicate.java (revision 7509)
@@ -9,5 +9,5 @@
*/
public interface Predicate {
-
+
/**
* Determines whether the object passes the test or not
Index: trunk/src/org/openstreetmap/josm/tools/Property.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Property.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/tools/Property.java (revision 7509)
@@ -8,5 +8,5 @@
*/
public interface Property {
-
+
/**
* Get the value of the property.
@@ -15,5 +15,5 @@
*/
public P get(O obj);
-
+
/**
* Set the value of the property for the object.
Index: trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java (revision 7505)
+++ trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java (revision 7509)
@@ -21,5 +21,5 @@
*/
public class RightAndLefthandTraffic {
-
+
private static class RLTrafficGeoProperty implements GeoProperty {
@@ -46,5 +46,5 @@
}
}
-
+
private static Collection leftHandTrafficPolygons;
private static GeoPropertyIndex rlCache;
@@ -52,7 +52,7 @@
/**
* Check if there is right-hand traffic at a certain location.
- *
+ *
* TODO: Synchronization can be refined inside the {@link GeoPropertyIndex}
- * as most look-ups are read-only.
+ * as most look-ups are read-only.
* @param ll the coordinates of the point
* @return true if there is right-hand traffic, false if there is left-hand traffic
@@ -77,4 +77,4 @@
rlCache = new GeoPropertyIndex(new RLTrafficGeoProperty(), 24);
}
-
+
}