Projects >> storymaker >>9a8e2c6634ada5291c1421b46184ea638ea306b4

Chunk
Conflicting content 
        int layout;
        public ViewPager mAddClipsViewPager;
        View mView = null;
<<<<<<< HEAD
        public AddClipsPagerAdapter mAddClipsPagerAdapter;
=======
        public ClipPagerAdapter mClipPagerAdapter;
        private FragmentManager mFm;
        private String mTemplatePath;
>>>>>>> d0e33845c7fbb7db9f9fd863cf4fc44012854eef
        
        /**
         * The sortable grid view that contains the clips to reorder on the Order tab
Solution content 
        int layout;
        public ViewPager mAddClipsViewPager;
        View mView = null;
        public AddClipsPagerAdapter mAddClipsPagerAdapter;
        private FragmentManager mFm;
        private String mTemplatePath;
        
        /**
         * The sortable grid view that contains the clips to reorder on the Order tab
File
SceneEditorNoSwipeActivity.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
					public void onClick(View v) {
					//	int cIdx = mClipViewPager.getCurrentItem();

<<<<<<< HEAD
						ViewPager vp = (ViewPager) v.getParent().getParent().getParent();
						mMPM.mClipIndex = vp.getCurrentItem();
=======
						ViewPager vp = (ViewPager) v.getParent().getParent().getParent().getParent();
						mMPM.clipIndex = vp.getCurrentItem();
>>>>>>> d0e33845c7fbb7db9f9fd863cf4fc44012854eef
						
						openCaptureMode(clip, mClipIndex);
Solution content 
					public void onClick(View v) {
					//	int cIdx = mClipViewPager.getCurrentItem();

//						ViewPager vp = (ViewPager) v.getParent().getParent().getParent();
						ViewPager vp = (ViewPager) v.getParent().getParent().getParent().getParent();
						mMPM.mClipIndex = vp.getCurrentItem();
						
						openCaptureMode(clip, mClipIndex);
File
SceneEditorNoSwipeActivity.java
Developer's decision
Manual
Kind of conflict
Attribute
Cast expression
Method invocation
Variable
Chunk
Conflicting content 
    }

    public void refreshClipPager() {
<<<<<<< HEAD
    	if ((mFragmentTab0 != null) && (mFragmentTab0.mAddClipsPagerAdapter != null)) {
    		mFragmentTab0.mAddClipsPagerAdapter.notifyDataSetChanged(); // FIXME this isn't refreshing the fragments for some reason
//    		setupAddClipsFragment();
=======
    	if (mFragmentTab0 != null) {
    		try
    		{
    			mFragmentTab0.reloadClips();
    		}
    		catch (Exception e)
    		{
    			Log.e(AppConstants.TAG,"error reloading clips",e);
    		}
>>>>>>> d0e33845c7fbb7db9f9fd863cf4fc44012854eef
    	}
    }
Solution content 
    }

    public void refreshClipPager() {
    	if (mFragmentTab0 != null) {
    		try
    		{
    			mFragmentTab0.reloadClips();
    		}
    		catch (Exception e)
    		{
    			Log.e(AppConstants.TAG,"error reloading clips",e);
    		}
    	}
    }
File
SceneEditorNoSwipeActivity.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation
Try statement
Chunk
Conflicting content 
>>>>>>> d0e33845c7fbb7db9f9fd863cf4fc44012854eef
	
    	Log.i(AppConstants.TAG,"media status: " + msg);
    }
    
<<<<<<< HEAD
    /*
	protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
		
		
		if (resultCode == RESULT_OK)
		{
			if (requestCode == 777) //overlay camera
			{
				//now launch real camera
				mMediaTmp = mMediaHelper.captureVideo(fileExternDir);
				

			}
			else
			{
				mMediaResult = mMediaHelper.handleResult(requestCode, resultCode, intent, mMediaTmp);
				
				try
				{
					if (mMediaResult != null)
						if (mMediaResult.path != null)
							addMediaFile(mMediaResult.path, mMediaResult.mimeType);
				}
				catch (IOException ioe)
				{
					Log.e(AppConstants.TAG,"error adding media result",ioe);
				}
				
			
				//if path is null, wait for the scanner callback in the mHandler
			}
		}
		
		
	}	*/
	
=======
	public void showMediaPrefs (Activity activity)
	{
Solution content 
	{
    	Log.i(AppConstants.TAG,"media status: " + msg);
    }
    
	
	public void showMediaPrefs (Activity activity)
File
MediaProjectManager.java
Developer's decision
Version 2
Kind of conflict
Comment