Revision: 4501
          http://sourceforge.net/p/jump-pilot/code/4501
Author:   michaudm
Date:     2015-06-18 05:53:25 +0000 (Thu, 18 Jun 2015)
Log Message:
-----------
New attempt to fix selection event dispatching between AttributeTable and 
LayerView

Modified Paths:
--------------
    core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanel.java
    core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerViewPanel.java

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanel.java
===================================================================
--- 
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanel.java    
    2015-06-17 20:52:45 UTC (rev 4500)
+++ 
core/trunk/src/com/vividsolutions/jump/workbench/ui/AttributeTablePanel.java    
    2015-06-18 05:53:25 UTC (rev 4501)
@@ -43,6 +43,7 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumnModel;
 
+import com.vividsolutions.jump.workbench.ui.plugin.ViewAttributesPlugIn;
 import org.openjump.core.ui.plugin.view.ViewOptionsPlugIn;
 
 import com.vividsolutions.jts.geom.Geometry;
@@ -527,6 +528,12 @@
             @Override
             public void selectionChanged() {
                 try {
+
+                    if 
(workbenchContext.getWorkbench().getFrame().getActiveInternalFrame()
+                            .isAncestorOf(AttributeTablePanel.this)) return;
+                    if 
(workbenchContext.getWorkbench().getFrame().getActiveInternalFrame()
+                            .isAncestorOf(AttributeTablePanel.this)) return;
+
                     // Get selected features :
                     // For AttributeTable, selected features are highlighted
                     // For InfoModel, selected features may be added to the 
model

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerViewPanel.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerViewPanel.java     
2015-06-17 20:52:45 UTC (rev 4500)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerViewPanel.java     
2015-06-18 05:53:25 UTC (rev 4501)
@@ -668,10 +668,6 @@
        public void fireSelectionChanged() {
                for (Iterator i = listeners.iterator(); i.hasNext();) {
                        LayerViewPanelListener l = (LayerViewPanelListener) 
i.next();
-            // [mmichaud 2015-06-17] Do not propagate selectionChange if the 
change
-            // comes from AttributeTablePanel
-            if (getWorkBenchFrame().getActiveInternalFrame() instanceof 
ViewAttributesPlugIn.ViewAttributesFrame) continue;
-            if (getWorkBenchFrame().getActiveInternalFrame() instanceof 
InfoFrame) continue;
             l.selectionChanged();
                }
        }


------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel

Reply via email to