diff --git a/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/internal/worldimage/WorldImageServiceExtension.java b/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/internal/worldimage/WorldImageServiceExtension.java index 9b8f075..1a1a571 100644 --- a/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/internal/worldimage/WorldImageServiceExtension.java +++ b/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/internal/worldimage/WorldImageServiceExtension.java @@ -32,20 +32,22 @@ import org.geotools.gce.image.WorldImageFormatFactory; * WorldImage plugin is capable of processing are created. *

* @author mleslie * @since 0.6.0 */ public class WorldImageServiceExtension implements ServiceExtension2 { /** URL_PARAM field */ public final static String URL_PARAM = "URL"; //$NON-NLS-1$ public static final String TYPE = "world+image"; //$NON-NLS-1$ + + public static final String FILE_PROTOCOL = "file"; private static WorldImageFormatFactory factory; /** * Construct WorldImageServiceExtension. * */ public WorldImageServiceExtension() { super(); } @@ -138,21 +140,21 @@ public class WorldImageServiceExtension implements ServiceExtension2 { } Collection endings = new HashSet(WorldImageFormat.getWorldExtension(fileExt)); endings.add(".wld"); //$NON-NLS-1$ endings.add(fileExt+"w"); //$NON-NLS-1$ File[] found = URLUtils.findRelatedFiles(file, endings.toArray(new String[0]) ); if (found.length==0) { return Messages.WorldImageServiceExtension_needsFile; } - if( !id.getProtocol().equals(Messages.WorldImageServiceExtension_file) ){ + if( !id.getProtocol().equals(FILE_PROTOCOL) ){ return Messages.WorldImageServiceExtension_mustBeFIle; } try { @SuppressWarnings("unused") File fileTest = URLUtils.urlToFile(id); } catch(IllegalArgumentException ex) { return Messages.WorldImageServiceExtension_IllegalFilePart1+id.getFile()+Messages.WorldImageServiceExtension_IllegalFilePart2; } return null; diff --git a/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/Messages.java b/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/Messages.java index d124ede..ff56766 100644 --- a/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/Messages.java +++ b/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/Messages.java @@ -19,21 +19,20 @@ package net.refractions.udig.catalog.worldimage.internal; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { private static final String BUNDLE_NAME = "net.refractions.udig.catalog.worldimage.internal.messages"; //$NON-NLS-1$ public static String InMemoryCoverageLoader_close_button; public static String InMemoryCoverageLoader_message; public static String InMemoryCoverageLoader_msgTitle; public static String InMemoryCoverageLoader_restart_button; public static String WorldImageGeoResourceImpl_PrjUnavailable; public static String WorldImageServiceExtension_badFileExtension; - public static String WorldImageServiceExtension_file; public static String WorldImageServiceExtension_geotoolsDisagrees; public static String WorldImageServiceExtension_IllegalFilePart1; public static String WorldImageServiceExtension_IllegalFilePart2; public static String WorldImageServiceExtension_mustBeFIle; public static String WorldImageServiceExtension_needsFile; public static String WorldImageServiceExtension_noID; public static String WorldImageServiceExtension_or; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages.properties b/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages.properties index b2fd834..9da9b58 100644 --- a/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages.properties +++ b/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages.properties @@ -10,21 +10,19 @@ InMemoryCoverageLoader_msgTitle = Maximum Permitted Memory Exceeded InMemoryCoverageLoader_restart_button = Restart WorldImageGeoResourceImpl_PrjUnavailable = .prj file could not be found for world image file. WorldImageServiceExtension_IllegalFilePart1 = The file portion of the URL: WorldImageServiceExtension_IllegalFilePart2 = \ is not a legal file name WorldImageServiceExtension_badFileExtension = The file extension must be one of: PNG, GIF, JPG, JPEG, TIF or TIFF but was -WorldImageServiceExtension_file = file - WorldImageServiceExtension_geotoolsDisagrees = Geotools World + Image implementation cannot accept the provided file, sorry no more information is known WorldImageServiceExtension_mustBeFIle = World + Image files must be a file, not a remote http or ftp style url WorldImageServiceExtension_needsFile = There needs to be a file declaring the bounds of the image. It should end with: WorldImageServiceExtension_noID = No ID provided WorldImageServiceExtension_or = or diff --git a/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages_de.properties b/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages_de.properties index 8ec4943..92f24f0 100644 --- a/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages_de.properties +++ b/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages_de.properties @@ -13,22 +13,20 @@ InMemoryCoverageLoader_restart_button = Udig neustarten WorldImageGeoResourceImpl_PrjUnavailable = Konnte keine Projektion (.prj) f\u00FCr Rasterbild finden. WorldImageServiceExtension_IllegalFilePart1 = Der Dateiteil der URL: WorldImageServiceExtension_IllegalFilePart2 = \ ist kein g\u00FCltiger Dateiname. WorldImageServiceExtension_badFileExtension = Es wird eine der folgenden Endungen erwartet: PNG, GIF, JPG, JPEG, TIF oder TIFF.\r\n\ Stattdessen war es: -WorldImageServiceExtension_file = Datei - WorldImageServiceExtension_geotoolsDisagrees = GeoTools 'World + Image'-Implementierung kann die angegebene Datei nicht verarbeiten.\r\n\ Leider liegen keine genaueren Fehlergr\u00FCnde vor. WorldImageServiceExtension_mustBeFIle = 'World + Image' mu\u00DF zu einer Datei zeigen, nicht zu einer HTTP- oder FTP-Adresse. WorldImageServiceExtension_needsFile = Es wird eine Georeferenzierungsdatei (mit den Grenzen des Bildes) erwartet. Die erwartete Endung ist: WorldImageServiceExtension_noID = Keine ID angegeben. WorldImageServiceExtension_or = oder diff --git a/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages_it.properties b/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages_it.properties index 189ec1a..33e44e6 100644 --- a/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages_it.properties +++ b/plugins/net.refractions.udig.catalog.worldimage/src/net/refractions/udig/catalog/worldimage/internal/messages_it.properties @@ -1,21 +1,19 @@ #Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net) WorldImageGeoResourceImpl_PrjUnavailable = Il file .prj non \u00E8 stato trovato per il world image file. WorldImageServiceExtension_IllegalFilePart1 = La parte di file del URL: WorldImageServiceExtension_IllegalFilePart2 = \ non \u00E8 un nome di file valido WorldImageServiceExtension_badFileExtension = L''estensione del file deve essere PNG, GIF, JPG, JPEG, TIF o TIFF invece di -WorldImageServiceExtension_file = file - WorldImageServiceExtension_geotoolsDisagrees = L''implementazione GeoTools "World + Image" non riesce ad elaborare il file fornito. Purtroppo non sono disponibili altre informazioni. WorldImageServiceExtension_mustBeFIle = "World + Image" files deve essere un file, non un indirizzo http o ftp WorldImageServiceExtension_needsFile = Deve esistere un file che contenga i limiti dell'immagine. Il file deve finire con: WorldImageServiceExtension_noID = Non \u00E8 stato fornito nessun ID WorldImageServiceExtension_or = oppure