Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 8413)
@@ -1600,5 +1600,8 @@
if (snapOn) {
// turn off snapping if we are in fixed mode or no actile snapping line exist
- if (fixed || !active) { snapOn=false; unsetFixedMode(); } else {
+ if (fixed || !active) {
+ snapOn = false;
+ unsetFixedMode();
+ } else {
setFixedMode();
}
Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 8413)
@@ -303,5 +303,6 @@
/** The unique instance/ */
public static final Always INSTANCE = new Always();
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
return true;
}
@@ -322,9 +323,15 @@
*/
public static class Not extends UnaryMatch {
- public Not(Match match) {super(match);}
- @Override public boolean match(OsmPrimitive osm) {
+ public Not(Match match) {
+ super(match);
+ }
+ @Override
+ public boolean match(OsmPrimitive osm) {
return !match.match(osm);
}
- @Override public String toString() {return "!"+match;}
+ @Override
+ public String toString() {
+ return "!" + match;
+ }
public Match getMatch() {
return match;
@@ -357,9 +364,13 @@
*/
public static class And extends BinaryMatch {
- public And(Match lhs, Match rhs) {super(lhs, rhs);}
- @Override public boolean match(OsmPrimitive osm) {
+ public And(Match lhs, Match rhs) {
+ super(lhs, rhs);
+ }
+ @Override
+ public boolean match(OsmPrimitive osm) {
return lhs.match(osm) && rhs.match(osm);
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return lhs + " && " + rhs;
}
@@ -370,9 +381,13 @@
*/
public static class Or extends BinaryMatch {
- public Or(Match lhs, Match rhs) {super(lhs, rhs);}
- @Override public boolean match(OsmPrimitive osm) {
+ public Or(Match lhs, Match rhs) {
+ super(lhs, rhs);
+ }
+ @Override
+ public boolean match(OsmPrimitive osm) {
return lhs.match(osm) || rhs.match(osm);
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return lhs + " || " + rhs;
}
@@ -383,9 +398,13 @@
*/
public static class Xor extends BinaryMatch {
- public Xor(Match lhs, Match rhs) {super(lhs, rhs);}
- @Override public boolean match(OsmPrimitive osm) {
+ public Xor(Match lhs, Match rhs) {
+ super(lhs, rhs);
+ }
+ @Override
+ public boolean match(OsmPrimitive osm) {
return lhs.match(osm) ^ rhs.match(osm);
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return lhs + " ^ " + rhs;
}
@@ -396,12 +415,16 @@
*/
private static class Id extends RangeMatch {
- public Id(Range range) {super(range);}
+ public Id(Range range) {
+ super(range);
+ }
public Id(PushbackTokenizer tokenizer) throws ParseError {
this(tokenizer.readRange(tr("Range of primitive ids expected")));
}
- @Override protected Long getNumber(OsmPrimitive osm) {
+ @Override
+ protected Long getNumber(OsmPrimitive osm) {
return osm.isNew() ? 0 : osm.getUniqueId();
}
- @Override protected String getString() {
+ @Override
+ protected String getString() {
return "id";
}
@@ -412,12 +435,16 @@
*/
private static class ChangesetId extends RangeMatch {
- public ChangesetId(Range range) {super(range);}
+ public ChangesetId(Range range) {
+ super(range);
+ }
public ChangesetId(PushbackTokenizer tokenizer) throws ParseError {
this(tokenizer.readRange(tr("Range of changeset ids expected")));
}
- @Override protected Long getNumber(OsmPrimitive osm) {
+ @Override
+ protected Long getNumber(OsmPrimitive osm) {
return (long) osm.getChangesetId();
}
- @Override protected String getString() {
+ @Override
+ protected String getString() {
return "changeset";
}
@@ -428,12 +455,16 @@
*/
private static class Version extends RangeMatch {
- public Version(Range range) {super(range);}
+ public Version(Range range) {
+ super(range);
+ }
public Version(PushbackTokenizer tokenizer) throws ParseError {
this(tokenizer.readRange(tr("Range of versions expected")));
}
- @Override protected Long getNumber(OsmPrimitive osm) {
+ @Override
+ protected Long getNumber(OsmPrimitive osm) {
return (long) osm.getVersion();
}
- @Override protected String getString() {
+ @Override
+ protected String getString() {
return "version";
}
@@ -485,5 +516,6 @@
}
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
if (keyPattern != null) {
@@ -696,5 +728,4 @@
return key + '=' + value;
}
-
}
@@ -728,5 +759,6 @@
}
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
if (!osm.hasKeys() && osm.getUser() == null)
return search.isEmpty();
@@ -760,5 +792,6 @@
return false;
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return search;
}
@@ -773,8 +806,12 @@
type));
}
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
return type.equals(osm.getType());
}
- @Override public String toString() {return "type="+type;}
+ @Override
+ public String toString() {
+ return "type=" + type;
+ }
}
@@ -792,5 +829,6 @@
}
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
if (osm.getUser() == null)
return user == null;
@@ -799,5 +837,6 @@
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return "user=" + (user == null ? "" : user);
}
@@ -817,5 +856,6 @@
}
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
for (OsmPrimitive ref: osm.getReferrers()) {
if (ref instanceof Relation && !ref.isIncomplete() && !ref.isDeleted()) {
@@ -832,5 +872,6 @@
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return "role=" + role;
}
@@ -920,5 +961,4 @@
}
-
/**
* Matches ways with a number of nodes in given range
@@ -1027,8 +1067,10 @@
*/
private static class New extends Match {
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
return osm.isNew();
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return "new";
}
@@ -1039,8 +1081,12 @@
*/
private static class Modified extends Match {
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
return osm.isModified() || osm.isNewOrUndeleted();
}
- @Override public String toString() {return "modified";}
+ @Override
+ public String toString() {
+ return "modified";
+ }
}
@@ -1049,8 +1095,12 @@
*/
private static class Selected extends Match {
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
return Main.main.getCurrentDataSet().isSelected(osm);
}
- @Override public String toString() {return "selected";}
+ @Override
+ public String toString() {
+ return "selected";
+ }
}
@@ -1061,8 +1111,12 @@
*/
private static class Incomplete extends Match {
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
return osm.isIncomplete();
}
- @Override public String toString() {return "incomplete";}
+ @Override
+ public String toString() {
+ return "incomplete";
+ }
}
@@ -1073,8 +1127,12 @@
*/
private static class Untagged extends Match {
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
return !osm.isTagged() && !osm.isIncomplete();
}
- @Override public String toString() {return "untagged";}
+ @Override
+ public String toString() {
+ return "untagged";
+ }
}
@@ -1083,8 +1141,12 @@
*/
private static class Closed extends Match {
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
return osm instanceof Way && ((Way) osm).isClosed();
}
- @Override public String toString() {return "closed";}
+ @Override
+ public String toString() {
+ return "closed";
+ }
}
@@ -1096,5 +1158,6 @@
super(m);
}
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
boolean isParent = false;
@@ -1110,5 +1173,8 @@
return isParent;
}
- @Override public String toString() {return "parent(" + match + ")";}
+ @Override
+ public String toString() {
+ return "parent(" + match + ")";
+ }
}
@@ -1122,5 +1188,6 @@
}
- @Override public boolean match(OsmPrimitive osm) {
+ @Override
+ public boolean match(OsmPrimitive osm) {
boolean isChild = false;
for (OsmPrimitive p : osm.getReferrers()) {
@@ -1129,5 +1196,8 @@
return isChild;
}
- @Override public String toString() {return "child(" + match + ")";}
+ @Override
+ public String toString() {
+ return "child(" + match + ")";
+ }
}
Index: /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 8413)
@@ -175,7 +175,12 @@
@Override
- public void layerAdded(Layer newLayer) {}
+ public void layerAdded(Layer newLayer) {
+ // Do nothing
+ }
+
@Override
- public void activeLayerChange(Layer oldLayer, Layer newLayer) {}
+ public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+ // Do nothing
+ }
/**
Index: /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 8413)
@@ -410,5 +410,7 @@
}
}
- } catch (NumberFormatException e) {} //ignore malformed Cache-Control headers
+ } catch (NumberFormatException e) {
+ // ignore malformed Cache-Control headers
+ }
}
Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 8413)
@@ -201,7 +201,11 @@
/* ------------------------------------------------------------------------------ */
@Override
- public void activeLayerChange(Layer oldLayer, Layer newLayer) {/* irrelevant in this context */}
+ public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+ /* irrelevant in this context */
+ }
@Override
- public void layerAdded(Layer newLayer) {/* irrelevant in this context */}
+ public void layerAdded(Layer newLayer) {
+ /* irrelevant in this context */
+ }
@Override
public void layerRemoved(Layer oldLayer) {
Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 8413)
@@ -516,9 +516,9 @@
final Popup staticPopup = newPopup;
if(this.popup != null) {
- // If an old popup exists, remove it when the new popup has been
- // drawn to keep flickering to a minimum
+ // If an old popup exists, remove it when the new popup has been drawn to keep flickering to a minimum
final Popup staticOldPopup = this.popup;
EventQueue.invokeLater(new Runnable(){
- @Override public void run() {
+ @Override
+ public void run() {
staticPopup.show();
staticOldPopup.hide();
@@ -528,5 +528,8 @@
// There is no old popup
EventQueue.invokeLater(new Runnable(){
- @Override public void run() { staticPopup.show(); }});
+ @Override
+ public void run() {
+ staticPopup.show();
+ }});
}
this.popupLabels = lbls;
Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8413)
@@ -432,9 +432,19 @@
double lat = cl.lat();
double lon = cl.lon();
- if(lat < b.getMinLat()) {changed = true; lat = b.getMinLat();
- } else if(lat > b.getMaxLat()) {changed = true; lat = b.getMaxLat(); }
- if(lon < b.getMinLon()) {changed = true; lon = b.getMinLon();
- } else if(lon > b.getMaxLon()) {changed = true; lon = b.getMaxLon(); }
- if(changed) {
+ if (lat < b.getMinLat()) {
+ changed = true;
+ lat = b.getMinLat();
+ } else if (lat > b.getMaxLat()) {
+ changed = true;
+ lat = b.getMaxLat();
+ }
+ if (lon < b.getMinLon()) {
+ changed = true;
+ lon = b.getMinLon();
+ } else if (lon > b.getMaxLon()) {
+ changed = true;
+ lon = b.getMaxLon();
+ }
+ if (changed) {
newCenter = Projections.project(new LatLon(lat,lon));
}
Index: /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 8413)
@@ -414,5 +414,7 @@
@Override
- public void focusGained(FocusEvent e) {/* irrelevant */}
+ public void focusGained(FocusEvent e) {
+ /* irrelevant */
+ }
@Override
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java (revision 8413)
@@ -16,15 +16,16 @@
public final class TagConflictResolutionUtil {
- /** no constructor, just static utility methods */
- private TagConflictResolutionUtil() {}
+ private TagConflictResolutionUtil() {
+ // no constructor, just static utility methods
+ }
/**
* Normalizes the tags in the tag collection tc before resolving tag conflicts.
*
- * Removes irrelevant tags like "created_by".
+ * Removes irrelevant tags like "created_by".
*
- * For tags which are not present on at least one of the merged nodes, the empty value ""
- * is added to the list of values for this tag, but only if there are at least two
- * primitives with tags, and at least one tagged primitive do not have this tag.
+ * For tags which are not present on at least one of the merged nodes, the empty value ""
+ * is added to the list of values for this tag, but only if there are at least two
+ * primitives with tags, and at least one tagged primitive do not have this tag.
*
* @param tc the tag collection
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8413)
@@ -640,8 +640,12 @@
@Override
- public void nodeMoved(NodeMovedEvent event) {/* irrelevant in this context */}
-
- @Override
- public void wayNodesChanged(WayNodesChangedEvent event) {/* irrelevant in this context */}
+ public void nodeMoved(NodeMovedEvent event) {
+ /* irrelevant in this context */
+ }
+
+ @Override
+ public void wayNodesChanged(WayNodesChangedEvent event) {
+ /* irrelevant in this context */
+ }
@Override
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 8413)
@@ -393,5 +393,7 @@
@Override
- public void layerAdded(Layer newLayer) {}
+ public void layerAdded(Layer newLayer) {
+ // Do nothing
+ }
@Override
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (revision 8413)
@@ -35,23 +35,37 @@
@Override
- public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored */}
+ public void primitivesAdded(PrimitivesAddedEvent event) {
+ // ignored
+ }
@Override
- public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored */}
+ public void primitivesRemoved(PrimitivesRemovedEvent event) {
+ // ignored
+ }
@Override
- public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignored */}
+ public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+ // ignored
+ }
@Override
- public void nodeMoved(NodeMovedEvent event) {/* ignored */}
+ public void nodeMoved(NodeMovedEvent event) {
+ // ignored
+ }
@Override
- public void relationMembersChanged(RelationMembersChangedEvent event) {/* ignored */}
+ public void relationMembersChanged(RelationMembersChangedEvent event) {
+ // ignored
+ }
@Override
- public void tagsChanged(TagsChangedEvent event) {/* ignored */}
+ public void tagsChanged(TagsChangedEvent event) {
+ // ignored
+ }
@Override
- public void wayNodesChanged(WayNodesChangedEvent event) {/* ignored */}
+ public void wayNodesChanged(WayNodesChangedEvent event) {
+ // ignored
+ }
/* ------------------------------------------------------------------------------ */
@@ -61,6 +75,5 @@
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
// just init the model content. Don't register as DataSetListener. The mode
- // is already registered to receive DataChangedEvents from the current
- // edit layer
+ // is already registered to receive DataChangedEvents from the current edit layer
if (newLayer != null) {
initFromDataSet(newLayer.data);
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 8413)
@@ -102,6 +102,5 @@
@Override
public void dataChanged(DataChangedEvent event) {
- // just trigger a repaint - the display name of the relation members may
- // have changed
+ // just trigger a repaint - the display name of the relation members may have changed
Collection sel = getSelectedMembers();
fireTableDataChanged();
@@ -110,7 +109,11 @@
@Override
- public void nodeMoved(NodeMovedEvent event) {/* ignore */}
- @Override
- public void primitivesAdded(PrimitivesAddedEvent event) {/* ignore */}
+ public void nodeMoved(NodeMovedEvent event) {
+ // ignore
+ }
+ @Override
+ public void primitivesAdded(PrimitivesAddedEvent event) {
+ // ignore
+ }
@Override
@@ -142,8 +145,13 @@
@Override
- public void wayNodesChanged(WayNodesChangedEvent event) {/* ignore */}
-
- @Override
- public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignore */}
+ public void wayNodesChanged(WayNodesChangedEvent event) {
+ // ignore
+ }
+
+ @Override
+ public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+ // ignore
+ }
+
/* --------------------------------------------------------------------------- */
@@ -167,6 +175,5 @@
members.clear();
if (relation != null) {
- // make sure we work with clones of the relation members
- // in the model.
+ // make sure we work with clones of the relation members in the model.
members.addAll(new Relation(relation).getMembers());
}
@@ -711,5 +718,4 @@
}
-
WayConnectionType getWayConnection(int i) {
if (connectionType == null) {
Index: /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 8413)
@@ -204,6 +204,5 @@
/**
- * Called, when the layer is removed from the mapview and is going to be
- * destroyed.
+ * Called, when the layer is removed from the mapview and is going to be destroyed.
*
* This is because the Layer constructor can not add itself safely as listener
@@ -212,8 +211,15 @@
*/
@Override
- public void destroy() {}
-
- public File getAssociatedFile() { return associatedFile; }
- public void setAssociatedFile(File file) { associatedFile = file; }
+ public void destroy() {
+ // Override in subclasses if needed
+ }
+
+ public File getAssociatedFile() {
+ return associatedFile;
+ }
+
+ public void setAssociatedFile(File file) {
+ associatedFile = file;
+ }
/**
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 8413)
@@ -433,5 +433,6 @@
@Override
public void run() {
- pnlPluginPreferences.refreshView(); }
+ pnlPluginPreferences.refreshView();
+ }
});
}
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 8413)
@@ -354,5 +354,7 @@
public void filter() {
String expr = filterField.getText().trim();
- if (expr.isEmpty()) { expr=null; }
+ if (expr.isEmpty()) {
+ expr = null;
+ }
try {
final TableRowSorter sorter =
@@ -376,9 +378,15 @@
@Override
- public void changedUpdate(DocumentEvent arg0) { filter(); }
- @Override
- public void insertUpdate(DocumentEvent arg0) { filter(); }
- @Override
- public void removeUpdate(DocumentEvent arg0) { filter(); }
+ public void changedUpdate(DocumentEvent e) {
+ filter();
+ }
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ filter();
+ }
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ filter();
+ }
}
}
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8413)
@@ -933,5 +933,7 @@
@Override
- boolean requestFocusInWindow() {return check.requestFocusInWindow();}
+ boolean requestFocusInWindow() {
+ return check.requestFocusInWindow();
+ }
@Override
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 8413)
@@ -130,5 +130,7 @@
* @see #setModel
*/
- public Node getModel() { return model; }
+ public Node getModel() {
+ return model;
+ }
/**
@@ -157,5 +159,7 @@
* @see #setDividerSize
*/
- public int getDividerSize() { return dividerSize; }
+ public int getDividerSize() {
+ return dividerSize;
+ }
/**
@@ -180,5 +184,7 @@
* @see #setFloatingDividers
*/
- public boolean getFloatingDividers() { return floatingDividers; }
+ public boolean getFloatingDividers() {
+ return floatingDividers;
+ }
/**
@@ -693,5 +699,7 @@
* @return the invalid Node.
*/
- public Node getNode() { return node; }
+ public Node getNode() {
+ return node;
+ }
}
@@ -825,5 +833,7 @@
* @see #parent_set
*/
- public Split parent_get() { return parent; }
+ public Split parent_get() {
+ return parent;
+ }
/**
@@ -873,5 +883,7 @@
* @see #setWeight
*/
- public double getWeight() { return weight; }
+ public double getWeight() {
+ return weight;
+ }
/**
@@ -951,5 +963,7 @@
* @see #setRowLayout
*/
- public boolean isRowLayout() { return rowLayout; }
+ public boolean isRowLayout() {
+ return rowLayout;
+ }
/**
@@ -1039,5 +1053,7 @@
* Create a Leaf node. The default value of name is "".
*/
- public Leaf() { }
+ public Leaf() {
+
+ }
/**
@@ -1059,5 +1075,7 @@
* @see #setName
*/
- public String getName() { return name; }
+ public String getName() {
+ return name;
+ }
/**
Index: /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 8412)
+++ /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 8413)
@@ -69,5 +69,7 @@
result = Result.WAITING;
interrupt();
- while (result == Result.WAITING) { sleep(10); /* yield(); */ }
+ while (result == Result.WAITING) {
+ sleep(10); /* yield(); */
+ }
if (result == Result.FAILED)
throw exception;
@@ -217,5 +219,7 @@
calibration = Main.pref.getDouble("audio.calibration", 1.0 /* default, ratio */);
start();
- while (state == State.INITIALIZING) { yield(); }
+ while (state == State.INITIALIZING) {
+ yield();
+ }
}
@@ -251,5 +255,7 @@
position += nBytesRead / bytesPerSecond;
command.possiblyInterrupt();
- if (nBytesRead < 0) { break; }
+ if (nBytesRead < 0) {
+ break;
+ }
audioOutputLine.write(abData, 0, nBytesRead); // => int nBytesWritten
command.possiblyInterrupt();