Projects >> sensei >>c60577046b8ce4a8f4bfa88a1dda3aa5c374ac8e

Chunk
Conflicting content 
	      {
	        JSONObject item = groupBy.optJSONObject(i);
	        if(item != null){
<<<<<<< HEAD
	          String column = item.optString(RequestConverter2.GROUPBY_COLUMN);
	          int top = item.optInt(RequestConverter2.GROUPBY_TOP, 1);
=======
	          String column = item.optString("column", null);
	          int top = item.optInt("top", 1);
>>>>>>> 4cf857a000d000cc52504fb2dae86811e7636726
	          req.setGroupBy(column);
	          req.setMaxPerGroup(top);
	        }
Solution content 
	      {
	        JSONObject item = groupBy.optJSONObject(i);
	        if(item != null){
	          String column = item.optString(RequestConverter2.GROUPBY_COLUMN);
	          int top = item.optInt(RequestConverter2.GROUPBY_TOP, 1);
	          req.setGroupBy(column);
	          req.setMaxPerGroup(top);
	        }
File
RequestConverter2.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
      if(iter.hasNext()){
        String facet = iter.next();
        JSONObject jsonParams = jsonSel.optJSONObject(facet);
<<<<<<< HEAD
        String value = jsonParams.optString(RequestConverter2.SELECTIONS_TERM_VALUE);
=======
        String value = jsonParams.optString("value", null);
>>>>>>> 4cf857a000d000cc52504fb2dae86811e7636726
        if(facet!= null && value != null)
        {
          BrowseSelection sel = new BrowseSelection(facet);
Solution content 
      if(iter.hasNext()){
        String facet = iter.next();
        JSONObject jsonParams = jsonSel.optJSONObject(facet);
        String value = jsonParams.optString(RequestConverter2.SELECTIONS_TERM_VALUE, null);
        if(facet!= null && value != null)
        {
          BrowseSelection sel = new BrowseSelection(facet);
File
RequestConverter2.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        String facet = iter.next();
        JSONObject jsonParams = jsonSel.optJSONObject(facet);
        
<<<<<<< HEAD
        String value = jsonParams.optString(RequestConverter2.SELECTIONS_PATH_VALUE);
=======
        String value = jsonParams.optString("value", null);
>>>>>>> 4cf857a000d000cc52504fb2dae86811e7636726

        if(facet != null && value != null){
          BrowseSelection sel = new BrowseSelection(facet);
Solution content 
        String facet = iter.next();
        JSONObject jsonParams = jsonSel.optJSONObject(facet);
        
        String value = jsonParams.optString(RequestConverter2.SELECTIONS_PATH_VALUE, null);

        if(facet != null && value != null){
          BrowseSelection sel = new BrowseSelection(facet);
File
RequestConverter2.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable