Revision 44835 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/DefaultSearchParameters.java

View differences:

DefaultSearchParameters.java
67 67 
    }
68 68 

  		




  69
  69
  
    
    void setResultColumnNames(List<String> selectedNames) {


  		




  70
  
  
    
        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.


  		




  
  70
  
    
        throw new UnsupportedOperationException("Not supported yet."); 


  		




  71
  71
  
    
    }


  		




  72
  72
  
    

  		




  73
  73
  
    
    @Override


  		




  ......




  90
  90
  
    
    @Override


  		




  91
  91
  
    
    public void saveToState(PersistentState state) throws PersistenceException {


  		




  92
  92
  
    
        state.set("resultColumnNames", this.resultColumnNames);


  		




  93
  
  
    
//        state.set("values", this.values);


  		




  
  93
  
    
        state.set("values", this.values);


  		




  94
  94
  
    
        state.set("query", this.query);


  		




  95
  95
  
    
        state.set("name", this.name);


  		




  96
  96
  
    
    }


  		




  ......




  98
  98
  
    
    @Override


  		




  99
  99
  
    
    public void loadFromState(PersistentState state) throws PersistenceException {


  		




  100
  100
  
    
        this.resultColumnNames = state.getList("resultColumnNames");


  		




  101
  
  
    
//        this.values = (JsonObject) state.get("searchJsonValues");


  		




  102
  
  
    
        this.values = new HashMap<>();


  		




  
  101
  
    
        this.values = state.getMap("values");


  		




  103
  102
  
    
        this.query = (FeatureQuery) state.get("query");


  		




  104
  103
  
    
        this.name = state.getString("name");


  		




  105
  104
  
    
    }


  		




  ......




  119
  118
  
    
        DefaultSearchParameters clone = (DefaultSearchParameters) super.clone();


  		




  120
  119
  
    
        clone.query = this.query.getCopy();


  		




  121
  120
  
    
        clone.resultColumnNames = new ArrayList(this.resultColumnNames);


  		




  122
  
  
    
        HashMap<String, JsonObject> cloneValues = new HashMap<String, JsonObject>(this.values);


  		




  
  121
  
    
        HashMap<String, JsonObject> cloneValues = new HashMap<>(this.values);


  		




  123
  122
  
    
        clone.values = cloneValues;


  		




  124
  123
  
    
        return clone;


  		




  125
  124
  
    
    }


  		




  ......




  131
  130
  
    
        }


  		




  132
  131
  
    
    }


  		




  133
  132
  
    

  		




  134
  
  
    
    public JsonObjectBuilder getValuesBuilder() {


  		




  135
  
  
    
        return Json.createObjectBuilder();


  		




  136
  
  
    
    }


  		




  137
  
  
    

  		




  138
  133
  
    
    @Override


  		




  139
  134
  
    
    public void copyFrom(SearchParameters params) {


  		




  140
  135
  
    
        this.resultColumnNames = params.getResultColumnNames();


  		












Also available in:  Unified diff