Changeset 8840 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2015-10-09T02:12:45+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java
r8510 r8840 38 38 * Where the data will be stored 39 39 */ 40 private byte[] data = null;40 private byte[] data; 41 41 42 42 /** -
trunk/src/org/openstreetmap/josm/io/CachedFile.java
r8597 r8840 69 69 protected CachingStrategy cachingStrategy; 70 70 71 protected File cacheFile = null;72 protected boolean initialized = false;71 protected File cacheFile; 72 protected boolean initialized; 73 73 74 74 public static final long DEFAULT_MAXTIME = -1L; -
trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java
r8510 r8840 36 36 37 37 /** the user id this query is restricted to. null, if no restriction to a user id applies */ 38 private Integer uid = null;38 private Integer uid; 39 39 /** the user name this query is restricted to. null, if no restriction to a user name applies */ 40 private String userName = null;40 private String userName; 41 41 /** the bounding box this query is restricted to. null, if no restriction to a bounding box applies */ 42 private Bounds bounds = null;43 44 private Date closedAfter = null;45 private Date createdBefore = null;42 private Bounds bounds; 43 44 private Date closedAfter; 45 private Date createdBefore; 46 46 /** indicates whether only open changesets are queried. null, if no restrictions regarding open changesets apply */ 47 private Boolean open = null;47 private Boolean open; 48 48 /** indicates whether only closed changesets are queried. null, if no restrictions regarding open changesets apply */ 49 private Boolean closed = null;49 private Boolean closed; 50 50 /** a collection of changeset ids to query for */ 51 private Collection<Long> changesetIds = null;51 private Collection<Long> changesetIds; 52 52 53 53 /** -
trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
r8510 r8840 41 41 * We therefore read the property at class loading time and remember it's value. 42 42 */ 43 private static boolean JVM_WILL_USE_SYSTEM_PROXIES = false;43 private static boolean JVM_WILL_USE_SYSTEM_PROXIES; 44 44 static { 45 45 String v = System.getProperty("java.net.useSystemProxies"); -
trunk/src/org/openstreetmap/josm/io/GpxReader.java
r8510 r8840 69 69 private StringBuffer accumulator = new StringBuffer(); 70 70 71 private boolean nokiaSportsTrackerBug = false;71 private boolean nokiaSportsTrackerBug; 72 72 73 73 @Override -
trunk/src/org/openstreetmap/josm/io/MessageNotifier.java
r8734 r8840 52 52 private static final Runnable WORKER = new Worker(); 53 53 54 private static volatile ScheduledFuture<?> task = null;54 private static volatile ScheduledFuture<?> task; 55 55 56 56 private static class Worker implements Runnable { 57 57 58 private int lastUnreadCount = 0;58 private int lastUnreadCount; 59 59 60 60 @Override -
trunk/src/org/openstreetmap/josm/io/NmeaReader.java
r8836 r8840 217 217 protected WayPoint pWp; 218 218 219 protected int success = 0; // number of successfully parsed sentences220 protected int malformed = 0;221 protected int checksumErrors = 0;222 protected int noChecksum = 0;223 protected int unknown = 0;224 protected int zeroCoord = 0;219 protected int success; // number of successfully parsed sentences 220 protected int malformed; 221 protected int checksumErrors; 222 protected int noChecksum; 223 protected int unknown; 224 protected int zeroCoord; 225 225 } 226 226 -
trunk/src/org/openstreetmap/josm/io/OsmApi.java
r8836 r8840 81 81 private static Map<String, OsmApi> instances = new HashMap<>(); 82 82 83 private URL url = null;83 private URL url; 84 84 85 85 /** … … 120 120 121 121 /** API version used for server communications */ 122 private String version = null;122 private String version; 123 123 124 124 /** API capabilities */ 125 private Capabilities capabilities = null;125 private Capabilities capabilities; 126 126 127 127 /** true if successfully initialized */ 128 private boolean initialized = false;128 private boolean initialized; 129 129 130 130 /** -
trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java
r8510 r8840 25 25 private OsmWriter osmwriter; 26 26 private String apiVersion = DEFAULT_API_VERSION; 27 private boolean prologWritten = false;27 private boolean prologWritten; 28 28 29 29 public OsmChangeBuilder(Changeset changeset) { -
trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java
r8510 r8840 71 71 72 72 /** The current changeset */ 73 private Changeset current = null;73 private Changeset current; 74 74 75 75 /** The current comment */ 76 private ChangesetDiscussionComment comment = null;76 private ChangesetDiscussionComment comment; 77 77 78 78 /** The current comment text */ 79 private StringBuilder text = null;79 private StringBuilder text; 80 80 81 81 protected void parseChangesetAttributes(Changeset cs, Attributes atts) throws XmlParsingException { -
trunk/src/org/openstreetmap/josm/io/OsmConnection.java
r8510 r8840 12 12 import java.nio.charset.StandardCharsets; 13 13 14 import oauth.signpost.OAuthConsumer;15 import oauth.signpost.exception.OAuthException;16 17 14 import org.openstreetmap.josm.Main; 18 15 import org.openstreetmap.josm.data.oauth.OAuthParameters; … … 23 20 import org.openstreetmap.josm.tools.Base64; 24 21 22 import oauth.signpost.OAuthConsumer; 23 import oauth.signpost.exception.OAuthException; 24 25 25 /** 26 26 * Base class that handles common things like authentication for the reader and writer … … 30 30 */ 31 31 public class OsmConnection { 32 protected boolean cancel = false;32 protected boolean cancel; 33 33 protected HttpURLConnection activeConnection; 34 34 protected OAuthParameters oauthParameters; -
trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
r8510 r8840 36 36 protected final ProgressMonitor progressMonitor; 37 37 protected final Compression compression; 38 protected InputStream in = null;38 protected InputStream in; 39 39 40 40 public Parser(ProgressMonitor progressMonitor, Compression compression) { -
trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
r8563 r8840 36 36 public abstract class OsmServerReader extends OsmConnection { 37 37 private OsmApi api = OsmApi.getOsmApi(); 38 private boolean doAuthenticate = false;38 private boolean doAuthenticate; 39 39 protected boolean gpxParsedProperly; 40 40 -
trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java
r8510 r8840 52 52 53 53 private OsmApi api = OsmApi.getOsmApi(); 54 private boolean canceled = false;54 private boolean canceled; 55 55 56 56 private static final int MSECS_PER_SECOND = 1000; -
trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java
r8470 r8840 18 18 19 19 private final InputStream in; 20 private int readSoFar = 0;21 private int lastDialogUpdate = 0;20 private int readSoFar; 21 private int lastDialogUpdate; 22 22 private boolean sizeKnown; 23 23 private final URLConnection connection; -
trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
r8510 r8840 20 20 21 21 /** The server socket */ 22 private ServerSocket server = null;22 private ServerSocket server; 23 23 24 24 /** The server instance for IPv4 */ 25 private static volatile RemoteControlHttpServer instance4 = null;25 private static volatile RemoteControlHttpServer instance4; 26 26 /** The server instance for IPv6 */ 27 private static volatile RemoteControlHttpServer instance6 = null;27 private static volatile RemoteControlHttpServer instance6; 28 28 29 29 /** -
trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
r8540 r8840 72 72 73 73 /** The server socket */ 74 private ServerSocket server = null;74 private ServerSocket server; 75 75 76 76 /** The server instance for IPv4 */ 77 private static volatile RemoteControlHttpsServer instance4 = null;77 private static volatile RemoteControlHttpsServer instance4; 78 78 /** The server instance for IPv6 */ 79 private static volatile RemoteControlHttpsServer instance6 = null;79 private static volatile RemoteControlHttpsServer instance6; 80 80 81 81 /** SSL context information for connections */
Note:
See TracChangeset
for help on using the changeset viewer.