Projects >> atlas-model >>dbb810846b4feb866090fb65a40f18c5c4bf22c3

Chunk
Conflicting content 
    
    
    private Publisher source;
<<<<<<< HEAD
    private Set> titles = Sets.newHashSet();
    private Set> images = Sets.newHashSet();
=======
    private Set titles = Sets.newHashSet();
    private Set images = Sets.newHashSet();
    private Set relatedLinks = Sets.newHashSet();
>>>>>>> b0b0a9794ab6cd00b7751477f0a9abb8e91928e8
    private MediaType mediaType;
    private String key;
    private Boolean highDefinition;
Solution content 
    
    
    private Publisher source;
    private Set> titles = Sets.newHashSet();
    private Set> images = Sets.newHashSet();
    private Set relatedLinks = Sets.newHashSet();
    private MediaType mediaType;
    private String key;
    private Boolean highDefinition;
File
Channel.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        private String uri;
        private String key;
        private Publisher broadcaster;
<<<<<<< HEAD
        private Set> images = Sets.newHashSet();
        private Set> titles = Sets.newHashSet();
=======
        private Set images = Sets.newHashSet();
        private Set titles = Sets.newHashSet();
        private Set relatedLinks = Sets.newHashSet();
>>>>>>> b0b0a9794ab6cd00b7751477f0a9abb8e91928e8
        private MediaType mediaType;
        private Boolean regional;
        private Boolean highDefinition;
Solution content 
        private String uri;
        private String key;
        private Publisher broadcaster;
        private Set> images = Sets.newHashSet();
        private Set> titles = Sets.newHashSet();
        private Set relatedLinks = Sets.newHashSet();
        private MediaType mediaType;
        private Boolean regional;
        private Boolean highDefinition;
File
Channel.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    
    @Deprecated
    public Channel(Publisher publisher, String title, String key, Boolean highDefinition, MediaType mediaType, String uri) {
<<<<<<< HEAD
        this(publisher, ImmutableSet.of(new TemporalField(title, null, null)), ImmutableSet.>of(), key, highDefinition, null, null, mediaType, uri, null, ImmutableSet.of(), ImmutableSet.of(), null, ImmutableSet.of(), null, null);
=======
        this(publisher, Sets.newHashSet(new TemporalString(title, null, null)), ImmutableSet.of(), ImmutableSet.of(), key, highDefinition, null, null, mediaType, uri, null, ImmutableSet.of(), ImmutableSet.of(), null, ImmutableSet.of(), null, null);
>>>>>>> b0b0a9794ab6cd00b7751477f0a9abb8e91928e8
    }
    
    @Deprecated //Required for OldChannel
Solution content 
    
    @Deprecated
    public Channel(Publisher publisher, String title, String key, Boolean highDefinition, MediaType mediaType, String uri) {
        this(publisher, ImmutableSet.of(new TemporalField(title, null, null)), ImmutableSet.>of(), ImmutableSet.of(), key, highDefinition, null, null, mediaType, uri, null, ImmutableSet.of(), ImmutableSet.of(), null, ImmutableSet.of(), null, null);
    }
    
    @Deprecated //Required for OldChannel
File
Channel.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
    @Deprecated //Required for OldChannel
    protected Channel() { }
    
<<<<<<< HEAD
    private Channel(Publisher publisher, Set> titles, Set> images, String key, Boolean highDefinition, Boolean regional, Duration timeshift, MediaType mediaType, String uri, Publisher broadcaster, Iterable availableFrom, Iterable variations, Long parent, Iterable channelNumbers, LocalDate startDate, LocalDate endDate) {
=======
    private Channel(Publisher publisher, Set titles, Set images, Set relatedLinks, String key, Boolean highDefinition, Boolean regional, Duration timeshift, MediaType mediaType, String uri, Publisher broadcaster, Iterable availableFrom, Iterable variations, Long parent, Iterable channelNumbers, LocalDate startDate, LocalDate endDate) {
>>>>>>> b0b0a9794ab6cd00b7751477f0a9abb8e91928e8
        super(uri);
        this.source = publisher;
        this.regional = regional;
Solution content 
    @Deprecated //Required for OldChannel
    protected Channel() { }
    
    private Channel(Publisher publisher, Set> titles, Set> images, Set relatedLinks, String key, Boolean highDefinition, Boolean regional, Duration timeshift, MediaType mediaType, String uri, Publisher broadcaster, Iterable availableFrom, Iterable variations, Long parent, Iterable channelNumbers, LocalDate startDate, LocalDate endDate) {
        super(uri);
        this.source = publisher;
        this.regional = regional;
File
Channel.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
        return ImmutableSet.copyOf(images);
    }
    
<<<<<<< HEAD
    public LocalDate getStartDate() {
=======
    public Set getRelatedLinks() {
        return relatedLinks;
    }
    
    public LocalDate startDate() {
>>>>>>> b0b0a9794ab6cd00b7751477f0a9abb8e91928e8
        return startDate;
    }
Solution content 
        return ImmutableSet.copyOf(images);
    }
    
    public LocalDate getStartDate() {
        return startDate;
    }
    
    public Set getRelatedLinks() {
        return relatedLinks;
    }
File
Channel.java
Developer's decision
Manual
Kind of conflict
Method declaration
Method signature