/*
 * Copyright 2015 Lukas Tenbrink
 *
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
 *    You may obtain a copy of the License at
 *
 *        http://www.apache.org/licenses/LICENSE-2.0
 *
 *    Unless required by applicable law or agreed to in writing, software
 *    distributed under the License is distributed on an "AS IS" BASIS,
 *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *    See the License for the specific language governing permissions and
 *    limitations under the License.
 */

package ivorius.ivtoolkit.maze.components;

import com.google.common.base.Predicates;
import com.google.common.collect.Maps;

import java.util.*;

/**
 * Created by lukas on 15.04.15.
 */
public class SetMazeComponent<C> implements MorphingMazeComponent<C>
{
    public final Set<MazeRoom> rooms = new HashSet<>();
    public final Map<MazeRoomConnection, C> exits = new HashMap<>();

    public SetMazeComponent()
    {
    }

    public SetMazeComponent(Set<MazeRoom> rooms, Map<MazeRoomConnection, C> exits)
    {
        this.rooms.addAll(rooms);
        this.exits.putAll(exits);
    }

    @Override
    public Set<MazeRoom> rooms()
    {
        return rooms;
    }

    @Override
    public Map<MazeRoomConnection, C> exits()
    {
        return exits;
    }

    @Override
    public void add(MazeComponent<C> component)
    {
        rooms.addAll(component.rooms());

        exits.putAll(Maps.filterKeys(component.exits(), Predicates.not(Predicates.in(exits.keySet()))));
        exits.keySet().removeAll(component.exits().keySet());
    }
}

@@ -1510,104 +1510,178 @@
     
-exits.putAll(Maps.filterKeys(component.exits(), Predicates.not(Predicates.in(exits.ke
+// Remove all solved connections, and add the ones still open from the other component%0A        for (Map.Entry%3CMazeRoomConnection, C%3E entry : component.exits().entr
 ySet())
-)));
 %0A   
@@ -1689,57 +1689,110 @@
     
-exits.keySet().removeAll(component.exits().keySet
+    if (exits.remove(entry.getKey()) == null)%0A                exits.put(entry.getKey(), entry.getValue
 ());

Fix maze components not merging exits correctly.