Context Navigation

Changeset 2990 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2010-02-15T09:03:57+01:00 (15 years ago)

Author:

jttt

Message:

Fix some eclipse warnings

Location:

trunk/src/org/openstreetmap/josm/io

Files:

-              r2986
+              r2990
     // If the cache is full, we don't want to delete just one file
     private static final int cleanUpThreshold = 20;
+    private static final int CLEANUP_TRESHOLD = 20;
     // We don't want to clean after every file-write
     private static final int cleanUpInterval = 5;
+    private static final int CLEANUP_INTERVAL = 5;
     // Stores how many files have been written
     private int writes = 0;
 …
      */
     public void checkCleanUp() {
         if(this.writes > this.cleanUpInterval) {
+        if(this.writes > CLEANUP_INTERVAL) {
             cleanUp();
+        }
 …
             // Delete a couple of files, then check again
             if(i % cleanUpThreshold == 0 && getDirSize() < maxsize)
+            if(i % CLEANUP_TRESHOLD == 0 && getDirSize() < maxsize)
                 return;
+        }

r2852	r2990
24	24	*/
25	25	public class DefaultProxySelector extends ProxySelector {
	26	@SuppressWarnings("unused")
26	27	static private final Logger logger = Logger.getLogger(DefaultProxySelector.class.getName());
27	28

-              r2889
+              r2990
         try {
             if(file != null && (file.getName().endsWith(".zip")
+            || file.getName().endsWith(".ZIP")))
+                    || file.getName().endsWith(".ZIP")))
+            {
                 ZipFile zipFile = new ZipFile(file);
                 ZipEntry resentry = null;
+                Enumeration entries = zipFile.entries();
+                Enumeration<? extends ZipEntry> entries = zipFile.entries();
                 while(entries.hasMoreElements()) {
                     ZipEntry entry = (ZipEntry)entries.nextElement();
+                    ZipEntry entry = entries.nextElement();
                     if(entry.getName().endsWith("."+extension)) {
                         /* choose any file with correct extension. When more than

r2852	r2990
50	50	*/
51	51	public class OsmApi extends OsmConnection {
	52	@SuppressWarnings("unused")
52	53	static private final Logger logger = Logger.getLogger(OsmApi.class.getName());
53	54	/** max number of retries to send a request in case of HTTP 500 errors or timeouts */

-              r2852
+              r2990
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
+            }
             if (v.equals("true")) return true;
             if (v.equals("false")) return false;
+            if ("true".equals(v)) return true;
+            if ("false".equals(v)) return false;
             throwException(tr("Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''.", name, v));
             // not reached

r2955	r2990
39	39	*/
40	40	public class OsmChangesetParser {
	41	@SuppressWarnings("unused")
41	42	static private final Logger logger = Logger.getLogger(OsmChangesetParser.class.getName());
42	43

r2862	r2990
31	31	*/
32	32	public class OsmConnection {
	33	@SuppressWarnings("unused")
33	34	private static final Logger logger = Logger.getLogger(OsmConnection.class.getName());
34	35

r2852	r2990
29	29	*/
30	30	public abstract class OsmServerReader extends OsmConnection {
	31	@SuppressWarnings("unused")
31	32	static private final Logger logger = Logger.getLogger(OsmServerReader.class.getName());
32	33	private OsmApi api = OsmApi.getOsmApi();

r2852	r2990
29	29	*/
30	30	public class OsmServerWriter {
	31	@SuppressWarnings("unused")
31	32	static private final Logger logger = Logger.getLogger(OsmServerWriter.class.getName());
32	33

r2801	r2990
17	17	*/
18	18	public class DefaultAuthenticator extends Authenticator {
	19	@SuppressWarnings("unused")
19	20	private static final Logger logger = Logger.getLogger(DefaultAuthenticator.class.getName());
20	21	private static DefaultAuthenticator instance;

Note: See TracChangeset for help on using the changeset viewer.