Projects >> Tamagotchi >>c6333a1c264025a212847f0cd5351871dc8f78a5

Chunk
Conflicting content 
package your.redditandroiddevelopers;

import android.app.Activity;
<<<<<<< HEAD
import android.content.Intent;
import android.os.Bundle;

import your.redditandroiddevelopers.dao.CreatureDao;
import your.redditandroiddevelopers.model.Creature;

import java.util.List;
=======
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;

import org.andengine.AndEngine;

import your.redditandroiddevelopers.dao.CreatureDao;
>>>>>>> cf1190404ef90e9f5e6a028496cea7bc9a081e80

public class TamagotchiActivity extends Activity {
    private CreatureDao creatureDao;
Solution content 
package your.redditandroiddevelopers;

import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.os.Bundle;

import your.redditandroiddevelopers.dao.CreatureDao;
import your.redditandroiddevelopers.model.Creature;

import java.util.List;

public class TamagotchiActivity extends Activity {
    private CreatureDao creatureDao;
File
TamagotchiActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        // Creature submitted = Creature.createACreature("TestName",
        // Gender.MALE, type);
        // creatureDao.create(submitted);
<<<<<<< HEAD

        creatureDao.seedData();

        /* Check to see if the database is empty */
        Boolean isDatabaseEmpty = creatureDao.isDatabaseEmpty();

        if (!isDatabaseEmpty) {

            /* Get the number of alive creatures */
            List aliveCreatures = creatureDao.getAlive();

            switch (aliveCreatures.size()) {
            /* Dead creatures */
                case 0: {
                    createCreature();
                    break;
                }
                /* One creature */
                case 1: {
                    startActivity(new Intent(getBaseContext(), MainCreatureActivity.class)
                            .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
                    finish();
                    break;
                }
                /* Multiple creatures */
                default: {
                    startActivity(new Intent(getBaseContext(), CreatureSelectionActivity.class)
                            .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
                    finish();
                    break;
                }
            }
        }
        /* If the database is empty create a new creature */
        createCreature();
    }

    private void createCreature() {
        startActivity(new Intent(getBaseContext(), CreateCreatureActivity.class)
                .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
        finish();
=======
>>>>>>> cf1190404ef90e9f5e6a028496cea7bc9a081e80
    }

}
Solution content 
        // Creature submitted = Creature.createACreature("TestName",
        // Gender.MALE, type);
        // creatureDao.create(submitted);

        creatureDao.seedData();

        /* Check to see if the database is empty */
        Boolean isDatabaseEmpty = creatureDao.isDatabaseEmpty();

        if (!isDatabaseEmpty) {

            /* Get the number of alive creatures */
            List aliveCreatures = creatureDao.getAlive();

            switch (aliveCreatures.size()) {
            /* Dead creatures */
                case 0: {
                    createCreature();
                    break;
                }
                /* One creature */
                case 1: {
                    startActivity(new Intent(getBaseContext(), MainCreatureActivity.class)
                            .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
                    finish();
                    break;
                }
                /* Multiple creatures */
                default: {
                    startActivity(new Intent(getBaseContext(), CreatureSelectionActivity.class)
                            .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
                    finish();
                    break;
                }
            }
        }
        /* If the database is empty create a new creature */
        createCreature();
    }

    private void createCreature() {
        startActivity(new Intent(getBaseContext(), CreateCreatureActivity.class)
                .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
        finish();
    }

}
File
TamagotchiActivity.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Method signature
Variable