Revision: 4667
http://sourceforge.net/p/jump-pilot/code/4667
Author: bertazza
Date: 2015-12-24 14:05:02 +0000 (Thu, 24 Dec 2015)
Log Message:
-----------
Fixed broken 4666 commit
Info feature tool: fixed issue related to dirty url
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/FeatureInfoTool.java
core/trunk/src/org/openjump/core/ui/plugin/queries/QueryDialog.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2015-12-24 12:33:54 UTC (rev 4666)
+++ core/trunk/ChangeLog 2015-12-24 14:05:02 UTC (rev 4667)
@@ -4,6 +4,10 @@
#<-------------------------------- 80 chars
---------------------------------->#
2015-12-24 bertazza
+ * Fixed broken 4666 commit
+ * Info feature tool: fixed issue related to dirty url
+
+2015-12-24 bertazza
* Removed IOExpcetion throw from TaskFrame
2015-12-24 bertazza
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/FeatureInfoTool.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/FeatureInfoTool.java
2015-12-24 12:33:54 UTC (rev 4666)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/FeatureInfoTool.java
2015-12-24 14:05:02 UTC (rev 4667)
@@ -124,9 +124,13 @@
continue;
}
- //String featInfoUrl =
wmsLayer.getService().getCapabilities().getFeatureInfoURL();
- String featInfoUrl =
wmsLayer.createRequest(getWorkbench().getContext().getLayerViewPanel()).getURL().toString();
+ String featInfoUrl =
wmsLayer.getService().getCapabilities().getFeatureInfoURL();
+ String userInfo =
wmsLayer.createRequest(getWorkbench().getContext().getLayerViewPanel()).getURL().getUserInfo();
+ if(userInfo != null) {
+ featInfoUrl = featInfoUrl.concat(userInfo);
+ }
+
String names = getWmsLayeNames(wmsLayer);
Point2D point = getPanel().getViewport().toViewPoint(coord);
Modified: core/trunk/src/org/openjump/core/ui/plugin/queries/QueryDialog.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/queries/QueryDialog.java
2015-12-24 12:33:54 UTC (rev 4666)
+++ core/trunk/src/org/openjump/core/ui/plugin/queries/QueryDialog.java
2015-12-24 14:05:02 UTC (rev 4667)
@@ -903,13 +903,9 @@
// initialization for infoframe
InfoFrame info = null;
if(display.getState()) {
- try {
- info = new InfoFrame(context.getWorkbenchContext(),
- (LayerManagerProxy)context,
-
(TaskFrame)context.getWorkbenchFrame().getActiveInternalFrame());
- } catch (IOException ex) {
- ex.printStackTrace();
- }
+ info = new InfoFrame(context.getWorkbenchContext(),
+ (LayerManagerProxy)context,
+
(TaskFrame)context.getWorkbenchFrame().getActiveInternalFrame());
}
// Loop on the requested layers
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
