Revision: 4556
http://sourceforge.net/p/jump-pilot/code/4556
Author: michaudm
Date: 2015-11-23 20:00:23 +0000 (Mon, 23 Nov 2015)
Log Message:
-----------
Fix bug #411 : plugins in attributeTable context menu was deactivated
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributePanel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanelListener.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2015-11-22 19:59:06 UTC (rev 4555)
+++ core/trunk/ChangeLog 2015-11-23 20:00:23 UTC (rev 4556)
@@ -1,6 +1,11 @@
# for display continuity sake please use 2 spaces instead of tabs
+
+2015-11-23 mmichaud <m.michael.mich...@orange.fr>
+ * Fix bug #411 : plugins in attributeTable context menu was deactivated
+
2015-11-19 bertazza <bertazza@gmail>
* Removed reference to IndentingXMLStreamWriter class in SLDHandler class
+
2015-11-19 bertazza <berta...@gmail.com>
* Raster styler: added options to save and load symbology as SLD file,
added option to invert ramp for stretched symbology, added given interval
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributePanel.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributePanel.java
2015-11-22 19:59:06 UTC (rev 4555)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributePanel.java
2015-11-23 20:00:23 UTC (rev 4556)
@@ -54,7 +54,7 @@
public class AttributePanel extends JPanel implements InfoModelListener {
- private SelectionManager selectionManager;
+ //private SelectionManager selectionManager;
private GridBagLayout gridBagLayout1 = new GridBagLayout();
private HashMap layerToTablePanelMap = new HashMap();
private InfoModel model;
@@ -103,8 +103,8 @@
LayerManagerProxy layerManagerProxy,
boolean addScrollPanesToChildren) {
this.addScrollPanesToChildren = addScrollPanesToChildren;
- selectionManager = new SelectionManager(null, layerManagerProxy);
- selectionManager.setPanelUpdatesEnabled(false);
+ //selectionManager = new SelectionManager(null, layerManagerProxy);
+ //selectionManager.setPanelUpdatesEnabled(false);
this.taskFrame = taskFrame;
this.workbenchContext = workbenchContext;
this.layerManagerProxy = layerManagerProxy;
@@ -403,6 +403,6 @@
}
}
public SelectionManager getSelectionManager() {
- return selectionManager;
+ return workbenchContext.getLayerViewPanel().getSelectionManager();
}
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanel.java
2015-11-22 19:59:06 UTC (rev 4555)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanel.java
2015-11-23 20:00:23 UTC (rev 4556)
@@ -957,7 +957,7 @@
for (Iterator i = listeners.iterator(); i.hasNext();) {
AttributeTablePanelListener listener =
(AttributeTablePanelListener) i
.next();
- listener.selectionReplaced(this);
+ listener.selectionReplaced(/*this*/);
}
}
@@ -1087,23 +1087,23 @@
/**
* Called by the SelectionModelWrapper to update LayerViewPanel
* when the table selection is changed.
- * @param panel
*/
- public void selectionReplaced(AttributeTablePanel panel) {
+ public void selectionReplaced() {
int[] selectedRows = table.getSelectedRows();
// After selectedRows have been memorized, clear the layer selection,
// other wise OpenJUMP will add the selectedRows to the already
selected features
-
workbenchContext.getLayerViewPanel().getSelectionManager().unselectItems(panel.layer);
- ArrayList selectedFeatures = new ArrayList();
+
workbenchContext.getLayerViewPanel().getSelectionManager().unselectItems(getModel().getLayer());
+ Map<Feature,List<Geometry>> map = new HashMap<Feature,
List<Geometry>>();
for (int j = 0; j < selectedRows.length; j++) {
- selectedFeatures.add(getModel().getFeature(selectedRows[j]));
+ Feature feature = getModel().getFeature(selectedRows[j]);
+ map.put(feature, Collections.singletonList(feature.getGeometry()));
}
workbenchContext
.getLayerViewPanel()
.getSelectionManager()
.getFeatureSelection()
- .selectItems(panel.layer, selectedFeatures);
+ .selectItems(getModel().getLayer(), map);
}
}
\ No newline at end of file
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanelListener.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanelListener.java
2015-11-22 19:59:06 UTC (rev 4555)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanelListener.java
2015-11-23 20:00:23 UTC (rev 4556)
@@ -38,5 +38,5 @@
* Called when the user creates a new selection, rather than adding to the
* existing selection
*/
- void selectionReplaced(AttributeTablePanel panel);
+ void selectionReplaced();
}
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741551&iu=/4140
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
