Changeset 9067 in josm
- Timestamp:
- 2015-11-28T18:26:23+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 54 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java
r8308 r9067 19 19 */ 20 20 public class ChangesetManagerToggleAction extends ToggleAction { 21 private transient WindowListener changesetCacheManagerClosedHandler;21 private final transient WindowListener changesetCacheManagerClosedHandler; 22 22 23 23 /** -
trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
r8919 r9067 463 463 } 464 464 465 private Set<NodePair> edges;465 private final Set<NodePair> edges; 466 466 private int numUndirectedEges; 467 467 private Map<Node, List<NodePair>> successors; -
trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java
r9062 r9067 102 102 */ 103 103 private static class PolarNode { 104 private double a;105 private Node node;104 private final double a; 105 private final Node node; 106 106 107 107 PolarNode(EastNorth center, Node n) { -
trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
r8510 r9067 28 28 */ 29 29 public class FullscreenToggleAction extends ToggleAction { 30 private transient GraphicsDevice gd;30 private final transient GraphicsDevice gd; 31 31 private Rectangle prevBounds; 32 32 -
trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
r9062 r9067 190 190 191 191 /** Set of {@link WayInPolygon} to be joined by walk algorithm */ 192 private Set<WayInPolygon> availableWays;192 private final Set<WayInPolygon> availableWays; 193 193 /** Current state of walk algorithm */ 194 194 private WayInPolygon lastWay; -
trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
r8510 r9067 181 181 182 182 private final EastNorth refPoint; 183 private EastNorth refPoint2;183 private final EastNorth refPoint2; 184 184 private final boolean projectToSegment; 185 185 -
trunk/src/org/openstreetmap/josm/actions/MoveAction.java
r8510 r9067 29 29 public enum Direction { UP, LEFT, RIGHT, DOWN } 30 30 31 private Direction myDirection;31 private final Direction myDirection; 32 32 33 33 // any better idea? -
trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java
r8510 r9067 28 28 public class RenameLayerAction extends AbstractAction { 29 29 30 private File file;31 private transient Layer layer;30 private final File file; 31 private final transient Layer layer; 32 32 33 33 /** -
trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java
r8919 r9067 32 32 33 33 public static class ReverseWayResult { 34 private Way newWay;35 private Collection<Command> tagCorrectionCommands;36 private Command reverseCommand;34 private final Way newWay; 35 private final Collection<Command> tagCorrectionCommands; 36 private final Command reverseCommand; 37 37 38 38 public ReverseWayResult(Way newWay, Collection<Command> tagCorrectionCommands, Command reverseCommand) { -
trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java
r8308 r9067 11 11 public class ToggleUploadDiscouragedLayerAction extends JosmAction { 12 12 13 private transient OsmDataLayer layer;13 private final transient OsmDataLayer layer; 14 14 15 15 public ToggleUploadDiscouragedLayerAction(OsmDataLayer layer) { -
trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
r9062 r9067 259 259 private boolean canceled; 260 260 private Exception lastException; 261 private Collection<OsmPrimitive> toUpload;262 private OsmDataLayer layer;261 private final Collection<OsmPrimitive> toUpload; 262 private final OsmDataLayer layer; 263 263 private OsmServerBackreferenceReader reader; 264 264 -
trunk/src/org/openstreetmap/josm/actions/ValidateAction.java
r8855 r9067 112 112 static class ValidationTask extends PleaseWaitRunnable { 113 113 private Collection<Test> tests; 114 private Collection<OsmPrimitive> validatedPrimitives;115 private Collection<OsmPrimitive> formerValidatedPrimitives;114 private final Collection<OsmPrimitive> validatedPrimitives; 115 private final Collection<OsmPrimitive> formerValidatedPrimitives; 116 116 private boolean canceled; 117 117 private List<TestError> errors; -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
r8908 r9067 13 13 */ 14 14 public abstract class AbstractDownloadTask<T> implements DownloadTask { 15 private List<Object> errorMessages;15 private final List<Object> errorMessages; 16 16 private boolean canceled; 17 17 private boolean failed; -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
r8908 r9067 98 98 99 99 class DownloadTask extends PleaseWaitRunnable { 100 private OsmServerReader reader;100 private final OsmServerReader reader; 101 101 private GpxData rawData; 102 102 private final boolean newLayer; -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
r8836 r9067 44 44 */ 45 45 public class DownloadTaskList { 46 private List<DownloadTask> tasks = new LinkedList<>();47 private List<Future<?>> taskFutures = new LinkedList<>();46 private final List<DownloadTask> tasks = new LinkedList<>(); 47 private final List<Future<?>> taskFutures = new LinkedList<>(); 48 48 private ProgressMonitor progressMonitor; 49 49 -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java
r8510 r9067 21 21 22 22 public class PostDownloadHandler implements Runnable { 23 private DownloadTask task;24 private List<Future<?>> futures;23 private final DownloadTask task; 24 private final List<Future<?>> futures; 25 25 26 26 /** -
trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
r9062 r9067 27 27 public class AddNoteAction extends MapMode implements KeyPressReleaseListener { 28 28 29 private transient NoteData noteData;29 private final transient NoteData noteData; 30 30 31 31 /** -
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
r9062 r9067 1408 1408 private JCheckBoxMenuItem checkBox; 1409 1409 1410 private MouseListener anglePopupListener = new PopupMenuLauncher(new AnglePopupMenu()) {1410 private final MouseListener anglePopupListener = new PopupMenuLauncher(new AnglePopupMenu()) { 1411 1411 @Override 1412 1412 public void mouseClicked(MouseEvent e) { -
trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
r8840 r9067 23 23 private Point mousePos; 24 24 private Point mouseStart; 25 private transient PlayHeadMarker playHeadMarker;25 private final transient PlayHeadMarker playHeadMarker; 26 26 27 27 /** -
trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
r9062 r9067 1020 1020 } 1021 1021 1022 private transient CycleManager cycleManager = new CycleManager();1023 private transient VirtualManager virtualManager = new VirtualManager();1022 private final transient CycleManager cycleManager = new CycleManager(); 1023 private final transient VirtualManager virtualManager = new VirtualManager(); 1024 1024 1025 1025 private class CycleManager { -
trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
r9021 r9067 65 65 public class SearchCompiler { 66 66 67 private boolean caseSensitive;68 private boolean regexSearch;67 private final boolean caseSensitive; 68 private final boolean regexSearch; 69 69 private static String rxErrorMsg = marktr("The regex \"{0}\" had a parse error at offset {1}, full error:\n\n{2}"); 70 70 private static String rxErrorMsgNoPos = marktr("The regex \"{0}\" had a parse error, full error:\n\n{1}"); 71 private PushbackTokenizer tokenizer;71 private final PushbackTokenizer tokenizer; 72 72 private static Map<String, SimpleMatchFactory> simpleMatchFactoryMap = new HashMap<>(); 73 73 private static Map<String, UnaryMatchFactory> unaryMatchFactoryMap = new HashMap<>(); … … 109 109 110 110 public class CoreSimpleMatchFactory implements SimpleMatchFactory { 111 private Collection<String> keywords = Arrays.asList("id", "version", "type", "user", "role",111 private final Collection<String> keywords = Arrays.asList("id", "version", "type", "user", "role", 112 112 "changeset", "nodes", "ways", "tags", "areasize", "waylength", "modified", "selected", 113 113 "incomplete", "untagged", "closed", "new", "indownloadedarea", -
trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
r8512 r9067 30 30 * List of checks to run on data 31 31 */ 32 private List<FixData> deprecated = new LinkedList<>();32 private final List<FixData> deprecated = new LinkedList<>(); 33 33 34 34 /** … … 107 107 public static class FixDataKey implements FixData { 108 108 /** key of wrong data */ 109 private String oldKey;109 private final String oldKey; 110 110 /** key of correct data */ 111 private String newKey;111 private final String newKey; 112 112 113 113 /** … … 141 141 public static class FixDataTag implements FixData { 142 142 /** key of wrong data */ 143 private String oldKey;143 private final String oldKey; 144 144 /** value of wrong data */ 145 private String oldValue;145 private final String oldValue; 146 146 /** key of correct data */ 147 private String newKey;147 private final String newKey; 148 148 /** value of correct data */ 149 private String newValue;149 private final String newValue; 150 150 151 151 /** -
trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
r8840 r9067 40 40 41 41 private boolean isCanceled; 42 private Map<Note, Note> updatedNotes = new HashMap<>();43 private Map<Note, Exception> failedNotes = new HashMap<>();42 private final Map<Note, Note> updatedNotes = new HashMap<>(); 43 private final Map<Note, Exception> failedNotes = new HashMap<>(); 44 44 45 45 /** -
trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java
r8456 r9067 25 25 private final Relation relation; 26 26 // Position of the member 27 private int position = -1;27 private final int position; 28 28 // The new role 29 29 private final String newRole; -
trunk/src/org/openstreetmap/josm/command/MoveCommand.java
r8549 r9067 51 51 * List of all old states of the objects. 52 52 */ 53 private List<OldNodeState> oldState = new LinkedList<>();53 private final List<OldNodeState> oldState = new LinkedList<>(); 54 54 55 55 /** -
trunk/src/org/openstreetmap/josm/command/RotateCommand.java
r8931 r9067 20 20 * Pivot point 21 21 */ 22 private EastNorth pivot;22 private final EastNorth pivot; 23 23 24 24 /** 25 25 * angle of rotation starting click to pivot 26 26 */ 27 private double startAngle;27 private final double startAngle; 28 28 29 29 /** -
trunk/src/org/openstreetmap/josm/command/ScaleCommand.java
r8840 r9067 14 14 * Pivot point 15 15 */ 16 private EastNorth pivot;16 private final EastNorth pivot; 17 17 18 18 /** … … 24 24 * World position of the mouse when the user started the command. 25 25 */ 26 private EastNorth startEN;26 private final EastNorth startEN; 27 27 28 28 /** -
trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java
r8510 r9067 11 11 public abstract class CorrectionTableModel<C extends Correction> extends AbstractTableModel { 12 12 13 private transient List<C> corrections;13 private final transient List<C> corrections; 14 14 private boolean[] apply; 15 private int applyColumn;15 private final int applyColumn; 16 16 17 17 public CorrectionTableModel(List<C> corrections) { -
trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java
r9062 r9067 46 46 public abstract Collection<Command> execute(P oldprimitive, P primitive) throws UserCancelException; 47 47 48 private String[] applicationOptions = new String[] {48 private final String[] applicationOptions = new String[] { 49 49 tr("Apply selected changes"), 50 50 tr("Do not apply changes"), -
trunk/src/org/openstreetmap/josm/data/APIDataSet.java
r8856 r9067 270 270 */ 271 271 private static class RelationUploadDependencyGraph { 272 private Map<Relation, Set<Relation>> children = new HashMap<>();272 private final Map<Relation, Set<Relation>> children = new HashMap<>(); 273 273 private Collection<Relation> relations; 274 274 private Set<Relation> visited = new HashSet<>(); -
trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
r8870 r9067 423 423 424 424 private Preferences mainPrefs; 425 private Map<String, Element> tasksMap = new HashMap<>();425 private final Map<String, Element> tasksMap = new HashMap<>(); 426 426 427 427 private boolean lastV; // last If condition result -
trunk/src/org/openstreetmap/josm/data/Preferences.java
r8926 r9067 1727 1727 1728 1728 private class SettingToXml implements SettingVisitor { 1729 private StringBuilder b;1730 private boolean noPassword;1729 private final StringBuilder b; 1730 private final boolean noPassword; 1731 1731 private String key; 1732 1732 -
trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
r9059 r9067 40 40 public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimitive>> { 41 41 private final List<Conflict<? extends OsmPrimitive>> conflicts; 42 private CopyOnWriteArrayList<IConflictListener> listeners;42 private final CopyOnWriteArrayList<IConflictListener> listeners; 43 43 44 44 private static class FilterPredicate implements Predicate<Conflict<? extends OsmPrimitive>> { -
trunk/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java
r8624 r9067 27 27 */ 28 28 public static final StringProperty PROP_TILECACHE_DIR = getTileCacheDir(); 29 private ICacheAccess<String, BufferedImageCacheEntry> cache;29 private final ICacheAccess<String, BufferedImageCacheEntry> cache; 30 30 private Constructor<? extends TileLoader> tileLoaderConstructor; 31 31 -
trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
r8846 r9067 42 42 private static final long MAXIMUM_EXPIRES = 30 /*days*/ * 24 /*hours*/ * 60 /*minutes*/ * 60 /*seconds*/ *1000L /*milliseconds*/; 43 43 private static final long MINIMUM_EXPIRES = 1 /*hour*/ * 60 /*minutes*/ * 60 /*seconds*/ *1000L /*milliseconds*/; 44 private Tile tile;44 private final Tile tile; 45 45 private volatile URL url; 46 46 -
trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java
r9059 r9067 12 12 public class NoteComment { 13 13 14 private String text;15 private User user;16 private Date commentTimestamp;17 private Action action;14 private final String text; 15 private final User user; 16 private final Date commentTimestamp; 17 private final Action action; 18 18 19 19 //not currently used. I'm planning on using this to keep track of new actions that need to be uploaded -
trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java
r8291 r9067 2 2 package org.openstreetmap.josm.data.oauth; 3 3 4 import org.openstreetmap.josm.tools.CheckParameterUtil; 5 4 6 import oauth.signpost.OAuthConsumer; 5 6 import org.openstreetmap.josm.tools.CheckParameterUtil;7 7 8 8 public class OAuthToken { … … 18 18 } 19 19 20 private String key;21 private String secret;20 private final String key; 21 private final String secret; 22 22 23 23 /** -
trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
r8836 r9067 153 153 154 154 private static class DefaultChangesetDataSetEntry implements ChangesetDataSetEntry { 155 private ChangesetModificationType modificationType;156 private HistoryOsmPrimitive primitive;155 private final ChangesetModificationType modificationType; 156 private final HistoryOsmPrimitive primitive; 157 157 158 158 DefaultChangesetDataSetEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) { … … 173 173 174 174 private class DefaultIterator implements Iterator<ChangesetDataSetEntry> { 175 private Iterator<Entry<PrimitiveId, ChangesetModificationType>> typeIterator;175 private final Iterator<Entry<PrimitiveId, ChangesetModificationType>> typeIterator; 176 176 177 177 DefaultIterator() { -
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r8870 r9067 233 233 } 234 234 235 /* 235 /** 236 236 * Holding bin for changeset tag information, to be applied when or if this is ever uploaded. 237 237 */ 238 private Map<String, String> changeSetTags = new HashMap<>();238 private final Map<String, String> changeSetTags = new HashMap<>(); 239 239 240 240 /** -
trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java
r8510 r9067 42 42 } 43 43 44 private Relation parent;45 private int position;46 private String role;47 private OsmPrimitive child;44 private final Relation parent; 45 private final int position; 46 private final String role; 47 private final OsmPrimitive child; 48 48 49 49 public RelationToChildReference(Relation parent, int position, String role, OsmPrimitive child) { -
trunk/src/org/openstreetmap/josm/data/osm/Storage.java
r9059 r9067 90 90 private int size; 91 91 private volatile int modCount; 92 private double loadFactor = 0.6d;92 private final double loadFactor = 0.6d; 93 93 private static final int DEFAULT_CAPACITY = 16; 94 94 private final boolean safeIterator; … … 363 363 364 364 private final class FMap<K> implements Map<K, T> { 365 private Hash<K, ? super T> fHash;365 private final Hash<K, ? super T> fHash; 366 366 367 367 private FMap(Hash<K, ? super T> h) { -
trunk/src/org/openstreetmap/josm/data/osm/history/History.java
r8512 r9067 36 36 37 37 /** the list of object snapshots */ 38 private List<HistoryOsmPrimitive> versions;38 private final List<HistoryOsmPrimitive> versions; 39 39 /** the object id */ 40 40 private final long id; -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
r9059 r9067 45 45 46 46 /** the history data */ 47 private Map<PrimitiveId, ArrayList<HistoryOsmPrimitive>> data;48 private CopyOnWriteArrayList<HistoryDataSetListener> listeners;49 private Map<Long, Changeset> changesets;47 private final Map<PrimitiveId, ArrayList<HistoryOsmPrimitive>> data; 48 private final CopyOnWriteArrayList<HistoryDataSetListener> listeners; 49 private final Map<Long, Changeset> changesets; 50 50 51 51 /** -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
r9059 r9067 21 21 public class HistoryRelation extends HistoryOsmPrimitive { 22 22 23 private List<RelationMemberData> members = new ArrayList<>();23 private final List<RelationMemberData> members = new ArrayList<>(); 24 24 25 25 /** -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
r8510 r9067 21 21 public class HistoryWay extends HistoryOsmPrimitive { 22 22 23 private List<Long> nodeIds = new ArrayList<>();23 private final List<Long> nodeIds = new ArrayList<>(); 24 24 25 25 /** -
trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
r8510 r9067 32 32 */ 33 33 public class MergeSourceBuildingVisitor extends AbstractVisitor { 34 private DataSet selectionBase;35 private DataSet hull;36 private Map<OsmPrimitive, PrimitiveData> mappedPrimitives;34 private final DataSet selectionBase; 35 private final DataSet hull; 36 private final Map<OsmPrimitive, PrimitiveData> mappedPrimitives; 37 37 38 38 /** -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
r8958 r9067 60 60 61 61 public static class Descriptor { 62 private Class<? extends AbstractMapRenderer> renderer;63 private String displayName;64 private String description;62 private final Class<? extends AbstractMapRenderer> renderer; 63 private final String displayName; 64 private final String description; 65 65 66 66 public Descriptor(Class<? extends AbstractMapRenderer> renderer, String displayName, String description) { -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
r8870 r9067 90 90 91 91 /** Helper variable for {@link #visit(Relation)} */ 92 private Stroke relatedWayStroke = new BasicStroke(92 private final Stroke relatedWayStroke = new BasicStroke( 93 93 4, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL); 94 94 -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
r8840 r9067 35 35 36 36 private NTV2GridShiftFile instance; 37 private String gridFileName;37 private final String gridFileName; 38 38 39 39 /** -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
r8870 r9067 41 41 private static final long serialVersionUID = 1L; 42 42 43 private String subGridName;44 private String parentSubGridName;45 private String created;46 private String updated;47 private double minLat;48 private double maxLat;49 private double minLon;50 private double maxLon;51 private double latInterval;52 private double lonInterval;53 private int nodeCount;54 55 private int lonColumnCount;56 private int latRowCount;57 private f loat[] latShift;58 private f loat[] lonShift;43 private final String subGridName; 44 private final String parentSubGridName; 45 private final String created; 46 private final String updated; 47 private final double minLat; 48 private final double maxLat; 49 private final double minLon; 50 private final double maxLon; 51 private final double latInterval; 52 private final double lonInterval; 53 private final int nodeCount; 54 55 private final int lonColumnCount; 56 private final int latRowCount; 57 private final float[] latShift; 58 private final float[] lonShift; 59 59 private float[] latAccuracy; 60 60 private float[] lonAccuracy; -
trunk/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java
r7937 r9067 7 7 public class ClassProjFactory implements ProjFactory { 8 8 9 private Class<? extends Proj> projClass;9 private final Class<? extends Proj> projClass; 10 10 11 11 public ClassProjFactory(Class<? extends Proj> projClass) { -
trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
r8846 r9067 44 44 private static class NodeHash implements Hash<Object, Object> { 45 45 46 private double precision = Main.pref.getDouble("validator.duplicatenodes.precision", 0.);46 private final double precision = Main.pref.getDouble("validator.duplicatenodes.precision", 0.); 47 47 48 48 private LatLon roundCoord(LatLon coor) { -
trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
r8850 r9067 39 39 public static class RelMember { 40 40 /** Role of the relation member */ 41 private String role;41 private final String role; 42 42 43 43 /** Type of the relation member */ 44 private OsmPrimitiveType type;44 private final OsmPrimitiveType type; 45 45 46 46 /** Tags of the relation member */ … … 103 103 private static class RelationMembers { 104 104 /** List of member objects of the relation */ 105 private List<RelMember> members;105 private final List<RelMember> members; 106 106 107 107 /** Store relation information … … 133 133 private static class RelationPair { 134 134 /** Member objects of the relation */ 135 private RelationMembers members;135 private final RelationMembers members; 136 136 /** Tags of the relation */ 137 private Map<String, String> keys;137 private final Map<String, String> keys; 138 138 139 139 /** Store relation information -
trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
r8846 r9067 41 41 private MultiMap<Way, Way> errorWays; 42 42 43 private List<NormalizeRule> rules = new ArrayList<NormalizeRule>();43 private final List<NormalizeRule> rules = new ArrayList<NormalizeRule>(); 44 44 45 45 /**
Note:
See TracChangeset
for help on using the changeset viewer.