Projects >> Pocket-Books-Pro >>a305210d414982a638195e87448b901a8624c24c

Chunk
Conflicting content 
package com.pocketbooks;

<<<<<<< HEAD
=======


import java.math.BigDecimal;
>>>>>>> 0f7a8445cd4fa3963f7e3d9ee859924dfe409994

import android.app.Activity;
import android.content.Intent;
Solution content 
package com.pocketbooks;

import java.math.BigDecimal;
import android.app.Activity;
import android.content.Intent;
File
AccountsActivity.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
	LinearLayout mNewAccount;
	LinearLayout header;
	TextView headerId;
<<<<<<< HEAD
=======
	TextView headerSum;
	Intent newAccountIntent;
	Intent prefIntent;
	Intent categoriesEditIntent;
	SharedPreferences prefs;
	Boolean hasAccounts;
	BigDecimal sum;
>>>>>>> 0f7a8445cd4fa3963f7e3d9ee859924dfe409994
	
	public void onCreate(Bundle savedInstanceState){
		super.onCreate(savedInstanceState);
Solution content 
	LinearLayout mNewAccount;
	LinearLayout header;
	TextView headerId;
	TextView headerSum;
	Intent newAccountIntent;
	Intent prefIntent;
	Intent categoriesEditIntent;
	SharedPreferences prefs;
	Boolean hasAccounts;
	BigDecimal sum;
	
	public void onCreate(Bundle savedInstanceState){
		super.onCreate(savedInstanceState);
File
AccountsActivity.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
	        	Log.d(TAG, "prefs retained------------------------------------------------------------------");
	        }
		cursor.requery();
<<<<<<< HEAD
=======
		
		if(cursor.getCount() > 0){
        	hasAccounts = true;
        }
		
		if(hasAccounts){
			accountsSum = accounts.getAccountsSum();
			startManagingCursor(accountsSum);
			accountsSum.requery();
			accountsSum.moveToFirst();
		
			sum = new BigDecimal(accountsSum.getString(accountsSum.getColumnIndex(AccountData.ACCOUNT_BALANCE)));
		}
		
		sum = sum.movePointLeft(2);
		headerSum.setText(sum.toPlainString());
		
>>>>>>> 0f7a8445cd4fa3963f7e3d9ee859924dfe409994
	}
	
	@Override
Solution content 
	}
	
	@Override
	        	Log.d(TAG, "prefs retained------------------------------------------------------------------");
	        }
		cursor.requery();
		
		if(cursor.getCount() > 0){
        	hasAccounts = true;
        }
		
		if(hasAccounts){
			accountsSum = accounts.getAccountsSum();
			startManagingCursor(accountsSum);
			accountsSum.requery();
			accountsSum.moveToFirst();
		
			sum = new BigDecimal(accountsSum.getString(accountsSum.getColumnIndex(AccountData.ACCOUNT_BALANCE)));
		}
		
		sum = sum.movePointLeft(2);
		headerSum.setText(sum.toPlainString());
File
AccountsActivity.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Method invocation
Chunk
Conflicting content 
import android.widget.TextView;
import android.widget.AdapterView.AdapterContextMenuInfo;

<<<<<<< HEAD

=======
>>>>>>> 0f7a8445cd4fa3963f7e3d9ee859924dfe409994
public class TransactionsActivity extends Activity {
	//private static String TAG = "PocketBooks::Transactions Activity";
	PocketBooksApplication pb;
Solution content 
import android.widget.TextView;
import android.widget.AdapterView.AdapterContextMenuInfo;

public class TransactionsActivity extends Activity {
	//private static String TAG = "PocketBooks::Transactions Activity";
	PocketBooksApplication pb;
File
TransactionsActivity.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
	
<<<<<<< HEAD
	
=======
	//private static String TAG = "PocketBooks::Transactions Activity";
	PocketBooksApplication pb;
>>>>>>> 0f7a8445cd4fa3963f7e3d9ee859924dfe409994
	ListView list;
	AccountData transactions;
	Cursor accountInfo;
Solution content 
	//private static String TAG = "PocketBooks::Transactions Activity";
	PocketBooksApplication pb;
	
	ListView list;
	AccountData transactions;
	Cursor accountInfo;
File
TransactionsActivity.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        startManagingCursor(accountInfo);
        
        //AdManager.setTestDevices( new String[] { "61288A13F61EE945752EE32D7DB60B3D" } );
<<<<<<< HEAD
        
=======
                
>>>>>>> 0f7a8445cd4fa3963f7e3d9ee859924dfe409994
        mNewTransaction = (LinearLayout) findViewById(R.id.footer);
          
        mNewTransaction.setOnClickListener(new OnClickListener(){
Solution content 
        startManagingCursor(accountInfo);
        
        //AdManager.setTestDevices( new String[] { "61288A13F61EE945752EE32D7DB60B3D" } );
        mNewTransaction = (LinearLayout) findViewById(R.id.footer);
          
        mNewTransaction.setOnClickListener(new OnClickListener(){
File
TransactionsActivity.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
    	cursor.requery();
    	
    	accountInfo.moveToFirst();
<<<<<<< HEAD
    	Log.d(TAG, "" + accountInfo.getColumnCount());
    	updateBalance();
    	
    	    
=======
    	//Log.d(TAG, "" + accountInfo.getColumnCount());
    	updateBalance();    	    
>>>>>>> 0f7a8445cd4fa3963f7e3d9ee859924dfe409994
    }
Solution content 
    	cursor.requery();
    	
    	accountInfo.moveToFirst();
    	
    	//Log.d(TAG, "" + accountInfo.getColumnCount());
    	updateBalance();
    }
File
TransactionsActivity.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation