Revision 46501 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/SearchConditionFieldController.java

View differences:

SearchConditionFieldController.java
45 45 
import org.gvsig.fmap.dal.feature.ForeingKey;
46 46 
import org.gvsig.fmap.dal.swing.DALSwingLocator;
47 47 
import org.gvsig.fmap.dal.swing.impl.featuretype.DefaultFeatureAttributeSelectionPanel;
48 
import static org.gvsig.fmap.dal.swing.impl.searchpanel.SearchConditionPanelSimplified.PANEL_NAME;
48 49 
import static org.gvsig.fmap.dal.swing.searchpanel.FeatureStoreSearchPanel.NOT_HANDLE_NULL;
49 50 
import static org.gvsig.fmap.dal.swing.searchpanel.FeatureStoreSearchPanel.NULL_AS_FALSE;
50 51 
import static org.gvsig.fmap.dal.swing.searchpanel.FeatureStoreSearchPanel.NULL_AS_TRUE;
......
379 380 
    }
380 381 

  		




  381
  382
  
    
    private void doSelectMoreFields() {


  		




  382
  
  
    
        DefaultFeatureAttributeSelectionPanel panel = new DefaultFeatureAttributeSelectionPanel(store, parameters.getFeatureType(store));


  		




  
  383
  
    
        DefaultFeatureAttributeSelectionPanel panel = new DefaultFeatureAttributeSelectionPanel(


  		




  
  384
  
    
                store, 


  		




  
  385
  
    
                parameters.getFeatureType(store),


  		




  
  386
  
    
                parameters.getQuery()


  		




  
  387
  
    
        );


  		




  383
  388
  
    
        WindowManager_v2 winManager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();


  		




  384
  389
  
    
        final Dialog dialog = winManager.createDialog(


  		




  385
  390
  
    
                panel,


  		




  ......




  1092
  1097
  
    
        fieldBuilder.add("nullBehavior", nullBehavior);


  		




  1093
  1098
  
    
        return fieldBuilder.build();


  		




  1094
  1099
  
    
    }


  		




  1095
  
  
    

  		




  
  1100
  
    
    


  		




  
  1101
  
    
    public void put(SearchParameters params, int index) {


  		




  
  1102
  
    
        this.parameters = params;


  		




  
  1103
  
    
        Map<String, JsonObject> values = params.getValues();


  		




  
  1104
  
    
        if( values == null ) {


  		




  
  1105
  
    
            return;


  		




  
  1106
  
    
        }


  		




  
  1107
  
    
        JsonObject panelState = values.getOrDefault(PANEL_NAME, null);


  		




  
  1108
  
    
        if( panelState == null ) {


  		




  
  1109
  
    
            return;


  		




  
  1110
  
    
        }


  		




  
  1111
  
    
        String name = DataTypeUtils.toString(index);


  		




  
  1112
  
    
        this.fromJson(panelState.getJsonObject(name));


  		




  
  1113
  
    
    }


  		




  
  1114
  
    
    


  		




  1096
  1115
  
    
    public void fromJson(JsonObject jsonState) {


  		




  1097
  1116
  
    
        if (jsonState == null) {


  		




  1098
  1117
  
    
            return;


  		












Also available in:  Unified diff