Changeset 30701 in osm for applications
- Timestamp:
- 2014-10-04T17:28:45+02:00 (11 years ago)
- Location:
- applications/editors/josm/plugins
- Files:
-
- 49 edited
-
ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleVertex.java (modified) (2 diffs)
-
NanoLog/src/nanolog/Correlator.java (modified) (2 diffs)
-
NanoLog/src/nanolog/NanoLogEntry.java (modified) (1 diff)
-
NanoLog/src/nanolog/NanoLogLayer.java (modified) (1 diff)
-
NanoLog/src/nanolog/NanoLogPanel.java (modified) (1 diff)
-
OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/parser/SyntaxException.java (modified) (2 diffs)
-
OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java (modified) (3 diffs)
-
OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorBugInfoDialog.java (modified) (5 diffs)
-
cadastre-fr/src/cadastre_fr/CadastreInterface.java (modified) (2 diffs)
-
cadastre-fr/src/cadastre_fr/CadastreSessionImporter.java (modified) (2 diffs)
-
cadastre-fr/src/cadastre_fr/ImageModifier.java (modified) (1 diff)
-
cadastre-fr/src/cadastre_fr/MenuActionGrab.java (modified) (2 diffs)
-
cadastre-fr/src/cadastre_fr/MenuActionRefineGeoRef.java (modified) (1 diff)
-
cadastre-fr/src/cadastre_fr/WMSDownloadAction.java (modified) (1 diff)
-
gpsblam/.settings/org.eclipse.jdt.core.prefs (modified) (1 diff)
-
gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamInputData.java (modified) (1 diff)
-
gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMarker.java (modified) (1 diff)
-
imagery_offset_db/.settings/org.eclipse.jdt.core.prefs (modified) (1 diff)
-
imagery_offset_db/src/iodb/GetImageryOffsetAction.java (modified) (2 diffs)
-
imagewaypoint/.settings/org.eclipse.jdt.core.prefs (modified) (1 diff)
-
imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java (modified) (8 diffs)
-
infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java (modified) (3 diffs)
-
infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java (modified) (1 diff)
-
opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/administration/GeoFlaHandler.java (modified) (1 diff)
-
opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/agriculture/RegistreParcellaireHandler.java (modified) (1 diff)
-
opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/AssainissementHandler.java (modified) (2 diffs)
-
opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/ForetsPubliquesHandler.java (modified) (2 diffs)
-
opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/InventaireForestierNationalHandler.java (modified) (2 diffs)
-
opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java (modified) (2 diffs)
-
opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/transport/Route500Handler.java (modified) (2 diffs)
-
opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java (modified) (1 diff)
-
opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/urbanisme/SanisettesHandler.java (modified) (2 diffs)
-
opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java (modified) (1 diff)
-
opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PistesCyclablesHandler.java (modified) (1 diff)
-
opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/NumerosRueHandler.java (modified) (1 diff)
-
opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java (modified) (2 diffs)
-
pdfimport/src/pdfimport/pdfbox/GraphicsProcessor.java (modified) (1 diff)
-
pdfimport/src/pdfimport/pdfbox/PdfBoxParser.java (modified) (2 diffs)
-
public_transport/src/public_transport/GTFSImporterAction.java (modified) (2 diffs)
-
reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java (modified) (1 diff)
-
reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java (modified) (1 diff)
-
utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java (modified) (1 diff)
-
utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java (modified) (6 diffs)
-
utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTaggerTableModel.java (modified) (1 diff)
-
utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java (modified) (1 diff)
-
utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java (modified) (1 diff)
-
utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java (modified) (1 diff)
-
utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java (modified) (1 diff)
-
utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleVertex.java
r30344 r30701 10 10 11 11 public class EleVertex { 12 private static final int NPOINTS = 3;13 private static final double MIN_DIST = 90;14 15 private double avrgEle = Double.NaN;16 private double area = Double.NaN;17 private final EleCoordinate[] points = new EleCoordinate[NPOINTS];18 19 public EleVertex(EleCoordinate p1, EleCoordinate p2, EleCoordinate p3) {20 points[0] = p1;21 points[1] = p2;22 points[2] = p3;23 24 // compute elevation25 double z = 0D;26 boolean eleValid = true;27 for (EleCoordinate point : points) {28 if (ElevationHelper.isValidElevation(p1.getEle())) {29 z += point.getEle();30 } else {31 eleValid = false;32 break;33 }34 }35 36 if (eleValid) {37 avrgEle = z / NPOINTS;38 } else {39 avrgEle = ElevationHelper.NO_ELEVATION;40 }41 42 // compute the (approx.!) area of the vertex using heron's formula43 double a = p1.greatCircleDistance(p2);44 double b = p2.greatCircleDistance(p3);45 double c = p1.greatCircleDistance(p3);46 47 double s = (a + b + c) / 2D;48 double sq = s * (s - a) * (s - b) * (s - c);49 area = Math.sqrt(sq);50 }51 52 public List<EleVertex> divide() {53 TriangleEdge[] edges = new TriangleEdge[NPOINTS];54 55 int k = 0;56 for (int i = 0; i < points.length; i++) {57 EleCoordinate c1 = points[i];58 59 for (int j = i + 1; j < points.length; j++) {60 EleCoordinate c2 = points[j];61 62 edges[k++] = new TriangleEdge(i, j, c1.greatCircleDistance(c2));63 }64 }65 66 /*12 private static final int NPOINTS = 3; 13 private static final double MIN_DIST = 90; 14 15 private double avrgEle = Double.NaN; 16 private double area = Double.NaN; 17 private final EleCoordinate[] points = new EleCoordinate[NPOINTS]; 18 19 public EleVertex(EleCoordinate p1, EleCoordinate p2, EleCoordinate p3) { 20 points[0] = p1; 21 points[1] = p2; 22 points[2] = p3; 23 24 // compute elevation 25 double z = 0D; 26 boolean eleValid = true; 27 for (EleCoordinate point : points) { 28 if (ElevationHelper.isValidElevation(p1.getEle())) { 29 z += point.getEle(); 30 } else { 31 eleValid = false; 32 break; 33 } 34 } 35 36 if (eleValid) { 37 avrgEle = z / NPOINTS; 38 } else { 39 avrgEle = ElevationHelper.NO_ELEVATION; 40 } 41 42 // compute the (approx.!) area of the vertex using heron's formula 43 double a = p1.greatCircleDistance(p2); 44 double b = p2.greatCircleDistance(p3); 45 double c = p1.greatCircleDistance(p3); 46 47 double s = (a + b + c) / 2D; 48 double sq = s * (s - a) * (s - b) * (s - c); 49 area = Math.sqrt(sq); 50 } 51 52 public List<EleVertex> divide() { 53 TriangleEdge[] edges = new TriangleEdge[NPOINTS]; 54 55 int k = 0; 56 for (int i = 0; i < points.length; i++) { 57 EleCoordinate c1 = points[i]; 58 59 for (int j = i + 1; j < points.length; j++) { 60 EleCoordinate c2 = points[j]; 61 62 edges[k++] = new TriangleEdge(i, j, c1.greatCircleDistance(c2)); 63 } 64 } 65 66 /* 67 67 for (int i = 0; i < edges.length; i++) { 68 68 TriangleEdge triangleEdge = edges[i]; … … 70 70 }*/ 71 71 72 // sort by distance73 Arrays.sort(edges);74 // pick the longest edge75 TriangleEdge longest = edges[0];76 77 78 //System.out.println("Longest " + longest);79 EleCoordinate pI = points[longest.getI()];80 EleCoordinate pJ = points[longest.getJ()];81 EleCoordinate pK = points[longest.getK()];82 EleCoordinate newP = getMid(pI, pJ);83 /*72 // sort by distance 73 Arrays.sort(edges); 74 // pick the longest edge 75 TriangleEdge longest = edges[0]; 76 77 78 //System.out.println("Longest " + longest); 79 EleCoordinate pI = points[longest.getI()]; 80 EleCoordinate pJ = points[longest.getJ()]; 81 EleCoordinate pK = points[longest.getK()]; 82 EleCoordinate newP = getMid(pI, pJ); 83 /* 84 84 System.out.println(pI); 85 85 System.out.println(pJ); 86 86 System.out.println(pK); 87 87 System.out.println(newP); 88 */89 List<EleVertex> res = new ArrayList<EleVertex>();90 res.add(new EleVertex(pI, pK, newP));91 res.add(new EleVertex(pJ, pK, newP));92 93 return res;94 }95 96 /**97 * Checks if vertex requires further processing or is finished. Currently this98 * method returns <code>true</code>, if the average deviation is < 5m99 *100 * @return true, if is finished101 */102 public boolean isFinished() {103 double z = 0D;88 */ 89 List<EleVertex> res = new ArrayList<EleVertex>(); 90 res.add(new EleVertex(pI, pK, newP)); 91 res.add(new EleVertex(pJ, pK, newP)); 92 93 return res; 94 } 95 96 /** 97 * Checks if vertex requires further processing or is finished. Currently this 98 * method returns <code>true</code>, if the average deviation is < 5m 99 * 100 * @return true, if is finished 101 */ 102 public boolean isFinished() { 103 /*double z = 0D; 104 104 double avrgEle = getEle(); 105 105 106 106 for (EleCoordinate point : points) { 107 107 z += (avrgEle - point.getEle()) * (avrgEle - point.getEle()); 108 } 109 110 // TODO: Check for proper limit111 return /*z < 75 || */getArea() < (30 * 30); // = 3 * 25112 }113 114 /**115 * Gets the approximate area of this vertex in square meters.116 *117 * @return the area118 */119 public double getArea() {120 return area;121 }122 123 /**124 * Gets the (linear interpolated) mid point of c1 and c2.125 *126 * @param c1 the first coordinate127 * @param c2 the second coordinate128 * @return the mid point129 */130 public EleCoordinate getMid(EleCoordinate c1, EleCoordinate c2) {131 double x = (c1.getX() + c2.getX()) / 2.0;132 double y = (c1.getY() + c2.getY()) / 2.0;133 134 double z = (c1.getEle() + c2.getEle()) / 2.0;135 if (c1.greatCircleDistance(c2) > MIN_DIST) {136 double hgtZ = ElevationHelper.getSrtmElevation(new LatLon(y, x));137 138 if (ElevationHelper.isValidElevation(hgtZ)) {139 z = hgtZ;140 }141 }142 143 return new EleCoordinate(y, x, z);144 }145 146 /**147 * Gets the coordinate for the given index.148 *149 * @param index the index between 0 and NPOINTS:150 * @return the elevation coordinate instance151 * @throws IllegalArgumentException, if index is invalid152 */153 public EleCoordinate get(int index) {154 if (index < 0 || index >= NPOINTS) throw new IllegalArgumentException("Invalid index: " + index);155 156 return points[index];157 }158 159 /**160 * Gets the average elevation of this vertex.161 *162 * @return the ele163 */164 public double getEle() {165 166 return avrgEle;167 }168 169 @Override170 public String toString() {171 return "EleVertex [avrgEle=" + avrgEle + ", area=" + area + ", points="172 + Arrays.toString(points) + "]";173 }174 175 176 177 178 class TriangleEdge implements Comparable<TriangleEdge> {179 private final int i;180 private final int j;181 private final double dist;182 183 public TriangleEdge(int i, int j, double dist) {184 super();185 this.i = i;186 this.j = j;187 this.dist = dist;188 }189 190 public int getI() {191 return i;192 }193 194 public int getJ() {195 return j;196 }197 198 public int getK() {199 if (i == 0) {200 return j == 1 ? 2 : 1;201 } else if (i == 1) {202 return j == 0 ? 2 : 0;203 } else {204 return j == 0 ? 1 : 0;205 }206 }207 208 public double getDist() {209 return dist;210 }211 212 @Override213 public int compareTo(TriangleEdge o) {214 return (int) (o.getDist() - dist);215 }216 217 @Override218 public String toString() {219 return "TriangleEdge [i=" + i + ", j=" + j + ", dist=" + dist + "]";220 }221 }108 }*/ 109 110 // TODO: Check for proper limit 111 return /*z < 75 || */getArea() < (30 * 30); // = 3 * 25 112 } 113 114 /** 115 * Gets the approximate area of this vertex in square meters. 116 * 117 * @return the area 118 */ 119 public double getArea() { 120 return area; 121 } 122 123 /** 124 * Gets the (linear interpolated) mid point of c1 and c2. 125 * 126 * @param c1 the first coordinate 127 * @param c2 the second coordinate 128 * @return the mid point 129 */ 130 public EleCoordinate getMid(EleCoordinate c1, EleCoordinate c2) { 131 double x = (c1.getX() + c2.getX()) / 2.0; 132 double y = (c1.getY() + c2.getY()) / 2.0; 133 134 double z = (c1.getEle() + c2.getEle()) / 2.0; 135 if (c1.greatCircleDistance(c2) > MIN_DIST) { 136 double hgtZ = ElevationHelper.getSrtmElevation(new LatLon(y, x)); 137 138 if (ElevationHelper.isValidElevation(hgtZ)) { 139 z = hgtZ; 140 } 141 } 142 143 return new EleCoordinate(y, x, z); 144 } 145 146 /** 147 * Gets the coordinate for the given index. 148 * 149 * @param index the index between 0 and NPOINTS: 150 * @return the elevation coordinate instance 151 * @throws IllegalArgumentException, if index is invalid 152 */ 153 public EleCoordinate get(int index) { 154 if (index < 0 || index >= NPOINTS) throw new IllegalArgumentException("Invalid index: " + index); 155 156 return points[index]; 157 } 158 159 /** 160 * Gets the average elevation of this vertex. 161 * 162 * @return the ele 163 */ 164 public double getEle() { 165 166 return avrgEle; 167 } 168 169 @Override 170 public String toString() { 171 return "EleVertex [avrgEle=" + avrgEle + ", area=" + area + ", points=" 172 + Arrays.toString(points) + "]"; 173 } 174 175 176 177 178 class TriangleEdge implements Comparable<TriangleEdge> { 179 private final int i; 180 private final int j; 181 private final double dist; 182 183 public TriangleEdge(int i, int j, double dist) { 184 super(); 185 this.i = i; 186 this.j = j; 187 this.dist = dist; 188 } 189 190 public int getI() { 191 return i; 192 } 193 194 public int getJ() { 195 return j; 196 } 197 198 public int getK() { 199 if (i == 0) { 200 return j == 1 ? 2 : 1; 201 } else if (i == 1) { 202 return j == 0 ? 2 : 0; 203 } else { 204 return j == 0 ? 1 : 0; 205 } 206 } 207 208 public double getDist() { 209 return dist; 210 } 211 212 @Override 213 public int compareTo(TriangleEdge o) { 214 return (int) (o.getDist() - dist); 215 } 216 217 @Override 218 public String toString() { 219 return "TriangleEdge [i=" + i + ", j=" + j + ", dist=" + dist + "]"; 220 } 221 } 222 222 } -
applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java
r30527 r30701 73 73 public static void correlate( List<NanoLogEntry> entries, GpxData data, long offset ) { 74 74 List<NanoLogEntry> sortedEntries = new ArrayList<NanoLogEntry>(entries); 75 int ret = 0; 75 //int ret = 0; 76 76 PrimaryDateParser dateParser = new PrimaryDateParser(); 77 77 Collections.sort(sortedEntries); … … 87 87 try { 88 88 long curWpTime = dateParser.parse(curWpTimeStr).getTime() + offset; 89 ret +=matchPoints(sortedEntries, prevWp, prevWpTime, curWp, curWpTime, offset);89 /*ret +=*/ matchPoints(sortedEntries, prevWp, prevWpTime, curWp, curWpTime, offset); 90 90 91 91 prevWp = curWp; -
applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java
r30491 r30701 1 1 package nanolog; 2 2 3 import java.awt.*; 4 import java.util.*; 5 import org.openstreetmap.josm.Main; 6 import org.openstreetmap.josm.data.Bounds; 3 import java.util.Date; 4 7 5 import org.openstreetmap.josm.data.coor.LatLon; 8 import org.openstreetmap.josm.gui.MapView;9 6 10 7 /** -
applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java
r30491 r30701 305 305 private boolean toZero; 306 306 307 public CorrelateEntries() {308 this(false);309 }310 311 307 public CorrelateEntries( boolean toZero ) { 312 308 super(toZero ? tr("Correlate with GPX...") : tr("Put on GPX..."), "nanolog/correlate", tr("Correlate entries with GPS trace"), null, false); -
applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java
r30491 r30701 1 1 package nanolog; 2 3 import static org.openstreetmap.josm.tools.I18n.tr; 2 4 3 5 import java.awt.Rectangle; 4 6 import java.text.SimpleDateFormat; 5 import java.util.*; 6 import javax.swing.*; 7 import java.util.ArrayList; 8 import java.util.List; 9 10 import javax.swing.AbstractListModel; 11 import javax.swing.JList; 12 7 13 import nanolog.NanoLogLayer.NanoLogLayerListener; 14 8 15 import org.openstreetmap.josm.Main; 9 16 import org.openstreetmap.josm.gui.MapView.LayerChangeListener; 10 17 import org.openstreetmap.josm.gui.dialogs.ToggleDialog; 11 18 import org.openstreetmap.josm.gui.layer.Layer; 12 import static org.openstreetmap.josm.tools.I18n.tr;13 import org.openstreetmap.josm.tools.Shortcut;14 19 15 20 /** -
applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/parser/SyntaxException.java
r30116 r30701 5 5 private int startColumn; 6 6 private int endColumn; 7 private String info;8 7 9 8 public int getStartColumn() { … … 19 18 this.startColumn = startColumn; 20 19 this.endColumn = endColumn; 21 this.info = info;22 20 } 23 21 } -
applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java
r28935 r30701 30 30 public class GeoFabrikWFSClient { 31 31 32 private Bounds bbox; 32 //private Bounds bbox; 33 33 private DataStore data; 34 34 private boolean bInitialized = false; 35 35 36 36 public GeoFabrikWFSClient(Bounds bounds) { 37 bbox = bounds; 37 //bbox = bounds; 38 38 } 39 39 … … 124 124 * @param args 125 125 */ 126 @SuppressWarnings("deprecation")127 126 public static void main(String[] args) { 128 127 … … 154 153 // } 155 154 } 156 157 155 } -
applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorBugInfoDialog.java
r29448 r30701 24 24 ListSelectionListener, LayerChangeListener, MouseListener { 25 25 26 /** 27 * 28 */ 29 private static final long serialVersionUID = 7730268317164906579L; 30 private OsmInspectorLayer layer; 26 //private OsmInspectorLayer layer; 31 27 private JTextPane bugTextArea; 32 33 28 34 29 /** … … 42 37 bugTextArea.setText("This is a demo"); 43 38 this.add(bugTextArea); 44 45 39 } 46 47 40 48 41 public OsmInspectorBugInfoDialog(OsmInspectorLayer layer) { … … 55 48 true // default is "show dialog" 56 49 ); 57 this.layer = layer; 50 //this.layer = layer; 58 51 buildContentPanel(); 59 52 } 60 53 61 54 public void updateDialog(OsmInspectorLayer l) { 62 this.layer = l; 55 //this.layer = l; 63 56 } 64 57 … … 67 60 } 68 61 69 @Override 62 /*@Override 70 63 public void showNotify() { 71 64 super.showNotify(); 72 } 65 }*/ 73 66 74 67 @Override 75 68 public void hideNotify() { 76 69 if (dialogsPanel != null) { 77 // TODO Auto-generated method stub78 70 super.hideNotify(); 79 71 } 80 72 } 81 73 82 83 74 @Override 84 75 public void mouseClicked(MouseEvent e) { 85 // TODO Auto-generated method stub86 87 76 } 88 77 89 78 @Override 90 79 public void mouseEntered(MouseEvent e) { 91 // TODO Auto-generated method stub92 93 80 } 94 81 95 82 @Override 96 83 public void mouseExited(MouseEvent e) { 97 // TODO Auto-generated method stub98 99 84 } 100 85 101 86 @Override 102 87 public void mousePressed(MouseEvent e) { 103 // TODO Auto-generated method stub104 105 88 } 106 89 107 90 @Override 108 91 public void mouseReleased(MouseEvent e) { 109 // TODO Auto-generated method stub110 111 92 } 112 93 113 94 @Override 114 95 public void activeLayerChange(Layer oldLayer, Layer newLayer) { 115 if(newLayer instanceof OsmInspectorLayer) { 96 /*if(newLayer instanceof OsmInspectorLayer) { 116 97 this.layer = (OsmInspectorLayer) newLayer; 117 } 118 98 }*/ 119 99 } 120 100 … … 129 109 @Override 130 110 public void valueChanged(ListSelectionEvent e) { 131 System.out.println(e.getFirstIndex()); 111 //System.out.println(e.getFirstIndex()); 132 112 } 133 134 113 } -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java
r30532 r30701 227 227 while ((ln = in.readLine()) != null) { 228 228 lines += ln; 229 } 230 if (Main.isDebugEnabled()) { 231 Main.debug(lines); 229 232 } 230 233 } catch (MalformedURLException e) { … … 544 547 } 545 548 546 private double tryParseDouble(String str) {547 try {548 return Double.parseDouble(str);549 } catch (NumberFormatException e) {550 return 0;551 }552 }553 554 549 private void checkLayerDuplicates(WMSLayer wmsLayer) throws DuplicateLayerException { 555 550 if (Main.map != null) { -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreSessionImporter.java
r29922 r30701 5 5 import java.io.File; 6 6 import java.io.IOException; 7 import java.io.InputStream;8 import java.net.URI;9 import java.net.URISyntaxException;10 import java.net.URL;11 7 import java.net.URLDecoder; 12 import java.net.URLEncoder;13 8 14 9 import javax.xml.xpath.XPath; … … 20 15 import org.openstreetmap.josm.gui.layer.Layer; 21 16 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 22 import org.openstreetmap.josm.io.GpxImporter;23 17 import org.openstreetmap.josm.io.IllegalDataException; 24 18 import org.openstreetmap.josm.io.session.SessionLayerImporter; -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java
r23190 r30701 15 15 */ 16 16 //public static int cadastreBackgroundTransp = 1; // original white but transparent 17 18 private static final long serialVersionUID = 1L;19 17 20 18 protected int parcelColor = Color.RED.getRGB(); -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java
r29101 r30701 2 2 package cadastre_fr; 3 3 4 import static org.openstreetmap.josm.tools.I18n.marktr; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 import static org.openstreetmap.josm.tools.I18n.marktr;6 6 7 7 import java.awt.event.ActionEvent; 8 8 import java.awt.event.KeyEvent; 9 10 import javax.swing.JOptionPane;11 9 12 10 import org.openstreetmap.josm.Main; … … 14 12 import org.openstreetmap.josm.tools.Shortcut; 15 13 14 /** 15 * Action calling the wms grabber for cadastre.gouv.fr 16 */ 16 17 public class MenuActionGrab extends JosmAction { 17 18 /**19 * Action calling the wms grabber for cadastre.gouv.fr20 */21 private static final long serialVersionUID = 1L;22 18 23 19 public static String name = marktr("Cadastre grab"); -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionRefineGeoRef.java
r29722 r30701 1 1 package cadastre_fr; 2 2 3 import static org.openstreetmap.josm.tools.I18n.marktr; 3 4 import static org.openstreetmap.josm.tools.I18n.tr; 4 import static org.openstreetmap.josm.tools.I18n.marktr;5 5 6 6 import java.awt.event.ActionEvent; 7 7 8 import javax.swing.JOptionPane;9 10 import org.openstreetmap.josm.Main;11 8 import org.openstreetmap.josm.actions.JosmAction; 12 9 13 @SuppressWarnings("serial")14 10 public class MenuActionRefineGeoRef extends JosmAction { 15 11 -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java
r24907 r30701 14 14 15 15 public class WMSDownloadAction /*extends JosmAction */{ 16 17 private static final long serialVersionUID = 1L;18 16 19 17 // public WMSDownloadAction(String layerName) { -
applications/editors/josm/plugins/gpsblam/.settings/org.eclipse.jdt.core.prefs
r30444 r30701 1 1 eclipse.preferences.version=1 2 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled 3 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore 4 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull 5 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault 6 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable 7 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled 2 8 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 3 9 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 4 10 org.eclipse.jdt.core.compiler.compliance=1.7 11 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning 5 12 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 13 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore 14 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning 15 org.eclipse.jdt.core.compiler.problem.deadCode=warning 16 org.eclipse.jdt.core.compiler.problem.deprecation=warning 17 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled 18 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled 19 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning 20 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore 6 21 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error 22 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore 23 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore 24 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled 25 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore 26 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning 27 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning 28 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error 29 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning 30 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled 31 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning 32 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning 33 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore 34 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore 35 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning 36 org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore 37 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore 38 org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled 39 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore 40 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore 41 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled 42 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore 43 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore 44 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning 45 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning 46 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore 47 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning 48 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error 49 org.eclipse.jdt.core.compiler.problem.nullReference=warning 50 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error 51 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning 52 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning 53 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore 54 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore 55 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore 56 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore 57 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning 58 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning 59 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore 60 org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore 61 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore 62 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore 63 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore 64 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled 65 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning 66 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled 67 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled 68 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled 69 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore 70 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning 71 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled 72 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning 73 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning 74 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore 75 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning 76 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore 77 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore 78 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore 79 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore 80 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled 81 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled 82 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled 83 org.eclipse.jdt.core.compiler.problem.unusedImport=warning 84 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning 85 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning 86 org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore 87 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore 88 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled 89 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled 90 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled 91 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning 92 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore 93 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning 94 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning 7 95 org.eclipse.jdt.core.compiler.source=1.7 -
applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamInputData.java
r28741 r30701 19 19 import java.util.Calendar; 20 20 import java.util.Collection; 21 import java.util.Date;22 21 import java.util.GregorianCalendar; 23 22 import java.util.HashSet; -
applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMarker.java
r28741 r30701 35 35 private CachedLatLon hair1Coord1, hair1Coord2, hair2Coord1, hair2Coord2; 36 36 private CachedLatLon ellipseCoord1, ellipseCoord2, ellipseCoord3; // 1=TL 2=TR 3=BL, where main axis = +R, minor +U 37 private int ndays;38 37 static final double fac = 2.45; // 2.45 gives 95% CI for 2D 39 38 -
applications/editors/josm/plugins/imagery_offset_db/.settings/org.eclipse.jdt.core.prefs
r30531 r30701 1 1 eclipse.preferences.version=1 2 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled 3 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore 4 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull 5 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault 6 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable 7 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled 2 8 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 3 9 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 4 10 org.eclipse.jdt.core.compiler.compliance=1.7 11 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning 5 12 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 13 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore 14 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning 15 org.eclipse.jdt.core.compiler.problem.deadCode=warning 16 org.eclipse.jdt.core.compiler.problem.deprecation=warning 17 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled 18 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled 19 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning 20 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore 6 21 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error 22 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore 23 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore 24 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled 25 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore 26 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning 27 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning 28 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error 29 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning 30 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled 31 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning 32 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning 33 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore 34 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore 35 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning 36 org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore 37 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore 38 org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled 39 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore 40 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore 41 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled 42 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore 43 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore 44 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning 45 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning 46 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore 47 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning 48 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error 49 org.eclipse.jdt.core.compiler.problem.nullReference=warning 50 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error 51 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning 52 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning 53 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore 54 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore 55 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore 56 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore 57 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning 58 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning 59 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore 60 org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore 61 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore 62 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore 63 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore 64 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled 65 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning 66 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled 67 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled 68 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled 69 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore 70 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning 71 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled 72 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning 73 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning 74 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore 75 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning 76 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore 77 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore 78 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore 79 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore 80 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled 81 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled 82 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled 83 org.eclipse.jdt.core.compiler.problem.unusedImport=warning 84 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning 85 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning 86 org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore 87 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore 88 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled 89 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled 90 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled 91 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning 92 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore 93 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning 94 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning 7 95 org.eclipse.jdt.core.compiler.source=1.7 -
applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java
r29433 r30701 114 114 */ 115 115 private class DownloadOffsetsTask extends SimpleOffsetQueryTask { 116 private ImageryLayer layer;117 116 private List<ImageryOffsetBase> offsets; 118 117 … … 136 135 throw new IllegalArgumentException(e); 137 136 } 138 this.layer = layer;139 137 } 140 138 -
applications/editors/josm/plugins/imagewaypoint/.settings/org.eclipse.jdt.core.prefs
r30416 r30701 1 1 eclipse.preferences.version=1 2 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled 3 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore 4 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull 5 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault 6 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable 7 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled 2 8 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 3 9 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 4 10 org.eclipse.jdt.core.compiler.compliance=1.7 11 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning 5 12 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 13 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore 14 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning 15 org.eclipse.jdt.core.compiler.problem.deadCode=warning 16 org.eclipse.jdt.core.compiler.problem.deprecation=warning 17 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled 18 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled 19 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning 20 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore 6 21 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error 22 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore 23 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore 24 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled 25 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore 26 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning 27 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning 28 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error 29 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning 30 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled 31 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning 32 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning 33 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore 34 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore 35 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning 36 org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore 37 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore 38 org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled 39 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore 40 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore 41 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled 42 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore 43 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore 44 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning 45 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning 46 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore 47 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning 48 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error 49 org.eclipse.jdt.core.compiler.problem.nullReference=warning 50 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error 51 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning 52 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning 53 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore 54 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore 55 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore 56 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore 57 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning 58 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning 59 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore 60 org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore 61 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore 62 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore 63 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore 64 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled 65 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning 66 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled 67 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled 68 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled 69 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore 70 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning 71 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled 72 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning 73 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning 74 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore 75 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning 76 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore 77 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore 78 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore 79 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore 80 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled 81 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled 82 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled 83 org.eclipse.jdt.core.compiler.problem.unusedImport=warning 84 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning 85 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning 86 org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore 87 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore 88 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled 89 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled 90 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled 91 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning 92 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore 93 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning 94 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning 7 95 org.eclipse.jdt.core.compiler.source=1.7 -
applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java
r29854 r30701 98 98 99 99 private static final class PreviousAction extends JosmAction { 100 private static final long serialVersionUID = -7899209365124237890L; 101 102 private final ImageWayPointDialog dialog; 103 104 public PreviousAction(final ImageWayPointDialog dialog) { 100 101 public PreviousAction() { 105 102 super(tr("Previous"), 106 103 null, … … 108 105 null, 109 106 false); 110 this.dialog = dialog;111 107 } 112 108 … … 119 115 120 116 private static final class NextAction extends JosmAction { 121 private static final long serialVersionUID = 176134010956760988L; 122 123 private final ImageWayPointDialog dialog; 124 125 public NextAction(final ImageWayPointDialog dialog) { 117 118 public NextAction() { 126 119 super(tr("Next"), null, tr("Next image"), null, false); 127 this.dialog = dialog;128 120 } 129 121 … … 136 128 137 129 private static final class RotateLeftAction extends JosmAction { 138 private static final long serialVersionUID = 3536922796446259943L; 139 140 private final ImageWayPointDialog dialog; 141 142 public RotateLeftAction(final ImageWayPointDialog dialog) { 130 131 public RotateLeftAction() { 143 132 super(tr("Rotate left"), 144 133 null, … … 146 135 null, 147 136 false); 148 this.dialog = dialog;149 137 } 150 138 … … 155 143 156 144 private static final class RotateRightAction extends JosmAction { 157 private static final long serialVersionUID = 1760186810341888993L; 158 159 private final ImageWayPointDialog dialog; 160 161 public RotateRightAction(final ImageWayPointDialog dialog) { 145 146 public RotateRightAction() { 162 147 super(tr("Rotate right"), 163 148 null, … … 165 150 null, 166 151 false); 167 this.dialog = dialog;168 152 } 169 153 … … 191 175 200); 192 176 193 this.previousAction = new PreviousAction( this);194 this.nextAction = new NextAction( this);195 this.rotateLeftAction = new RotateLeftAction( this);196 this.rotateRightAction = new RotateRightAction( this);177 this.previousAction = new PreviousAction(); 178 this.nextAction = new NextAction(); 179 this.rotateLeftAction = new RotateLeftAction(); 180 this.rotateRightAction = new RotateRightAction(); 197 181 198 182 final JButton previousButton = new JButton(this.previousAction); -
applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java
r27852 r30701 47 47 private MapView mv; 48 48 private String statusText; 49 private boolean drawing; 50 private boolean ctrl; 49 //private boolean drawing; 50 //private boolean ctrl; 51 51 private boolean shift; 52 private boolean oldCtrl; 53 private boolean oldShift; 52 //private boolean oldCtrl; 53 //private boolean oldShift; 54 54 private EastNorth pos; 55 55 private WayPoint wpOld; … … 195 195 @Override 196 196 protected void updateKeyModifiers(InputEvent e) { 197 oldCtrl = ctrl; 198 oldShift = shift; 197 //oldCtrl = ctrl; 198 //oldShift = shift; 199 199 ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; 200 200 shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; … … 213 213 if (Main.map!=null) Main.map.mapView.repaint(); 214 214 } 215 private void setStatusLine(String tr) { 215 /*private void setStatusLine(String tr) { 216 216 statusText=tr; 217 217 updateStatusLine(); 218 } 218 }*/ 219 219 220 220 private synchronized void filterTracks() { -
applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java
r27492 r30701 1 1 package org.openstreetmap.josm.plugins.infomode; 2 2 3 import java.awt.Color;4 3 import java.awt.event.MouseEvent; 5 4 import java.util.HashSet; -
applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/administration/GeoFlaHandler.java
r30340 r30701 178 178 179 179 private Pair<String, URL> getGeoflaURL(String name, String urlSuffix) throws MalformedURLException { 180 return new Pair< String, URL>(name, new URL("http://professionnels.ign.fr/sites/default/files/"+urlSuffix));180 return new Pair<>(name, new URL("http://professionnels.ign.fr/sites/default/files/"+urlSuffix)); 181 181 } 182 182 183 183 @Override 184 184 public List<Pair<String, URL>> getDataURLs() { 185 List<Pair<String, URL>> result = new ArrayList< Pair<String,URL>>();185 List<Pair<String, URL>> result = new ArrayList<>(); 186 186 try { 187 187 result.add(getGeoflaURL("Départements France métropolitaine et Corse", "GEOFLADept_FR_Corse_AV_L93.zip")); -
applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/agriculture/RegistreParcellaireHandler.java
r30340 r30701 117 117 118 118 private Pair<String, URL> getRpgURL(String number, String name) throws MalformedURLException { 119 return new Pair< String, URL>(number+" - "+name, new URL("http://www.data.gouv.fr/var/download/ign/RPG_2010_"+number+".ZIP"));119 return new Pair<>(number+" - "+name, new URL("http://www.data.gouv.fr/var/download/ign/RPG_2010_"+number+".ZIP")); 120 120 } 121 121 122 122 @Override 123 123 public List<Pair<String, URL>> getDataURLs() { 124 List<Pair<String, URL>> result = new ArrayList< Pair<String,URL>>();124 List<Pair<String, URL>> result = new ArrayList<>(); 125 125 try { 126 126 for (FrenchAdministrativeUnit dpt : FrenchAdministrativeUnit.allDepartments) { -
applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/AssainissementHandler.java
r30340 r30701 38 38 @Override 39 39 public List<Pair<String, URL>> getDataURLs() { 40 List<Pair<String, URL>> result = new ArrayList< Pair<String,URL>>();40 List<Pair<String, URL>> result = new ArrayList<>(); 41 41 try { 42 result.add(new Pair< String, URL>("Données 2009", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2.php")));43 result.add(new Pair< String, URL>("Données 2010", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2010.php")));44 result.add(new Pair< String, URL>("Données 2011", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2011.php")));42 result.add(new Pair<>("Données 2009", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2.php"))); 43 result.add(new Pair<>("Données 2010", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2010.php"))); 44 result.add(new Pair<>("Données 2011", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2011.php"))); 45 45 } catch (MalformedURLException e) { 46 46 e.printStackTrace(); … … 53 53 private Node nodeWithKeys; 54 54 55 private final Set<String> interestingKeys = new HashSet< String>();55 private final Set<String> interestingKeys = new HashSet<>(); 56 56 57 57 public InternalOdsHandler() { -
applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/ForetsPubliquesHandler.java
r30340 r30701 109 109 @Override 110 110 public List<Pair<String, URL>> getDataURLs() { 111 List<Pair<String, URL>> result = new ArrayList< Pair<String,URL>>();111 List<Pair<String, URL>> result = new ArrayList<>(); 112 112 try { 113 113 for (FrenchAdministrativeUnit region : FrenchAdministrativeUnit.allRegions) { … … 123 123 124 124 private Pair<String, URL> getForetURL(String code, String regionName) throws MalformedURLException { 125 return new Pair< String, URL>("PublicForests_"+regionName, new URL(FRENCH_PORTAL+"var/download/"+"for_publ_v2011_reg"+code+".zip"));125 return new Pair<>("PublicForests_"+regionName, new URL(FRENCH_PORTAL+"var/download/"+"for_publ_v2011_reg"+code+".zip")); 126 126 } 127 127 } -
applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/InventaireForestierNationalHandler.java
r30340 r30701 81 81 @Override 82 82 public List<Pair<String, URL>> getDataURLs() { 83 List<Pair<String, URL>> result = new ArrayList< Pair<String,URL>>();83 List<Pair<String, URL>> result = new ArrayList<>(); 84 84 try { 85 85 for (int year = 2010; year >= 2005; year--) { … … 94 94 95 95 private Pair<String, URL> getIfnURL(int year, String name, String type) throws MalformedURLException { 96 return new Pair< String, URL>(name+" "+year, new URL("http://www.ifn.fr/spip/IMG/csv/placettes_"+type+"_"+year+".csv"));96 return new Pair<>(name+" "+year, new URL("http://www.ifn.fr/spip/IMG/csv/placettes_"+type+"_"+year+".csv")); 97 97 } 98 98 } -
applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java
r30340 r30701 94 94 @Override 95 95 public List<Pair<String, URL>> getDataURLs() { 96 List<Pair<String, URL>> result = new ArrayList< Pair<String,URL>>();96 List<Pair<String, URL>> result = new ArrayList<>(); 97 97 try { 98 98 for (WaterAgency wa : waterAgencies) { … … 106 106 107 107 private Pair<String, URL> getDownloadURL(WaterAgency a) throws MalformedURLException { 108 return new Pair< String, URL>("SurfaceWater_"+a.name, new URL("http://www.rapportage.eaufrance.fr/sites/default/files/SIG/FR"+a.code+"_SW.zip"));108 return new Pair<>("SurfaceWater_"+a.name, new URL("http://www.rapportage.eaufrance.fr/sites/default/files/SIG/FR"+a.code+"_SW.zip")); 109 109 } 110 110 -
applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/transport/Route500Handler.java
r30340 r30701 44 44 @Override 45 45 public List<Pair<String, URL>> getDataURLs() { 46 List<Pair<String, URL>> result = new ArrayList< Pair<String,URL>>();46 List<Pair<String, URL>> result = new ArrayList<>(); 47 47 try { 48 48 for (FrenchAdministrativeUnit dpt : FrenchAdministrativeUnit.allDepartments) { … … 58 58 59 59 private Pair<String, URL> getRoute500URL(String code, String name) throws MalformedURLException { 60 return new Pair< String, URL>(name, new URL(OSMFR_PORTAL+"ROUTE500_1-1_SHP_LAMB93_D"+code+"_2012-11-21.7z"));60 return new Pair<>(name, new URL(OSMFR_PORTAL+"ROUTE500_1-1_SHP_LAMB93_D"+code+"_2012-11-21.7z")); 61 61 } 62 62 } -
applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java
r30340 r30701 75 75 @Override 76 76 public List<Pair<String, URL>> getDataURLs() { 77 List<Pair<String, URL>> result = new ArrayList< Pair<String,URL>>();77 List<Pair<String, URL>> result = new ArrayList<>(); 78 78 try { 79 if (kmzUuid != null && !kmzUuid.isEmpty()) result.add(new Pair< String, URL>(getName() + " (KMZ)", new URL(PORTAL + "download.do?uuid=" + kmzUuid)));80 if (shpUuid != null && !shpUuid.isEmpty()) result.add(new Pair< String, URL>(getName() + " (SHP)", new URL(PORTAL + "download.do?uuid=" + shpUuid)));79 if (kmzUuid != null && !kmzUuid.isEmpty()) result.add(new Pair<>(getName() + " (KMZ)", new URL(PORTAL + "download.do?uuid=" + kmzUuid))); 80 if (shpUuid != null && !shpUuid.isEmpty()) result.add(new Pair<>(getName() + " (SHP)", new URL(PORTAL + "download.do?uuid=" + shpUuid))); 81 81 } catch (MalformedURLException e) { 82 82 e.printStackTrace(); -
applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/urbanisme/SanisettesHandler.java
r30340 r30701 50 50 public void updateDataSet(DataSet ds) { 51 51 52 List<Way> sourceWays = new ArrayList< Way>(ds.getWays());53 List<List<Way>> waysToCombine = new ArrayList< List<Way>>();52 List<Way> sourceWays = new ArrayList<>(ds.getWays()); 53 List<List<Way>> waysToCombine = new ArrayList<>(); 54 54 55 55 for (Iterator<Way> it = sourceWays.iterator(); it.hasNext();) { … … 57 57 it.remove(); 58 58 if (!wayProcessed(w, waysToCombine)) { 59 List<Way> list = new ArrayList< Way>();59 List<Way> list = new ArrayList<>(); 60 60 list.add(w); 61 61 boolean finished = false; 62 List<Way> sourceWays2 = new ArrayList< Way>(sourceWays);62 List<Way> sourceWays2 = new ArrayList<>(sourceWays); 63 63 while (!finished) { 64 64 int before = list.size(); -
applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java
r30340 r30701 113 113 114 114 private static final Collection<Relation> getBoundaries(int admin_level) { 115 Collection<Relation> result = new TreeSet< Relation>(new Comparator<Relation>() {115 Collection<Relation> result = new TreeSet<>(new Comparator<Relation>() { 116 116 @Override 117 117 public int compare(Relation o1, Relation o2) { -
applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PistesCyclablesHandler.java
r30340 r30701 18 18 public class PistesCyclablesHandler extends ToulouseDataSetHandler { 19 19 20 protected final Map<String, Collection<String>> map = new HashMap< String, Collection<String>>();20 protected final Map<String, Collection<String>> map = new HashMap<>(); 21 21 22 22 private String streetField; -
applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/NumerosRueHandler.java
r30340 r30701 27 27 @Override 28 28 public void updateDataSet(DataSet ds) { 29 Map<String, Relation> associatedStreets = new HashMap< String, Relation>();29 Map<String, Relation> associatedStreets = new HashMap<>(); 30 30 31 31 for (Node n : ds.getNodes()) { -
applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java
r30340 r30701 17 17 public class VoirieHandler extends ToulouseDataSetHandler { 18 18 19 protected final Map<String, Collection<String>> map = new HashMap< String, Collection<String>>();19 protected final Map<String, Collection<String>> map = new HashMap<>(); 20 20 21 21 private String streetField; … … 65 65 @Override 66 66 public void updateDataSet(DataSet ds) { 67 Map<String, Relation> associatedStreets = new HashMap< String, Relation>();67 Map<String, Relation> associatedStreets = new HashMap<>(); 68 68 69 69 for (Way w : ds.getWays()) { -
applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/GraphicsProcessor.java
r25349 r30701 117 117 //fill all 118 118 } 119 else 120 { 119 else { 121 120 //Unexpected operation 122 int a = 10;123 a++;124 121 } 125 122 -
applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/PdfBoxParser.java
r25349 r30701 22 22 } 23 23 24 @SuppressWarnings("unchecked")25 24 public void parse(File file, int maxPaths, ProgressMonitor monitor) throws Exception 26 25 { … … 33 32 } 34 33 35 List allPages = document.getDocumentCatalog().getAllPages(); 34 List<?> allPages = document.getDocumentCatalog().getAllPages(); 36 35 37 36 if (allPages.size() != 1) { -
applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java
r29854 r30701 24 24 import org.openstreetmap.josm.actions.JosmAction; 25 25 import org.openstreetmap.josm.data.coor.LatLon; 26 import org.openstreetmap.josm.data.osm.DataSet;27 26 import org.openstreetmap.josm.data.osm.Node; 28 27 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 68 67 } 69 68 70 public void actionPerformed(ActionEvent event) 71 { 72 DataSet mainDataSet = Main.main.getCurrentDataSet(); 69 public void actionPerformed(ActionEvent event) { 73 70 74 71 if (dialog == null) -
applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java
r29344 r30701 33 33 */ 34 34 public class AddRemoveMemberAction extends JosmAction implements ChosenRelationListener { 35 private static final String ACTION_NAME = "Add/remove member";36 35 private ChosenRelation rel; 37 36 private SortAndFixAction sortAndFix; -
applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java
r30587 r30701 24 24 */ 25 25 public class CreateMultipolygonAction extends JosmAction { 26 private static final String ACTION_NAME = "Create relation";27 26 private static final String PREF_MULTIPOLY = "reltoolbox.multipolygon."; 28 27 protected ChosenRelation chRel; -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java
r29124 r30701 253 253 double startAngle = realA1; 254 254 // Transform the angles to get a consistent starting point 255 double a1 = 0; 255 //double a1 = 0; 256 256 double a2 = normalizeAngle(realA2 - startAngle); 257 257 double a3 = normalizeAngle(realA3 - startAngle); -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java
r30419 r30701 1 1 package org.openstreetmap.josm.plugins.utilsplugin2.multitagger; 2 3 import static org.openstreetmap.josm.tools.I18n.marktr; 4 import static org.openstreetmap.josm.tools.I18n.tr; 2 5 3 6 import java.awt.Color; … … 18 21 import java.util.LinkedList; 19 22 import java.util.List; 23 20 24 import javax.swing.AbstractAction; 21 import static javax.swing.Action.SHORT_DESCRIPTION;22 25 import javax.swing.BoxLayout; 23 import javax.swing.DefaultCellEditor;24 26 import javax.swing.JButton; 25 27 import javax.swing.JComponent; … … 35 37 import javax.swing.event.ListSelectionListener; 36 38 import javax.swing.table.DefaultTableCellRenderer; 39 37 40 import org.openstreetmap.josm.Main; 38 41 import org.openstreetmap.josm.actions.AutoScaleAction; … … 51 54 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; 52 55 import org.openstreetmap.josm.tools.GBC; 53 import static org.openstreetmap.josm.tools.I18n.marktr;54 import static org.openstreetmap.josm.tools.I18n.tr;55 56 import org.openstreetmap.josm.tools.ImageProvider; 56 import org.openstreetmap.josm.tools.Shortcut;57 57 import org.openstreetmap.josm.tools.WindowGeometry; 58 58 … … 166 166 } 167 167 168 private OsmPrimitive getSelectedPrimitive() { 168 /*private OsmPrimitive getSelectedPrimitive() { 169 169 int idx = tbl.getSelectedRow(); 170 170 if (idx>=0) { … … 173 173 return null; 174 174 } 175 } 175 }*/ 176 176 177 177 private final MouseAdapter tableMouseAdapter = new MouseAdapter() { -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTaggerTableModel.java
r30389 r30701 10 10 import java.util.List; 11 11 import java.util.Set; 12 12 13 import javax.swing.JTable; 13 14 import javax.swing.table.AbstractTableModel; 14 import javax.swing.table.TableCellEditor; 15 15 16 import org.openstreetmap.josm.Main; 16 17 import org.openstreetmap.josm.command.ChangePropertyCommand; -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java
r30177 r30701 10 10 import java.util.HashSet; 11 11 import java.util.Set; 12 12 13 import javax.swing.JOptionPane; 13 import org.openstreetmap.josm.Main; 14 14 15 import org.openstreetmap.josm.actions.JosmAction; 15 import org.openstreetmap.josm.data.osm.*; 16 import org.openstreetmap.josm.data.osm.OsmPrimitive; 17 import org.openstreetmap.josm.data.osm.Way; 16 18 import org.openstreetmap.josm.gui.Notification; 17 18 19 import org.openstreetmap.josm.tools.Shortcut; 19 20 -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java
r30177 r30701 10 10 import java.util.HashSet; 11 11 import java.util.Set; 12 12 13 import javax.swing.JOptionPane; 13 import org.openstreetmap.josm.Main; 14 14 15 import org.openstreetmap.josm.actions.JosmAction; 15 import org.openstreetmap.josm.data.osm.*; 16 import org.openstreetmap.josm.data.osm.OsmPrimitive; 17 import org.openstreetmap.josm.data.osm.Way; 16 18 import org.openstreetmap.josm.gui.Notification; 17 import static org.openstreetmap.josm.tools.I18n.tr;18 19 19 import org.openstreetmap.josm.tools.Shortcut; 20 20 -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java
r30177 r30701 10 10 import java.util.HashSet; 11 11 import java.util.Set; 12 12 13 import javax.swing.JOptionPane; 13 import org.openstreetmap.josm.Main; 14 14 15 import org.openstreetmap.josm.actions.JosmAction; 15 import org.openstreetmap.josm.data.osm.*; 16 import org.openstreetmap.josm.data.osm.Node; 17 import org.openstreetmap.josm.data.osm.OsmPrimitive; 16 18 import org.openstreetmap.josm.gui.Notification; 17 18 19 import org.openstreetmap.josm.tools.Shortcut; 19 20 -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java
r30200 r30701 11 11 import javax.swing.JOptionPane; 12 12 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.actions.JosmAction; 15 import org.openstreetmap.josm.data.osm. *;14 import org.openstreetmap.josm.data.osm.OsmPrimitive; 16 15 import org.openstreetmap.josm.gui.Notification; 17 18 16 import org.openstreetmap.josm.tools.Shortcut; 19 17 -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java
r30177 r30701 6 6 import java.awt.event.ActionEvent; 7 7 import java.awt.event.KeyEvent; 8 import java.util.*; 8 import java.util.ArrayList; 9 import java.util.Collection; 10 import java.util.Collections; 11 import java.util.HashSet; 12 import java.util.LinkedList; 13 import java.util.List; 14 import java.util.Queue; 15 import java.util.Set; 16 9 17 import javax.swing.JOptionPane; 10 import org.openstreetmap.josm.Main; 18 11 19 import org.openstreetmap.josm.actions.JosmAction; 12 import org.openstreetmap.josm.data.osm.*; 20 import org.openstreetmap.josm.data.osm.Node; 21 import org.openstreetmap.josm.data.osm.OsmPrimitive; 22 import org.openstreetmap.josm.data.osm.Way; 13 23 import org.openstreetmap.josm.gui.Notification; 14 import static org.openstreetmap.josm.tools.I18n.tr;15 24 import org.openstreetmap.josm.tools.Shortcut; 16 25
Note:
See TracChangeset
for help on using the changeset viewer.
