Projects >> celements-core >>476533e3f42e40902bfc399966f4252f197b66ff

Chunk
Conflicting content
    return "1".equals(isActive);
  }

<<<<<<< HEAD
  boolean isPublished(List objs) {
    boolean isPublished = false;
    if((objs != null) && (!objs.isEmpty())) {
      for(BaseObject obj : objs) {
        if(obj != null) {
          isPublished |= isAfterStart(obj) && isBeforeEnd(obj);
        }
      }
    } else {
      isPublished = true; //no limits set mean always published
    }
    return isPublished;
=======
  boolean isPublished(BaseObject obj) {
    return isAfterStart(obj) && isBeforeEnd(obj);
>>>>>>> c7c8a7e106ba1e85dea0360373b4cdd321ca7ed9
  }
  
  boolean isAfterStart(BaseObject obj) {
Solution content
    return "1".equals(isActive);
  }

  boolean isPublished(List objs) {
    boolean isPublished = false;
    if((objs != null) && (!objs.isEmpty())) {
      for(BaseObject obj : objs) {
        if(obj != null) {
          isPublished |= isAfterStart(obj) && isBeforeEnd(obj);
        }
      }
    } else {
      isPublished = true; //no limits set mean always published
    }
    return isPublished;
  }
  
  boolean isAfterStart(BaseObject obj) {
File
CelementsRightServiceImpl.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Method signature
Return statement
Variable