Projects >> mct >>211691bd88352fb13781b9beaf1d35f502b0b17b

Chunk
Conflicting content 
import gov.nasa.arc.mct.policy.PolicyInfo;
import gov.nasa.arc.mct.services.component.AbstractComponentProvider;
import gov.nasa.arc.mct.services.component.ComponentTypeInfo;
<<<<<<< HEAD
import gov.nasa.arc.mct.services.component.CreateWizardUI;
import gov.nasa.arc.mct.services.component.TypeInfo;
=======
>>>>>>> e9d24e022c514c8af14a3711975750a196568ba3
import gov.nasa.arc.mct.services.component.ViewInfo;

import java.util.Collection;
Solution content 
import gov.nasa.arc.mct.policy.PolicyInfo;
import gov.nasa.arc.mct.services.component.AbstractComponentProvider;
import gov.nasa.arc.mct.services.component.ComponentTypeInfo;
import gov.nasa.arc.mct.services.component.CreateWizardUI;
import gov.nasa.arc.mct.services.component.TypeInfo;
import gov.nasa.arc.mct.services.component.ViewInfo;

import java.util.Collection;
File
LimitLineComponentProvider.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
		componentTypeInfo = new ComponentTypeInfo(
				bundle.getString("display_name"), 
				bundle.getString("description"), 
<<<<<<< HEAD
				LimitLineComponent.class);
=======
				LimitLineComponent.class, 
				new LimitLineCreateWizardUI()
				);
>>>>>>> e9d24e022c514c8af14a3711975750a196568ba3
	}

	@Override
Solution content 
		componentTypeInfo = new ComponentTypeInfo(
				bundle.getString("display_name"), 
				bundle.getString("description"), 
				LimitLineComponent.class);
	}

	@Override
File
LimitLineComponentProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import gov.nasa.arc.mct.components.AbstractComponent;
import gov.nasa.arc.mct.defaults.view.SwitcherView;
<<<<<<< HEAD
=======
import gov.nasa.arc.mct.gui.ActionContext;
import gov.nasa.arc.mct.gui.ContextAwareButton;
>>>>>>> e9d24e022c514c8af14a3711975750a196568ba3
import gov.nasa.arc.mct.gui.OptionBox;
import gov.nasa.arc.mct.gui.SelectionProvider;
import gov.nasa.arc.mct.gui.SettingsButton;
Solution content 
import gov.nasa.arc.mct.components.AbstractComponent;
import gov.nasa.arc.mct.defaults.view.SwitcherView;
import gov.nasa.arc.mct.gui.ActionContext;
import gov.nasa.arc.mct.gui.ContextAwareButton;
import gov.nasa.arc.mct.gui.OptionBox;
import gov.nasa.arc.mct.gui.SelectionProvider;
import gov.nasa.arc.mct.gui.SettingsButton;
File
Inspector.java
Developer's decision
Version 2
Kind of conflict
Import