Projects >> atlas >>c558a29a49a597c2492040e8c6290a3d569852d4

Chunk
Conflicting content 
            ContentResolver resolver, ContentWriter writer) {
        this.scheduleResolver = scheduleResolver;
        this.defaultPublisher = Optional.fromNullable(publisher);
<<<<<<< HEAD
		this.resolver = checkNotNull(resolver);
        this.writer = checkNotNull(writer);
    }
    
    public ScheduleResolverBroadcastTrimmer(ScheduleResolver scheduleResolver, 
            ContentResolver resolver, ContentWriter writer) {
        this(null, scheduleResolver, resolver, writer);
    }

=======
        this.resolver = checkNotNull(resolver);
        this.writer = checkNotNull(writer);
    }

    public ScheduleResolverBroadcastTrimmer(ScheduleResolver scheduleResolver, 
            ContentResolver resolver, ContentWriter writer) {
        this(null, scheduleResolver, resolver, writer);
    }

>>>>>>> 1e463782a658d259c2daddc87f0d39f2c5020c7a
    @Override
    public void trimBroadcasts(Publisher publisher, Interval scheduleInterval, Channel channel,
            Map acceptableIds) {
Solution content 
            ContentResolver resolver, ContentWriter writer) {
        this.scheduleResolver = scheduleResolver;
        this.defaultPublisher = Optional.fromNullable(publisher);
        this.resolver = checkNotNull(resolver);
        this.writer = checkNotNull(writer);
    }

    public ScheduleResolverBroadcastTrimmer(ScheduleResolver scheduleResolver, 
            ContentResolver resolver, ContentWriter writer) {
        this(null, scheduleResolver, resolver, writer);
    }

    @Override
    public void trimBroadcasts(Publisher publisher, Interval scheduleInterval, Channel channel,
            Map acceptableIds) {
File
ScheduleResolverBroadcastTrimmer.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Method invocation
Chunk
Conflicting content 
        
        for (String prefix : YOUVIEW_SERVICE_ID_ALIAS_PREFIXES) {
            buildEntriesForPrefix(channelResolver, prefix, channelMapBuilder, aliasMapBuilder);
<<<<<<< HEAD
        }
        
        channelMap = channelMapBuilder.build();
        aliasMap = aliasMapBuilder.build();
    }
    
    private void buildEntriesForPrefix(ChannelResolver channelResolver, 
            String prefix, Builder channelMapBuilder,
            Builder aliasMapBuilder) {
        
        Pattern pattern = Pattern.compile("^" + prefix + "(\\d+)$");
        for (Entry entry: channelResolver.forAliases(prefix).entrySet()) {
            Matcher m = pattern.matcher(entry.getKey());
            if (m.matches()) {
                Integer channel = Integer.decode(m.group(1));
                
                channelMapBuilder.put(channel, entry.getValue());
                aliasMapBuilder.put(channel, entry.getKey());
            } else {
                log.error("Could not parse YouView alias " + entry.getKey());
            }
=======
>>>>>>> 1e463782a658d259c2daddc87f0d39f2c5020c7a
        }
        
        channelMap = channelMapBuilder.build();
Solution content 
        
        for (String prefix : YOUVIEW_SERVICE_ID_ALIAS_PREFIXES) {
            buildEntriesForPrefix(channelResolver, prefix, channelMapBuilder, aliasMapBuilder);
        }
        
        channelMap = channelMapBuilder.build();
        aliasMap = aliasMapBuilder.build();
    }
    
    private void buildEntriesForPrefix(ChannelResolver channelResolver, 
            String prefix, Builder channelMapBuilder,
            Builder aliasMapBuilder) {
        
        Pattern pattern = Pattern.compile("^" + prefix + "(\\d+)$");
        for (Entry entry: channelResolver.forAliases(prefix).entrySet()) {
            Matcher m = pattern.matcher(entry.getKey());
            if (m.matches()) {
                Integer serviceId = Integer.decode(m.group(1));
                
                channelMapBuilder.put(serviceId, entry.getValue());
                aliasMapBuilder.put(serviceId, entry.getKey());
            } else {
                log.error("Could not parse YouView alias " + entry.getKey());
            }
        }
    }

    @Override
    public String getChannelUri(int serviceId) {
        if (channelMap.containsKey(serviceId)) {
            return channelMap.get(serviceId).getUri();
        }
        return null;
    }
    
    @Override
    public String getChannelServiceAlias(int serviceId) {
        return aliasMap.get(serviceId);
    }
    
    @Override
    public Optional getChannel(int serviceId) {
        if (channelMap.containsKey(serviceId)) {
            return Optional.fromNullable(channelMap.get(serviceId));
        }
        return Optional.absent();
    }

    @Override
    public Iterable getAllChannels() {
        return channelMap.values();
    }

    @Override
    public Map getAllChannelsByServiceId() {
        return channelMap;
    }

}
File
DefaultYouViewChannelResolver.java
Developer's decision
Manual
Kind of conflict
Attribute
For statement
If statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
        channelMap = channelMapBuilder.build();
        aliasMap = aliasMapBuilder.build();
    }
<<<<<<< HEAD
=======
    
    private void buildEntriesForPrefix(ChannelResolver channelResolver, 
            String prefix, Builder channelMapBuilder,
            Builder aliasMapBuilder) {
        
        Pattern pattern = Pattern.compile("^" + prefix + "(\\d+)$");
        for (Entry entry: channelResolver.forAliases(prefix).entrySet()) {
            Matcher m = pattern.matcher(entry.getKey());
            if (m.matches()) {
                Integer serviceId = Integer.decode(m.group(1));
                
                channelMapBuilder.put(serviceId, entry.getValue());
                aliasMapBuilder.put(serviceId, entry.getKey());
            } else {
                log.error("Could not parse YouView alias " + entry.getKey());
            }
        }
    }
>>>>>>> 1e463782a658d259c2daddc87f0d39f2c5020c7a

    @Override
    public String getChannelUri(int serviceId) {
Solution content 
                Integer serviceId = Integer.decode(m.group(1));
                
                channelMapBuilder.put(serviceId, entry.getValue());
                aliasMapBuilder.put(serviceId, entry.getKey());
            } else {
                log.error("Could not parse YouView alias " + entry.getKey());
            }
        }
    }

    @Override
    public String getChannelUri(int serviceId) {
File
DefaultYouViewChannelResolver.java
Developer's decision
Combination
Kind of conflict
Method declaration
Chunk
Conflicting content 
    @Override
<<<<<<< HEAD
    }
    
    public String getChannelServiceAlias(int channelId) {
        return aliasMap.get(channelId);
    }
    
    @Override
    public Optional getChannel(int channelId) {
        if (channelMap.containsKey(channelId)) {
            return Optional.fromNullable(channelMap.get(channelId));
=======
    public String getChannelServiceAlias(int serviceId) {
        return aliasMap.get(serviceId);
    }
    
    @Override
    public Optional getChannel(int serviceId) {
        if (channelMap.containsKey(serviceId)) {
            return Optional.fromNullable(channelMap.get(serviceId));
>>>>>>> 1e463782a658d259c2daddc87f0d39f2c5020c7a
        }
        return Optional.absent();
    }
Solution content 
    }
    
    @Override
    public String getChannelServiceAlias(int serviceId) {
        return aliasMap.get(serviceId);
    }
    
    @Override
    public Optional getChannel(int serviceId) {
        if (channelMap.containsKey(serviceId)) {
            return Optional.fromNullable(channelMap.get(serviceId));
        }
        return Optional.absent();
    }
File
DefaultYouViewChannelResolver.java
Developer's decision
Version 2
Kind of conflict
Annotation
If statement
Method declaration
Method invocation
Method signature
Return statement