Projects >> mct >>8ad49b18d000dc81103a931c868d34e7f4eee91a

Chunk
Conflicting content 
<<<<<<< HEAD
	}

	@Override
	public  T getExtension(String key, Class extensionClass) {
		return super.get(key, extensionClass);
	}

	@Override
	public  void setExtension(String key, T value) {
		super.set(key, value);
=======
	public void setFeedTypeSetting(String feedType) {
		this.set(PlotConstants.FEED_TYPE_SETTING, feedType);
	}
	
	@Override
	public String getFeedTypeSetting() {
		return this.get(PlotConstants.FEED_TYPE_SETTING, String.class);
>>>>>>> c2ffdb072537537c3067385e38512d7feb18adb5
	}
}
Solution content 
	}

	@Override
	public  T getExtension(String key, Class extensionClass) {
		return super.get(key, extensionClass);
	}

	@Override
	public  void setExtension(String key, T value) {
		super.set(key, value);
	}
}
File
PlotSettings.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
package gov.nasa.arc.mct.fastplot.view;

import gov.nasa.arc.mct.components.AbstractComponent;
<<<<<<< HEAD
import gov.nasa.arc.mct.components.FeedFilterProvider;
=======
import gov.nasa.arc.mct.components.FeedInfoProvider;
import gov.nasa.arc.mct.components.FeedInfoProvider.FeedInfo;
>>>>>>> c2ffdb072537537c3067385e38512d7feb18adb5
import gov.nasa.arc.mct.components.FeedProvider;
import gov.nasa.arc.mct.components.FeedProvider.FeedType;
import gov.nasa.arc.mct.fastplot.bridge.PlotConstants;
Solution content 
package gov.nasa.arc.mct.fastplot.view;

import gov.nasa.arc.mct.components.AbstractComponent;
import gov.nasa.arc.mct.components.FeedFilterProvider;
import gov.nasa.arc.mct.components.FeedInfoProvider;
import gov.nasa.arc.mct.components.FeedInfoProvider.FeedInfo;
import gov.nasa.arc.mct.components.FeedProvider;
import gov.nasa.arc.mct.components.FeedProvider.FeedType;
import gov.nasa.arc.mct.fastplot.bridge.PlotConstants;
File
PlotDataAssigner.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
package gov.nasa.arc.mct.fastplot.view;

import gov.nasa.arc.mct.components.AbstractComponent;
<<<<<<< HEAD
import gov.nasa.arc.mct.components.FeedFilterProvider;
import gov.nasa.arc.mct.components.FeedFilterProvider.FeedFilter;
=======
import gov.nasa.arc.mct.components.FeedInfoProvider;
import gov.nasa.arc.mct.components.FeedInfoProvider.FeedInfo;
>>>>>>> c2ffdb072537537c3067385e38512d7feb18adb5
import gov.nasa.arc.mct.components.FeedProvider;
import gov.nasa.arc.mct.fastplot.bridge.PlotConstants;
import gov.nasa.arc.mct.fastplot.bridge.PlotView;
Solution content 
package gov.nasa.arc.mct.fastplot.view;

import gov.nasa.arc.mct.components.AbstractComponent;
import gov.nasa.arc.mct.components.FeedFilterProvider;
import gov.nasa.arc.mct.components.FeedFilterProvider.FeedFilter;
import gov.nasa.arc.mct.components.FeedInfoProvider;
import gov.nasa.arc.mct.components.FeedInfoProvider.FeedInfo;
import gov.nasa.arc.mct.components.FeedProvider;
import gov.nasa.arc.mct.fastplot.bridge.PlotConstants;
import gov.nasa.arc.mct.fastplot.bridge.PlotView;
File
PlotViewManifestation.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public  T getExtension(String key, Class extensionClass) {
		// TODO Auto-generated method stub
		return null;
	}

	@Override
	public  void setExtension(String key, T value) {
		// TODO Auto-generated method stub
		
=======
	public void setFeedTypeSetting(String feedType) {
		// TODO Auto-generated method stub
		
	}

	@Override
	public String getFeedTypeSetting() {
		// TODO Auto-generated method stub
		return null;
>>>>>>> c2ffdb072537537c3067385e38512d7feb18adb5
	}
Solution content 
	}

	@Override
	public  T getExtension(String key, Class extensionClass) {
		// TODO Auto-generated method stub
		return null;
	}

	@Override
	public  void setExtension(String key, T value) {
		// TODO Auto-generated method stub		
	}
File
ShellPlotPackageImplementation.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration
Method signature
Return statement