Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleVertex.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleVertex.java (revision 30700) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleVertex.java (revision 30701) @@ -10,59 +10,59 @@ public class EleVertex { - private static final int NPOINTS = 3; - private static final double MIN_DIST = 90; - - private double avrgEle = Double.NaN; - private double area = Double.NaN; - private final EleCoordinate[] points = new EleCoordinate[NPOINTS]; - - public EleVertex(EleCoordinate p1, EleCoordinate p2, EleCoordinate p3) { - points[0] = p1; - points[1] = p2; - points[2] = p3; - - // compute elevation - double z = 0D; - boolean eleValid = true; - for (EleCoordinate point : points) { - if (ElevationHelper.isValidElevation(p1.getEle())) { - z += point.getEle(); - } else { - eleValid = false; - break; - } - } - - if (eleValid) { - avrgEle = z / NPOINTS; - } else { - avrgEle = ElevationHelper.NO_ELEVATION; - } - - // compute the (approx.!) area of the vertex using heron's formula - double a = p1.greatCircleDistance(p2); - double b = p2.greatCircleDistance(p3); - double c = p1.greatCircleDistance(p3); - - double s = (a + b + c) / 2D; - double sq = s * (s - a) * (s - b) * (s - c); - area = Math.sqrt(sq); - } - - public List divide() { - TriangleEdge[] edges = new TriangleEdge[NPOINTS]; - - int k = 0; - for (int i = 0; i < points.length; i++) { - EleCoordinate c1 = points[i]; - - for (int j = i + 1; j < points.length; j++) { - EleCoordinate c2 = points[j]; - - edges[k++] = new TriangleEdge(i, j, c1.greatCircleDistance(c2)); - } - } - - /* + private static final int NPOINTS = 3; + private static final double MIN_DIST = 90; + + private double avrgEle = Double.NaN; + private double area = Double.NaN; + private final EleCoordinate[] points = new EleCoordinate[NPOINTS]; + + public EleVertex(EleCoordinate p1, EleCoordinate p2, EleCoordinate p3) { + points[0] = p1; + points[1] = p2; + points[2] = p3; + + // compute elevation + double z = 0D; + boolean eleValid = true; + for (EleCoordinate point : points) { + if (ElevationHelper.isValidElevation(p1.getEle())) { + z += point.getEle(); + } else { + eleValid = false; + break; + } + } + + if (eleValid) { + avrgEle = z / NPOINTS; + } else { + avrgEle = ElevationHelper.NO_ELEVATION; + } + + // compute the (approx.!) area of the vertex using heron's formula + double a = p1.greatCircleDistance(p2); + double b = p2.greatCircleDistance(p3); + double c = p1.greatCircleDistance(p3); + + double s = (a + b + c) / 2D; + double sq = s * (s - a) * (s - b) * (s - c); + area = Math.sqrt(sq); + } + + public List divide() { + TriangleEdge[] edges = new TriangleEdge[NPOINTS]; + + int k = 0; + for (int i = 0; i < points.length; i++) { + EleCoordinate c1 = points[i]; + + for (int j = i + 1; j < points.length; j++) { + EleCoordinate c2 = points[j]; + + edges[k++] = new TriangleEdge(i, j, c1.greatCircleDistance(c2)); + } + } + + /* for (int i = 0; i < edges.length; i++) { TriangleEdge triangleEdge = edges[i]; @@ -70,153 +70,153 @@ }*/ - // sort by distance - Arrays.sort(edges); - // pick the longest edge - TriangleEdge longest = edges[0]; - - - //System.out.println("Longest " + longest); - EleCoordinate pI = points[longest.getI()]; - EleCoordinate pJ = points[longest.getJ()]; - EleCoordinate pK = points[longest.getK()]; - EleCoordinate newP = getMid(pI, pJ); - /* + // sort by distance + Arrays.sort(edges); + // pick the longest edge + TriangleEdge longest = edges[0]; + + + //System.out.println("Longest " + longest); + EleCoordinate pI = points[longest.getI()]; + EleCoordinate pJ = points[longest.getJ()]; + EleCoordinate pK = points[longest.getK()]; + EleCoordinate newP = getMid(pI, pJ); + /* System.out.println(pI); System.out.println(pJ); System.out.println(pK); System.out.println(newP); - */ - List res = new ArrayList(); - res.add(new EleVertex(pI, pK, newP)); - res.add(new EleVertex(pJ, pK, newP)); - - return res; - } - - /** - * Checks if vertex requires further processing or is finished. Currently this - * method returns true, if the average deviation is < 5m - * - * @return true, if is finished - */ - public boolean isFinished() { - double z = 0D; + */ + List res = new ArrayList(); + res.add(new EleVertex(pI, pK, newP)); + res.add(new EleVertex(pJ, pK, newP)); + + return res; + } + + /** + * Checks if vertex requires further processing or is finished. Currently this + * method returns true, if the average deviation is < 5m + * + * @return true, if is finished + */ + public boolean isFinished() { + /*double z = 0D; double avrgEle = getEle(); for (EleCoordinate point : points) { z += (avrgEle - point.getEle()) * (avrgEle - point.getEle()); - } - - // TODO: Check for proper limit - return /*z < 75 || */getArea() < (30 * 30); // = 3 * 25 - } - - /** - * Gets the approximate area of this vertex in square meters. - * - * @return the area - */ - public double getArea() { - return area; - } - - /** - * Gets the (linear interpolated) mid point of c1 and c2. - * - * @param c1 the first coordinate - * @param c2 the second coordinate - * @return the mid point - */ - public EleCoordinate getMid(EleCoordinate c1, EleCoordinate c2) { - double x = (c1.getX() + c2.getX()) / 2.0; - double y = (c1.getY() + c2.getY()) / 2.0; - - double z = (c1.getEle() + c2.getEle()) / 2.0; - if (c1.greatCircleDistance(c2) > MIN_DIST) { - double hgtZ = ElevationHelper.getSrtmElevation(new LatLon(y, x)); - - if (ElevationHelper.isValidElevation(hgtZ)) { - z = hgtZ; - } - } - - return new EleCoordinate(y, x, z); - } - - /** - * Gets the coordinate for the given index. - * - * @param index the index between 0 and NPOINTS: - * @return the elevation coordinate instance - * @throws IllegalArgumentException, if index is invalid - */ - public EleCoordinate get(int index) { - if (index < 0 || index >= NPOINTS) throw new IllegalArgumentException("Invalid index: " + index); - - return points[index]; - } - - /** - * Gets the average elevation of this vertex. - * - * @return the ele - */ - public double getEle() { - - return avrgEle; - } - - @Override - public String toString() { - return "EleVertex [avrgEle=" + avrgEle + ", area=" + area + ", points=" - + Arrays.toString(points) + "]"; - } - - - - - class TriangleEdge implements Comparable { - private final int i; - private final int j; - private final double dist; - - public TriangleEdge(int i, int j, double dist) { - super(); - this.i = i; - this.j = j; - this.dist = dist; - } - - public int getI() { - return i; - } - - public int getJ() { - return j; - } - - public int getK() { - if (i == 0) { - return j == 1 ? 2 : 1; - } else if (i == 1) { - return j == 0 ? 2 : 0; - } else { - return j == 0 ? 1 : 0; - } - } - - public double getDist() { - return dist; - } - - @Override - public int compareTo(TriangleEdge o) { - return (int) (o.getDist() - dist); - } - - @Override - public String toString() { - return "TriangleEdge [i=" + i + ", j=" + j + ", dist=" + dist + "]"; - } - } + }*/ + + // TODO: Check for proper limit + return /*z < 75 || */getArea() < (30 * 30); // = 3 * 25 + } + + /** + * Gets the approximate area of this vertex in square meters. + * + * @return the area + */ + public double getArea() { + return area; + } + + /** + * Gets the (linear interpolated) mid point of c1 and c2. + * + * @param c1 the first coordinate + * @param c2 the second coordinate + * @return the mid point + */ + public EleCoordinate getMid(EleCoordinate c1, EleCoordinate c2) { + double x = (c1.getX() + c2.getX()) / 2.0; + double y = (c1.getY() + c2.getY()) / 2.0; + + double z = (c1.getEle() + c2.getEle()) / 2.0; + if (c1.greatCircleDistance(c2) > MIN_DIST) { + double hgtZ = ElevationHelper.getSrtmElevation(new LatLon(y, x)); + + if (ElevationHelper.isValidElevation(hgtZ)) { + z = hgtZ; + } + } + + return new EleCoordinate(y, x, z); + } + + /** + * Gets the coordinate for the given index. + * + * @param index the index between 0 and NPOINTS: + * @return the elevation coordinate instance + * @throws IllegalArgumentException, if index is invalid + */ + public EleCoordinate get(int index) { + if (index < 0 || index >= NPOINTS) throw new IllegalArgumentException("Invalid index: " + index); + + return points[index]; + } + + /** + * Gets the average elevation of this vertex. + * + * @return the ele + */ + public double getEle() { + + return avrgEle; + } + + @Override + public String toString() { + return "EleVertex [avrgEle=" + avrgEle + ", area=" + area + ", points=" + + Arrays.toString(points) + "]"; + } + + + + + class TriangleEdge implements Comparable { + private final int i; + private final int j; + private final double dist; + + public TriangleEdge(int i, int j, double dist) { + super(); + this.i = i; + this.j = j; + this.dist = dist; + } + + public int getI() { + return i; + } + + public int getJ() { + return j; + } + + public int getK() { + if (i == 0) { + return j == 1 ? 2 : 1; + } else if (i == 1) { + return j == 0 ? 2 : 0; + } else { + return j == 0 ? 1 : 0; + } + } + + public double getDist() { + return dist; + } + + @Override + public int compareTo(TriangleEdge o) { + return (int) (o.getDist() - dist); + } + + @Override + public String toString() { + return "TriangleEdge [i=" + i + ", j=" + j + ", dist=" + dist + "]"; + } + } } Index: /applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java =================================================================== --- /applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java (revision 30700) +++ /applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java (revision 30701) @@ -73,5 +73,5 @@ public static void correlate( List entries, GpxData data, long offset ) { List sortedEntries = new ArrayList(entries); - int ret = 0; + //int ret = 0; PrimaryDateParser dateParser = new PrimaryDateParser(); Collections.sort(sortedEntries); @@ -87,5 +87,5 @@ try { long curWpTime = dateParser.parse(curWpTimeStr).getTime() + offset; - ret += matchPoints(sortedEntries, prevWp, prevWpTime, curWp, curWpTime, offset); + /*ret +=*/ matchPoints(sortedEntries, prevWp, prevWpTime, curWp, curWpTime, offset); prevWp = curWp; Index: /applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java =================================================================== --- /applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java (revision 30700) +++ /applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java (revision 30701) @@ -1,10 +1,7 @@ package nanolog; -import java.awt.*; -import java.util.*; -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.Bounds; +import java.util.Date; + import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.gui.MapView; /** Index: /applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java =================================================================== --- /applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java (revision 30700) +++ /applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java (revision 30701) @@ -305,8 +305,4 @@ private boolean toZero; - public CorrelateEntries() { - this(false); - } - public CorrelateEntries( boolean toZero ) { super(toZero ? tr("Correlate with GPX...") : tr("Put on GPX..."), "nanolog/correlate", tr("Correlate entries with GPS trace"), null, false); Index: /applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java =================================================================== --- /applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java (revision 30700) +++ /applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java (revision 30701) @@ -1,15 +1,20 @@ package nanolog; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Rectangle; import java.text.SimpleDateFormat; -import java.util.*; -import javax.swing.*; +import java.util.ArrayList; +import java.util.List; + +import javax.swing.AbstractListModel; +import javax.swing.JList; + import nanolog.NanoLogLayer.NanoLogLayerListener; + import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.MapView.LayerChangeListener; import org.openstreetmap.josm.gui.dialogs.ToggleDialog; import org.openstreetmap.josm.gui.layer.Layer; -import static org.openstreetmap.josm.tools.I18n.tr; -import org.openstreetmap.josm.tools.Shortcut; /** Index: /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/parser/SyntaxException.java =================================================================== --- /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/parser/SyntaxException.java (revision 30700) +++ /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/parser/SyntaxException.java (revision 30701) @@ -5,5 +5,4 @@ private int startColumn; private int endColumn; - private String info; public int getStartColumn() { @@ -19,5 +18,4 @@ this.startColumn = startColumn; this.endColumn = endColumn; - this.info = info; } } Index: /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java =================================================================== --- /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java (revision 30700) +++ /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java (revision 30701) @@ -30,10 +30,10 @@ public class GeoFabrikWFSClient { - private Bounds bbox; + //private Bounds bbox; private DataStore data; private boolean bInitialized = false; public GeoFabrikWFSClient(Bounds bounds) { - bbox = bounds; + //bbox = bounds; } @@ -124,5 +124,4 @@ * @param args */ - @SuppressWarnings("deprecation") public static void main(String[] args) { @@ -154,4 +153,3 @@ // } } - } Index: /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorBugInfoDialog.java =================================================================== --- /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorBugInfoDialog.java (revision 30700) +++ /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorBugInfoDialog.java (revision 30701) @@ -24,11 +24,6 @@ ListSelectionListener, LayerChangeListener, MouseListener { - /** - * - */ - private static final long serialVersionUID = 7730268317164906579L; - private OsmInspectorLayer layer; + //private OsmInspectorLayer layer; private JTextPane bugTextArea; - /** @@ -42,7 +37,5 @@ bugTextArea.setText("This is a demo"); this.add(bugTextArea); - } - public OsmInspectorBugInfoDialog(OsmInspectorLayer layer) { @@ -55,10 +48,10 @@ true // default is "show dialog" ); - this.layer = layer; + //this.layer = layer; buildContentPanel(); } public void updateDialog(OsmInspectorLayer l) { - this.layer = l; + //this.layer = l; } @@ -67,54 +60,41 @@ } - @Override + /*@Override public void showNotify() { super.showNotify(); - } + }*/ @Override public void hideNotify() { if (dialogsPanel != null) { - // TODO Auto-generated method stub super.hideNotify(); } } - @Override public void mouseClicked(MouseEvent e) { - // TODO Auto-generated method stub - } @Override public void mouseEntered(MouseEvent e) { - // TODO Auto-generated method stub - } @Override public void mouseExited(MouseEvent e) { - // TODO Auto-generated method stub - } @Override public void mousePressed(MouseEvent e) { - // TODO Auto-generated method stub - } @Override public void mouseReleased(MouseEvent e) { - // TODO Auto-generated method stub - } @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { - if(newLayer instanceof OsmInspectorLayer) { + /*if(newLayer instanceof OsmInspectorLayer) { this.layer = (OsmInspectorLayer) newLayer; - } - + }*/ } @@ -129,6 +109,5 @@ @Override public void valueChanged(ListSelectionEvent e) { - System.out.println(e.getFirstIndex()); + //System.out.println(e.getFirstIndex()); } - } Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java (revision 30700) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java (revision 30701) @@ -227,4 +227,7 @@ while ((ln = in.readLine()) != null) { lines += ln; + } + if (Main.isDebugEnabled()) { + Main.debug(lines); } } catch (MalformedURLException e) { @@ -544,12 +547,4 @@ } - private double tryParseDouble(String str) { - try { - return Double.parseDouble(str); - } catch (NumberFormatException e) { - return 0; - } - } - private void checkLayerDuplicates(WMSLayer wmsLayer) throws DuplicateLayerException { if (Main.map != null) { Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreSessionImporter.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreSessionImporter.java (revision 30700) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreSessionImporter.java (revision 30701) @@ -5,10 +5,5 @@ import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; import java.net.URLDecoder; -import java.net.URLEncoder; import javax.xml.xpath.XPath; @@ -20,5 +15,4 @@ import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.gui.progress.ProgressMonitor; -import org.openstreetmap.josm.io.GpxImporter; import org.openstreetmap.josm.io.IllegalDataException; import org.openstreetmap.josm.io.session.SessionLayerImporter; Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java (revision 30700) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java (revision 30701) @@ -15,6 +15,4 @@ */ //public static int cadastreBackgroundTransp = 1; // original white but transparent - - private static final long serialVersionUID = 1L; protected int parcelColor = Color.RED.getRGB(); Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java (revision 30700) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java (revision 30701) @@ -2,11 +2,9 @@ package cadastre_fr; +import static org.openstreetmap.josm.tools.I18n.marktr; import static org.openstreetmap.josm.tools.I18n.tr; -import static org.openstreetmap.josm.tools.I18n.marktr; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; - -import javax.swing.JOptionPane; import org.openstreetmap.josm.Main; @@ -14,10 +12,8 @@ import org.openstreetmap.josm.tools.Shortcut; +/** + * Action calling the wms grabber for cadastre.gouv.fr + */ public class MenuActionGrab extends JosmAction { - - /** - * Action calling the wms grabber for cadastre.gouv.fr - */ - private static final long serialVersionUID = 1L; public static String name = marktr("Cadastre grab"); Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionRefineGeoRef.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionRefineGeoRef.java (revision 30700) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionRefineGeoRef.java (revision 30701) @@ -1,15 +1,11 @@ package cadastre_fr; +import static org.openstreetmap.josm.tools.I18n.marktr; import static org.openstreetmap.josm.tools.I18n.tr; -import static org.openstreetmap.josm.tools.I18n.marktr; import java.awt.event.ActionEvent; -import javax.swing.JOptionPane; - -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; -@SuppressWarnings("serial") public class MenuActionRefineGeoRef extends JosmAction { Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java (revision 30700) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java (revision 30701) @@ -14,6 +14,4 @@ public class WMSDownloadAction /*extends JosmAction */{ - - private static final long serialVersionUID = 1L; // public WMSDownloadAction(String layerName) { Index: /applications/editors/josm/plugins/gpsblam/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/gpsblam/.settings/org.eclipse.jdt.core.prefs (revision 30700) +++ /applications/editors/josm/plugins/gpsblam/.settings/org.eclipse.jdt.core.prefs (revision 30701) @@ -1,7 +1,95 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.7 Index: /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamInputData.java =================================================================== --- /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamInputData.java (revision 30700) +++ /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamInputData.java (revision 30701) @@ -19,5 +19,4 @@ import java.util.Calendar; import java.util.Collection; -import java.util.Date; import java.util.GregorianCalendar; import java.util.HashSet; Index: /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMarker.java =================================================================== --- /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMarker.java (revision 30700) +++ /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMarker.java (revision 30701) @@ -35,5 +35,4 @@ private CachedLatLon hair1Coord1, hair1Coord2, hair2Coord1, hair2Coord2; private CachedLatLon ellipseCoord1, ellipseCoord2, ellipseCoord3; // 1=TL 2=TR 3=BL, where main axis = +R, minor +U - private int ndays; static final double fac = 2.45; // 2.45 gives 95% CI for 2D Index: /applications/editors/josm/plugins/imagery_offset_db/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/imagery_offset_db/.settings/org.eclipse.jdt.core.prefs (revision 30700) +++ /applications/editors/josm/plugins/imagery_offset_db/.settings/org.eclipse.jdt.core.prefs (revision 30701) @@ -1,7 +1,95 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.7 Index: /applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java =================================================================== --- /applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java (revision 30700) +++ /applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java (revision 30701) @@ -114,5 +114,4 @@ */ private class DownloadOffsetsTask extends SimpleOffsetQueryTask { - private ImageryLayer layer; private List offsets; @@ -136,5 +135,4 @@ throw new IllegalArgumentException(e); } - this.layer = layer; } Index: /applications/editors/josm/plugins/imagewaypoint/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/imagewaypoint/.settings/org.eclipse.jdt.core.prefs (revision 30700) +++ /applications/editors/josm/plugins/imagewaypoint/.settings/org.eclipse.jdt.core.prefs (revision 30701) @@ -1,7 +1,95 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.7 Index: /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java =================================================================== --- /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java (revision 30700) +++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java (revision 30701) @@ -98,9 +98,6 @@ private static final class PreviousAction extends JosmAction { - private static final long serialVersionUID = -7899209365124237890L; - - private final ImageWayPointDialog dialog; - - public PreviousAction(final ImageWayPointDialog dialog) { + + public PreviousAction() { super(tr("Previous"), null, @@ -108,5 +105,4 @@ null, false); - this.dialog = dialog; } @@ -119,11 +115,7 @@ private static final class NextAction extends JosmAction { - private static final long serialVersionUID = 176134010956760988L; - - private final ImageWayPointDialog dialog; - - public NextAction(final ImageWayPointDialog dialog) { + + public NextAction() { super(tr("Next"), null, tr("Next image"), null, false); - this.dialog = dialog; } @@ -136,9 +128,6 @@ private static final class RotateLeftAction extends JosmAction { - private static final long serialVersionUID = 3536922796446259943L; - - private final ImageWayPointDialog dialog; - - public RotateLeftAction(final ImageWayPointDialog dialog) { + + public RotateLeftAction() { super(tr("Rotate left"), null, @@ -146,5 +135,4 @@ null, false); - this.dialog = dialog; } @@ -155,9 +143,6 @@ private static final class RotateRightAction extends JosmAction { - private static final long serialVersionUID = 1760186810341888993L; - - private final ImageWayPointDialog dialog; - - public RotateRightAction(final ImageWayPointDialog dialog) { + + public RotateRightAction() { super(tr("Rotate right"), null, @@ -165,5 +150,4 @@ null, false); - this.dialog = dialog; } @@ -191,8 +175,8 @@ 200); - this.previousAction = new PreviousAction(this); - this.nextAction = new NextAction(this); - this.rotateLeftAction = new RotateLeftAction(this); - this.rotateRightAction = new RotateRightAction(this); + this.previousAction = new PreviousAction(); + this.nextAction = new NextAction(); + this.rotateLeftAction = new RotateLeftAction(); + this.rotateRightAction = new RotateRightAction(); final JButton previousButton = new JButton(this.previousAction); Index: /applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java =================================================================== --- /applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java (revision 30700) +++ /applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java (revision 30701) @@ -47,9 +47,9 @@ private MapView mv; private String statusText; - private boolean drawing; - private boolean ctrl; + //private boolean drawing; + //private boolean ctrl; private boolean shift; - private boolean oldCtrl; - private boolean oldShift; + //private boolean oldCtrl; + //private boolean oldShift; private EastNorth pos; private WayPoint wpOld; @@ -195,6 +195,6 @@ @Override protected void updateKeyModifiers(InputEvent e) { - oldCtrl = ctrl; - oldShift = shift; + //oldCtrl = ctrl; + //oldShift = shift; ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; @@ -213,8 +213,8 @@ if (Main.map!=null) Main.map.mapView.repaint(); } - private void setStatusLine(String tr) { + /*private void setStatusLine(String tr) { statusText=tr; updateStatusLine(); - } + }*/ private synchronized void filterTracks() { Index: /applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java =================================================================== --- /applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java (revision 30700) +++ /applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java (revision 30701) @@ -1,5 +1,4 @@ package org.openstreetmap.josm.plugins.infomode; -import java.awt.Color; import java.awt.event.MouseEvent; import java.util.HashSet; Index: /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/administration/GeoFlaHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/administration/GeoFlaHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/administration/GeoFlaHandler.java (revision 30701) @@ -178,10 +178,10 @@ private Pair getGeoflaURL(String name, String urlSuffix) throws MalformedURLException { - return new Pair(name, new URL("http://professionnels.ign.fr/sites/default/files/"+urlSuffix)); + return new Pair<>(name, new URL("http://professionnels.ign.fr/sites/default/files/"+urlSuffix)); } @Override public List> getDataURLs() { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); try { result.add(getGeoflaURL("Départements France métropolitaine et Corse", "GEOFLADept_FR_Corse_AV_L93.zip")); Index: /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/agriculture/RegistreParcellaireHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/agriculture/RegistreParcellaireHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/agriculture/RegistreParcellaireHandler.java (revision 30701) @@ -117,10 +117,10 @@ private Pair getRpgURL(String number, String name) throws MalformedURLException { - return new Pair(number+" - "+name, new URL("http://www.data.gouv.fr/var/download/ign/RPG_2010_"+number+".ZIP")); + return new Pair<>(number+" - "+name, new URL("http://www.data.gouv.fr/var/download/ign/RPG_2010_"+number+".ZIP")); } @Override public List> getDataURLs() { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); try { for (FrenchAdministrativeUnit dpt : FrenchAdministrativeUnit.allDepartments) { Index: /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/AssainissementHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/AssainissementHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/AssainissementHandler.java (revision 30701) @@ -38,9 +38,9 @@ @Override public List> getDataURLs() { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); try { - result.add(new Pair("Données 2009", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2.php"))); - result.add(new Pair("Données 2010", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2010.php"))); - result.add(new Pair("Données 2011", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2011.php"))); + result.add(new Pair<>("Données 2009", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2.php"))); + result.add(new Pair<>("Données 2010", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2010.php"))); + result.add(new Pair<>("Données 2011", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2011.php"))); } catch (MalformedURLException e) { e.printStackTrace(); @@ -53,5 +53,5 @@ private Node nodeWithKeys; - private final Set interestingKeys = new HashSet(); + private final Set interestingKeys = new HashSet<>(); public InternalOdsHandler() { Index: /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/ForetsPubliquesHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/ForetsPubliquesHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/ForetsPubliquesHandler.java (revision 30701) @@ -109,5 +109,5 @@ @Override public List> getDataURLs() { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); try { for (FrenchAdministrativeUnit region : FrenchAdministrativeUnit.allRegions) { @@ -123,5 +123,5 @@ private Pair getForetURL(String code, String regionName) throws MalformedURLException { - return new Pair("PublicForests_"+regionName, new URL(FRENCH_PORTAL+"var/download/"+"for_publ_v2011_reg"+code+".zip")); + return new Pair<>("PublicForests_"+regionName, new URL(FRENCH_PORTAL+"var/download/"+"for_publ_v2011_reg"+code+".zip")); } } Index: /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/InventaireForestierNationalHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/InventaireForestierNationalHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/InventaireForestierNationalHandler.java (revision 30701) @@ -81,5 +81,5 @@ @Override public List> getDataURLs() { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); try { for (int year = 2010; year >= 2005; year--) { @@ -94,5 +94,5 @@ private Pair getIfnURL(int year, String name, String type) throws MalformedURLException { - return new Pair(name+" "+year, new URL("http://www.ifn.fr/spip/IMG/csv/placettes_"+type+"_"+year+".csv")); + return new Pair<>(name+" "+year, new URL("http://www.ifn.fr/spip/IMG/csv/placettes_"+type+"_"+year+".csv")); } } Index: /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java (revision 30701) @@ -94,5 +94,5 @@ @Override public List> getDataURLs() { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); try { for (WaterAgency wa : waterAgencies) { @@ -106,5 +106,5 @@ private Pair getDownloadURL(WaterAgency a) throws MalformedURLException { - return new Pair("SurfaceWater_"+a.name, new URL("http://www.rapportage.eaufrance.fr/sites/default/files/SIG/FR"+a.code+"_SW.zip")); + return new Pair<>("SurfaceWater_"+a.name, new URL("http://www.rapportage.eaufrance.fr/sites/default/files/SIG/FR"+a.code+"_SW.zip")); } Index: /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/transport/Route500Handler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/transport/Route500Handler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/transport/Route500Handler.java (revision 30701) @@ -44,5 +44,5 @@ @Override public List> getDataURLs() { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); try { for (FrenchAdministrativeUnit dpt : FrenchAdministrativeUnit.allDepartments) { @@ -58,5 +58,5 @@ private Pair getRoute500URL(String code, String name) throws MalformedURLException { - return new Pair(name, new URL(OSMFR_PORTAL+"ROUTE500_1-1_SHP_LAMB93_D"+code+"_2012-11-21.7z")); + return new Pair<>(name, new URL(OSMFR_PORTAL+"ROUTE500_1-1_SHP_LAMB93_D"+code+"_2012-11-21.7z")); } } Index: /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java (revision 30701) @@ -75,8 +75,8 @@ @Override public List> getDataURLs() { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); try { - if (kmzUuid != null && !kmzUuid.isEmpty()) result.add(new Pair(getName() + " (KMZ)", new URL(PORTAL + "download.do?uuid=" + kmzUuid))); - if (shpUuid != null && !shpUuid.isEmpty()) result.add(new Pair(getName() + " (SHP)", new URL(PORTAL + "download.do?uuid=" + shpUuid))); + if (kmzUuid != null && !kmzUuid.isEmpty()) result.add(new Pair<>(getName() + " (KMZ)", new URL(PORTAL + "download.do?uuid=" + kmzUuid))); + if (shpUuid != null && !shpUuid.isEmpty()) result.add(new Pair<>(getName() + " (SHP)", new URL(PORTAL + "download.do?uuid=" + shpUuid))); } catch (MalformedURLException e) { e.printStackTrace(); Index: /applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/urbanisme/SanisettesHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/urbanisme/SanisettesHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/urbanisme/SanisettesHandler.java (revision 30701) @@ -50,6 +50,6 @@ public void updateDataSet(DataSet ds) { - List sourceWays = new ArrayList(ds.getWays()); - List> waysToCombine = new ArrayList>(); + List sourceWays = new ArrayList<>(ds.getWays()); + List> waysToCombine = new ArrayList<>(); for (Iterator it = sourceWays.iterator(); it.hasNext();) { @@ -57,8 +57,8 @@ it.remove(); if (!wayProcessed(w, waysToCombine)) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(w); boolean finished = false; - List sourceWays2 = new ArrayList(sourceWays); + List sourceWays2 = new ArrayList<>(sourceWays); while (!finished) { int before = list.size(); Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java (revision 30701) @@ -113,5 +113,5 @@ private static final Collection getBoundaries(int admin_level) { - Collection result = new TreeSet(new Comparator() { + Collection result = new TreeSet<>(new Comparator() { @Override public int compare(Relation o1, Relation o2) { Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PistesCyclablesHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PistesCyclablesHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PistesCyclablesHandler.java (revision 30701) @@ -18,5 +18,5 @@ public class PistesCyclablesHandler extends ToulouseDataSetHandler { - protected final Map> map = new HashMap>(); + protected final Map> map = new HashMap<>(); private String streetField; Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/NumerosRueHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/NumerosRueHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/NumerosRueHandler.java (revision 30701) @@ -27,5 +27,5 @@ @Override public void updateDataSet(DataSet ds) { - Map associatedStreets = new HashMap(); + Map associatedStreets = new HashMap<>(); for (Node n : ds.getNodes()) { Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java (revision 30700) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java (revision 30701) @@ -17,5 +17,5 @@ public class VoirieHandler extends ToulouseDataSetHandler { - protected final Map> map = new HashMap>(); + protected final Map> map = new HashMap<>(); private String streetField; @@ -65,5 +65,5 @@ @Override public void updateDataSet(DataSet ds) { - Map associatedStreets = new HashMap(); + Map associatedStreets = new HashMap<>(); for (Way w : ds.getWays()) { Index: /applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/GraphicsProcessor.java =================================================================== --- /applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/GraphicsProcessor.java (revision 30700) +++ /applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/GraphicsProcessor.java (revision 30701) @@ -117,9 +117,6 @@ //fill all } - else - { + else { //Unexpected operation - int a = 10; - a++; } Index: /applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/PdfBoxParser.java =================================================================== --- /applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/PdfBoxParser.java (revision 30700) +++ /applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/PdfBoxParser.java (revision 30701) @@ -22,5 +22,4 @@ } - @SuppressWarnings("unchecked") public void parse(File file, int maxPaths, ProgressMonitor monitor) throws Exception { @@ -33,5 +32,5 @@ } - List allPages = document.getDocumentCatalog().getAllPages(); + List allPages = document.getDocumentCatalog().getAllPages(); if (allPages.size() != 1) { Index: /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java (revision 30700) +++ /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java (revision 30701) @@ -24,5 +24,4 @@ import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -68,7 +67,5 @@ } - public void actionPerformed(ActionEvent event) - { - DataSet mainDataSet = Main.main.getCurrentDataSet(); + public void actionPerformed(ActionEvent event) { if (dialog == null) Index: /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java =================================================================== --- /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java (revision 30700) +++ /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java (revision 30701) @@ -33,5 +33,4 @@ */ public class AddRemoveMemberAction extends JosmAction implements ChosenRelationListener { - private static final String ACTION_NAME = "Add/remove member"; private ChosenRelation rel; private SortAndFixAction sortAndFix; Index: /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java =================================================================== --- /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java (revision 30700) +++ /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java (revision 30701) @@ -24,5 +24,4 @@ */ public class CreateMultipolygonAction extends JosmAction { - private static final String ACTION_NAME = "Create relation"; private static final String PREF_MULTIPOLY = "reltoolbox.multipolygon."; protected ChosenRelation chRel; Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java (revision 30700) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java (revision 30701) @@ -253,5 +253,5 @@ double startAngle = realA1; // Transform the angles to get a consistent starting point - double a1 = 0; + //double a1 = 0; double a2 = normalizeAngle(realA2 - startAngle); double a3 = normalizeAngle(realA3 - startAngle); Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java (revision 30700) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java (revision 30701) @@ -1,3 +1,6 @@ package org.openstreetmap.josm.plugins.utilsplugin2.multitagger; + +import static org.openstreetmap.josm.tools.I18n.marktr; +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Color; @@ -18,8 +21,7 @@ import java.util.LinkedList; import java.util.List; + import javax.swing.AbstractAction; -import static javax.swing.Action.SHORT_DESCRIPTION; import javax.swing.BoxLayout; -import javax.swing.DefaultCellEditor; import javax.swing.JButton; import javax.swing.JComponent; @@ -35,4 +37,5 @@ import javax.swing.event.ListSelectionListener; import javax.swing.table.DefaultTableCellRenderer; + import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.AutoScaleAction; @@ -51,8 +54,5 @@ import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; import org.openstreetmap.josm.tools.GBC; -import static org.openstreetmap.josm.tools.I18n.marktr; -import static org.openstreetmap.josm.tools.I18n.tr; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.tools.Shortcut; import org.openstreetmap.josm.tools.WindowGeometry; @@ -166,5 +166,5 @@ } - private OsmPrimitive getSelectedPrimitive() { + /*private OsmPrimitive getSelectedPrimitive() { int idx = tbl.getSelectedRow(); if (idx>=0) { @@ -173,5 +173,5 @@ return null; } - } + }*/ private final MouseAdapter tableMouseAdapter = new MouseAdapter() { Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTaggerTableModel.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTaggerTableModel.java (revision 30700) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTaggerTableModel.java (revision 30701) @@ -10,7 +10,8 @@ import java.util.List; import java.util.Set; + import javax.swing.JTable; import javax.swing.table.AbstractTableModel; -import javax.swing.table.TableCellEditor; + import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.ChangePropertyCommand; Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java (revision 30700) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java (revision 30701) @@ -10,10 +10,11 @@ import java.util.HashSet; import java.util.Set; + import javax.swing.JOptionPane; -import org.openstreetmap.josm.Main; + import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.*; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.Notification; - import org.openstreetmap.josm.tools.Shortcut; Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java (revision 30700) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java (revision 30701) @@ -10,11 +10,11 @@ import java.util.HashSet; import java.util.Set; + import javax.swing.JOptionPane; -import org.openstreetmap.josm.Main; + import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.*; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.Notification; -import static org.openstreetmap.josm.tools.I18n.tr; - import org.openstreetmap.josm.tools.Shortcut; Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java (revision 30700) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java (revision 30701) @@ -10,10 +10,11 @@ import java.util.HashSet; import java.util.Set; + import javax.swing.JOptionPane; -import org.openstreetmap.josm.Main; + import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.*; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.gui.Notification; - import org.openstreetmap.josm.tools.Shortcut; Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java (revision 30700) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java (revision 30701) @@ -11,9 +11,7 @@ import javax.swing.JOptionPane; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.*; +import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.gui.Notification; - import org.openstreetmap.josm.tools.Shortcut; Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java (revision 30700) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java (revision 30701) @@ -6,11 +6,20 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Queue; +import java.util.Set; + import javax.swing.JOptionPane; -import org.openstreetmap.josm.Main; + import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.*; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.Notification; -import static org.openstreetmap.josm.tools.I18n.tr; import org.openstreetmap.josm.tools.Shortcut;