Projects >> beavers >>d0cd823885fdcffbf613959dc6fc932cc7824ef1

Chunk
Conflicting content 
import org.beavers.ingame.Tile;
import org.beavers.ingame.WayPoint;
import org.beavers.storage.CustomGSON;
<<<<<<< HEAD
import org.beavers.storage.GameStorage;
import org.beavers.storage.GameStorage.UnexpectedTileContentException;
import org.beavers.ui.ContextMenuHandler;
=======
import org.beavers.ui.IContextMenuHandler;
>>>>>>> ff82eac6a5a8e369b509312025c398ad70dcea4e

import android.content.BroadcastReceiver;
import android.content.Context;
Solution content 
import org.beavers.ingame.Tile;
import org.beavers.ingame.WayPoint;
import org.beavers.storage.CustomGSON;
import org.beavers.storage.GameStorage;
import org.beavers.storage.GameStorage.UnexpectedTileContentException;
import org.beavers.ui.IContextMenuHandler;

import android.content.BroadcastReceiver;
import android.content.Context;
File
GameActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
					});
					}
				else{
<<<<<<< HEAD
					storage.addWaypoint(waypoint);
					mainScene.attachChild(waypoint);

					selectedSoldier.changeAP(-waypoint.getPath().getCosts());
=======
					addObject(waypoint);
					selectedSoldier.changeAP(-waypoint.getPath().getCost()/10);
>>>>>>> ff82eac6a5a8e369b509312025c398ad70dcea4e
				}
			}
			else
Solution content 
					});
					}
				else{
					try {
						storage.addWaypoint(waypoint);
					} catch (final UnexpectedTileContentException e) {
						Log.e(TAG, "Could not add waypoint to storage!", e);
					}

					mainScene.attachChild(waypoint);

					selectedSoldier.changeAP(-waypoint.getPath().getCost()/10);
				}
			}
			else
File
GameActivity.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
		while(itr.hasNext()){  //durchläuft Liste des ersten Teams
			final Soldier s=itr.next();

<<<<<<< HEAD
			final Iterator itr2 = storage.getSoldiersByTeam(targets).iterator();
			if(!s.isShooting()){   //Abbruch, falls der Soldat schon schießt
=======
			final Iterator itr2=getSoldiers(targets).iterator();
			
			if(s.isShooting())
			{
				if(s.getShot().findPath(getPathFinder(), s.getShot().getTarget().getTile()) == null)
				{
					s.getShot().stopShooting();
				}
			}
			
			if(!s.isShooting() && !s.getIgnore()){   //Abbruch, falls der Soldat schon schießt
>>>>>>> ff82eac6a5a8e369b509312025c398ad70dcea4e
				while(itr2.hasNext()){  //durchläuft Liste des zweiten Teams

					final Soldier t=itr2.next();
Solution content 
		while(itr.hasNext()){  //durchläuft Liste des ersten Teams
			final Soldier s=itr.next();

			final Iterator itr2= storage.getSoldiersByTeam(targets).iterator();

			if(s.isShooting())
			{
				if(s.getShot().findPath(getPathFinder(), s.getShot().getTarget().getTile()) == null)
				{
					s.getShot().stopShooting();
				}
			}

			if(!s.isShooting() && !s.getIgnore()){   //Abbruch, falls der Soldat schon schießt
				while(itr2.hasNext()){  //durchläuft Liste des zweiten Teams

					final Soldier t=itr2.next();
File
GameActivity.java
Developer's decision
Combination
Kind of conflict
Comment
If statement
Method invocation
Variable