Revision: 6223
http://sourceforge.net/p/jump-pilot/code/6223
Author: michaudm
Date: 2020-01-14 16:36:38 +0000 (Tue, 14 Jan 2020)
Log Message:
-----------
Better management of WMS GetCapabilities with empty title tag
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/wms/AbstractParser.java
core/trunk/src/language/jump.properties
core/trunk/src/language/jump_de.properties
core/trunk/src/language/jump_es.properties
core/trunk/src/language/jump_fi.properties
core/trunk/src/language/jump_fr.properties
core/trunk/src/language/jump_hu.properties
core/trunk/src/language/jump_it.properties
core/trunk/src/language/jump_ja_JP.properties
core/trunk/src/language/jump_ml.properties
core/trunk/src/language/jump_pt.properties
core/trunk/src/language/jump_pt_BR.properties
core/trunk/src/language/jump_ta_IN.properties
core/trunk/src/language/jump_te.properties
core/trunk/src/language/jump_zh_CN.properties
core/trunk/src/language/jump_zh_HK.properties
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2020-01-13 20:36:59 UTC (rev 6222)
+++ core/trunk/ChangeLog 2020-01-14 16:36:38 UTC (rev 6223)
@@ -3,6 +3,10 @@
# 2. make sure that lines break at 80 chars for constricted display situations
#<-------------------------------- 80 chars
---------------------------------->#
+2020-01-14 mmichaud <m.michael.mich...@orange.fr>
+ * Display a message instead of throwing an exception if a WMS
+ GetCapabilies has an empty tag WMT_MS_Capabilies/Service/Title
+
2020-01-08 mmichaud <m.michael.mich...@orange.fr>
* fix a bug related to WMS GetCapability reading (used
platform encoding instead of encoding declared in xml)
Modified: core/trunk/src/com/vividsolutions/wms/AbstractParser.java
===================================================================
--- core/trunk/src/com/vividsolutions/wms/AbstractParser.java 2020-01-13
20:36:59 UTC (rev 6222)
+++ core/trunk/src/com/vividsolutions/wms/AbstractParser.java 2020-01-14
16:36:38 UTC (rev 6223)
@@ -59,7 +59,11 @@
import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.wms.util.XMLTools;
+import javax.swing.*;
+import static javax.swing.JOptionPane.showMessageDialog;
+
+
/**
* Pulls WMS objects out of the XML
* @author Chris Hodgson chodg...@refractions.net
@@ -125,14 +129,17 @@
}
protected String getTitle(Document doc) throws IOException {
- String title;
+ String title = "Untitled";
try {
title = ((CharacterData)XMLTools.simpleXPath(doc,
getTitlePath()).getFirstChild()).getData();
- } catch (Exception e) {
+ } catch (NullPointerException e) {
// possible NullPointerException if there is no firstChild()
// also possible miscast causing an Exception
// [uwe dalluege]
- throw new IOException( "Element <" + getTitlePath() + "> not
found, maybe a WMS version problem! " );
+ showMessageDialog(null,
+
I18N.getMessage("com.vividsolutions.wms.AbstractParser.wms-parser-not-found",
getTitlePath()),
+ null, JOptionPane.INFORMATION_MESSAGE);
+ //throw new IOException( "Element <" + getTitlePath() + "> not
found, maybe a WMS version problem! " );
}
return title;
}
Modified: core/trunk/src/language/jump.properties
===================================================================
--- core/trunk/src/language/jump.properties 2020-01-13 20:36:59 UTC (rev
6222)
+++ core/trunk/src/language/jump.properties 2020-01-14 16:36:38 UTC (rev
6223)
@@ -228,6 +228,7 @@
com.vividsolutions.jump.workbench.ui.zoom.ZoomToFullExtentPlugIn = Zoom To
Full Extent
com.vividsolutions.jump.workbench.ui.zoom.ZoomToLayerPlugIn = Zoom To Layer
com.vividsolutions.jump.workbench.ui.zoom.ZoomToSelectedItemsPlugIn = Zoom To
Selected Items
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found = Mandatory element
<{0}> not found in the GetCapabilities,\nThere may be a WMS version problem!
com.vividsolutions.wms.Parser.invalid-bounding-box-element-node = Invalid
bounding box element node.
com.vividsolutions.wms.Parser.not-a-latlon-boundingbox-element = Not a
(Lat/Long) Bounding-Box Element
com.vividsolutions.wms.WMService.Error = Error
Modified: core/trunk/src/language/jump_de.properties
===================================================================
--- core/trunk/src/language/jump_de.properties 2020-01-13 20:36:59 UTC (rev
6222)
+++ core/trunk/src/language/jump_de.properties 2020-01-14 16:36:38 UTC (rev
6223)
@@ -2903,7 +2903,7 @@
org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn=#T:Select
all ordered features
org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn.selected-features=#T:objets
s\xE9lectionn\xE9s
org.openjump.core.ui.plugin.style.LegendPlugIn=\#T\:Show legend
-org.openjump.core.ui.plugin.style.LegendPlugIn.modify-label=\#T\:Modify Label
+org.openjump.core.ui.plugin.style.LegendPlugIn.modify-label=#T:Modify Label
org.openjump.core.ui.plugin.style.StylePlugIns.IO.select-folder=\#T\:Select
folder where vertex images are located
org.openjump.core.ui.plugin.style.StylePlugIns.IO.styles-could-not-be-loaded=\#T\:Some
styles could not be loaded
org.openjump.core.ui.plugin.style.StylePlugIns.IO.error=\#T\:Error on loading
symbols.
@@ -2952,3 +2952,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=#T:Copy To Clipboard
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_es.properties
===================================================================
--- core/trunk/src/language/jump_es.properties 2020-01-13 20:36:59 UTC (rev
6222)
+++ core/trunk/src/language/jump_es.properties 2020-01-14 16:36:38 UTC (rev
6223)
@@ -2930,3 +2930,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.Name=Crear poligonos desde raster
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=Explotar
multipol\xEDgonos
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=Algoritmos
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_fi.properties
===================================================================
--- core/trunk/src/language/jump_fi.properties 2020-01-13 20:36:59 UTC (rev
6222)
+++ core/trunk/src/language/jump_fi.properties 2020-01-14 16:36:38 UTC (rev
6223)
@@ -2929,3 +2929,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\Pura
multipolygonit
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\Algoritmi
ui.AboutDialog.copy-clipboard=Kopioi leikep\u00F6yd\u00E4lle
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_fr.properties
===================================================================
--- core/trunk/src/language/jump_fr.properties 2020-01-13 20:36:59 UTC (rev
6222)
+++ core/trunk/src/language/jump_fr.properties 2020-01-14 16:36:38 UTC (rev
6223)
@@ -2961,3 +2961,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=Copier dans le presse-papier
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=L''\xE9lement
obligatoire <{0}> n''a pas \xE9t\xE9 trouv\xE9 dans le GetCapabilities,\nCela
peut \xEAtre d\xFB \xE0 un probl\xE8me de version WMS!
Modified: core/trunk/src/language/jump_hu.properties
===================================================================
--- core/trunk/src/language/jump_hu.properties 2020-01-13 20:36:59 UTC (rev
6222)
+++ core/trunk/src/language/jump_hu.properties 2020-01-14 16:36:38 UTC (rev
6223)
@@ -2948,3 +2948,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=#T:Copy To Clipboard
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_it.properties
===================================================================
--- core/trunk/src/language/jump_it.properties 2020-01-13 20:36:59 UTC (rev
6222)
+++ core/trunk/src/language/jump_it.properties 2020-01-14 16:36:38 UTC (rev
6223)
@@ -2932,3 +2932,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.Name=Crea poligoni dal raster
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=Esplodi
multipoligoni
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=Algoritmi
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_ja_JP.properties
===================================================================
--- core/trunk/src/language/jump_ja_JP.properties 2020-01-13 20:36:59 UTC
(rev 6222)
+++ core/trunk/src/language/jump_ja_JP.properties 2020-01-14 16:36:38 UTC
(rev 6223)
@@ -2954,3 +2954,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=#T:Copy To Clipboard
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_ml.properties
===================================================================
--- core/trunk/src/language/jump_ml.properties 2020-01-13 20:36:59 UTC (rev
6222)
+++ core/trunk/src/language/jump_ml.properties 2020-01-14 16:36:38 UTC (rev
6223)
@@ -3729,3 +3729,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=#T:Copy To Clipboard
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_pt.properties
===================================================================
--- core/trunk/src/language/jump_pt.properties 2020-01-13 20:36:59 UTC (rev
6222)
+++ core/trunk/src/language/jump_pt.properties 2020-01-14 16:36:38 UTC (rev
6223)
@@ -2953,3 +2953,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=#T:Copy To Clipboard
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_pt_BR.properties
===================================================================
--- core/trunk/src/language/jump_pt_BR.properties 2020-01-13 20:36:59 UTC
(rev 6222)
+++ core/trunk/src/language/jump_pt_BR.properties 2020-01-14 16:36:38 UTC
(rev 6223)
@@ -2953,3 +2953,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=#T:Copy To Clipboard
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_ta_IN.properties
===================================================================
--- core/trunk/src/language/jump_ta_IN.properties 2020-01-13 20:36:59 UTC
(rev 6222)
+++ core/trunk/src/language/jump_ta_IN.properties 2020-01-14 16:36:38 UTC
(rev 6223)
@@ -2951,3 +2951,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=#T:Copy To Clipboard
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_te.properties
===================================================================
--- core/trunk/src/language/jump_te.properties 2020-01-13 20:36:59 UTC (rev
6222)
+++ core/trunk/src/language/jump_te.properties 2020-01-14 16:36:38 UTC (rev
6223)
@@ -3459,3 +3459,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=#T:Copy To Clipboard
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_zh_CN.properties
===================================================================
--- core/trunk/src/language/jump_zh_CN.properties 2020-01-13 20:36:59 UTC
(rev 6222)
+++ core/trunk/src/language/jump_zh_CN.properties 2020-01-14 16:36:38 UTC
(rev 6223)
@@ -3116,3 +3116,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=#T:Copy To Clipboard
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
Modified: core/trunk/src/language/jump_zh_HK.properties
===================================================================
--- core/trunk/src/language/jump_zh_HK.properties 2020-01-13 20:36:59 UTC
(rev 6222)
+++ core/trunk/src/language/jump_zh_HK.properties 2020-01-14 16:36:38 UTC
(rev 6223)
@@ -3115,3 +3115,4 @@
ui.plugin.raster.VectorizeToPolygonsPlugIn.explode-multipolygons=\#T\:Explode
multipolygons
ui.plugin.raster.VectorizeToPolygonsPlugIn.algorithms=\#T\:Algorithms
ui.AboutDialog.copy-clipboard=#T:Copy To Clipboard
+com.vividsolutions.wms.AbstractParser.wms-parser-not-found=#T:Mandatory
element <{0}> not found in the GetCapabilities,\nThere may be a WMS version
problem!
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
