Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/Main.java (revision 7801)
@@ -983,6 +983,6 @@
dialog.setVisible(true);
switch(dialog.getUserAction()) {
- case CANCEL: return false;
case PROCEED: return true;
+ case CANCEL:
default: return false;
}
Index: /trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java (revision 7801)
@@ -29,5 +29,5 @@
// Hide default constructor for utils classes
}
-
+
/**
* Tags that imply a semantic meaning from the way direction and cannot be changed.
@@ -45,5 +45,5 @@
new Tag("waterway", "canal")
}));
-
+
/**
* Replies the tags that imply a semantic meaning from way
direction and cannot be changed.
@@ -54,5 +54,5 @@
return directionalTags.intersect(TagCollection.from(way));
}
-
+
/**
* Tests whether way can be reversed without semantic change.
@@ -64,5 +64,5 @@
return getDirectionalTags(way).isEmpty();
}
-
+
protected static String getHTML(TagCollection tags) {
if (tags.size() == 1) {
@@ -74,5 +74,5 @@
}
}
-
+
protected static boolean confirmReverseWay(Way way, TagCollection tags) {
String msg = trn(
@@ -100,10 +100,12 @@
);
switch(ret) {
- case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true;
- case JOptionPane.YES_OPTION: return true;
- default: return false;
+ case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION:
+ case JOptionPane.YES_OPTION:
+ return true;
+ default:
+ return false;
}
}
-
+
/**
* Checks the given way can be safely reversed and asks user to confirm the operation if it not the case.
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 7801)
@@ -1458,5 +1458,4 @@
private final int to;
private final List output;
- private final DataSet data;
private final ElemStyles styles = MapPaintStyles.getStyles();
@@ -1472,12 +1471,10 @@
* @param to last index + 1
* @param output the list of styles to which styles will be added
- * @param data the data set
*/
- public ComputeStyleListWorker(final List extends OsmPrimitive> input, int from, int to, List output, DataSet data) {
+ public ComputeStyleListWorker(final List extends OsmPrimitive> input, int from, int to, List output) {
this.input = input;
this.from = from;
this.to = to;
this.output = output;
- this.data = data;
this.styles.setDrawMultipolygon(drawMultipolygon);
}
@@ -1595,5 +1592,5 @@
int to = Math.min((i+1)*bucketsize, prims.size());
List target = singleThread ? allStyleElems : new ArrayList(to - from);
- tasks.add(new ComputeStyleListWorker(prims, from, to, target, data));
+ tasks.add(new ComputeStyleListWorker(prims, from, to, target));
}
if (singleThread) {
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (revision 7801)
@@ -126,4 +126,5 @@
* @return true if the parameter is a valid domain name
*/
+ @Override
public boolean isValid(String domain) {
String[] groups = domainRegex.match(domain);
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java (revision 7801)
@@ -55,4 +55,5 @@
* @return true if the string validates as an IP address
*/
+ @Override
public boolean isValid(String inetAddress) {
return isValidInet4Address(inetAddress);
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java (revision 7801)
@@ -123,4 +123,5 @@
* otherwise false
.
*/
+ @Override
public boolean isValid(String value) {
if (value == null) {
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (revision 7801)
@@ -35,5 +35,5 @@
/**
- * constuctor
+ * constructor
*/
public MultiValueResolutionDecision() {
@@ -148,6 +148,6 @@
case KEEP_ONE: return value;
case SUM_ALL_NUMERIC: return tags.getSummedValues(getKey());
- case KEEP_NONE: return null;
case KEEP_ALL: return tags.getJoinedValues(getKey());
+ case KEEP_NONE:
default: return null;
}
@@ -308,5 +308,5 @@
case KEEP_ONE: return new Tag(getKey(),value);
case KEEP_NONE: return new Tag(getKey(), "");
- case UNDECIDED: return null;
+ case UNDECIDED:
default: return null;
}
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 7801)
@@ -664,7 +664,8 @@
);
switch(ret) {
- case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return;
- case JOptionPane.CLOSED_OPTION: return;
- case JOptionPane.NO_OPTION: return;
+ case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION:
+ case JOptionPane.CLOSED_OPTION:
+ case JOptionPane.NO_OPTION:
+ return;
case JOptionPane.YES_OPTION:
memberTableModel.removeMembersReferringTo(toCheck);
@@ -714,9 +715,12 @@
);
switch(ret) {
- case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true;
- case JOptionPane.YES_OPTION: return true;
- case JOptionPane.NO_OPTION: return false;
- case JOptionPane.CLOSED_OPTION: return false;
- case JOptionPane.CANCEL_OPTION: throw new AddAbortException();
+ case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION:
+ case JOptionPane.YES_OPTION:
+ return true;
+ case JOptionPane.NO_OPTION:
+ case JOptionPane.CLOSED_OPTION:
+ return false;
+ case JOptionPane.CANCEL_OPTION:
+ throw new AddAbortException();
}
// should not happen
@@ -1581,6 +1585,7 @@
);
switch(ret) {
- case JOptionPane.YES_OPTION: return true;
- case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return true;
+ case JOptionPane.YES_OPTION:
+ case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION:
+ return true;
default:
return false;
Index: /trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java (revision 7801)
@@ -17,4 +17,5 @@
public class TagInfoViewer extends HistoryViewerPanel {
+ @Override
protected JTable buildReferenceTable() {
JTable table = new JTable(
@@ -28,4 +29,5 @@
}
+ @Override
protected JTable buildCurrentTable() {
JTable table = new JTable(
Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 7801)
@@ -252,6 +252,4 @@
switch(strategy) {
case INDIVIDUAL_OBJECTS_STRATEGY:
- spec.setStrategy(strategy);
- break;
case SINGLE_REQUEST_STRATEGY:
spec.setStrategy(strategy);
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 7801)
@@ -414,4 +414,5 @@
* @return {@code true} if all conditions apply, false otherwise.
*/
+ @Override
public boolean matches(Environment env) {
if (conds == null) return true;
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlCondition.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlCondition.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlCondition.java (revision 7801)
@@ -4,6 +4,6 @@
import org.openstreetmap.josm.data.osm.OsmUtils;
-public class XmlCondition
-{
+public class XmlCondition {
+
public String key;
public String value;
@@ -33,4 +33,5 @@
}
+ @Override
public String toString() {
return "Rule["+key+","+(boolValue != null ? "b="+boolValue:"v="+value)+"]";
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java (revision 7801)
@@ -2,13 +2,6 @@
package org.openstreetmap.josm.gui.widgets;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.GBC;
+import static org.openstreetmap.josm.tools.I18n.tr;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
import java.awt.BorderLayout;
import java.awt.Dimension;
@@ -19,5 +12,13 @@
import java.util.List;
-import static org.openstreetmap.josm.tools.I18n.tr;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.GBC;
/**
@@ -138,4 +139,5 @@
}
+ @Override
public void setEnabled(boolean enabled) {
sourcesList.setEnabled(enabled);
Index: /trunk/src/org/openstreetmap/josm/io/GpxReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 7801)
@@ -405,7 +405,4 @@
break;
case "time":
- currentWayPoint.put(localName, accumulator.toString());
- currentWayPoint.setTime();
- break;
case "cmt":
case "desc":
Index: /trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 7801)
@@ -84,16 +84,10 @@
data.put(currentPrimitive, currentModificationType);
break;
- case "osmChange":
- // do nothing
- break;
case "create":
- currentModificationType = null;
- break;
case "modify":
- currentModificationType = null;
- break;
case "delete":
currentModificationType = null;
break;
+ case "osmChange":
case "tag":
case "nd":
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java (revision 7801)
@@ -101,4 +101,5 @@
* Return the type of the GeneralName.
*/
+ @Override
public int getType() {
return GeneralNameInterface.NAME_DNS;
@@ -119,4 +120,5 @@
* @exception IOException on encoding errors.
*/
+ @Override
public void encode(DerOutputStream out) throws IOException {
out.putIA5String(name);
Index: /trunk/src/org/openstreetmap/josm/tools/Diff.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 7800)
+++ /trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 7801)
@@ -912,5 +912,4 @@
&& equivs[start] == equivs[end]
&& !other_changed[1+j]
- && end != i_end
&& !((preceding >= 0 && start == preceding)
|| (other_preceding >= 0