* Note: a URL should NOT be constructed from the string instead the URL
* should be obtained through calling one of the aquireLock methods.
- *
+ *
* @param type
* indicates the type of file the caller is interested in.
- *
+ *
* @return the string form of the url that identifies the file indicated by
* the type parameter or null if it is known that the file does not
* exist.
*/
+ @Override
public String get(ShpFileType type) {
return urls.get(type).toExternalForm();
@@ -255,7 +261,8 @@
* is not thread safe so do not count on it to have a completely accurate
* picture but it can be useful debugging
- *
+ *
* @return the number of locks on the current set of shapefile files.
*/
+ @Override
public int numberOfLocks() {
int count = 0;
@@ -269,10 +276,10 @@
* get*Channel methods are used when reading or writing to the file is
* desired.
- *
- *
+ *
+ *
* @see #getInputStream(ShpFileType, FileReader)
* @see #getReadChannel(ShpFileType, FileReader)
* @see #getWriteChannel(ShpFileType, FileReader)
- *
+ *
* @param type
* the type of the file desired.
@@ -280,6 +287,7 @@
* the object that is requesting the File. The same object
* must release the lock and is also used for debugging.
- * @return the File type requested
- */
+ * @return the File type requested
+ */
+ @Override
public File acquireReadFile(ShpFileType type,
FileReader requestor) {
@@ -290,15 +298,15 @@
return DataUtilities.urlToFile(url);
}
-
+
/**
* Acquire a URL for read only purposes. It is recommended that get*Stream or
* get*Channel methods are used when reading or writing to the file is
* desired.
- *
- *
+ *
+ *
* @see #getInputStream(ShpFileType, FileReader)
* @see #getReadChannel(ShpFileType, FileReader)
* @see #getWriteChannel(ShpFileType, FileReader)
- *
+ *
* @param type
* the type of the file desired.
@@ -308,9 +316,10 @@
* @return the URL to the file of the type requested
*/
+ @Override
public URL acquireRead(ShpFileType type, FileReader requestor) {
URL url = urls.get(type);
if (url == null)
return null;
-
+
readWriteLock.readLock().lock();
Collection
It is recommended that get*Stream or * get*Channel methods are used when reading or writing to the file is * desired. *
- * + * * @see #getInputStream(ShpFileType, FileReader) * @see #getReadChannel(ShpFileType, FileReader) * @see #getWriteChannel(ShpFileType, FileReader) - * + * * @param type * the type of the file desired. @@ -422,4 +434,5 @@ * @return the File to the file of the type requested */ + @Override public File acquireWriteFile(ShpFileType type, FileWriter requestor) { @@ -431,15 +444,15 @@ } /** - * Acquire a URL for read and write purposes. + * Acquire a URL for read and write purposes. *It is recommended that get*Stream or * get*Channel methods are used when reading or writing to the file is * desired. *
- * + * * @see #getInputStream(ShpFileType, FileReader) * @see #getReadChannel(ShpFileType, FileReader) * @see #getWriteChannel(ShpFileType, FileReader) - * + * * @param type * the type of the file desired. @@ -449,4 +462,5 @@ * @return the URL to the file of the type requested */ + @Override public URL acquireWrite(ShpFileType type, FileWriter requestor) { URL url = urls.get(type); @@ -460,8 +474,8 @@ readWriteLock.writeLock().lock(); threadLockers.add(new ShpFilesLocker(url, requestor)); - mapCache.cleanFileCache(url); + mapCache.cleanFileCache(url); return url; } - + /** * Tries to acquire a URL for read/write purposes. Returns null if the @@ -471,10 +485,10 @@ * desired. * - * + * * @see #getInputStream(ShpFileType, FileReader) * @see #getReadChannel(ShpFileType, FileReader) * @see #getWriteChannel(ShpFileType, FileReader) - * + * * @param type * the type of the file desired. @@ -484,7 +498,8 @@ * @return A result object containing the URL or the reason for the failure. */ + @Override public Result* A write lock is obtained when this method is called and released when the * channel is closed. *
- * - * + * + * * @param type * the type of file to open the stream to. * @param requestor * the object requesting the stream - * + * * @return a WritableByteChannel for the provided file type - * + * * @throws IOException * if there is an error opening the stream */ + @Override public WritableByteChannel getWriteChannel(ShpFileType type, FileWriter requestor) throws IOException { @@ -860,12 +882,13 @@ * Obtains a Storage file for the type indicated. An id is provided so that * the same file can be obtained at a later time with just the id - * + * * @param type * the type of file to create and return - * + * * @return StorageFile * @throws IOException * if temporary files cannot be created */ + @Override public StorageFile getStorageFile(ShpFileType type) throws IOException { String baseName = getTypeName(); @@ -877,4 +900,5 @@ } + @Override public String getTypeName() { String path = SHP.toBase(urls.get(SHP)); @@ -888,5 +912,5 @@ return path.substring(slash, dot); } - + /** * Internal method that the file channel decorators will call to allow reuse of the memory mapped buffers @@ -899,4 +923,5 @@ * @throws IOException */ + @Override MappedByteBuffer map(FileChannel wrapped, URL url, MapMode mode, long position, long size) throws IOException { if(memoryMapCacheEnabled) { @@ -906,5 +931,5 @@ } } - + /** * Returns the status of the memory map cache. When enabled the memory mapped portions of the files are cached and shared @@ -912,4 +937,5 @@ * @param memoryMapCacheEnabled */ + @Override public boolean isMemoryMapCacheEnabled() { return memoryMapCacheEnabled; @@ -921,4 +947,5 @@ * @param memoryMapCacheEnabled */ + @Override public void setMemoryMapCacheEnabled(boolean memoryMapCacheEnabled) { this.memoryMapCacheEnabled = memoryMapCacheEnabled; @@ -931,10 +958,10 @@ * Returns true if the file exists. Throws an exception if the file is not * local. - * + * * @param fileType * the type of file to check existance for. - * + * * @return true if the file exists. - * + * * @throws IllegalArgumentException * if the files are not local. Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/AbstractModule.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/AbstractModule.java (revision 30730) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/AbstractModule.java (revision 30731) @@ -10,4 +10,5 @@ import java.util.List; +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry; import org.openstreetmap.josm.gui.preferences.SourceEntry; @@ -24,5 +25,5 @@ protected final ModuleInformation info; - + public AbstractModule(ModuleInformation info) { this.info = info; @@ -50,24 +51,26 @@ ExtendedSourceEntry src; if (handler != null && (src = handler.getMapPaintStyle()) != null) { - try { - // Copy style sheet to disk to allow JOSM to load it at startup (even making the plugin "early" does not allow it) - String path = OdPlugin.getInstance().getResourcesDirectory()+File.separator+src.url.replace(OdConstants.PROTO_RSRC, "").replace('/', File.separatorChar); - - int n = 0; - byte[] buffer = new byte[4096]; - InputStream in = getClass().getResourceAsStream(src.url.substring(OdConstants.PROTO_RSRC.length()-1)); - new File(path.substring(0, path.lastIndexOf(File.separatorChar))).mkdirs(); - FileOutputStream out = new FileOutputStream(path); + // Copy style sheet to disk to allow JOSM to load it at startup + // (even making the plugin "early" does not allow it) + String path = OdPlugin.getInstance().getResourcesDirectory() + File.separator + + src.url.replace(OdConstants.PROTO_RSRC, "").replace('/', File.separatorChar); + + int n = 0; + byte[] buffer = new byte[4096]; + try (InputStream in = getClass().getResourceAsStream( + src.url.substring(OdConstants.PROTO_RSRC.length()-1)); + FileOutputStream out = new FileOutputStream(path)) { + String dir = path.substring(0, path.lastIndexOf(File.separatorChar)); + if (new File(dir).mkdirs() && Main.isDebugEnabled()) { + Main.debug("Created directory: "+dir); + } while ((n = in.read(buffer)) > 0) { out.write(buffer, 0, n); } - out.close(); - in.close(); - // Add source pointing to the local file src.url = OdConstants.PROTO_FILE+path; sources.add(src); } catch (IOException e) { - System.err.println(e.getMessage()); + Main.error(e.getMessage()); } } @@ -96,5 +99,5 @@ }; } - + @Override public final List