Projects >> social >>32b95c2b06b0d918c5788fe78cec42fa0611dd4a

Chunk
Conflicting content 
        activitiesContainer.setSpace(space);
      }

<<<<<<< HEAD
      List activities = loadActivities(currentLoadIndex, loadingCapacity);
=======
      List activities = new ArrayList(0);
      if (activityListAccess.getSize() > loadingCapacity) {
        setUnableLoadNext(false);
      }
      
      if (isShowActivities(space)) {
        activities = loadActivities(currentLoadIndex, loadingCapacity);
      }
      
>>>>>>> df64a86c30b9225301aee8770075b5b473ae5171
      activitiesContainer.setActivityList(activities);
    } catch (Exception e) {
      LOG.error(e.getMessage(), e);
Solution content 
        activitiesContainer.setSpace(space);
      }

      List activities = new ArrayList(0);
      
      if (isShowActivities(space)) {
        activities = loadActivities(currentLoadIndex, loadingCapacity);
      }
      
      activitiesContainer.setActivityList(activities);
    } catch (Exception e) {
      LOG.error(e.getMessage(), e);
File
UIActivitiesLoader.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
  private void loadNext() throws Exception {
    currentLoadIndex += loadingCapacity;
<<<<<<< HEAD
    
=======
    List activities = new ArrayList(0);
>>>>>>> df64a86c30b9225301aee8770075b5b473ae5171
    lastActivitiesLoader = extendContainer.addChild(UIActivitiesLoader.class, null, UIActivitiesLoader.genereateId());
    lastActivitiesLoader.setExtendLoader(true);
Solution content 
  private void loadNext() throws Exception {
    currentLoadIndex += loadingCapacity;
    List activities = new ArrayList(0);
    lastActivitiesLoader = extendContainer.addChild(UIActivitiesLoader.class, null, UIActivitiesLoader.genereateId());
    lastActivitiesLoader.setExtendLoader(true);
File
UIActivitiesLoader.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable