Revision: 4666
http://sourceforge.net/p/jump-pilot/code/4666
Author: bertazza
Date: 2015-12-24 12:33:54 +0000 (Thu, 24 Dec 2015)
Log Message:
-----------
Removed IOExpcetion throw from TaskFrame
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/workbench/ui/InfoFrame.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/PrimaryInfoFrame.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/TaskFrame.java
core/trunk/src/com/vividsolutions/wms/AbstractParser.java
core/trunk/src/com/vividsolutions/wms/Parser.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2015-12-24 12:03:26 UTC (rev 4665)
+++ core/trunk/ChangeLog 2015-12-24 12:33:54 UTC (rev 4666)
@@ -4,6 +4,9 @@
#<-------------------------------- 80 chars
---------------------------------->#
2015-12-24 bertazza
+ * Removed IOExpcetion throw from TaskFrame
+
+2015-12-24 bertazza
* Info feature tool for WMS: info shown only for visible layers, added
&FEATURE_COUNT=10 parameter, and changed method to retrieve url as
suggested by Jukka (should now support basic authentication).
Modified: core/trunk/src/com/vividsolutions/jump/workbench/ui/InfoFrame.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/InfoFrame.java
2015-12-24 12:03:26 UTC (rev 4665)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/InfoFrame.java
2015-12-24 12:33:54 UTC (rev 4666)
@@ -108,7 +108,7 @@
public InfoFrame(
WorkbenchContext workbenchContext,
LayerManagerProxy layerManagerProxy,
- final TaskFrame taskFrame) throws IOException {
+ final TaskFrame taskFrame) {
blackboard = PersistentBlackboardPlugIn.get(workbenchContext);
geometryInfoTab = new GeometryInfoTab(model, workbenchContext);
rasterInfoTab = new RasterInfoTab(null, null);
@@ -375,7 +375,7 @@
private final JEditorPane jEditorPane;
- public WMSInfoTab() throws IOException {
+ public WMSInfoTab() {
setLayout(new BorderLayout());
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/PrimaryInfoFrame.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/PrimaryInfoFrame.java
2015-12-24 12:03:26 UTC (rev 4665)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/PrimaryInfoFrame.java
2015-12-24 12:33:54 UTC (rev 4666)
@@ -45,7 +45,7 @@
* positions InfoFrames differently depending on whether or not they are
primary.
*/
public class PrimaryInfoFrame extends InfoFrame {
- public PrimaryInfoFrame(WorkbenchContext workbenchContext,
LayerManagerProxy layerManagerProxy, TaskFrame taskFrame) throws IOException {
+ public PrimaryInfoFrame(WorkbenchContext workbenchContext,
LayerManagerProxy layerManagerProxy, TaskFrame taskFrame) {
super(workbenchContext, layerManagerProxy, taskFrame);
}
}
Modified: core/trunk/src/com/vividsolutions/jump/workbench/ui/TaskFrame.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/TaskFrame.java
2015-12-24 12:03:26 UTC (rev 4665)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/TaskFrame.java
2015-12-24 12:33:54 UTC (rev 4666)
@@ -224,7 +224,7 @@
return task.getLayerManager();
}
- public InfoFrame getInfoFrame() throws IOException {
+ public InfoFrame getInfoFrame() {
if (infoFrame == null || infoFrame.isClosed()) {
infoFrame = new PrimaryInfoFrame(workbenchContext, this, this);
}
Modified: core/trunk/src/com/vividsolutions/wms/AbstractParser.java
===================================================================
--- core/trunk/src/com/vividsolutions/wms/AbstractParser.java 2015-12-24
12:03:26 UTC (rev 4665)
+++ core/trunk/src/com/vividsolutions/wms/AbstractParser.java 2015-12-24
12:33:54 UTC (rev 4666)
@@ -220,20 +220,20 @@
boundingBoxList.add ( new BoundingBox("Geographics",
geographicBBox.getEnvelope()) );
} else if( n.getNodeName().equals( "Layer" ) ) {
subLayers.add( wmsLayerFromNode( n ) );
- } else if (n.getNodeName().equals("Style")) { //$NON-NLS-1$
- String styleName = ""; //$NON-NLS-1$
- String titleName = ""; //$NON-NLS-1$
- String legendFormat = ""; //$NON-NLS-1$
- String url = ""; //$NON-NLS-1$
+ } else if (n.getNodeName().equals("Style")) {
+ String styleName = "";
+ String titleName = "";
+ String legendFormat = "";
+ String url = "";
int h=0,w=0;
NodeList nodeStyle = n.getChildNodes();
for( int k = 0; k < nodeStyle.getLength(); k++ ) {
Node n1 = nodeStyle.item(k);
- if (n1.getNodeName().equals("Name")) {
//$NON-NLS-1$
+ if (n1.getNodeName().equals("Name")) {
styleName = ((CharacterData)
n1.getFirstChild()).getData();
- } else if (n1.getNodeName().equals("Title") &
n1.hasChildNodes()) { //$NON-NLS-1$
+ } else if (n1.getNodeName().equals("Title") &
n1.hasChildNodes()) {
titleName = ((CharacterData)
n1.getFirstChild()).getData();
- } else if (n1.getNodeName().equals("LegendURL")) {
//$NON-NLS-1$
+ } else if (n1.getNodeName().equals("LegendURL")) {
try {
h=Integer.parseInt(n1.getAttributes().getNamedItem("height").getNodeValue());
w=Integer.parseInt(n1.getAttributes().getNamedItem("width").getNodeValue());
@@ -245,13 +245,13 @@
NodeList nodelegend = n1.getChildNodes();
for( int k1 = 0; k1 < nodelegend.getLength();
k1++ ) {
Node n2 = nodelegend.item(k1);
- if (n2.getNodeName().equals("Format")) {
//$NON-NLS-1$
+ if (n2.getNodeName().equals("Format")) {
legendFormat =
((CharacterData)
n2.getFirstChild()).getData();
- } else if
(n2.getNodeName().equals("OnlineResource")) { //$NON-NLS-1$
+ } else if
(n2.getNodeName().equals("OnlineResource")) {
url =
n2.getAttributes()
-
.getNamedItem("xlink:href").getNodeValue(); //$NON-NLS-1$
+
.getNamedItem("xlink:href").getNodeValue();
}
}
Modified: core/trunk/src/com/vividsolutions/wms/Parser.java
===================================================================
--- core/trunk/src/com/vividsolutions/wms/Parser.java 2015-12-24 12:03:26 UTC
(rev 4665)
+++ core/trunk/src/com/vividsolutions/wms/Parser.java 2015-12-24 12:33:54 UTC
(rev 4666)
@@ -157,20 +157,20 @@
} else if( n.getNodeName().equals( "Layer" ) ) {
subLayers.add( wmsLayerFromNode( n ) );
- } else if (n.getNodeName().equals("Style")) { //$NON-NLS-1$
- String styleName = ""; //$NON-NLS-1$
- String titleName = ""; //$NON-NLS-1$
- String legendFormat = ""; //$NON-NLS-1$
- String url = ""; //$NON-NLS-1$
+ } else if (n.getNodeName().equals("Style")) {
+ String styleName = "";
+ String titleName = "";
+ String legendFormat = "";
+ String url = "";
int h=0,w=0;
NodeList nodeStyle = n.getChildNodes();
for( int k = 0; k < nodeStyle.getLength(); k++ ) {
Node n1 = nodeStyle.item(k);
- if (n1.getNodeName().equals("Name")) { //$NON-NLS-1$
+ if (n1.getNodeName().equals("Name")) {
styleName = ((CharacterData) n1.getFirstChild()).getData();
- } else if (n1.getNodeName().equals("Title") &
n1.hasChildNodes()) { //$NON-NLS-1$
+ } else if (n1.getNodeName().equals("Title") &
n1.hasChildNodes()) {
titleName = ((CharacterData) n1.getFirstChild()).getData();
- } else if (n1.getNodeName().equals("LegendURL")) {
//$NON-NLS-1$
+ } else if (n1.getNodeName().equals("LegendURL")) {
try {
h=Integer.parseInt(n1.getAttributes().getNamedItem("height").getNodeValue());
w=Integer.parseInt(n1.getAttributes().getNamedItem("width").getNodeValue());
@@ -182,13 +182,13 @@
NodeList nodelegend = n1.getChildNodes();
for( int k1 = 0; k1 < nodelegend.getLength(); k1++ ) {
Node n2 = nodelegend.item(k1);
- if (n2.getNodeName().equals("Format")) { //$NON-NLS-1$
+ if (n2.getNodeName().equals("Format")) {
legendFormat =
((CharacterData) n2.getFirstChild()).getData();
- } else if (n2.getNodeName().equals("OnlineResource"))
{ //$NON-NLS-1$
+ } else if (n2.getNodeName().equals("OnlineResource"))
{
url =
n2.getAttributes()
-
.getNamedItem("xlink:href").getNodeValue(); //$NON-NLS-1$
+
.getNamedItem("xlink:href").getNodeValue();
}
}
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
