Ignore:
Timestamp:
2015-06-03T13:24:59+02:00 (9 years ago)
Author:
Don-vip
Message:

javadoc / Unit test fixes

Location:
trunk/src/org/openstreetmap/josm/data
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

    r8433 r8459  
    114114    /**
    115115     * @param cache cache instance that we will work on
    116      * @param headers
    117      * @param readTimeout
    118      * @param connectTimeout
    119      * @param downloadJobExecutor
     116     * @param headers HTTP headers to be sent together with request
     117     * @param readTimeout when connecting to remote resource
     118     * @param connectTimeout when connecting to remote resource
     119     * @param downloadJobExecutor that will be executing the jobs
    120120     */
    121121    public JCSCachedTileLoaderJob(ICacheAccess<K,V> cache,
    … …  
    134134    /**
    135135     * @param cache cache instance that we will work on
    136      * @param headers
    137      * @param readTimeout
    138      * @param connectTimeout
     136     * @param headers HTTP headers to be sent together with request
     137     * @param readTimeout when connecting to remote resource
     138     * @param connectTimeout when connecting to remote resource
    139139     */
    140140    public JCSCachedTileLoaderJob(ICacheAccess<K, V> cache,

  • trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

    r8456 r8459  
    10231023
    10241024    /**
    1025      * Sets the Map of &lt;header name, header value&gt; that if any of this header
     1025     * Sets the map of &lt;header name, header value&gt; that if any of this header
    10261026     * will be returned, then this tile will be treated as "no tile at this zoom level"
    10271027     *
    1028      * @param noTileHeaders
     1028     * @param noTileHeaders Map of &lt;header name, header value&gt; which will be treated as "no tile at this zoom level"
    10291029     * @since 8344
    10301030     */
    … …  
    10391039
    10401040    /**
    1041      * Returns the map &lt;header name, metadata key&gt; indicating, which HTTP headers should
     1041     * Returns the map of &lt;header name, metadata key&gt; indicating, which HTTP headers should
    10421042     * be moved to metadata
    10431043     *
    1044      * @param metadataHeaders
     1044     * @param metadataHeaders map of &lt;header name, metadata key&gt; indicating, which HTTP headers should be moved to metadata
    10451045     * @since 8418
    10461046     */

  • trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

    r8403 r8459  
    2929public class TMSCachedTileLoader implements TileLoader, CachedTileLoader, TileCache {
    3030
    31     private ICacheAccess<String, BufferedImageCacheEntry> cache;
    32     private int connectTimeout;
    33     private int readTimeout;
    34     private Map<String, String> headers;
    35     private TileLoaderListener listener;
     31    private final ICacheAccess<String, BufferedImageCacheEntry> cache;
     32    private final int connectTimeout;
     33    private final int readTimeout;
     34    private final Map<String, String> headers;
     35    private final TileLoaderListener listener;
    3636    private static final String PREFERENCE_PREFIX   = "imagery.tms.cache.";
     37
    3738    /**
    38      * how many object on disk should be stored for TMS region. Average tile size is about 20kb
     39     * how many object on disk should be stored for TMS region. Average tile size is about 20kb. 25000 is around 500MB under this assumption
    3940     */
    40     public static final IntegerProperty MAX_OBJECTS_ON_DISK = new IntegerProperty(PREFERENCE_PREFIX + "max_objects_disk", 25000); // 25000 is around 500MB under this assumptions
     41    public static final IntegerProperty MAX_OBJECTS_ON_DISK = new IntegerProperty(PREFERENCE_PREFIX + "max_objects_disk", 25000);
    4142
    4243    /**
    … …  
    5051    public static final IntegerProperty HOST_LIMIT = new IntegerProperty("imagery.tms.tmsloader.maxjobsperhost", 6);
    5152
    52 
    5353    /**
    5454     * separate from JCS thread pool for TMS loader, so we can have different thread pools for default JCS
    … …  
    5656     */
    5757    private static ThreadPoolExecutor DEFAULT_DOWNLOAD_JOB_DISPATCHER = getThreadPoolExecutor();
     58
     59    private final ThreadPoolExecutor downloadExecutor = DEFAULT_DOWNLOAD_JOB_DISPATCHER;
    5860
    5961    private static ThreadPoolExecutor getThreadPoolExecutor() {
    … …  
    6870    }
    6971
    70     private ThreadPoolExecutor downloadExecutor = DEFAULT_DOWNLOAD_JOB_DISPATCHER;
    71 
    7272    /**
    7373     * Constructor
    … …  
    7676     * @param connectTimeout    to remote resource
    7777     * @param readTimeout       to remote resource
    78      * @param headers           to be sent along with request
     78     * @param headers           HTTP headers to be sent along with request
    7979     * @param cacheDir          where cache file shall reside
    8080     * @throws IOException      when cache initialization fails

  • trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

    r8433 r8459  
    5252    /**
    5353     * Constructor for creating a job, to get a specific tile from cache
    54      * @param listener
     54     * @param listener Tile loader listener
    5555     * @param tile to be fetched from cache
    5656     * @param cache object
    5757     * @param connectTimeout when connecting to remote resource
    5858     * @param readTimeout when connecting to remote resource
    59      * @param headers to be sent together with request
     59     * @param headers HTTP headers to be sent together with request
    6060     * @param downloadExecutor that will be executing the jobs
    6161     */
Note: See TracChangeset for help on using the changeset viewer.