Revision 45705 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/searchpanel/DefaultSearchPanel.java

View differences:

DefaultSearchPanel.java
110 110 
import org.gvsig.tools.dynform.DynFormLocator;
111 111 
import org.gvsig.tools.dynform.JDynForm;
112 112 
import org.gvsig.tools.dynobject.DynObject;
113 
import org.gvsig.tools.evaluator.Evaluator;
113 114 
import org.gvsig.tools.swing.api.SupportIsEnable;
114 115 
import org.gvsig.tools.swing.api.SupportIsVisible;
116 
import org.gvsig.tools.swing.api.ToolsSwingUtils;
115 117 
import org.gvsig.tools.swing.api.bookmarkshistory.ActionEventWithCurrentValue;
116 118 
import static org.gvsig.tools.swing.api.bookmarkshistory.ActionEventWithCurrentValue.ID_GETVALUE;
117 119 
import static org.gvsig.tools.swing.api.bookmarkshistory.ActionEventWithCurrentValue.ID_SETVALUE;
......
1509 1511 
            FeatureQuery myQuery = searchParams.getQuery().getCopy();
1510 1512 
//            item.addActionListener(new SearchPostProcessListener(this.store, myQuery, manager.getSearchPostProcess(factory)));
1511 1513 
            item.addActionListener((ActionEvent e) -> {
1512 
                doSearchPostProcess(store, myQuery, manager.getSearchPostProcess(factory));
1514 
                doSearchPostProcess(store, myQuery, manager.getSearchPostProcess(factory), searchParams );
1513 1515 
            });
1514 1516 
            menu.add(item);
1515 1517 
        }
......
1558 1560 
        final List<Feature> featuresSearchPostProccessResults;
1559 1561 
        final FeatureQuery finalQuery;
1560 1562 
        finalQuery = null;
1561 
        try {
1563 
        try {
1562 1564 
            this.tabResults.setEnabledAt(1, true);
1563 1565 
            this.tabResults.setSelectedIndex(1);
1564 1566 
            featuresSearchPostProccessResults = input.getFeatures(finalQuery, 20);
......
1567 1569 
            // al modelo le pasamos el ftype de esas features
1568 1570 
            resultPostProcessModel = new SimpleFeaturesTableModelImpl(
1569 1571 
                    ftypeSearchPostProccessResults,
1570 
                    null,
1572 
                    this.parameters.getResultColumnNames(),
1571 1573 
                    featuresSearchPostProccessResults
1572 1574 
            );
1573 1575 

  		




  ......




  1606
  1608
  
    
        this.tblSearchPostProcessResults.setModel(new DefaultTableModel());


  		




  1607
  1609
  
    
    }


  		




  1608
  1610
  
    
    


  		




  1609
  
  
    
    private void doSearchPostProcess(FeatureStore store, FeatureQuery query, SearchPostProcessFactory factory){


  		




  
  1611
  
    
    private void doSearchPostProcess(FeatureStore store, FeatureQuery query, SearchPostProcessFactory factory, SearchParameters searchParams){


  		




  1610
  1612
  
    
        if (factory.hasProcessParameters()) {


  		




  1611
  
  
    
                DynObject parametersPostProcess = factory.createProcessParameters(store);


  		




  
  1613
  
    
                DynObject parametersPostProcess = factory.createProcessParameters(store, query, searchParams);


  		




  1612
  1614
  
    
                JDynForm form = DynFormLocator.getDynFormManager().createJDynForm(parametersPostProcess);


  		




  1613
  1615
  
    
                form.setLayoutMode(JDynForm.USE_SEPARATORS);


  		




  1614
  1616
  
    

  		




  ......




  1626
  1628
  
    
                                }


  		




  1627
  1629
  
    
                        ),


  		




  1628
  1630
  
    
                        WindowManager_v2.BUTTONS_OK_CANCEL);


  		




  1629
  
  
    

  		




  
  1631
  
    
                


  		




  
  1632
  
    
                dialog.asJComponent().setPreferredSize(ToolsSwingUtils.ensureMaxRows(dialog.asJComponent(), 50));


  		




  1630
  1633
  
    
                dialog.addActionListener((ActionEvent e2) -> {


  		




  1631
  1634
  
    
                    if (dialog.getAction() == WindowManager_v2.BUTTON_OK) {


  		




  1632
  1635
  
    
                        form.getValues(parametersPostProcess); // actualiza el valor de lo los parametros con los valores introducidos por el usuario


  		












Also available in:  Unified diff