Index: trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 14340)
+++ trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 14341)
@@ -58,5 +58,5 @@
* Whether the checkbox is ticked
*/
- public boolean checkboxTicked = false;
+ public boolean checkboxTicked;
/**
Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 14340)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 14341)
@@ -260,6 +260,6 @@
static class GpxTrackSegmentSpan {
- public final Date firstTime;
- public final Date lastTime;
+ final Date firstTime;
+ final Date lastTime;
private final boolean inv;
private final WayPoint firstWp;
@@ -283,9 +283,9 @@
}
- public WayPoint getFirstWp() {
+ WayPoint getFirstWp() {
return new WayPoint(firstWp);
}
- public WayPoint getLastWp() {
+ WayPoint getLastWp() {
return new WayPoint(lastWp);
}
@@ -293,9 +293,9 @@
// no new instances needed, therefore own methods for that
- public boolean firstEquals(Object other) {
+ boolean firstEquals(Object other) {
return firstWp.equals(other);
}
- public boolean lastEquals(Object other) {
+ boolean lastEquals(Object other) {
return lastWp.equals(other);
}
@@ -305,10 +305,10 @@
}
- public boolean overlapsWith(GpxTrackSegmentSpan other) {
+ boolean overlapsWith(GpxTrackSegmentSpan other) {
return (firstTime.before(other.lastTime) && other.firstTime.before(lastTime))
|| (other.firstTime.before(lastTime) && firstTime.before(other.lastTime));
}
- public static GpxTrackSegmentSpan tryGetFromSegment(GpxTrackSegment seg) {
+ static GpxTrackSegmentSpan tryGetFromSegment(GpxTrackSegment seg) {
WayPoint b = getNextWpWithTime(seg, true);
if (b != null) {
@@ -348,7 +348,5 @@
}
}
- segSpans.sort((o1, o2) -> {
- return o1.firstTime.compareTo(o2.firstTime);
- });
+ segSpans.sort((o1, o2) -> o1.firstTime.compareTo(o2.firstTime));
}
return segSpans;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeGpxLayerDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeGpxLayerDialog.java (revision 14340)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeGpxLayerDialog.java (revision 14341)
@@ -43,5 +43,4 @@
private final JTable t;
private final JCheckBox c;
- private final Component parent;
private final JButton btnUp;
private final JButton btnDown;
@@ -55,5 +54,4 @@
super(parent, tr("Merge GPX layers"), tr("Merge"), tr("Cancel"));
setButtonIcons("dialogs/mergedown", "cancel");
- this.parent = parent;
JPanel p = new JPanel(new GridBagLayout());
@@ -137,5 +135,5 @@
&& (!ConditionalOptionPaneUtil.showConfirmationDialog(
"gpx_target_change",
- parent,
+ getParent(),
new JLabel("" +
tr("This will change the target layer to \"{0}\".
Would you like to continue?",
@@ -185,12 +183,11 @@
public int getRowCount() {
return layers.size();
-
- }
-
- public void moveRow(int row, int newRow) {
+ }
+
+ void moveRow(int row, int newRow) {
Collections.swap(layers, row, newRow);
}
- public List getSortedLayers() {
+ List getSortedLayers() {
return layers;
}
@@ -210,6 +207,7 @@
case 2:
return layers.get(row).data.getTrackSegsCount();
+ default:
+ throw new IndexOutOfBoundsException(Integer.toString(col));
}
- throw new IndexOutOfBoundsException(Integer.toString(col));
}
}