Projects information

Chunk

Conflicting content
if (defaultRowKeyConverter == null) { defaultRowKeyConverter = getFacesContext().getApplication().createConverter(Integer.class); } <<<<<<< HEAD converter = defaultRowKeyConverter; } ======= converter = defaultRowKeyConverter; } >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 return converter; }

Conflicting content

            if (defaultRowKeyConverter == null) {
                defaultRowKeyConverter = getFacesContext().getApplication().createConverter(Integer.class);
            }
<<<<<<< HEAD
            
            converter = defaultRowKeyConverter;
        }
        
=======

            converter = defaultRowKeyConverter;
        }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        return converter;
    }

Solution content
} return converter; } if (defaultRowKeyConverter == null) { defaultRowKeyConverter = getFacesContext().getApplication().createConverter(Integer.class); } converter = defaultRowKeyConverter;

File
UISequence.java

Developer's decision
Version 1

Kind of conflict
Attribute
Variable

Chunk

Conflicting content
* @author Anton Belevich * */ <<<<<<< HEAD @JsfBehavior(id = "org.ajax4jsf.behavior.Ajax", tag = @Tag(name = "ajax", handler = "org.richfaces.view.facelets.html.AjaxHandler", type = TagType.Facelets), attributes = {"ajaxBehavior-prop.xml"}) ======= @JsfBehavior(id = "org.ajax4jsf.behavior.Ajax", tag = @Tag(name = "ajax", handler = "org.richfaces.view.facelets.html.AjaxHandler", type = TagType.Facelets), attributes = { "ajaxBehavior-prop.xml" }) >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 public class AjaxBehavior extends ClientBehavior implements AjaxClientBehavior { public static final String BEHAVIOR_ID = "org.ajax4jsf.behavior.Ajax"; private static final Set HINTS = Collections.unmodifiableSet(EnumSet.of(ClientBehaviorHint.SUBMITTING));

Conflicting content

 * @author Anton Belevich
 *
 */
<<<<<<< HEAD

@JsfBehavior(id = "org.ajax4jsf.behavior.Ajax", tag = @Tag(name = "ajax", handler = "org.richfaces.view.facelets.html.AjaxHandler", type = TagType.Facelets),
			attributes = {"ajaxBehavior-prop.xml"})
=======
@JsfBehavior(id = "org.ajax4jsf.behavior.Ajax", tag = @Tag(name = "ajax", handler = "org.richfaces.view.facelets.html.AjaxHandler", type = TagType.Facelets), attributes = { "ajaxBehavior-prop.xml" })
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public class AjaxBehavior extends ClientBehavior implements AjaxClientBehavior {
    public static final String BEHAVIOR_ID = "org.ajax4jsf.behavior.Ajax";
    private static final Set HINTS = Collections.unmodifiableSet(EnumSet.of(ClientBehaviorHint.SUBMITTING));

Solution content
* @author Anton Belevich * */ @JsfBehavior(id = "org.ajax4jsf.behavior.Ajax", tag = @Tag(name = "ajax", handler = "org.richfaces.view.facelets.html.AjaxHandler", type = TagType.Facelets), attributes = { "ajaxBehavior-prop.xml" }) public class AjaxBehavior extends ClientBehavior implements AjaxClientBehavior { public static final String BEHAVIOR_ID = "org.ajax4jsf.behavior.Ajax"; private static final Set HINTS = Collections.unmodifiableSet(EnumSet.of(ClientBehaviorHint.SUBMITTING));

Solution content

 * @author Anton Belevich
 *
 */
@JsfBehavior(id = "org.ajax4jsf.behavior.Ajax", tag = @Tag(name = "ajax", handler = "org.richfaces.view.facelets.html.AjaxHandler", type = TagType.Facelets), attributes = { "ajaxBehavior-prop.xml" })
public class AjaxBehavior extends ClientBehavior implements AjaxClientBehavior {
    public static final String BEHAVIOR_ID = "org.ajax4jsf.behavior.Ajax";
    private static final Set HINTS = Collections.unmodifiableSet(EnumSet.of(ClientBehaviorHint.SUBMITTING));

File
AjaxBehavior.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content
======= ELContext elContext = context.getELContext(); try { <<<<<<< HEAD methodExpressionOneArg.invoke(elContext, new Object[] { event}); } catch (MethodNotFoundException mnfe) { methodExpressionZeroArg.invoke(elContext, new Object[] {}); } methodExpressionOneArg.invoke(elContext, new Object[] { event }); } catch (MethodNotFoundException mnfe) { methodExpressionZeroArg.invoke(elContext, new Object[] {}); } >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 } public boolean isTransient() {

Conflicting content

=======
        ELContext elContext = context.getELContext();

        try {
<<<<<<< HEAD
            methodExpressionOneArg.invoke(elContext, new Object[] { event});
        } catch (MethodNotFoundException mnfe) {
            methodExpressionZeroArg.invoke(elContext, new Object[] {});
        } 
            methodExpressionOneArg.invoke(elContext, new Object[] { event });
        } catch (MethodNotFoundException mnfe) {
            methodExpressionZeroArg.invoke(elContext, new Object[] {});
        }
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }

    public boolean isTransient() {

Solution content
ELContext elContext = context.getELContext(); try { methodExpressionOneArg.invoke(elContext, new Object[] { event }); } catch (MethodNotFoundException mnfe) { methodExpressionZeroArg.invoke(elContext, new Object[] {}); } } public boolean isTransient() {

Solution content

        ELContext elContext = context.getELContext();

        try {
            methodExpressionOneArg.invoke(elContext, new Object[] { event });
        } catch (MethodNotFoundException mnfe) {
            methodExpressionZeroArg.invoke(elContext, new Object[] {});
        }
    }

    public boolean isTransient() {

File
MethodExpressionAjaxBehaviorListener.java

Developer's decision
Version 1

Kind of conflict
Catch clause
Method invocation

Chunk

Conflicting content
@Override public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior behavior) { String script = null; <<<<<<< HEAD if (behavior instanceof AjaxBehavior && !((AjaxBehavior)behavior).isDisabled()) { ======= if (behavior instanceof AjaxBehavior && !((AjaxBehavior) behavior).isDisabled()) { >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 script = buildAjaxCommand(behaviorContext, (AjaxBehavior) behavior); }

Conflicting content

    @Override
    public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior behavior) {
        String script = null;
<<<<<<< HEAD
        if (behavior instanceof AjaxBehavior && !((AjaxBehavior)behavior).isDisabled()) {
=======
        if (behavior instanceof AjaxBehavior && !((AjaxBehavior) behavior).isDisabled()) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            script = buildAjaxCommand(behaviorContext, (AjaxBehavior) behavior);
        }

Solution content
@Override public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior behavior) { String script = null; if (behavior instanceof AjaxBehavior && !((AjaxBehavior) behavior).isDisabled()) { script = buildAjaxCommand(behaviorContext, (AjaxBehavior) behavior); }

Solution content

    @Override
    public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior behavior) {
        String script = null;
        if (behavior instanceof AjaxBehavior && !((AjaxBehavior) behavior).isDisabled()) {
            script = buildAjaxCommand(behaviorContext, (AjaxBehavior) behavior);
        }

File
AjaxBehaviorRenderer.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content
*/ @JsfComponent(renderer = @JsfRenderer(type = "org.richfaces.StatusRenderer"), tag = @Tag(type = TagType.Facelets)) public abstract class AbstractAjaxStatus extends UIComponentBase { <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 public static final String COMPONENT_TYPE = "org.richfaces.Status"; public static final String COMPONENT_FAMILY = "org.richfaces.Status";

Conflicting content

 */
@JsfComponent(renderer = @JsfRenderer(type = "org.richfaces.StatusRenderer"), tag = @Tag(type = TagType.Facelets))
public abstract class AbstractAjaxStatus extends UIComponentBase {
<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public static final String COMPONENT_TYPE = "org.richfaces.Status";
    public static final String COMPONENT_FAMILY = "org.richfaces.Status";

Solution content
*/ @JsfComponent(renderer = @JsfRenderer(type = "org.richfaces.StatusRenderer"), tag = @Tag(type = TagType.Facelets)) public abstract class AbstractAjaxStatus extends UIComponentBase { public static final String COMPONENT_TYPE = "org.richfaces.Status"; public static final String COMPONENT_FAMILY = "org.richfaces.Status";

Solution content

 */
@JsfComponent(renderer = @JsfRenderer(type = "org.richfaces.StatusRenderer"), tag = @Tag(type = TagType.Facelets))
public abstract class AbstractAjaxStatus extends UIComponentBase {
    public static final String COMPONENT_TYPE = "org.richfaces.Status";
    public static final String COMPONENT_FAMILY = "org.richfaces.Status";

File
AbstractAjaxStatus.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
@Attribute(events = @EventName("success")) public abstract String getOnsuccess(); <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 @Attribute public abstract String getName();

Solution content
@Attribute(events = @EventName("success")) public abstract String getOnsuccess(); @Attribute public abstract String getName();

File
AbstractAjaxStatus.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
@Attribute public abstract String getStartText(); <<<<<<< HEAD @Attribute public abstract String getStopText(); @Attribute public abstract String getErrorText(); @Attribute public abstract String getStartStyle(); @Attribute public abstract String getStopStyle(); @Attribute public abstract String getErrorStyle(); @Attribute public abstract String getStartStyleClass(); @Attribute public abstract String getStopStyleClass(); @Attribute public abstract String getErrorStyleClass(); ======= @Attribute public abstract String getStopText(); @Attribute public abstract String getErrorText(); @Attribute public abstract String getStartStyle(); @Attribute public abstract String getStopStyle(); @Attribute public abstract String getErrorStyle(); @Attribute public abstract String getStartStyleClass(); @Attribute public abstract String getStopStyleClass(); @Attribute public abstract String getErrorStyleClass(); >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 }

Conflicting content

    @Attribute
    public abstract String getStartText();
<<<<<<< HEAD
    
    @Attribute
    public abstract String getStopText();
    
    @Attribute
    public abstract String getErrorText();
    
    @Attribute
    public abstract String getStartStyle();
    
    @Attribute
    public abstract String getStopStyle();
    
    @Attribute
    public abstract String getErrorStyle();
    
    @Attribute
    public abstract String getStartStyleClass();
    
    @Attribute
    public abstract String getStopStyleClass();
    
    @Attribute
    public abstract String getErrorStyleClass();
    
=======

    @Attribute
    public abstract String getStopText();

    @Attribute
    public abstract String getErrorText();

    @Attribute
    public abstract String getStartStyle();

    @Attribute
    public abstract String getStopStyle();

    @Attribute
    public abstract String getErrorStyle();

    @Attribute
    public abstract String getStartStyleClass();

    @Attribute
    public abstract String getStopStyleClass();

    @Attribute
    public abstract String getErrorStyleClass();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
}

Solution content
@Attribute public abstract String getStartText(); @Attribute public abstract String getStopText(); @Attribute public abstract String getErrorText(); @Attribute public abstract String getStartStyle(); @Attribute public abstract String getStopStyle(); @Attribute public abstract String getErrorStyle(); @Attribute public abstract String getStartStyleClass(); @Attribute public abstract String getStopStyleClass(); @Attribute public abstract String getErrorStyleClass(); }

Solution content

    @Attribute
    public abstract String getStartText();

    @Attribute
    public abstract String getStopText();

    @Attribute
    public abstract String getErrorText();

    @Attribute
    public abstract String getStartStyle();

    @Attribute
    public abstract String getStopStyle();

    @Attribute
    public abstract String getErrorStyle();

    @Attribute
    public abstract String getStartStyleClass();

    @Attribute
    public abstract String getStopStyleClass();

    @Attribute
    public abstract String getErrorStyleClass();
}

File
AbstractAjaxStatus.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method interface

Chunk

Conflicting content
@Attribute public abstract String getImage(); <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 public String resolveClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) { return null; }

Conflicting content

    @Attribute
    public abstract String getImage();
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public String resolveClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) {
        return null;
    }

Solution content
@Attribute public abstract String getImage(); public String resolveClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) { return null; }

File
AbstractCommandButton.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
* @author Nick Belaevski * */ <<<<<<< HEAD @JsfComponent( tag = @Tag(name = "repeat", handler = "org.richfaces.view.facelets.html.RepeatHandler",type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"), attributes = "rowKeyConverter-prop.xml" ) ======= @JsfComponent(tag = @Tag(name = "repeat", handler = "org.richfaces.view.facelets.html.RepeatHandler", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"), attributes = "rowKeyConverter-prop.xml") >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 public class UIRepeat extends UISequence { public static final String COMPONENT_TYPE = "org.richfaces.Repeat"; public static final String COMPONENT_FAMILY = "javax.faces.Data";

Conflicting content

 * @author Nick Belaevski
 *
 */
<<<<<<< HEAD
@JsfComponent(
        tag = @Tag(name = "repeat", handler = "org.richfaces.view.facelets.html.RepeatHandler",type = TagType.Facelets),
        renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"),
        attributes = "rowKeyConverter-prop.xml"
)
=======
@JsfComponent(tag = @Tag(name = "repeat", handler = "org.richfaces.view.facelets.html.RepeatHandler", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"), attributes = "rowKeyConverter-prop.xml")
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public class UIRepeat extends UISequence {
    public static final String COMPONENT_TYPE = "org.richfaces.Repeat";
    public static final String COMPONENT_FAMILY = "javax.faces.Data";

Solution content

 * @author Nick Belaevski
 *
 */
@JsfComponent(tag = @Tag(name = "repeat", handler = "org.richfaces.view.facelets.html.RepeatHandler", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"), attributes = "rowKeyConverter-prop.xml")
public class UIRepeat extends UISequence {
    public static final String COMPONENT_TYPE = "org.richfaces.Repeat";
    public static final String COMPONENT_FAMILY = "javax.faces.Data";

File
UIRepeat.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

            utils.encodeBeginForm(context, component, writer, clientId);
            utils.encodeEndForm(context, writer);
        }
<<<<<<< HEAD
        
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        // polling script.
        writer.startElement(HtmlConstants.SCRIPT_ELEM, component);
        writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/javascript", null);

Solution content

            utils.encodeBeginForm(context, component, writer, clientId);
            utils.encodeEndForm(context, writer);
        }

        // polling script.
        writer.startElement(HtmlConstants.SCRIPT_ELEM, component);
        writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/javascript", null);

File
AjaxPollRenderer.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

 * @author abelevich
 *
 */
<<<<<<< HEAD

@JsfComponent(
        type = AbstractDropTarget.COMPONENT_TYPE,
        family = AbstractDropTarget.COMPONENT_FAMILY, 
        generate = "org.richfaces.component.UIDropTarget",
        renderer = @JsfRenderer(type = "org.richfaces.DropTargetRenderer"),
        attributes = {"dropListener-props.xml"},
        tag = @Tag(name="dropTarget" ,handler="org.richfaces.view.facelets.DropHandler", type = TagType.Facelets)
)
=======
@JsfComponent(type = AbstractDropTarget.COMPONENT_TYPE, family = AbstractDropTarget.COMPONENT_FAMILY, generate = "org.richfaces.component.UIDropTarget", renderer = @JsfRenderer(type = "org.richfaces.DropTargetRenderer"), attributes = { "dropListener-props.xml" }, tag = @Tag(name = "dropTarget", handler = "org.richfaces.view.facelets.DropHandler", type = TagType.Facelets))
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public abstract class AbstractDropTarget extends UIComponentBase {
    public static final String COMPONENT_TYPE = "org.richfaces.DropTarget";
    public static final String COMPONENT_FAMILY = "org.richfaces.DropTarget";

Solution content

 * @author abelevich
 *
 */
@JsfComponent(type = AbstractDropTarget.COMPONENT_TYPE, family = AbstractDropTarget.COMPONENT_FAMILY, generate = "org.richfaces.component.UIDropTarget", renderer = @JsfRenderer(type = "org.richfaces.DropTargetRenderer"), attributes = { "dropListener-props.xml" }, tag = @Tag(name = "dropTarget", handler = "org.richfaces.view.facelets.DropHandler", type = TagType.Facelets))
public abstract class AbstractDropTarget extends UIComponentBase {
    public static final String COMPONENT_TYPE = "org.richfaces.DropTarget";
    public static final String COMPONENT_FAMILY = "org.richfaces.DropTarget";

File
AbstractDropTarget.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

    public abstract Object getExecute();

    @Attribute
<<<<<<< HEAD
    public abstract  Object getRender();
=======
    public abstract Object getRender();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

    @Attribute
    public abstract Object getAcceptedTypes();

Solution content
public abstract Object getExecute(); @Attribute public abstract Object getRender(); @Attribute public abstract Object getAcceptedTypes();

File
AbstractDropTarget.java

Developer's decision
Version 1

Kind of conflict
Method interface

Chunk

Conflicting content

=======
 *
 */
public interface InplaceComponent {
<<<<<<< HEAD
    
    public boolean isDisabled();
    
    public String getDefaultLabel();
    
    public String getEditEvent();
    
    public boolean isShowControls();
    
    public boolean isSaveOnBlur();
    
    public InplaceState getState();

    public String getActiveClass();

    public String getChangedClass();

    public String getDisabledClass();

    public abstract int getTabindex();
    boolean isDisabled();

    String getDefaultLabel();

    String getEditEvent();

    boolean isShowControls();

    boolean isSaveOnBlur();

    InplaceState getState();

    String getActiveClass();

    String getChangedClass();

    String getDisabledClass();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

    int getTabindex();
}

Solution content

 *
 */
public interface InplaceComponent {
    boolean isDisabled();

    String getDefaultLabel();

    String getEditEvent();

    boolean isShowControls();

    boolean isSaveOnBlur();

    InplaceState getState();

    String getActiveClass();

    String getChangedClass();

    String getDisabledClass();

    int getTabindex();
}

File
InplaceComponent.java

Developer's decision
Version 2

Kind of conflict
Method interface

Chunk

Conflicting content

import javax.faces.event.FacesListener;

public interface FileUploadListener extends FacesListener {
<<<<<<< HEAD

    public void processFileUpload(FileUploadEvent event);
=======
    void processFileUpload(FileUploadEvent event);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
}

Solution content
import javax.faces.event.FacesListener; public interface FileUploadListener extends FacesListener { void processFileUpload(FileUploadEvent event); }

File
FileUploadListener.java

Developer's decision
Version 2

Kind of conflict
Method interface

Chunk

Conflicting content

import javax.faces.component.visit.VisitContext;
import javax.faces.component.visit.VisitResult;
import javax.faces.context.FacesContext;
<<<<<<< HEAD
import java.io.IOException;
=======

import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Signature;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;
import org.richfaces.context.ExtendedVisitContext;
import org.richfaces.context.ExtendedVisitContextMode;
import org.richfaces.renderkit.MetaComponentRenderer;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

/**
 * @author Nick Belaevski

Solution content

import javax.faces.component.visit.VisitContext;
import javax.faces.component.visit.VisitResult;
import javax.faces.context.FacesContext;

import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Signature;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;
import org.richfaces.context.ExtendedVisitContext;
import org.richfaces.context.ExtendedVisitContextMode;
import org.richfaces.renderkit.MetaComponentRenderer;

/**
 * @author Nick Belaevski

File
AbstractAutocomplete.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

    @Attribute
    public abstract String getLayout();

<<<<<<< HEAD
=======
    @Attribute
    public abstract String getTokens();

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    @Attribute(defaultValue = "true")
    public abstract boolean isAutofill();

Solution content
@Attribute public abstract String getLayout(); @Attribute public abstract String getTokens(); @Attribute(defaultValue = "true") public abstract boolean isAutofill();

File
AbstractAutocomplete.java

Developer's decision
Version 2

Kind of conflict
Annotation
Method interface

Chunk

Conflicting content
@Attribute public abstract String getStyleClass(); <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 @Attribute public abstract String getPopupStyle();

Solution content
@Attribute public abstract String getStyleClass(); @Attribute public abstract String getPopupStyle();

File
AbstractCalendar.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

    @Attribute(events = @EventName("inputblur"))
    public abstract String getOninputblur();
<<<<<<< HEAD
    
    @Attribute(events = @EventName(value="change", defaultEvent=true))
=======

    @Attribute(events = @EventName(value = "change", defaultEvent = true))
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public abstract String getOnchange();

    @Attribute(events = @EventName("dateselect"))

Solution content

    @Attribute(events = @EventName("inputblur"))
    public abstract String getOninputblur();

    @Attribute(events = @EventName(value = "change", defaultEvent = true))
    public abstract String getOnchange();

    @Attribute(events = @EventName("dateselect"))

File
AbstractCalendar.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

 * @author Konstantin Mishin
 *
 */
<<<<<<< HEAD
@JsfComponent(tag = @Tag(generate = false, handler = "org.richfaces.view.facelets.FileUploadHandler"),
    renderer = @JsfRenderer(type = "org.richfaces.FileUploadRenderer"),
    attributes = {"events-props.xml", "core-props.xml", "ajax-props.xml", "i18n-props.xml", "fileUploadListener-props.xml"})
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
public abstract class AbstractFileUpload extends UIComponentBase {
    
    public static final String COMPONENT_TYPE = "org.richfaces.FileUpload";

=======
@JsfComponent(tag = @Tag(generate = false, handler = "org.richfaces.view.facelets.FileUploadHandler"), renderer = @JsfRenderer(type = "org.richfaces.FileUploadRenderer"), attributes = {
        "events-props.xml", "core-props.xml", "ajax-props.xml", "i18n-props.xml", "fileUploadListener-props.xml" })
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
public abstract class AbstractFileUpload extends UIComponentBase {
    public static final String COMPONENT_TYPE = "org.richfaces.FileUpload";
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public static final String COMPONENT_FAMILY = "org.richfaces.FileUpload";

    @Attribute

Solution content

 * @author Konstantin Mishin
 *
 */
@JsfComponent(tag = @Tag(generate = false, handler = "org.richfaces.view.facelets.FileUploadHandler"), renderer = @JsfRenderer(type = "org.richfaces.FileUploadRenderer"), attributes = {
        "events-props.xml", "core-props.xml", "ajax-props.xml", "i18n-props.xml", "fileUploadListener-props.xml" })
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
public abstract class AbstractFileUpload extends UIComponentBase {
    public static final String COMPONENT_TYPE = "org.richfaces.FileUpload";
    public static final String COMPONENT_FAMILY = "org.richfaces.FileUpload";

    @Attribute

File
AbstractFileUpload.java

Developer's decision
Version 1

Kind of conflict
Annotation
Attribute

Chunk

Conflicting content

    @Attribute
    public abstract String getDisabledClass();

<<<<<<< HEAD
    @Attribute(events=@EventName("click"))
=======
    @Attribute(events = @EventName("click"))
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public abstract String getOnclick();

    @Attribute(events = @EventName("ondblclick"))

Solution content
@Attribute public abstract String getDisabledClass(); @Attribute(events = @EventName("click")) public abstract String getOnclick(); @Attribute(events = @EventName("ondblclick"))

File
AbstractInplaceInput.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content


    @Attribute
    public abstract String getChangedClass();
<<<<<<< HEAD
    
    @Attribute
    public abstract String getDefaultLabel();
    
    @Attribute
    public abstract String getDisabledClass();
    
=======

    @Attribute
    public abstract String getDefaultLabel();

    @Attribute
    public abstract String getDisabledClass();

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    @Attribute
    public abstract String getActiveClass();

Solution content

    @Attribute
    public abstract String getChangedClass();

    @Attribute
    public abstract String getDefaultLabel();

    @Attribute
    public abstract String getDisabledClass();

    @Attribute
    public abstract String getActiveClass();

File
AbstractInplaceSelect.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method interface

Chunk

Conflicting content

    @Attribute()
    public abstract String getEditEvent();

<<<<<<< HEAD
    @Attribute(events=@EventName("inputclick"))
=======
    @Attribute(events = @EventName("inputclick"))
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public abstract String getOninputclick();

    @Attribute(events = @EventName("inputdblclick"))

Solution content
@Attribute() public abstract String getEditEvent(); @Attribute(events = @EventName("inputclick")) public abstract String getOninputclick(); @Attribute(events = @EventName("inputdblclick"))

File
AbstractInplaceSelect.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

 * @author abelevich
 *
 */
<<<<<<< HEAD
@JsfComponent(
        type = AbstractSelect.COMPONENT_TYPE,
        family = AbstractSelect.COMPONENT_FAMILY, 
        generate = "org.richfaces.component.UISelect",
        renderer = @JsfRenderer(type = "org.richfaces.SelectRenderer"),
        tag = @Tag(name="select")
)

=======
@JsfComponent(type = AbstractSelect.COMPONENT_TYPE, family = AbstractSelect.COMPONENT_FAMILY, generate = "org.richfaces.component.UISelect", renderer = @JsfRenderer(type = "org.richfaces.SelectRenderer"), tag = @Tag(name = "select"))
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public abstract class AbstractSelect extends AbstractSelectComponent {
    public static final String COMPONENT_TYPE = "org.richfaces.Select";
    public static final String COMPONENT_FAMILY = "org.richfaces.Select";

Solution content

 * @author abelevich
 *
 */
@JsfComponent(type = AbstractSelect.COMPONENT_TYPE, family = AbstractSelect.COMPONENT_FAMILY, generate = "org.richfaces.component.UISelect", renderer = @JsfRenderer(type = "org.richfaces.SelectRenderer"), tag = @Tag(name = "select"))
public abstract class AbstractSelect extends AbstractSelectComponent {
    public static final String COMPONENT_TYPE = "org.richfaces.Select";
    public static final String COMPONENT_FAMILY = "org.richfaces.Select";

File
AbstractSelect.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content
@Attribute public abstract String getDisabledClass(); <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 @Attribute public abstract String getListClass();

Solution content
@Attribute public abstract String getDisabledClass(); @Attribute public abstract String getListClass();

File
AbstractSelectComponent.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

 */
package org.richfaces.renderkit;

<<<<<<< HEAD
=======
import java.io.IOException;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import javax.el.ELException;
import javax.el.ExpressionFactory;
import javax.el.MethodExpression;
import javax.el.MethodNotFoundException;
import javax.el.ValueExpression;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
import javax.faces.component.ValueHolder;
import javax.faces.context.FacesContext;
import javax.faces.context.PartialResponseWriter;
import javax.faces.context.PartialViewContext;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
import javax.faces.model.ArrayDataModel;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import javax.faces.model.ResultDataModel;
import javax.faces.model.ResultSetDataModel;
import javax.servlet.jsp.jstl.sql.Result;

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
import org.ajax4jsf.javascript.JSObject;
import org.ajax4jsf.javascript.JSReference;
import org.richfaces.application.ServiceTracker;

Solution content

 */
package org.richfaces.renderkit;

import java.io.IOException;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import javax.el.ELException;
import javax.el.ExpressionFactory;
import javax.el.MethodExpression;
import javax.el.MethodNotFoundException;
import javax.el.ValueExpression;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
import javax.faces.component.ValueHolder;
import javax.faces.context.FacesContext;
import javax.faces.context.PartialResponseWriter;
import javax.faces.context.PartialViewContext;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
import javax.faces.model.ArrayDataModel;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import javax.faces.model.ResultDataModel;
import javax.faces.model.ResultSetDataModel;
import javax.servlet.jsp.jstl.sql.Result;

import org.ajax4jsf.javascript.JSObject;
import org.ajax4jsf.javascript.JSReference;
import org.richfaces.application.ServiceTracker;

File
AutocompleteRendererBase.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
Object savedVar = saveVar(facesContext, comboBox.getVar()); Iterator

Solution content
Object savedVar = saveVar(facesContext, comboBox.getVar()); Iterator

File
AutocompleteRendererBase.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation
Variable
While statement

Chunk

Conflicting content

                if (comboBox.getFetchValue() != null) {
                    fetchValues.add(comboBox.getFetchValue().toString());
<<<<<<< HEAD
                } else if(item != null) {
=======
                } else if (item != null) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                    fetchValues.add(item.toString());
                }
            }

Solution content
if (comboBox.getFetchValue() != null) { fetchValues.add(comboBox.getFetchValue().toString()); } else if (item != null) { fetchValues.add(item.toString()); } }

File
AutocompleteRendererBase.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

    }

    public void encodeItem(FacesContext facesContext, AbstractAutocomplete comboBox, Object item,
<<<<<<< HEAD
                           AutocompleteEncodeStrategy strategy) throws IOException {
=======
        AutocompleteEncodeStrategy strategy) throws IOException {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        ResponseWriter writer = facesContext.getResponseWriter();
        if (comboBox.getChildCount() > 0) {
            strategy.encodeItem(facesContext, comboBox);

Solution content

    }

    public void encodeItem(FacesContext facesContext, AbstractAutocomplete comboBox, Object item,
        AutocompleteEncodeStrategy strategy) throws IOException {
        ResponseWriter writer = facesContext.getResponseWriter();
        if (comboBox.getChildCount() > 0) {
            strategy.encodeItem(facesContext, comboBox);

File
AutocompleteRendererBase.java

Developer's decision
Version 1

Kind of conflict
Variable

Chunk

Conflicting content

            ValueExpression expression = component.getValueExpression("value");

            if (expression != null) {
<<<<<<< HEAD
                Class containerClass = ServiceTracker.getService(context, GenericsIntrospectionService.class).getContainerClass(context, expression);
=======
                Class containerClass = ServiceTracker.getService(context, GenericsIntrospectionService.class)
                    .getContainerClass(context, expression);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

                converter = InputUtils.getConverterForType(context, containerClass);
            }

Solution content

            ValueExpression expression = component.getValueExpression("value");

            if (expression != null) {
                Class containerClass = ServiceTracker.getService(context, GenericsIntrospectionService.class)
                    .getContainerClass(context, expression);

                converter = InputUtils.getConverterForType(context, containerClass);
            }

File
AutocompleteRendererBase.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

        }
        return true;
    }
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public String getPopupStyle(FacesContext facesContext, UIComponent component) {
        AbstractCalendar calendar = (AbstractCalendar) component;
        int zindex = calendar.getZindex();

Solution content
} return true; } public String getPopupStyle(FacesContext facesContext, UIComponent component) { AbstractCalendar calendar = (AbstractCalendar) component; int zindex = calendar.getZindex();

File
CalendarRendererBase.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        @ResourceDependency(library = "org.richfaces", name = "inplaceInput.js"),
        @ResourceDependency(library = "org.richfaces", name = "inplaceInput.ecss") })
public class InplaceInputRendererBase extends InputRendererBase {
<<<<<<< HEAD

        
    //TODO: anton - move to RenderUtils (we use the same in the calendar base renderer) ? 
=======
    // TODO: anton - move to RenderUtils (we use the same in the calendar base renderer) ?
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    protected static final Map INPLACE_INPUT_HANDLER_ATTRIBUTES = Collections
        .unmodifiableMap(ComponentAttribute.createMap(
            new ComponentAttribute(HtmlConstants.ONCLICK_ATTRIBUTE).setEventNames("inputclick").setComponentAttributeName(

Solution content

        @ResourceDependency(library = "org.richfaces", name = "inplaceInput.js"),
        @ResourceDependency(library = "org.richfaces", name = "inplaceInput.ecss") })
public class InplaceInputRendererBase extends InputRendererBase {
    // TODO: anton - move to RenderUtils (we use the same in the calendar base renderer) ?
    protected static final Map INPLACE_INPUT_HANDLER_ATTRIBUTES = Collections
        .unmodifiableMap(ComponentAttribute.createMap(
            new ComponentAttribute(HtmlConstants.ONCLICK_ATTRIBUTE).setEventNames("inputclick").setComponentAttributeName(

File
InplaceInputRendererBase.java

Developer's decision
Version 1

Kind of conflict
Comment

Chunk

Conflicting content

        @ResourceDependency(library = "org.richfaces", name = "inplaceSelect.js"),
        @ResourceDependency(library = "org.richfaces", name = "inplaceSelect.ecss") })
public class InplaceSelectRendererBase extends InplaceInputRendererBase {
<<<<<<< HEAD

    public static final String ITEM_CSS = "rf-is-opt"; 
=======
    public static final String ITEM_CSS = "rf-is-opt";
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

    public List getConvertedSelectItems(FacesContext facesContext, UIComponent component) {
        return SelectHelper.getConvertedSelectItems(facesContext, component);

Solution content

        @ResourceDependency(library = "org.richfaces", name = "inplaceSelect.js"),
        @ResourceDependency(library = "org.richfaces", name = "inplaceSelect.ecss") })
public class InplaceSelectRendererBase extends InplaceInputRendererBase {
    public static final String ITEM_CSS = "rf-is-opt";

    public List getConvertedSelectItems(FacesContext facesContext, UIComponent component) {
        return SelectHelper.getConvertedSelectItems(facesContext, component);

File
InplaceSelectRendererBase.java

Developer's decision
Version 1

Kind of conflict
Attribute

Chunk

Conflicting content

    public String getDisableStateCss(InplaceComponent component) {
        String css = component.getDisabledClass();
        return concatClasses("rf-is-dis", css);
<<<<<<< HEAD
    }

    public String getDisabledCss(UIComponent component) {
        AbstractInplaceSelect inplaceSelect = (AbstractInplaceSelect) component;
        return getDisableStateCss(inplaceSelect);
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }

    public String getDisabledCss(UIComponent component) {

Solution content

    public String getDisableStateCss(InplaceComponent component) {
        String css = component.getDisabledClass();
        return concatClasses("rf-is-dis", css);
    }

    public String getDisabledCss(UIComponent component) {

File
InplaceSelectRendererBase.java

Developer's decision
Version 2

Kind of conflict
Cast expression
Method invocation
Method signature
Return statement
Variable

Chunk

Conflicting content

                    return new ConverterMetadata(attribute) {
                        public void applyMetadata(FaceletContext ctx, Object instance) {
                            ((AbstractAutocomplete) instance).setConverter(this.getConverter(ctx,
<<<<<<< HEAD
                                (AbstractAutocomplete) instance,
                                this.getAttr().getValueExpression(ctx, Converter.class)));
=======
                                (AbstractAutocomplete) instance, this.getAttr().getValueExpression(ctx, Converter.class)));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                        }
                    };
                }

Solution content

                    return new ConverterMetadata(attribute) {
                        public void applyMetadata(FaceletContext ctx, Object instance) {
                            ((AbstractAutocomplete) instance).setConverter(this.getConverter(ctx,
                                (AbstractAutocomplete) instance, this.getAttr().getValueExpression(ctx, Converter.class)));
                        }
                    };
                }

File
AutocompleteHandler.java

Developer's decision
Version 1

Kind of conflict
Cast expression
Method invocation

Chunk

Conflicting content

    public void testDefaultWithControlsEncode() throws IOException, SAXException {
        doTestDefaultWithControlsEncode(PAGE_NAME, BASE_ID);
    }
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    @Test
    public void testEdit() throws Exception {
        HtmlPage page = environment.getPage("/inplaceInputTest.jsf");

Solution content

    public void testDefaultWithControlsEncode() throws IOException, SAXException {
        doTestDefaultWithControlsEncode(PAGE_NAME, BASE_ID);
    }

    @Test
    public void testEdit() throws Exception {
        HtmlPage page = environment.getPage("/inplaceInputTest.jsf");

File
InplaceInputRendererTest.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        blur(page);
        DomText text = page.getFirstByXPath("//*[@id = '" + BASE_ID + "DefaultLabel']/text()");
        assertEquals("Another Test String", text.getTextContent());
<<<<<<< HEAD
        HtmlElement span = page.getFirstByXPath("//*[@id = '"+ BASE_ID + DEFAULT +"']");
=======
        HtmlElement span = page.getFirstByXPath("//*[@id = '" + BASE_ID + DEFAULT + "']");
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        assertEquals("rf-ii rf-ii-chng", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));
    }

Solution content

        blur(page);
        DomText text = page.getFirstByXPath("//*[@id = '" + BASE_ID + "DefaultLabel']/text()");
        assertEquals("Another Test String", text.getTextContent());
        HtmlElement span = page.getFirstByXPath("//*[@id = '" + BASE_ID + DEFAULT + "']");
        assertEquals("rf-ii rf-ii-chng", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));
    }

File
InplaceInputRendererTest.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

        HtmlElement span = page.getFirstByXPath("//*[@id = '" + withControlsComponentId + "']");
        assertNotNull(span);
        assertEquals("rf-ii", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));
<<<<<<< HEAD
        
        edit(page, withControlsComponentId,  "Another Test String");
                
        HtmlElement ok = page.getFirstByXPath("//*[@id = '"+ withControlsComponentId + "Okbtn']");
=======

        edit(page, withControlsComponentId, "Another Test String");

        HtmlElement ok = page.getFirstByXPath("//*[@id = '" + withControlsComponentId + "Okbtn']");
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        assertNotNull(ok);
        ok.mouseDown();

Solution content

        HtmlElement span = page.getFirstByXPath("//*[@id = '" + withControlsComponentId + "']");
        assertNotNull(span);
        assertEquals("rf-ii", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));

        edit(page, withControlsComponentId, "Another Test String");

        HtmlElement ok = page.getFirstByXPath("//*[@id = '" + withControlsComponentId + "Okbtn']");
        assertNotNull(ok);
        ok.mouseDown();

File
InplaceInputRendererTest.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

        span = page.getFirstByXPath("//*[@id = '" + withControlsComponentId + "']");
        assertNotNull(span);
        assertEquals("rf-ii rf-ii-chng", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));
<<<<<<< HEAD
        
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        edit(page, withControlsComponentId, "Test String");

        blur(page);

Solution content

        span = page.getFirstByXPath("//*[@id = '" + withControlsComponentId + "']");
        assertNotNull(span);
        assertEquals("rf-ii rf-ii-chng", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));

        edit(page, withControlsComponentId, "Test String");

        blur(page);

File
InplaceInputRendererTest.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

<<<<<<< HEAD
    
=======
    public void testEditEncode() throws IOException, SAXException {
        doTestEditEncode(PAGE_NAME, BASE_ID);
    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private void edit(HtmlPage page, String inplaceSelectId, int selectIndex) throws Exception {
        HtmlElement span = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "']");
        assertNotNull(span);

Solution content

    public void testEditEncode() throws IOException, SAXException {
        doTestEditEncode(PAGE_NAME, BASE_ID);
    }

    private void edit(HtmlPage page, String inplaceSelectId, int selectIndex) throws Exception {
        HtmlElement span = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "']");
        assertNotNull(span);

File
InplaceSelectRendererTest.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        HtmlElement edit = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "Edit']");
        assertNotNull(edit);
        assertEquals("rf-is-fld-cntr", edit.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));
<<<<<<< HEAD
        
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        HtmlElement list = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "List']");
        assertNotNull(list);
        assertTrue(list.isDisplayed());

Solution content

        HtmlElement edit = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "Edit']");
        assertNotNull(edit);
        assertEquals("rf-is-fld-cntr", edit.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));

        HtmlElement list = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "List']");
        assertNotNull(list);
        assertTrue(list.isDisplayed());

File
InplaceSelectRendererTest.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

    void setExpanded(boolean expand);

<<<<<<< HEAD
    public void addCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener);

    public void removeCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener);

    public CollapsibleSubTableToggleListener[] getCollapsibleSubTableToggleListener();
=======
    void addCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener);

    void removeCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener);

    CollapsibleSubTableToggleListener[] getCollapsibleSubTableToggleListener();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
}

Solution content

    void setExpanded(boolean expand);

    void addCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener);

    void removeCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener);

    CollapsibleSubTableToggleListener[] getCollapsibleSubTableToggleListener();
}

File
Expandable.java

Developer's decision
Version 2

Kind of conflict
Method interface

Chunk

Conflicting content

 *
 */
public class CollapsibleSubTableToggleEvent extends FacesEvent {
<<<<<<< HEAD:iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleEvent.java

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8:iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleEvent.java
    private static final long serialVersionUID = 2916560585918250885L;
    private String togglerId;
    private boolean expanded;

Solution content
* */ public class CollapsibleSubTableToggleEvent extends FacesEvent { private static final long serialVersionUID = 2916560585918250885L; private String togglerId; private boolean expanded;

File
CollapsibleSubTableToggleEvent.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

    private static final long serialVersionUID = 2916560585918250885L;
    private String togglerId;
    private boolean expanded;
<<<<<<< HEAD:iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleEvent.java
    
    
   
    public CollapsibleSubTableToggleEvent(UIComponent source, boolean expanded) {
        this(source, expanded, null);
    }
    
=======

    public CollapsibleSubTableToggleEvent(UIComponent source, boolean expanded) {
        this(source, expanded, null);
    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8:iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleEvent.java
    public CollapsibleSubTableToggleEvent(UIComponent source, boolean expanded, String toggerId) {
        super(source);
        this.expanded = expanded;

Solution content

    private static final long serialVersionUID = 2916560585918250885L;
    private String togglerId;
    private boolean expanded;

    public CollapsibleSubTableToggleEvent(UIComponent source, boolean expanded) {
        this(source, expanded, null);
    }

    public CollapsibleSubTableToggleEvent(UIComponent source, boolean expanded, String toggerId) {
        super(source);
        this.expanded = expanded;

File
CollapsibleSubTableToggleEvent.java

Developer's decision
Version 1

Kind of conflict
Method declaration

Chunk

Conflicting content

 *
 */
public interface CollapsibleSubTableToggleListener extends FacesListener {
<<<<<<< HEAD:iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleListener.java

    public void processCollapsibleSubTableToggle(CollapsibleSubTableToggleEvent event);

=======
    void processCollapsibleSubTableToggle(CollapsibleSubTableToggleEvent event);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8:iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleListener.java
}

Solution content
* */ public interface CollapsibleSubTableToggleListener extends FacesListener { void processCollapsibleSubTableToggle(CollapsibleSubTableToggleEvent event); }

File
CollapsibleSubTableToggleListener.java

Developer's decision
Version 2

Kind of conflict
Method interface

Chunk

Conflicting content

 * @author Wesley Hales
 */
public class DataScrollEvent extends ActionEvent {
<<<<<<< HEAD:iteration/api/src/main/java/org/richfaces/event/DataScrollEvent.java

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8:iteration/api/src/main/java/org/richfaces/event/DataScrollEvent.java
    /**
     *
     */

Solution content
* @author Wesley Hales / public class DataScrollEvent extends ActionEvent { /* * */

File
DataScrollEvent.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

import javax.faces.event.FacesListener;

public interface DataScrollListener extends FacesListener {
<<<<<<< HEAD:iteration/api/src/main/java/org/richfaces/event/DataScrollListener.java

    public void processDataScroll(org.richfaces.event.DataScrollEvent event);

=======
    void processDataScroll(org.richfaces.event.DataScrollEvent event);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8:iteration/api/src/main/java/org/richfaces/event/DataScrollListener.java
}

Solution content
import javax.faces.event.FacesListener; public interface DataScrollListener extends FacesListener { void processDataScroll(org.richfaces.event.DataScrollEvent event); }

File
DataScrollListener.java

Developer's decision
Version 2

Kind of conflict
Method interface

Chunk

Conflicting content

package org.richfaces.event;

public interface DataScrollSource {
<<<<<<< HEAD:iteration/api/src/main/java/org/richfaces/event/DataScrollSource.java

    /**
     * Adds a DataScrollListener to this DataScrollSource.
     * 
     * @param listener
     *            the Scroll listener to be added
     */
    public void addScrollListener(org.richfaces.event.DataScrollListener listener);

    /**
     * Removes a DataFilterSliderListener from this DataScrollSource.
     * 
     * @param listener  the Scroll listener to be removed
     */
    public void removeScrollListener(DataScrollListener listener);

    /**
     * Returns all ScrollListeners for this DataScrollSource.
     * 
     * @return the Scroll listener array
     */
    public DataScrollListener[] getScrollListeners();

=======
    /**
     * Adds a DataScrollListener to this DataScrollSource.
     *
     * @param listener the Scroll listener to be added
     */
    void addScrollListener(org.richfaces.event.DataScrollListener listener);

    /**
     * Removes a DataFilterSliderListener from this DataScrollSource.
     *
     * @param listener the Scroll listener to be removed
     */
    void removeScrollListener(DataScrollListener listener);

    /**
     * Returns all ScrollListeners for this DataScrollSource.
     *
     * @return the Scroll listener array
     */
    DataScrollListener[] getScrollListeners();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8:iteration/api/src/main/java/org/richfaces/event/DataScrollSource.java
}

Solution content

package org.richfaces.event;

public interface DataScrollSource {
    /**
     * Adds a DataScrollListener to this DataScrollSource.
     *
     * @param listener the Scroll listener to be added
     */
    void addScrollListener(org.richfaces.event.DataScrollListener listener);

    /**
     * Removes a DataFilterSliderListener from this DataScrollSource.
     *
     * @param listener the Scroll listener to be removed
     */
    void removeScrollListener(DataScrollListener listener);

    /**
     * Returns all ScrollListeners for this DataScrollSource.
     *
     * @return the Scroll listener array
     */
    DataScrollListener[] getScrollListeners();
}

File
DataScrollSource.java

Developer's decision
Version 2

Kind of conflict
Comment
Method interface

Chunk

Conflicting content

 *
 */
public interface TreeSelectionChangeListener extends FacesListener {
<<<<<<< HEAD

    public void processTreeSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException;
    
=======
    void processTreeSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
}

Solution content
* */ public interface TreeSelectionChangeListener extends FacesListener { void processTreeSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException; }

File
TreeSelectionChangeListener.java

Developer's decision
Version 2

Kind of conflict
Method interface

Chunk

Conflicting content

 *
 */
public interface TreeToggleListener extends FacesListener {
<<<<<<< HEAD

    public void processTreeToggle(TreeToggleEvent event) throws AbortProcessingException;
    
=======
    void processTreeToggle(TreeToggleEvent event) throws AbortProcessingException;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
}

Solution content
* */ public interface TreeToggleListener extends FacesListener { void processTreeToggle(TreeToggleEvent event) throws AbortProcessingException; }

File
TreeToggleListener.java

Developer's decision
Version 2

Kind of conflict
Method interface

Chunk

Conflicting content

 * @author Konstantin Mishin
 *
 */
<<<<<<< HEAD
public abstract class Field implements Serializable{

    private static final long serialVersionUID = 1448767072411366177L;
    
=======
public abstract class Field implements Serializable {
    private static final long serialVersionUID = 1448767072411366177L;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private ValueExpression expression;

    public Field(ValueExpression expression) {

Solution content

 * @author Konstantin Mishin
 *
 */
public abstract class Field implements Serializable {
    private static final long serialVersionUID = 1448767072411366177L;
    private ValueExpression expression;

    public Field(ValueExpression expression) {

File
Field.java

Developer's decision
Version 1

Kind of conflict
Attribute
Class signature

Chunk

Conflicting content

 * @author Konstantin Mishin
 *
 */
<<<<<<< HEAD
public class FilterField extends Field{

    private static final long serialVersionUID = -935655586515863809L;

=======
public class FilterField extends Field {
    private static final long serialVersionUID = -935655586515863809L;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private Filter filter;
    private Object filterValue;

Solution content
* @author Konstantin Mishin * */ public class FilterField extends Field { private static final long serialVersionUID = -935655586515863809L; private Filter filter; private Object filterValue;

File
FilterField.java

Developer's decision
Version 1

Kind of conflict
Attribute
Class signature

Chunk

Conflicting content

=======
 *
 */
public class SortField extends Field {
<<<<<<< HEAD

    private static final long serialVersionUID = 654268763477658266L;
    private static final long serialVersionUID = 654268763477658266L;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private Comparator comparator;
    private SortOrder sortOrder;

Solution content
* */ public class SortField extends Field { private static final long serialVersionUID = 654268763477658266L; private Comparator comparator; private SortOrder sortOrder;

File
SortField.java

Developer's decision
Version 1

Kind of conflict
Attribute

Chunk

Conflicting content

import org.richfaces.cdk.annotations.TagType;
import org.richfaces.event.CollapsibleSubTableToggleEvent;
import org.richfaces.event.CollapsibleSubTableToggleListener;
<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

/**
 * @author Anton Belevich

Solution content
import org.richfaces.cdk.annotations.TagType; import org.richfaces.event.CollapsibleSubTableToggleEvent; import org.richfaces.event.CollapsibleSubTableToggleListener; /** * @author Anton Belevich

File
AbstractCollapsibleSubTable.java

Developer's decision
Version 1

Kind of conflict
Other

Chunk

Conflicting content

 * @author Anton Belevich
 *
 */
<<<<<<< HEAD
@JsfComponent(
    type = AbstractCollapsibleSubTable.COMPONENT_TYPE,
    family = AbstractCollapsibleSubTable.COMPONENT_FAMILY, 
    generate = "org.richfaces.component.UICollapsibleSubTable",
    renderer = @JsfRenderer(type = "org.richfaces.CollapsibleSubTableRenderer"),
    tag = @Tag(name = "collapsibleSubTable", handler = "org.richfaces.taglib.CollapsibleSubTableHandler", type = TagType.Facelets),
    attributes = "rowKeyConverter-prop.xml"
)
=======
@JsfComponent(type = AbstractCollapsibleSubTable.COMPONENT_TYPE, family = AbstractCollapsibleSubTable.COMPONENT_FAMILY, generate = "org.richfaces.component.UICollapsibleSubTable", renderer = @JsfRenderer(type = "org.richfaces.CollapsibleSubTableRenderer"), tag = @Tag(name = "collapsibleSubTable", handler = "org.richfaces.taglib.CollapsibleSubTableHandler", type = TagType.Facelets), attributes = "rowKeyConverter-prop.xml")
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public abstract class AbstractCollapsibleSubTable extends UIDataTableBase implements Column, Expandable {
    public static final String COMPONENT_TYPE = "org.richfaces.CollapsibleSubTable";
    public static final String COMPONENT_FAMILY = UIDataTableBase.COMPONENT_FAMILY;

Solution content

 * @author Anton Belevich
 *
 */
@JsfComponent(type = AbstractCollapsibleSubTable.COMPONENT_TYPE, family = AbstractCollapsibleSubTable.COMPONENT_FAMILY, generate = "org.richfaces.component.UICollapsibleSubTable", renderer = @JsfRenderer(type = "org.richfaces.CollapsibleSubTableRenderer"), tag = @Tag(name = "collapsibleSubTable", handler = "org.richfaces.taglib.CollapsibleSubTableHandler", type = TagType.Facelets), attributes = "rowKeyConverter-prop.xml")
public abstract class AbstractCollapsibleSubTable extends UIDataTableBase implements Column, Expandable {
    public static final String COMPONENT_TYPE = "org.richfaces.CollapsibleSubTable";
    public static final String COMPONENT_FAMILY = UIDataTableBase.COMPONENT_FAMILY;

File
AbstractCollapsibleSubTable.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

    public void setSortExpression(String sortExpression) {
        throw new IllegalArgumentException("subtable is not sortable element");
    }
<<<<<<< HEAD
    
    public void addCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener) {
        addFacesListener(listener);
    }
    
=======

    public void addCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener) {
        addFacesListener(listener);
    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public void removeCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener) {
        removeFacesListener(listener);
    }

Solution content

    public void setSortExpression(String sortExpression) {
        throw new IllegalArgumentException("subtable is not sortable element");
    }

    public void addCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener) {
        addFacesListener(listener);
    }

    public void removeCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener) {
        removeFacesListener(listener);
    }

File
AbstractCollapsibleSubTable.java

Developer's decision
Version 1

Kind of conflict
Method declaration

Chunk

Conflicting content

    public void setIterationState(Object stateObject) {
        StateHolderArray stateHolderList = (StateHolderArray) stateObject;
<<<<<<< HEAD
        
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        if (stateHolderList != null && !stateHolderList.isEmpty()) {
            super.setIterationState(stateHolderList.get(0));
            getStateHelper().put(PropertyKeys.expanded, (Boolean) stateHolderList.get(1));

Solution content

    public void setIterationState(Object stateObject) {
        StateHolderArray stateHolderList = (StateHolderArray) stateObject;

        if (stateHolderList != null && !stateHolderList.isEmpty()) {
            super.setIterationState(stateHolderList.get(0));
            getStateHelper().put(PropertyKeys.expanded, (Boolean) stateHolderList.get(1));

File
AbstractCollapsibleSubTable.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

    public Object getIterationState() {
        StateHolderArray holderList = new StateHolderArray();
<<<<<<< HEAD
        
        holderList.add(super.getIterationState());
        holderList.add(getStateHelper().get(PropertyKeys.expanded));
        
=======

        holderList.add(super.getIterationState());
        holderList.add(getStateHelper().get(PropertyKeys.expanded));

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        return holderList;
    }
}

Solution content

    public Object getIterationState() {
        StateHolderArray holderList = new StateHolderArray();

        holderList.add(super.getIterationState());
        holderList.add(getStateHelper().get(PropertyKeys.expanded));

        return holderList;
    }
}

File
AbstractCollapsibleSubTable.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

 * @author Anton Belevich
 *
 */
<<<<<<< HEAD

@JsfComponent(
    type = AbstractDataGrid.COMPONENT_TYPE,
    family = AbstractDataGrid.COMPONENT_FAMILY, 
    generate = "org.richfaces.component.UIDataGrid",
    renderer = @JsfRenderer(type = "org.richfaces.DataGridRenderer"),
    tag = @Tag(name="dataGrid", handler="org.richfaces.taglib.DataGridHandler", type=TagType.Facelets),
    attributes = {"core-props.xml", "dataGrid-rows-props.xml", "rowKeyConverter-prop.xml"}
)
=======
@JsfComponent(type = AbstractDataGrid.COMPONENT_TYPE, family = AbstractDataGrid.COMPONENT_FAMILY, generate = "org.richfaces.component.UIDataGrid", renderer = @JsfRenderer(type = "org.richfaces.DataGridRenderer"), tag = @Tag(name = "dataGrid", handler = "org.richfaces.taglib.DataGridHandler", type = TagType.Facelets), attributes = {
        "core-props.xml", "dataGrid-rows-props.xml", "rowKeyConverter-prop.xml" })
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public abstract class AbstractDataGrid extends UISequence implements Row, MetaComponentResolver, MetaComponentEncoder {
    public static final String COMPONENT_TYPE = "org.richfaces.DataGrid";
    public static final String COMPONENT_FAMILY = UIDataTableBase.COMPONENT_FAMILY;

Solution content

 * @author Anton Belevich
 *
 */
@JsfComponent(type = AbstractDataGrid.COMPONENT_TYPE, family = AbstractDataGrid.COMPONENT_FAMILY, generate = "org.richfaces.component.UIDataGrid", renderer = @JsfRenderer(type = "org.richfaces.DataGridRenderer"), tag = @Tag(name = "dataGrid", handler = "org.richfaces.taglib.DataGridHandler", type = TagType.Facelets), attributes = {
        "core-props.xml", "dataGrid-rows-props.xml", "rowKeyConverter-prop.xml" })
public abstract class AbstractDataGrid extends UISequence implements Row, MetaComponentResolver, MetaComponentEncoder {
    public static final String COMPONENT_TYPE = "org.richfaces.DataGrid";
    public static final String COMPONENT_FAMILY = UIDataTableBase.COMPONENT_FAMILY;

File
AbstractDataGrid.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

import org.richfaces.application.FacesMessages;
import org.richfaces.application.MessageFactory;
import org.richfaces.application.ServiceTracker;
<<<<<<< HEAD
import org.richfaces.application.FacesMessages;
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.Facet;
import org.richfaces.cdk.annotations.JsfComponent;

Solution content

import org.richfaces.application.FacesMessages;
import org.richfaces.application.MessageFactory;
import org.richfaces.application.ServiceTracker;
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.Facet;
import org.richfaces.cdk.annotations.JsfComponent;

File
AbstractDataScroller.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

import org.richfaces.event.DataScrollEvent;
import org.richfaces.event.DataScrollListener;
import org.richfaces.event.DataScrollSource;
<<<<<<< HEAD


@JsfComponent(
    type = AbstractDataScroller.COMPONENT_TYPE,
    family = AbstractDataScroller.COMPONENT_FAMILY, 
    generate = "org.richfaces.component.UIDataScroller",
    renderer = @JsfRenderer(type = "org.richfaces.DataScrollerRenderer"),
    tag = @Tag(name="dataScroller", handler="org.richfaces.taglib.DataScrollerHandler", type=TagType.Facelets)
)
public abstract class AbstractDataScroller extends UIComponentBase implements DataScrollSource, IterationStateHolder {
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

@JsfComponent(type = AbstractDataScroller.COMPONENT_TYPE, family = AbstractDataScroller.COMPONENT_FAMILY, generate = "org.richfaces.component.UIDataScroller", renderer = @JsfRenderer(type = "org.richfaces.DataScrollerRenderer"), tag = @Tag(name = "dataScroller", handler = "org.richfaces.taglib.DataScrollerHandler", type = TagType.Facelets))
public abstract class AbstractDataScroller extends UIComponentBase implements DataScrollSource, IterationStateHolder {

Solution content

import org.richfaces.event.DataScrollEvent;
import org.richfaces.event.DataScrollListener;
import org.richfaces.event.DataScrollSource;

@JsfComponent(type = AbstractDataScroller.COMPONENT_TYPE, family = AbstractDataScroller.COMPONENT_FAMILY, generate = "org.richfaces.component.UIDataScroller", renderer = @JsfRenderer(type = "org.richfaces.DataScrollerRenderer"), tag = @Tag(name = "dataScroller", handler = "org.richfaces.taglib.DataScrollerHandler", type = TagType.Facelets))
public abstract class AbstractDataScroller extends UIComponentBase implements DataScrollSource, IterationStateHolder {

File
AbstractDataScroller.java

Developer's decision
Version 2

Kind of conflict
Annotation
Class signature

Chunk

Conflicting content

    public abstract String getLastPageMode();

    @Attribute
<<<<<<< HEAD
    public  abstract Object getRender();
=======
    public abstract Object getRender();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

    @Attribute
    public abstract int getMaxPages();

Solution content
public abstract String getLastPageMode(); @Attribute public abstract Object getRender(); @Attribute public abstract int getMaxPages();

File
AbstractDataScroller.java

Developer's decision
Version 1

Kind of conflict
Method interface

Chunk

Conflicting content

 * @author Anton Belevich
 *
 */
<<<<<<< HEAD

@JsfComponent(
    type = AbstractDataTable.COMPONENT_TYPE,
    family = AbstractDataTable.COMPONENT_FAMILY, 
    generate = "org.richfaces.component.UIDataTable",
    renderer = @JsfRenderer(type = "org.richfaces.DataTableRenderer"),
    tag = @Tag(name="dataTable", handler="org.richfaces.taglib.DataTableHandler", type=TagType.Facelets),
    attributes = "rowKeyConverter-prop.xml"
)
=======
@JsfComponent(type = AbstractDataTable.COMPONENT_TYPE, family = AbstractDataTable.COMPONENT_FAMILY, generate = "org.richfaces.component.UIDataTable", renderer = @JsfRenderer(type = "org.richfaces.DataTableRenderer"), tag = @Tag(name = "dataTable", handler = "org.richfaces.taglib.DataTableHandler", type = TagType.Facelets), attributes = "rowKeyConverter-prop.xml")
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public abstract class AbstractDataTable extends UIDataTableBase {
    public static final String COMPONENT_TYPE = "org.richfaces.DataTable";
    public static final String COMPONENT_FAMILY = UIDataTableBase.COMPONENT_FAMILY;

Solution content

 * @author Anton Belevich
 *
 */
@JsfComponent(type = AbstractDataTable.COMPONENT_TYPE, family = AbstractDataTable.COMPONENT_FAMILY, generate = "org.richfaces.component.UIDataTable", renderer = @JsfRenderer(type = "org.richfaces.DataTableRenderer"), tag = @Tag(name = "dataTable", handler = "org.richfaces.taglib.DataTableHandler", type = TagType.Facelets), attributes = "rowKeyConverter-prop.xml")
public abstract class AbstractDataTable extends UIDataTableBase {
    public static final String COMPONENT_TYPE = "org.richfaces.DataTable";
    public static final String COMPONENT_FAMILY = UIDataTableBase.COMPONENT_FAMILY;

File
AbstractDataTable.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

import javax.faces.component.visit.VisitContext;
import javax.faces.component.visit.VisitResult;
import javax.faces.context.FacesContext;
<<<<<<< HEAD
import java.io.IOException;
import java.util.Collection;
import java.util.Map;
=======

import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;
import org.richfaces.context.ExtendedVisitContext;
import org.richfaces.context.ExtendedVisitContextMode;
import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.model.SelectionMode;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

/**
 * @author Konstantin Mishin

Solution content

import org.richfaces.cdk.annotations.TagType;
import javax.faces.component.visit.VisitContext;
import javax.faces.component.visit.VisitResult;
import javax.faces.context.FacesContext;

import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.context.ExtendedVisitContext;
import org.richfaces.context.ExtendedVisitContextMode;
import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.model.SelectionMode;

/**
 * @author Konstantin Mishin

File
AbstractExtendedDataTable.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

 * @author Konstantin Mishin
 *
 */
<<<<<<< HEAD


@JsfComponent(
    type = AbstractExtendedDataTable.COMPONENT_TYPE,
    family = AbstractExtendedDataTable.COMPONENT_FAMILY, 
    generate = "org.richfaces.component.UIExtendedDataTable",
    renderer = @JsfRenderer(type = "org.richfaces.ExtendedDataTableRenderer"),
    tag = @Tag(name = "extendedDataTable", handler = "org.richfaces.taglib.ExtendedDataTableHandler", type = TagType.Facelets),
    attributes = "rowKeyConverter-prop.xml"
)
=======
@JsfComponent(type = AbstractExtendedDataTable.COMPONENT_TYPE, family = AbstractExtendedDataTable.COMPONENT_FAMILY, generate = "org.richfaces.component.UIExtendedDataTable", renderer = @JsfRenderer(type = "org.richfaces.ExtendedDataTableRenderer"), tag = @Tag(name = "extendedDataTable", handler = "org.richfaces.taglib.ExtendedDataTableHandler", type = TagType.Facelets), attributes = "rowKeyConverter-prop.xml")
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public abstract class AbstractExtendedDataTable extends UIDataTableBase implements MetaComponentResolver, MetaComponentEncoder {
    public static final String COMPONENT_TYPE = "org.richfaces.ExtendedDataTable";
    public static final String COMPONENT_FAMILY = UIDataTableBase.COMPONENT_FAMILY;

Solution content

 * @author Konstantin Mishin
 *
 */
@JsfComponent(type = AbstractExtendedDataTable.COMPONENT_TYPE, family = AbstractExtendedDataTable.COMPONENT_FAMILY, generate = "org.richfaces.component.UIExtendedDataTable", renderer = @JsfRenderer(type = "org.richfaces.ExtendedDataTableRenderer"), tag = @Tag(name = "extendedDataTable", handler = "org.richfaces.taglib.ExtendedDataTableHandler", type = TagType.Facelets), attributes = "rowKeyConverter-prop.xml")
public abstract class AbstractExtendedDataTable extends UIDataTableBase implements MetaComponentResolver, MetaComponentEncoder {
    public static final String COMPONENT_TYPE = "org.richfaces.ExtendedDataTable";
    public static final String COMPONENT_FAMILY = UIDataTableBase.COMPONENT_FAMILY;

File
AbstractExtendedDataTable.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

 */
package org.richfaces.component;

<<<<<<< HEAD
=======
import java.util.Iterator;

import javax.faces.component.UIComponent;

import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.Facet;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterators;

Solution content

 */
package org.richfaces.component;

import java.util.Iterator;

import javax.faces.component.UIComponent;

import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.Facet;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;

import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterators;

File
AbstractList.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

 * JSF component class
 *
 */
<<<<<<< HEAD
@JsfComponent(
        type = "org.richfaces.List",
        family = "org.richfaces.List",
        facets = @Facet(name = AbstractList.TERM),
        tag = @Tag(name = "list", handler = "org.richfaces.taglib.ListHandler", type = TagType.Facelets),
        renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"),
        attributes = "rowKeyConverter-prop.xml"
)
=======
@JsfComponent(type = "org.richfaces.List", family = "org.richfaces.List", facets = @Facet(name = AbstractList.TERM), tag = @Tag(name = "list", handler = "org.richfaces.taglib.ListHandler", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"), attributes = "rowKeyConverter-prop.xml")
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public abstract class AbstractList extends UISequence {
    public static final String TERM = "term";
    private static final Predicate TERM_PREDICATE = new Predicate() {

Solution content

 * JSF component class
 *
 */
@JsfComponent(type = "org.richfaces.List", family = "org.richfaces.List", facets = @Facet(name = AbstractList.TERM), tag = @Tag(name = "list", handler = "org.richfaces.taglib.ListHandler", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"), attributes = "rowKeyConverter-prop.xml")
public abstract class AbstractList extends UISequence {
    public static final String TERM = "term";
    private static final Predicate TERM_PREDICATE = new Predicate() {

File
AbstractList.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

 * @author Nick Belaevski
 *
 */
<<<<<<< HEAD
@JsfComponent(
    type = AbstractTree.COMPONENT_TYPE,
    family = AbstractTree.COMPONENT_FAMILY, 
    tag = @Tag(name = "tree", handler = "org.richfaces.view.facelets.TreeHandler"),
    renderer = @JsfRenderer(type = "org.richfaces.TreeRenderer"),
    attributes = {"ajax-props.xml", "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml", 
        "rowKeyConverter-prop.xml", "tree-serverEventListeners-props.xml"}
)
//TODO add rowData caching for wrapper events
public abstract class AbstractTree extends UIDataAdaptor implements MetaComponentResolver, MetaComponentEncoder, TreeSelectionChangeSource, TreeToggleSource {

=======
@JsfComponent(type = AbstractTree.COMPONENT_TYPE, family = AbstractTree.COMPONENT_FAMILY, tag = @Tag(name = "tree", handler = "org.richfaces.view.facelets.TreeHandler"), renderer = @JsfRenderer(type = "org.richfaces.TreeRenderer"), attributes = {
        "ajax-props.xml", "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml",
        "rowKeyConverter-prop.xml", "tree-serverEventListeners-props.xml" })
// TODO add rowData caching for wrapper events
public abstract class AbstractTree extends UIDataAdaptor implements MetaComponentResolver, MetaComponentEncoder,
    TreeSelectionChangeSource, TreeToggleSource {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public static final String COMPONENT_TYPE = "org.richfaces.Tree";
    public static final String COMPONENT_FAMILY = "org.richfaces.Tree";
    public static final String SELECTION_META_COMPONENT_ID = "selection";

Solution content

 * @author Nick Belaevski
 *
 */
@JsfComponent(type = AbstractTree.COMPONENT_TYPE, family = AbstractTree.COMPONENT_FAMILY, tag = @Tag(name = "tree", handler = "org.richfaces.view.facelets.TreeHandler"), renderer = @JsfRenderer(type = "org.richfaces.TreeRenderer"), attributes = {
        "ajax-props.xml", "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml",
        "rowKeyConverter-prop.xml", "tree-serverEventListeners-props.xml" })
// TODO add rowData caching for wrapper events
public abstract class AbstractTree extends UIDataAdaptor implements MetaComponentResolver, MetaComponentEncoder,
    TreeSelectionChangeSource, TreeToggleSource {
    public static final String COMPONENT_TYPE = "org.richfaces.Tree";
    public static final String COMPONENT_FAMILY = "org.richfaces.Tree";
    public static final String SELECTION_META_COMPONENT_ID = "selection";

File
AbstractTree.java

Developer's decision
Version 1

Kind of conflict
Annotation
Class signature
Comment

Chunk

Conflicting content

    private enum PropertyKeys {
        selection
    }
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private transient TreeRange treeRange;
    private transient UIComponent currentComponent = this;
    private transient Map declatariveModelsMap = null;

Solution content
private enum PropertyKeys { selection } private transient TreeRange treeRange; private transient UIComponent currentComponent = this; private transient Map declatariveModelsMap = null;

File
AbstractTree.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

            if (value instanceof ExtendedDataModel) {
                dataModel = (ExtendedDataModel) value;
            } else {
<<<<<<< HEAD
                throw new IllegalArgumentException(
                    MessageFormat.format("TreeDataModel implementation {0} is not a subclass of ExtendedDataModel", 
                            value.getClass().getName()));
=======
                throw new IllegalArgumentException(MessageFormat.format(
                    "TreeDataModel implementation {0} is not a subclass of ExtendedDataModel", value.getClass().getName()));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            }
        } else {
            dataModel = new SwingTreeNodeDataModelImpl();

Solution content

            if (value instanceof ExtendedDataModel) {
                dataModel = (ExtendedDataModel) value;
            } else {
                throw new IllegalArgumentException(MessageFormat.format(
                    "TreeDataModel implementation {0} is not a subclass of ExtendedDataModel", value.getClass().getName()));
            }
        } else {
            dataModel = new SwingTreeNodeDataModelImpl();

File
AbstractTree.java

Developer's decision
Version 1

Kind of conflict
Throw statement

Chunk

Conflicting content
} private Converter rowKeyConverter; <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 @Attribute public Converter getRowKeyConverter() { if (this.rowKeyConverter != null) {

Solution content
} private Converter rowKeyConverter; @Attribute public Converter getRowKeyConverter() { if (this.rowKeyConverter != null) {

File
AbstractTreeModelAdaptor.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

 * @author Nick Belaevski
 *
 */
<<<<<<< HEAD
@JsfComponent(
    type = AbstractTreeNode.COMPONENT_TYPE,
    family = AbstractTreeNode.COMPONENT_FAMILY, 
    tag = @Tag(name = "treeNode", handler = "org.richfaces.view.facelets.TreeNodeHandler"),
    renderer = @JsfRenderer(type = "org.richfaces.TreeNodeRenderer"),
    attributes = {"events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml", "treeNode-serverEventListeners-props.xml"}
)
public abstract class AbstractTreeNode extends UIComponentBase implements MetaComponentResolver, MetaComponentEncoder, IterationStateHolder, TreeToggleSource {

=======
@JsfComponent(type = AbstractTreeNode.COMPONENT_TYPE, family = AbstractTreeNode.COMPONENT_FAMILY, tag = @Tag(name = "treeNode", handler = "org.richfaces.view.facelets.TreeNodeHandler"), renderer = @JsfRenderer(type = "org.richfaces.TreeNodeRenderer"), attributes = {
        "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml",
        "treeNode-serverEventListeners-props.xml" })
public abstract class AbstractTreeNode extends UIComponentBase implements MetaComponentResolver, MetaComponentEncoder,
    IterationStateHolder, TreeToggleSource {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public static final String COMPONENT_TYPE = "org.richfaces.TreeNode";
    public static final String COMPONENT_FAMILY = "org.richfaces.TreeNode";
    public static final String SUBTREE_META_COMPONENT_ID = "subtree";

Solution content

 * @author Nick Belaevski
 *
 */
@JsfComponent(type = AbstractTreeNode.COMPONENT_TYPE, family = AbstractTreeNode.COMPONENT_FAMILY, tag = @Tag(name = "treeNode", handler = "org.richfaces.view.facelets.TreeNodeHandler"), renderer = @JsfRenderer(type = "org.richfaces.TreeNodeRenderer"), attributes = {
        "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml",
        "treeNode-serverEventListeners-props.xml" })
public abstract class AbstractTreeNode extends UIComponentBase implements MetaComponentResolver, MetaComponentEncoder,
    IterationStateHolder, TreeToggleSource {
    public static final String COMPONENT_TYPE = "org.richfaces.TreeNode";
    public static final String COMPONENT_FAMILY = "org.richfaces.TreeNode";
    public static final String SUBTREE_META_COMPONENT_ID = "subtree";

File
AbstractTreeNode.java

Developer's decision
Version 1

Kind of conflict
Annotation
Class signature

Chunk

Conflicting content

import javax.faces.component.UIComponent;

import com.google.common.collect.AbstractIterator;
<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

/**
 * Iterator for all children table columns.

Solution content
import javax.faces.component.UIComponent; import com.google.common.collect.AbstractIterator; /** * Iterator for all children table columns.

File
DataTableColumnsIterator.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

 *
 */
class DataTableColumnsIterator extends AbstractIterator {
<<<<<<< HEAD

    private Iterator childrenIterator;
    
=======
    private Iterator childrenIterator;

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public DataTableColumnsIterator(UIComponent component) {
        super();
        this.childrenIterator = component.getChildren().iterator();

Solution content

 *
 */
class DataTableColumnsIterator extends AbstractIterator {
    private Iterator childrenIterator;

    public DataTableColumnsIterator(UIComponent component) {
        super();
        this.childrenIterator = component.getChildren().iterator();

File
DataTableColumnsIterator.java

Developer's decision
Version 1

Kind of conflict
Attribute

Chunk

Conflicting content

    protected UIComponent computeNext() {
        while (childrenIterator.hasNext()) {
            UIComponent child = childrenIterator.next();
<<<<<<< HEAD
            
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            if (child instanceof UIColumn || child instanceof Column) {
                return child;
            }

Solution content
protected UIComponent computeNext() { while (childrenIterator.hasNext()) { UIComponent child = childrenIterator.next(); if (child instanceof UIColumn \|\| child instanceof Column) { return child; }

File
DataTableColumnsIterator.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
return child; } } <<<<<<< HEAD return endOfData(); } ======= return endOfData(); } >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 }

Solution content
return child; } } return endOfData(); } }

File
DataTableColumnsIterator.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Return statement

Chunk

Conflicting content

import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Iterators;

<<<<<<< HEAD

class DataTableFixedChildrenIterator extends AbstractIterator {

    private Iterator facetsIterator;
    
    private Iterator dataTableChildren;
    
    private Iterator columnFacets = Iterators.emptyIterator();
    
    public DataTableFixedChildrenIterator(UIComponent dataTable) {
        super();
        
=======
class DataTableFixedChildrenIterator extends AbstractIterator {
    private Iterator facetsIterator;
    private Iterator dataTableChildren;
    private Iterator columnFacets = Iterators.emptyIterator();

    public DataTableFixedChildrenIterator(UIComponent dataTable) {
        super();

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        this.facetsIterator = dataTable.getFacets().values().iterator();
        this.dataTableChildren = dataTable.getChildren().iterator();
    }

Solution content

import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Iterators;

class DataTableFixedChildrenIterator extends AbstractIterator {
    private Iterator facetsIterator;
    private Iterator dataTableChildren;
    private Iterator columnFacets = Iterators.emptyIterator();

    public DataTableFixedChildrenIterator(UIComponent dataTable) {
        super();

        this.facetsIterator = dataTable.getFacets().values().iterator();
        this.dataTableChildren = dataTable.getChildren().iterator();
    }

File
DataTableFixedChildrenIterator.java

Developer's decision
Version 1

Kind of conflict
Attribute
Class signature
Method invocation
Method signature

Chunk

Conflicting content

        if (facetsIterator.hasNext()) {
            return facetsIterator.next();
        }
<<<<<<< HEAD
        
        while (columnFacets.hasNext() || dataTableChildren.hasNext()) {
            if (columnFacets.hasNext()) {
                return columnFacets.next();
            }
            
            UIComponent child = dataTableChildren.next();
            if (child instanceof UIColumn || child instanceof AbstractColumn) {
                columnFacets = child.getFacets().values().iterator();
            }
=======

        while (columnFacets.hasNext() || dataTableChildren.hasNext()) {
            if (columnFacets.hasNext()) {
                return columnFacets.next();
            }

            UIComponent child = dataTableChildren.next();
            if (child instanceof UIColumn || child instanceof AbstractColumn) {
                columnFacets = child.getFacets().values().iterator();
            }
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        }

        dataTableChildren = Iterators.emptyIterator();

Solution content

        if (facetsIterator.hasNext()) {
            return facetsIterator.next();
        }

        while (columnFacets.hasNext() || dataTableChildren.hasNext()) {
            if (columnFacets.hasNext()) {
                return columnFacets.next();
            }

            UIComponent child = dataTableChildren.next();
            if (child instanceof UIColumn || child instanceof AbstractColumn) {
                columnFacets = child.getFacets().values().iterator();
            }
        }

        dataTableChildren = Iterators.emptyIterator();

File
DataTableFixedChildrenIterator.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation
Variable
While statement

Chunk

Conflicting content

    }

    protected Iterator dataChildren() {
<<<<<<< HEAD
        return new DataTableDataChilderIterator(this);
=======
        return new DataTableDataChildrenIterator(this);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }

    public boolean isColumnFacetPresent(String facetName) {

Solution content
} protected Iterator dataChildren() { return new DataTableDataChildrenIterator(this); } public boolean isColumnFacetPresent(String facetName) {

File
UIDataTableBase.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Return statement

Chunk

Conflicting content

<<<<<<< HEAD

        return super.visitFixedChildren(visitContext, callback);
    }
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    @Override
    protected void restoreChildState(FacesContext facesContext) {
        // Forces client id to be reset

Solution content
return super.visitFixedChildren(visitContext, callback); } @Override protected void restoreChildState(FacesContext facesContext) { // Forces client id to be reset

File
UIDataTableBase.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        for (UIComponent child : getChildren()) {
            child.setId(child.getId());
        }
<<<<<<< HEAD
        
        super.restoreChildState(facesContext);
    }
    
=======

        super.restoreChildState(facesContext);
    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    protected boolean visitDataChildren(VisitContext visitContext, final VisitCallback callback, boolean visitRows) {
        if (visitContext instanceof ExtendedVisitContext && visitRows) {
            ExtendedVisitContext extendedVisitContext = (ExtendedVisitContext) visitContext;

Solution content

        for (UIComponent child : getChildren()) {
            child.setId(child.getId());
        }

        super.restoreChildState(facesContext);
    }

    protected boolean visitDataChildren(VisitContext visitContext, final VisitCallback callback, boolean visitRows) {
        if (visitContext instanceof ExtendedVisitContext && visitRows) {
            ExtendedVisitContext extendedVisitContext = (ExtendedVisitContext) visitContext;

File
UIDataTableBase.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
public static Set getSupportedMetaComponents() { return SUPPORTED_META_COMPONENTS; } <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 }

Solution content
public static Set getSupportedMetaComponents() { return SUPPORTED_META_COMPONENTS; } }

File
UIDataTableBase.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

 */
public class ClassicTreeNodeDataModelImpl extends NodesTreeSequenceKeyModel {
    private static final Converter DEFAULT_CONVERTER = new StringSequenceRowKeyConverter();
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public boolean isLeaf() {
        return getData().isLeaf();
    }

Solution content

 */
public class ClassicTreeNodeDataModelImpl extends NodesTreeSequenceKeyModel {
    private static final Converter DEFAULT_CONVERTER = new StringSequenceRowKeyConverter();

    public boolean isLeaf() {
        return getData().isLeaf();
    }

File
ClassicTreeNodeDataModelImpl.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
*/ public class ClassicTreeNodeTuplesIterator extends BaseTupleIterator { private TreeNode treeNode; <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 private Iterator

Solution content
*/ public class ClassicTreeNodeTuplesIterator extends BaseTupleIterator { private TreeNode treeNode; private Iterator

File
ClassicTreeNodeTuplesIterator.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

    public void encodeFirstRowStart(ResponseWriter writer, FacesContext context, String parentId, int currentRow,
        UIComponent component) throws IOException {
        writer.startElement(HtmlConstants.TR_ELEMENT, component);
<<<<<<< HEAD
        String styleClass = concatClasses(getRowClass(context, parentId), getFirstRowClass(context, parentId), component.getAttributes().get(ROW_CLASS));
=======
        writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, parentId + ":" + currentRow, null);
        String styleClass = concatClasses(getRowClass(context, parentId), getFirstRowClass(context, parentId), component
            .getAttributes().get(ROW_CLASS));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        if (styleClass.length() > 0) {
            writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, styleClass, null);
        }

Solution content

    public void encodeFirstRowStart(ResponseWriter writer, FacesContext context, String parentId, int currentRow,
        UIComponent component) throws IOException {
        writer.startElement(HtmlConstants.TR_ELEMENT, component);
        writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, parentId + ":" + currentRow, null);
        String styleClass = concatClasses(getRowClass(context, parentId), getFirstRowClass(context, parentId), component
            .getAttributes().get(ROW_CLASS));
        if (styleClass.length() > 0) {
            writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, styleClass, null);
        }

File
AbstractTableBaseRenderer.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

    protected void doDecode(FacesContext context, UIComponent component) {
        decodeSortingFiltering(context, component);
    }
<<<<<<< HEAD
    
    protected void putRowStylesIntoContext(FacesContext facesContext, RowHolderBase rowHolder) {
        UIDataTableBase dataTableBase = (UIDataTableBase)rowHolder.getRow();
=======

    protected void putRowStylesIntoContext(FacesContext facesContext, RowHolderBase rowHolder) {
        UIDataTableBase dataTableBase = (UIDataTableBase) rowHolder.getRow();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

        String rowClass = getRowSkinClass();
        String cellClass = getCellSkinClass();

Solution content

    protected void doDecode(FacesContext context, UIComponent component) {
        decodeSortingFiltering(context, component);
    }

    protected void putRowStylesIntoContext(FacesContext facesContext, RowHolderBase rowHolder) {
        UIDataTableBase dataTableBase = (UIDataTableBase) rowHolder.getRow();

        String rowClass = getRowSkinClass();
        String cellClass = getCellSkinClass();

File
AbstractTableRenderer.java

Developer's decision
Version 1

Kind of conflict
Cast expression
Method signature
Variable

Chunk

Conflicting content

        cellClass = mergeStyleClasses(CELL_CLASS_KEY, cellClass, dataTableBase);
        firstClass = mergeStyleClasses(FIRST_ROW_CLASS_KEY, firstClass, dataTableBase);

<<<<<<< HEAD
        saveRowStyles(facesContext, dataTableBase.getClientId(facesContext), firstClass, rowClass, cellClass);    	
=======
        saveRowStyles(facesContext, dataTableBase.getClientId(facesContext), firstClass, rowClass, cellClass);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }

    protected boolean isEncodeHeaders(UIDataTableBase table) {

Solution content

        cellClass = mergeStyleClasses(CELL_CLASS_KEY, cellClass, dataTableBase);
        firstClass = mergeStyleClasses(FIRST_ROW_CLASS_KEY, firstClass, dataTableBase);

        saveRowStyles(facesContext, dataTableBase.getClientId(facesContext), firstClass, rowClass, cellClass);
    }

    protected boolean isEncodeHeaders(UIDataTableBase table) {

File
AbstractTableRenderer.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

        encodeBeforeRows(writer, facesContext, dataTableBase, encodeParentTBody, encodePartialUpdate);

        if (rowCount > 0) {
<<<<<<< HEAD
            processRows(writer, facesContext, dataTableBase, new Object[]{encodePartialUpdate, encodeParentTBody});
        } else {
            encodeNoDataFacetOrLabel(writer,facesContext,dataTableBase);
        }
       
        
=======
            processRows(writer, facesContext, dataTableBase, new Object[] { encodePartialUpdate, encodeParentTBody });
        } else {
            encodeNoDataFacetOrLabel(writer, facesContext, dataTableBase);
        }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        encodeAfterRows(writer, facesContext, dataTableBase, encodeParentTBody, encodePartialUpdate);

        if (encodePartialUpdate) {

Solution content

        encodeBeforeRows(writer, facesContext, dataTableBase, encodeParentTBody, encodePartialUpdate);

        if (rowCount > 0) {
            processRows(writer, facesContext, dataTableBase, new Object[] { encodePartialUpdate, encodeParentTBody });
        } else {
            encodeNoDataFacetOrLabel(writer, facesContext, dataTableBase);
        }

        encodeAfterRows(writer, facesContext, dataTableBase, encodeParentTBody, encodePartialUpdate);

        if (encodePartialUpdate) {

File
AbstractTableRenderer.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

<<<<<<< HEAD
        }
        writer.endElement(HtmlConstants.TD_ELEM);
        writer.endElement(HtmlConstants.TR_ELEMENT);

    }
           
=======
    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
        if (component instanceof UIDataTableBase) {
            encodeTableRows(writer, context, (UIDataTableBase) component, false);

Solution content

        }
        writer.endElement(HtmlConstants.TD_ELEM);
        writer.endElement(HtmlConstants.TR_ELEMENT);
    }

    protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
        if (component instanceof UIDataTableBase) {
            encodeTableRows(writer, context, (UIDataTableBase) component, false);

File
AbstractTableRenderer.java

Developer's decision
Version 1

Kind of conflict
Other

Chunk

Conflicting content

            partialEnd(facesContext);
        }

<<<<<<< HEAD
        if (isColumnGroup){
=======
        if (isColumnGroup) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            writer.endElement(HtmlConstants.TR_ELEMENT);
        } else {
            writer.endElement(element);

Solution content
partialEnd(facesContext); } if (isColumnGroup) { writer.endElement(HtmlConstants.TR_ELEMENT); } else { writer.endElement(element);

File
AbstractTableRenderer.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

 */
package org.richfaces.renderkit;

<<<<<<< HEAD
import org.ajax4jsf.javascript.JSFunction;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.component.AbstractCollapsibleSubTable;
import org.richfaces.component.AbstractDataTable;
import org.richfaces.component.Row;
import org.richfaces.component.UIDataTableBase;
import org.richfaces.event.CollapsibleSubTableToggleEvent;
import org.richfaces.renderkit.util.AjaxRendererUtils;
=======
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;

Solution content

 */
package org.richfaces.renderkit;

import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;

File
CollapsibleSubTableRenderer.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

            if (newValue < 1) {
                isExpanded = false;
<<<<<<< HEAD
            } 
            
            if(subTable.isExpanded() != isExpanded) {
=======
            }

            if (subTable.isExpanded() != isExpanded) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                new CollapsibleSubTableToggleEvent(subTable, isExpanded, togglerId).queue();
            }
        }

Solution content
if (newValue < 1) { isExpanded = false; } if (subTable.isExpanded() != isExpanded) { new CollapsibleSubTableToggleEvent(subTable, isExpanded, togglerId).queue(); } }

File
CollapsibleSubTableRenderer.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

    public void encodeRow(ResponseWriter writer, FacesContext facesContext, RowHolderBase holder) throws IOException {
        RowHolder rowHolder = (RowHolder) holder;
        Row row = rowHolder.getRow();
<<<<<<< HEAD
        putRowStylesIntoContext(facesContext, rowHolder);    
=======
        putRowStylesIntoContext(facesContext, rowHolder);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        rowHolder.setRowStart(true);
        Iterator components = row.columns();
        if (rowHolder.isUpdatePartial()) {

Solution content

    public void encodeRow(ResponseWriter writer, FacesContext facesContext, RowHolderBase holder) throws IOException {
        RowHolder rowHolder = (RowHolder) holder;
        Row row = rowHolder.getRow();
        putRowStylesIntoContext(facesContext, rowHolder);
        rowHolder.setRowStart(true);
        Iterator components = row.columns();
        if (rowHolder.isUpdatePartial()) {

File
CollapsibleSubTableRenderer.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

        if (label != null && label.trim().length() > 0) {
            writer.startElement(HtmlConstants.A_ELEMENT, control);
            writer.writeAttribute(HtmlConstants.HREF_ATTR, "javascript:void(0);", null);
<<<<<<< HEAD
            writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-csttg-lnk", null); 
=======
            writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-csttg-lnk", null);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            writer.writeText(label, null);
            writer.endElement(HtmlConstants.A_ELEMENT);
        }

Solution content

        if (label != null && label.trim().length() > 0) {
            writer.startElement(HtmlConstants.A_ELEMENT, control);
            writer.writeAttribute(HtmlConstants.HREF_ATTR, "javascript:void(0);", null);
            writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-csttg-lnk", null);
            writer.writeText(label, null);
            writer.endElement(HtmlConstants.A_ELEMENT);
        }

File
CollapsibleSubTableTogglerRendererBase.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

        String classes = concatClasses("rf-dg", attributes.get(HtmlConstants.STYLE_CLASS_ATTR));
        writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, classes, null);
        RenderKitUtils.renderAttribute(facesContext, "style", attributes.get(HtmlConstants.STYLE_ATTRIBUTE));
<<<<<<< HEAD
        RenderKitUtils.renderAttribute(facesContext, HtmlConstants.TITLE_ATTRIBUTE, attributes.get(HtmlConstants.TITLE_ATTRIBUTE));
=======
        RenderKitUtils.renderAttribute(facesContext, HtmlConstants.TITLE_ATTRIBUTE,
            attributes.get(HtmlConstants.TITLE_ATTRIBUTE));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        encodeCaption(writer, facesContext, dataGrid);
        encodeHeader(writer, facesContext, dataGrid, false);
        encodeFooter(writer, facesContext, dataGrid, false);

Solution content

        String classes = concatClasses("rf-dg", attributes.get(HtmlConstants.STYLE_CLASS_ATTR));
        writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, classes, null);
        RenderKitUtils.renderAttribute(facesContext, "style", attributes.get(HtmlConstants.STYLE_ATTRIBUTE));
        RenderKitUtils.renderAttribute(facesContext, HtmlConstants.TITLE_ATTRIBUTE,
            attributes.get(HtmlConstants.TITLE_ATTRIBUTE));
        encodeCaption(writer, facesContext, dataGrid);
        encodeHeader(writer, facesContext, dataGrid, false);
        encodeFooter(writer, facesContext, dataGrid, false);

File
DataGridRenderer.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

        int cell = rowHolder.getProcessCell();
        int columns = dataGrid.getColumns();
        int rest = columns - cell;
<<<<<<< HEAD
        
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        for (int i = 0; i < rest; i++) {
            writer.startElement(HtmlConstants.TD_ELEM, dataGrid);
            writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-c", null);

Solution content

        int cell = rowHolder.getProcessCell();
        int columns = dataGrid.getColumns();
        int rest = columns - cell;

        for (int i = 0; i < rest; i++) {
            writer.startElement(HtmlConstants.TD_ELEM, dataGrid);
            writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-c", null);

File
DataGridRenderer.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

            throws IOException {
            org.richfaces.component.AbstractColumn column = (org.richfaces.component.AbstractColumn) component;
            writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, column.getClientId(context), null);
<<<<<<< HEAD
=======
        }

        public void end(ResponseWriter writer, FacesContext context, UIComponent component, Object[] params) throws IOException {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        }
    }

Solution content

            throws IOException {
            org.richfaces.component.AbstractColumn column = (org.richfaces.component.AbstractColumn) component;
            writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, column.getClientId(context), null);
        }

        public void end(ResponseWriter writer, FacesContext context, UIComponent component, Object[] params) throws IOException {
        }
    }

File
DataTableRenderer.java

Developer's decision
Version 2

Kind of conflict
Method signature

Chunk

Conflicting content

        }
    }

<<<<<<< HEAD
        public void end(ResponseWriter writer, FacesContext context, UIComponent component, Object [] params) throws IOException {
=======
    protected void doDecode(FacesContext context, final UIComponent component) {
        super.doDecode(context, component);

        if ((null == context) || (null == component)) {
            throw new NullPointerException();
        }

        if (component instanceof ClientBehaviorHolder) {
            final Map> behaviors = ((ClientBehaviorHolder) component).getClientBehaviors();

            if (behaviors == null || behaviors.isEmpty()) {
                return;
            }

            Map parametersMap = context.getExternalContext().getRequestParameterMap();
            final String behaviorEvent = parametersMap.get(BEHAVIOR_EVENT_NAME);

            if (!behaviorEvent.startsWith(ROW)) {
                return;
            }

            String behaviorSourceId = RenderKitUtils.getBehaviorSourceId(context);

            ((UIDataAdaptor) component).invokeOnRow(context, behaviorSourceId, new ContextCallback() {
                public void invokeContextCallback(FacesContext context, UIComponent target) {
                    if (target.equals(component)) {
                        List behaviorsForEvent = behaviors.get(behaviorEvent);
                        if (behaviorsForEvent != null && !behaviorsForEvent.isEmpty()) {
                            for (ClientBehavior behavior : behaviorsForEvent) {
                                behavior.decode(context, component);
                            }
                        }
                    }
                }
            });
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        }
    }

Solution content

        }
    }

    protected void doDecode(FacesContext context, final UIComponent component) {
        super.doDecode(context, component);

        if ((null == context) || (null == component)) {
            throw new NullPointerException();
        }

        if (component instanceof ClientBehaviorHolder) {
            final Map> behaviors = ((ClientBehaviorHolder) component).getClientBehaviors();

            if (behaviors == null || behaviors.isEmpty()) {
                return;
            }

            Map parametersMap = context.getExternalContext().getRequestParameterMap();
            final String behaviorEvent = parametersMap.get(BEHAVIOR_EVENT_NAME);

            if (!behaviorEvent.startsWith(ROW)) {
                return;
            }

            String behaviorSourceId = RenderKitUtils.getBehaviorSourceId(context);

            ((UIDataAdaptor) component).invokeOnRow(context, behaviorSourceId, new ContextCallback() {
                public void invokeContextCallback(FacesContext context, UIComponent target) {
                    if (target.equals(component)) {
                        List behaviorsForEvent = behaviors.get(behaviorEvent);
                        if (behaviorsForEvent != null && !behaviorsForEvent.isEmpty()) {
                            for (ClientBehavior behavior : behaviorsForEvent) {
                                behavior.decode(context, component);
                            }
                        }
                    }
                }
            });
        }
    }

File
DataTableRenderer.java

Developer's decision
Version 2

Kind of conflict
If statement
Method invocation
Method signature
Variable

Chunk

Conflicting content

                        } 
                                encodeTableBodyEnd(writer);
                                tbodyStart = false;
                            }
<<<<<<< HEAD
                        rowHolder.setRowStart(true);
                        rowHolder.resetProcessCell();
                    }
                    
=======
                        }
                        rowHolder.setRowStart(true);
                        rowHolder.resetProcessCell();
                    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                    if (isSubtable && partialUpdate) {
                        partialEnd(facesContext);
                    }

Solution content
encodeTableBodyEnd(writer); tbodyStart = false; } } rowHolder.setRowStart(true); rowHolder.resetProcessCell(); } if (isSubtable && partialUpdate) { partialEnd(facesContext); }

File
DataTableRenderer.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

        return true;
    }

<<<<<<< HEAD
    public void encodeClientScript(ResponseWriter writer, FacesContext facesContext, UIDataTableBase dataTableBase) throws IOException {
=======
    public void encodeClientScript(ResponseWriter writer, FacesContext facesContext, UIDataTableBase dataTableBase)
        throws IOException {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        AbstractDataTable dataTable = (AbstractDataTable) dataTableBase;

        writer.startElement(HtmlConstants.SCRIPT_ELEM, dataTable);

Solution content

        return true;
    }

    public void encodeClientScript(ResponseWriter writer, FacesContext facesContext, UIDataTableBase dataTableBase)
        throws IOException {
        AbstractDataTable dataTable = (AbstractDataTable) dataTableBase;

        writer.startElement(HtmlConstants.SCRIPT_ELEM, dataTable);

File
DataTableRenderer.java

Developer's decision
Version 1

Kind of conflict
Method signature

Chunk

Conflicting content

            UIComponent column = (UIComponent) columns.next();
            if (column.isRendered()) {
                writer.startElement(HtmlConstants.TD_ELEM, table);
<<<<<<< HEAD
                
                String columnClass = concatClasses(getColumnClass(rowHolder, columnNumber), 
=======

                String columnClass = concatClasses(getColumnClass(rowHolder, columnNumber),
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                    column.getAttributes().get(HtmlConstants.STYLE_CLASS_ATTR));
                if (!"".equals(columnClass)) {
                    writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, columnClass, null);

Solution content

            UIComponent column = (UIComponent) columns.next();
            if (column.isRendered()) {
                writer.startElement(HtmlConstants.TD_ELEM, table);

                String columnClass = concatClasses(getColumnClass(rowHolder, columnNumber),
                    column.getAttributes().get(HtmlConstants.STYLE_CLASS_ATTR));
                if (!"".equals(columnClass)) {
                    writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, columnClass, null);

File
ExtendedDataTableRenderer.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

                if (!"".equals(columnClass)) {
                    writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, columnClass, null);
                }
<<<<<<< HEAD
                
                String columnStyle = (String)column.getAttributes().get(HtmlConstants.STYLE_ATTRIBUTE);
                if (!"".equals(columnStyle)) {
                    writer.writeAttribute(HtmlConstants.STYLE_ATTRIBUTE, columnStyle, null);
                }
                
=======

                String columnStyle = (String) column.getAttributes().get(HtmlConstants.STYLE_ATTRIBUTE);
                if (!"".equals(columnStyle)) {
                    writer.writeAttribute(HtmlConstants.STYLE_ATTRIBUTE, columnStyle, null);
                }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                columnNumber++;

                writer.startElement(HtmlConstants.DIV_ELEM, table);

Solution content

                if (!"".equals(columnClass)) {
                    writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, columnClass, null);
                }

                String columnStyle = (String) column.getAttributes().get(HtmlConstants.STYLE_ATTRIBUTE);
                if (!"".equals(columnStyle)) {
                    writer.writeAttribute(HtmlConstants.STYLE_ATTRIBUTE, columnStyle, null);
                }

                columnNumber++;

                writer.startElement(HtmlConstants.DIV_ELEM, table);

File
ExtendedDataTableRenderer.java

Developer's decision
Version 1

Kind of conflict
Cast expression
If statement
Variable

Chunk

Conflicting content

import org.richfaces.component.AbstractCollapsibleSubTable;
import org.richfaces.view.facelets.RowKeyConverterRule;
<<<<<<< HEAD

import javax.faces.view.facelets.*;
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

/**
 * @author Anton Belevich

Solution content

import javax.faces.view.facelets.ComponentConfig;
import javax.faces.view.facelets.ComponentHandler;
import javax.faces.view.facelets.FaceletContext;
import javax.faces.view.facelets.MetaRule;
import javax.faces.view.facelets.MetaRuleset;
import javax.faces.view.facelets.Metadata;
import javax.faces.view.facelets.MetadataTarget;
import javax.faces.view.facelets.TagAttribute;

import org.richfaces.component.AbstractCollapsibleSubTable;
import org.richfaces.view.facelets.RowKeyConverterRule;

/**
 * @author Anton Belevich

File
CollapsibleSubTableHandler.java

Developer's decision
Manual

Kind of conflict
Import

Chunk

Conflicting content

 *
 */
public class CollapsibleSubTableHandler extends ComponentHandler {
<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public CollapsibleSubTableHandler(ComponentConfig config) {
        super(config);
    }

Solution content
* */ public class CollapsibleSubTableHandler extends ComponentHandler { public CollapsibleSubTableHandler(ComponentConfig config) { super(config); }

File
CollapsibleSubTableHandler.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

    }

    static class CollapsibleSubTableMapper extends Metadata {
<<<<<<< HEAD

        private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.CollapsibleSubTableToggleEvent.class };

=======
        private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.CollapsibleSubTableToggleEvent.class };
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        private final TagAttribute attribute;

        public CollapsibleSubTableMapper(TagAttribute attribute) {

Solution content

    }

    static class CollapsibleSubTableMapper extends Metadata {
        private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.CollapsibleSubTableToggleEvent.class };
        private final TagAttribute attribute;

        public CollapsibleSubTableMapper(TagAttribute attribute) {

File
CollapsibleSubTableHandler.java

Developer's decision
Version 1

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content

        }

        public void applyMetadata(FaceletContext ctx, Object instance) {
<<<<<<< HEAD
            ((AbstractCollapsibleSubTable) instance).addCollapsibleSubTableToggleListener((new MethodExpressionToggleListener(this.attribute.getMethodExpression(ctx, null, SIGNATURE))));
=======
            ((AbstractCollapsibleSubTable) instance).addCollapsibleSubTableToggleListener((new MethodExpressionToggleListener(
                this.attribute.getMethodExpression(ctx, null, SIGNATURE))));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        }
    }
}

Solution content

        }

        public void applyMetadata(FaceletContext ctx, Object instance) {
            ((AbstractCollapsibleSubTable) instance).addCollapsibleSubTableToggleListener((new MethodExpressionToggleListener(
                this.attribute.getMethodExpression(ctx, null, SIGNATURE))));
        }
    }
}

File
CollapsibleSubTableHandler.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

        MetaRuleset metaRuleset = super.createMetaRuleset(type);
        metaRuleset.alias(ELEMENTS, ROWS);
        metaRuleset.addRule(RowKeyConverterRule.INSTANCE);
<<<<<<< HEAD
        return metaRuleset; 
=======
        return metaRuleset;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }
}

Solution content
MetaRuleset metaRuleset = super.createMetaRuleset(type); metaRuleset.alias(ELEMENTS, ROWS); metaRuleset.addRule(RowKeyConverterRule.INSTANCE); return metaRuleset; } }

File
DataGridHandler.java

Developer's decision
Version 1

Kind of conflict
Return statement
Variable

Chunk

Conflicting content

    };

    private static final class ScrollListenerMapper extends Metadata {
<<<<<<< HEAD

        private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.DataScrollEvent.class };

=======
        private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.DataScrollEvent.class };
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        private final TagAttribute attribute;

        public ScrollListenerMapper(TagAttribute attribute) {

Solution content

    };

    private static final class ScrollListenerMapper extends Metadata {
        private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.DataScrollEvent.class };
        private final TagAttribute attribute;

        public ScrollListenerMapper(TagAttribute attribute) {

File
DataScrollerHandler.java

Developer's decision
Version 1

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content

        @Override
        public void applyMetadata(FaceletContext ctx, Object instance) {
<<<<<<< HEAD
                                                                    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            ((AbstractDataScroller) instance).addScrollListener((new MethodExpressionScrollListener(this.attribute
                .getMethodExpression(ctx, null, SIGNATURE))));
        }

Solution content

        @Override
        public void applyMetadata(FaceletContext ctx, Object instance) {

            ((AbstractDataScroller) instance).addScrollListener((new MethodExpressionScrollListener(this.attribute
                .getMethodExpression(ctx, null, SIGNATURE))));
        }

File
DataScrollerHandler.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

import org.richfaces.component.AbstractDataTable;
import org.richfaces.view.facelets.RowKeyConverterRule;
<<<<<<< HEAD

import javax.faces.view.facelets.*;
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

/**
 * @author Anton Belevich

Solution content

import javax.faces.view.facelets.ComponentConfig;
import javax.faces.view.facelets.ComponentHandler;
import javax.faces.view.facelets.FaceletContext;
import javax.faces.view.facelets.MetaRule;
import javax.faces.view.facelets.MetaRuleset;
import javax.faces.view.facelets.Metadata;
import javax.faces.view.facelets.MetadataTarget;
import javax.faces.view.facelets.TagAttribute;

import org.richfaces.component.AbstractDataTable;
import org.richfaces.view.facelets.RowKeyConverterRule;

/**
 * @author Anton Belevich

File
DataTableHandler.java

Developer's decision
Manual

Kind of conflict
Import

Chunk

Conflicting content
* */ public class DataTableHandler extends ComponentHandler { <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 public DataTableHandler(ComponentConfig config) { super(config); }

Solution content
* */ public class DataTableHandler extends ComponentHandler { public DataTableHandler(ComponentConfig config) { super(config); }

File
DataTableHandler.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

 *
 */
public class MethodExpressionScrollListener implements DataScrollListener {
<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private MethodExpression methodExpression;

    public MethodExpressionScrollListener() {

Solution content
* */ public class MethodExpressionScrollListener implements DataScrollListener { private MethodExpression methodExpression; public MethodExpressionScrollListener() {

File
MethodExpressionScrollListener.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

import org.richfaces.event.CollapsibleSubTableToggleListener;

public class MethodExpressionToggleListener implements CollapsibleSubTableToggleListener {
<<<<<<< HEAD
    
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private MethodExpression methodExpression;

    public MethodExpressionToggleListener() {

Solution content

import org.richfaces.event.CollapsibleSubTableToggleListener;

public class MethodExpressionToggleListener implements CollapsibleSubTableToggleListener {
    private MethodExpression methodExpression;

    public MethodExpressionToggleListener() {

File
MethodExpressionToggleListener.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        super();
        this.methodExpression = methodExpression;
    }
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public void processCollapsibleSubTableToggle(CollapsibleSubTableToggleEvent toggleEvent) {
        FacesContext facesContext = FacesContext.getCurrentInstance();
        methodExpression.invoke(facesContext.getELContext(), new Object[] { toggleEvent });

Solution content

        super();
        this.methodExpression = methodExpression;
    }

    public void processCollapsibleSubTableToggle(CollapsibleSubTableToggleEvent toggleEvent) {
        FacesContext facesContext = FacesContext.getCurrentInstance();
        methodExpression.invoke(facesContext.getELContext(), new Object[] { toggleEvent });

File
MethodExpressionToggleListener.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

     */
    @Test
    public void testDataChildren() {
<<<<<<< HEAD
        Assert.assertTrue(table.dataChildren() instanceof DataTableDataChilderIterator);
=======
        Assert.assertTrue(table.dataChildren() instanceof DataTableDataChildrenIterator);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }

    /**

Solution content
/ @Test public void testDataChildren() { Assert.assertTrue(table.dataChildren() instanceof DataTableDataChildrenIterator); } /*

File
UIDataTableTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

    private List children;

    enum PropertyKeys {
<<<<<<< HEAD
        target, selector, operation, onbeforeoperation, event
=======
        target,
        selector,
        operation,
        onbeforeoperation,
        event
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }

    public List getChildren() {

Solution content
private List children; enum PropertyKeys { target, selector, operation, onbeforeoperation, event } public List getChildren() {

File
ComponentControlBehavior.java

Developer's decision
Version 1

Kind of conflict
Enum value

Chunk

Conflicting content

    public void setEvent(String event) {
        getStateHelper().put(PropertyKeys.event, event);
    }
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    @Attribute
    public String getTarget() {
        return (String) getStateHelper().eval(PropertyKeys.target);

Solution content
public void setEvent(String event) { getStateHelper().put(PropertyKeys.event, event); } @Attribute public String getTarget() { return (String) getStateHelper().eval(PropertyKeys.target);

File
ComponentControlBehavior.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

 */
package org.richfaces.component;

<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;

Solution content
*/ package org.richfaces.component; import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.EventName; import org.richfaces.cdk.annotations.JsfComponent;

File
AbstractAccordion.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        if (res == null) {
            res = getFirstItem().getName();
        } else {
<<<<<<< HEAD
            AbstractTogglePanelTitledItem item =
                    (AbstractTogglePanelTitledItem) super.getItemByIndex(super.getChildIndex(res));
=======
            AbstractTogglePanelTitledItem item = (AbstractTogglePanelTitledItem) super.getItemByIndex(super.getChildIndex(res));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            if (item.isDisabled()) {
                res = getFirstItem().getName();
            }

Solution content

        if (res == null) {
            res = getFirstItem().getName();
        } else {
            AbstractTogglePanelTitledItem item = (AbstractTogglePanelTitledItem) super.getItemByIndex(super.getChildIndex(res));
            if (item.isDisabled()) {
                res = getFirstItem().getName();
            }

File
AbstractAccordion.java

Developer's decision
Version 1

Kind of conflict
Cast expression
Variable

Chunk

Conflicting content

    @Override
    public void broadcast(FacesEvent event) throws AbortProcessingException {
        if (event instanceof PanelToggleEvent) {
<<<<<<< HEAD
            setExpanded(((PanelToggleEvent)event).getExpanded());
=======
            setExpanded(((PanelToggleEvent) event).getExpanded());
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            setSubmittedActiveItem(null);
            if (event.getPhaseId() != PhaseId.UPDATE_MODEL_VALUES) {
                FacesContext.getCurrentInstance().renderResponse();

Solution content

    @Override
    public void broadcast(FacesEvent event) throws AbortProcessingException {
        if (event instanceof PanelToggleEvent) {
            setExpanded(((PanelToggleEvent) event).getExpanded());
            setSubmittedActiveItem(null);
            if (event.getPhaseId() != PhaseId.UPDATE_MODEL_VALUES) {
                FacesContext.getCurrentInstance().renderResponse();

File
AbstractCollapsiblePanel.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

    public abstract String getOnhide();

    @Attribute(events = @EventName("itemclick"))
<<<<<<< HEAD
    public abstract String getOnitemclick();    
    
    @Attribute
    public abstract String getLabel();
    
=======
    public abstract String getOnitemclick();

    @Attribute
    public abstract String getLabel();

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public enum Facets {
        label,
        labelDisabled

Solution content

    public abstract String getOnhide();

    @Attribute(events = @EventName("itemclick"))
    public abstract String getOnitemclick();

    @Attribute
    public abstract String getLabel();

    public enum Facets {
        label,
        labelDisabled

File
AbstractDropDownMenu.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method interface

Chunk

Conflicting content

import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;
<<<<<<< HEAD
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
/**
 * JSF component class
 *

Solution content
import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; import org.richfaces.cdk.annotations.TagType; /** * JSF component class *

File
AbstractPanel.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

@JsfComponent(tag = @Tag(type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.PanelRenderer"), attributes = {
        "core-props.xml", "events-props.xml" })
public abstract class AbstractPanel extends UIComponentBase {
<<<<<<< HEAD
    
    public static final String COMPONENT_TYPE = "org.richfaces.Panel";
    
    public static final String COMPONENT_FAMILY = "org.richfaces.Panel";    
=======
    public static final String COMPONENT_TYPE = "org.richfaces.Panel";
    public static final String COMPONENT_FAMILY = "org.richfaces.Panel";
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

    @Attribute
    public abstract String getHeader();

Solution content

@JsfComponent(tag = @Tag(type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.PanelRenderer"), attributes = {
        "core-props.xml", "events-props.xml" })
public abstract class AbstractPanel extends UIComponentBase {
    public static final String COMPONENT_TYPE = "org.richfaces.Panel";
    public static final String COMPONENT_FAMILY = "org.richfaces.Panel";

    @Attribute
    public abstract String getHeader();

File
AbstractPanel.java

Developer's decision
Version 1

Kind of conflict
Attribute

Chunk

Conflicting content

            event.queue();
        }
    }
<<<<<<< HEAD
    
    public void queueEvent(FacesEvent event) {
        if ((event instanceof ItemChangeEvent) && (event.getComponent() == this)) {
            setEventPhase((ItemChangeEvent)event);
        }
        super.queueEvent(event);
    }
    
    public void setEventPhase(FacesEvent event) {
        if (event instanceof ItemChangeEvent) {
            AbstractPanelMenuItem actItm = (AbstractPanelMenuItem) ((ItemChangeEvent)event).getNewItem(); 
            if (isImmediate() || (actItm != null && actItm.isImmediate())) {
                event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
            } else if (actItm!= null && actItm.isBypassUpdates()) {
                event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
            } else {
                event.setPhaseId(PhaseId.UPDATE_MODEL_VALUES);
            }
        }
    }

    private ItemChangeEvent createItemChangeEvent(FacesContext context) {

=======

    public void queueEvent(FacesEvent event) {
        if ((event instanceof ItemChangeEvent) && (event.getComponent() == this)) {
            setEventPhase((ItemChangeEvent) event);
        }
        super.queueEvent(event);
    }

    public void setEventPhase(FacesEvent event) {
        if (event instanceof ItemChangeEvent) {
            AbstractPanelMenuItem actItm = (AbstractPanelMenuItem) ((ItemChangeEvent) event).getNewItem();
            if (isImmediate() || (actItm != null && actItm.isImmediate())) {
                event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
            } else if (actItm != null && actItm.isBypassUpdates()) {
                event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
            } else {
                event.setPhaseId(PhaseId.UPDATE_MODEL_VALUES);
            }
        }
    }

    private ItemChangeEvent createItemChangeEvent(FacesContext context) {

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        // Submitted value == null means "the component was not submitted at all".
        String activeItem = getSubmittedActiveItem();
        if (activeItem == null) {

Solution content

        }
            event.queue();
        }
    }

    public void queueEvent(FacesEvent event) {
        if ((event instanceof ItemChangeEvent) && (event.getComponent() == this)) {
            setEventPhase((ItemChangeEvent) event);
        super.queueEvent(event);
    }

    public void setEventPhase(FacesEvent event) {
        if (event instanceof ItemChangeEvent) {
            AbstractPanelMenuItem actItm = (AbstractPanelMenuItem) ((ItemChangeEvent) event).getNewItem();
            if (isImmediate() || (actItm != null && actItm.isImmediate())) {
                event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
            } else if (actItm != null && actItm.isBypassUpdates()) {
                event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
            } else {
                event.setPhaseId(PhaseId.UPDATE_MODEL_VALUES);
            }
        }
    }

    private ItemChangeEvent createItemChangeEvent(FacesContext context) {

        // Submitted value == null means "the component was not submitted at all".
        String activeItem = getSubmittedActiveItem();
        if (activeItem == null) {

File
AbstractPanelMenu.java

Developer's decision
Version 1

Kind of conflict
Method declaration
Method signature

Chunk

Conflicting content

            if (activeItem != null) {
                actItm = getItem(activeItem);
            }
<<<<<<< HEAD
            
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            return new ItemChangeEvent(this, previous, prevItm, activeItem, actItm);
        }
        return null;

Solution content
if (activeItem != null) { actItm = getItem(activeItem); } return new ItemChangeEvent(this, previous, prevItm, activeItem, actItm); } return null;

File
AbstractPanelMenu.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

    public void removeItemChangeListener(ItemChangeListener listener) {
        removeFacesListener(listener);
    }
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    @Attribute(generate = false, hidden = true)
    public Object getValue() {
        return getStateHelper().eval(Properties.value);

Solution content

    public void removeItemChangeListener(ItemChangeListener listener) {
        removeFacesListener(listener);
    }

    @Attribute(generate = false, hidden = true)
    public Object getValue() {
        return getStateHelper().eval(Properties.value);

File
AbstractPanelMenu.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
public void setValue(Object value) { getStateHelper().put(Properties.value, value); <<<<<<< HEAD } ======= } >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 }

Solution content
public void setValue(Object value) { getStateHelper().put(Properties.value, value); } }

File
AbstractPanelMenu.java

Developer's decision
Version 1

Kind of conflict
Other

Chunk

Conflicting content

    @Attribute(events = @EventName("beforeselect"))
    public abstract String getOnbeforeselect();
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public boolean hasActiveItem(UIComponent component, String activeItem) {
        if (activeItem == null) {
            return false;

Solution content

    @Attribute(events = @EventName("beforeselect"))
    public abstract String getOnbeforeselect();

    public boolean hasActiveItem(UIComponent component, String activeItem) {
        if (activeItem == null) {
            return false;

File
AbstractPanelMenuGroup.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

                return true;
            }
        }
<<<<<<< HEAD
        
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        if (component instanceof AbstractPanelMenuGroup) {
            AbstractPanelMenuGroup group = (AbstractPanelMenuGroup) component;
            if (!group.getPanelMenu().isBubbleSelection()) {

Solution content
return true; } } if (component instanceof AbstractPanelMenuGroup) { AbstractPanelMenuGroup group = (AbstractPanelMenuGroup) component; if (!group.getPanelMenu().isBubbleSelection()) {

File
AbstractPanelMenuGroup.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

                if (!child.isRendered()) {
                    continue;
                }
<<<<<<< HEAD
                
                if (!(child instanceof AbstractPanelMenuItem)) {
                    continue;
                }
                
=======

                if (!(child instanceof AbstractPanelMenuItem)) {
                    continue;
                }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                if (hasActiveItem(child, activeItem)) {
                    return true;
                }

Solution content
if (!child.isRendered()) { continue; } if (!(child instanceof AbstractPanelMenuItem)) { continue; } if (hasActiveItem(child, activeItem)) { return true; }

File
AbstractPanelMenuGroup.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

                }
            }
        }
<<<<<<< HEAD
        
        return false;
    }
    
=======

        return false;
    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public boolean getState() {
        Boolean flag = this.isExpanded();
        return (flag == null ? this.hasActiveItem(this, this.getPanelMenu().getActiveItem()) : flag);

Solution content
} } } return false; } public boolean getState() { Boolean flag = this.isExpanded(); return (flag == null ? this.hasActiveItem(this, this.getPanelMenu().getActiveItem()) : flag);

File
AbstractPanelMenuGroup.java

Developer's decision
Version 1

Kind of conflict
Return statement

Chunk

Conflicting content

    // ------------------------------------------------ Html Attributes
    enum Properties {
<<<<<<< HEAD
        leftIcon, 
        leftDisabledIcon, 
        rightIcon, 
        rightDisabledIcon, 
        styleClass, 
        disabledClass, 
        execute, 
=======
        leftIcon,
        leftDisabledIcon,
        rightIcon,
        rightDisabledIcon,
        styleClass,
        disabledClass,
        execute,
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        name,
        value
    }

Solution content
// ------------------------------------------------ Html Attributes enum Properties { leftIcon, leftDisabledIcon, rightIcon, rightDisabledIcon, styleClass, disabledClass, execute, name, value }

File
AbstractPanelMenuItem.java

Developer's decision
Version 1

Kind of conflict
Enum value

Chunk

Conflicting content

            return comp instanceof AbstractPanelMenuGroup || comp instanceof AbstractPanelMenu;
        }
    }
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    @Attribute(generate = false, hidden = true)
    public Object getValue() {
        return getStateHelper().eval(Properties.value);

Solution content

            return comp instanceof AbstractPanelMenuGroup || comp instanceof AbstractPanelMenu;
        }
    }

    @Attribute(generate = false, hidden = true)
    public Object getValue() {
        return getStateHelper().eval(Properties.value);

File
AbstractPanelMenuItem.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        if (res == null) {
            res = getFirstItem().getName();
        } else {
<<<<<<< HEAD
            AbstractTogglePanelTitledItem item =
                    (AbstractTogglePanelTitledItem) super.getItemByIndex(super.getChildIndex(res));
=======
            AbstractTogglePanelTitledItem item = (AbstractTogglePanelTitledItem) super.getItemByIndex(super.getChildIndex(res));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            if (item.isDisabled()) {
                res = getFirstItem().getName();
            }

Solution content

        if (res == null) {
            res = getFirstItem().getName();
        } else {
            AbstractTogglePanelTitledItem item = (AbstractTogglePanelTitledItem) super.getItemByIndex(super.getChildIndex(res));
            if (item.isDisabled()) {
                res = getFirstItem().getName();
            }

File
AbstractTabPanel.java

Developer's decision
Version 1

Kind of conflict
Cast expression
Variable

Chunk

Conflicting content

import javax.faces.event.PostValidateEvent;
import javax.faces.event.PreValidateEvent;

<<<<<<< HEAD
import org.richfaces.application.MessageFactory;
import org.richfaces.application.ServiceTracker;
import org.richfaces.application.FacesMessages;
=======
import org.richfaces.application.FacesMessages;
import org.richfaces.application.MessageFactory;
import org.richfaces.application.ServiceTracker;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;

Solution content

import javax.faces.event.PostValidateEvent;
import javax.faces.event.PreValidateEvent;

import org.richfaces.application.FacesMessages;
import org.richfaces.application.MessageFactory;
import org.richfaces.application.ServiceTracker;
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;

File
AbstractTogglePanel.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

 * @author akolonitsky
 * @version 1.0
 */
<<<<<<< HEAD
@JsfComponent(tag = @Tag(type = TagType.Facelets, handler = "org.richfaces.view.facelets.html.TogglePanelTagHandler"),
        renderer = @JsfRenderer(type = "org.richfaces.TogglePanelRenderer"))
public abstract class AbstractTogglePanel extends UIOutput implements AbstractDivPanel, ItemChangeSource, MetaComponentResolver, MetaComponentEncoder {

    public static final String ACTIVE_ITEM_META_COMPONENT = "activeItem";
    
=======
@JsfComponent(tag = @Tag(type = TagType.Facelets, handler = "org.richfaces.view.facelets.html.TogglePanelTagHandler"), renderer = @JsfRenderer(type = "org.richfaces.TogglePanelRenderer"))
public abstract class AbstractTogglePanel extends UIOutput implements AbstractDivPanel, ItemChangeSource,
    MetaComponentResolver, MetaComponentEncoder {
    public static final String ACTIVE_ITEM_META_COMPONENT = "activeItem";
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public static final String COMPONENT_TYPE = "org.richfaces.TogglePanel";
    public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanel";
    public static final String META_NAME_FIRST = "@first";

Solution content

 * @author akolonitsky
 * @version 1.0
 */
@JsfComponent(tag = @Tag(type = TagType.Facelets, handler = "org.richfaces.view.facelets.html.TogglePanelTagHandler"), renderer = @JsfRenderer(type = "org.richfaces.TogglePanelRenderer"))
public abstract class AbstractTogglePanel extends UIOutput implements AbstractDivPanel, ItemChangeSource,
    MetaComponentResolver, MetaComponentEncoder {
    public static final String ACTIVE_ITEM_META_COMPONENT = "activeItem";
    public static final String COMPONENT_TYPE = "org.richfaces.TogglePanel";
    public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanel";
    public static final String META_NAME_FIRST = "@first";

File
AbstractTogglePanel.java

Developer's decision
Version 1

Kind of conflict
Annotation
Attribute
Class signature

Chunk

Conflicting content

        } finally {
            popComponentFromEL(context);
        }
<<<<<<< HEAD
        
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        ItemChangeEvent event = createItemChangeEvent(context);
        if (event != null) {
            event.queue();

Solution content
} finally { popComponentFromEL(context); } ItemChangeEvent event = createItemChangeEvent(context); if (event != null) { event.queue();

File
AbstractTogglePanel.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

            if (activeItem != null) {
                actvComp = (UIComponent) getItem(activeItem);
            }
<<<<<<< HEAD
            
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            return new ItemChangeEvent(this, previous, prevComp, activeItem, actvComp);
        }
        return null;

Solution content
if (activeItem != null) { actvComp = (UIComponent) getItem(activeItem); } return new ItemChangeEvent(this, previous, prevComp, activeItem, actvComp); } return null;

File
AbstractTogglePanel.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        return null;
    }

<<<<<<< HEAD
    public String substituteUnresolvedClientId(FacesContext facesContext, UIComponent contextComponent,
        String metaComponentId) {
        return null;
    }
    
    public void encodeMetaComponent(FacesContext context, String metaComponentId) throws IOException {
        ((MetaComponentRenderer) getRenderer(context)).encodeMetaComponent(context, this, metaComponentId);
    }
    
=======
    public String substituteUnresolvedClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) {
        return null;
    }

    public void encodeMetaComponent(FacesContext context, String metaComponentId) throws IOException {
        ((MetaComponentRenderer) getRenderer(context)).encodeMetaComponent(context, this, metaComponentId);
    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    @Override
    public boolean visitTree(VisitContext context, VisitCallback callback) {
        if (!isVisitable(context)) {

Solution content

        return null;
    }

    public String substituteUnresolvedClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) {
        return null;
    }

    public void encodeMetaComponent(FacesContext context, String metaComponentId) throws IOException {
        ((MetaComponentRenderer) getRenderer(context)).encodeMetaComponent(context, this, metaComponentId);
    }

    @Override
    public boolean visitTree(VisitContext context, VisitCallback callback) {
        if (!isVisitable(context)) {

File
AbstractTogglePanel.java

Developer's decision
Version 1

Kind of conflict
Method declaration

Chunk

Conflicting content

                if (context instanceof ExtendedVisitContext) {
                    ExtendedVisitContext extendedVisitContext = (ExtendedVisitContext) context;
                    if (extendedVisitContext.getVisitMode() == ExtendedVisitContextMode.RENDER) {
<<<<<<< HEAD
    
                        result = extendedVisitContext.invokeMetaComponentVisitCallback(this, callback, ACTIVE_ITEM_META_COMPONENT);
=======

                        result = extendedVisitContext.invokeMetaComponentVisitCallback(this, callback,
                            ACTIVE_ITEM_META_COMPONENT);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                        if (result == VisitResult.COMPLETE) {
                            return true;
                        }

Solution content

                if (context instanceof ExtendedVisitContext) {
                    ExtendedVisitContext extendedVisitContext = (ExtendedVisitContext) context;
                    if (extendedVisitContext.getVisitMode() == ExtendedVisitContextMode.RENDER) {

                        result = extendedVisitContext.invokeMetaComponentVisitCallback(this, callback,
                            ACTIVE_ITEM_META_COMPONENT);
                        if (result == VisitResult.COMPLETE) {
                            return true;
                        }

File
AbstractTogglePanel.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

                    }
                }
            }
<<<<<<< HEAD
            
            if (result == VisitResult.ACCEPT) {
                Iterator kids = this.getFacetsAndChildren();

                while(kids.hasNext()) {
=======

            if (result == VisitResult.ACCEPT) {
                Iterator kids = this.getFacetsAndChildren();

                while (kids.hasNext()) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                    boolean done = kids.next().visitTree(context, callback);

                    if (done) {

Solution content
} } } if (result == VisitResult.ACCEPT) { Iterator kids = this.getFacetsAndChildren(); while (kids.hasNext()) { boolean done = kids.next().visitTree(context, callback); if (done) {

File
AbstractTogglePanel.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation
Variable
While statement

Chunk

Conflicting content
} return false; <<<<<<< HEAD } ======= } >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 }

Solution content
} return false; } }

File
AbstractTogglePanel.java

Developer's decision
Version 1

Kind of conflict
Other

Chunk

Conflicting content

        }
    }

<<<<<<< HEAD
    /** overridden due to {@link https://issues.jboss.org/browse/RF-10695}
=======
    /**
     * overridden due to {@link https://issues.jboss.org/browse/RF-10695}
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
     *
     * @param context
     * @param component

Solution content
} } /** * overridden due to {@link https://issues.jboss.org/browse/RF-10695} * * @param context * @param component

File
MenuItemRendererBase.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content

     * @param component
     * @return
     */
<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    @Override
    public String getOnClick(FacesContext context, UIComponent component) {
        StringBuffer onClick = new StringBuffer();

Solution content
* @param component * @return */ @Override public String getOnClick(FacesContext context, UIComponent component) { StringBuffer onClick = new StringBuffer();

File
MenuItemRendererBase.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        }
        return Mode.server;
    }
<<<<<<< HEAD
    
    protected String getStyleClass(FacesContext facesContext, UIComponent component, String ddMenuStyle, String menuGroupStyle, String menuItemStyle) {
=======

    protected String getStyleClass(FacesContext facesContext, UIComponent component, String ddMenuStyle, String menuGroupStyle,
        String menuItemStyle) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        UIComponent ddMenu = getDDMenu(component);
        UIComponent menuGroup = getMenuGroup(component);
        Object styleClass = null;

Solution content

        String menuItemStyle) {
        }
        return Mode.server;
    }

    protected String getStyleClass(FacesContext facesContext, UIComponent component, String ddMenuStyle, String menuGroupStyle,
        UIComponent ddMenu = getDDMenu(component);
        UIComponent menuGroup = getMenuGroup(component);
        Object styleClass = null;

File
MenuItemRendererBase.java

Developer's decision
Version 1

Kind of conflict
Method signature

Chunk

Conflicting content

        if (iconExpanded == null || iconExpanded.trim().length() == 0) {
            iconExpanded = PanelIcons.transparent.toString();
        }
<<<<<<< HEAD
        
        encodeTdIcon(writer, context, HtmlUtil.concatClasses(cssClassPrefix + "-ico", group.getLeftIconClass()), iconCollapsed, iconExpanded, getState(group));
=======

        encodeTdIcon(writer, context, HtmlUtil.concatClasses(cssClassPrefix + "-ico", group.getLeftIconClass()), iconCollapsed,
            iconExpanded, getState(group));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }

    protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group)

Solution content

        if (iconExpanded == null || iconExpanded.trim().length() == 0) {
            iconExpanded = PanelIcons.transparent.toString();
        }

        encodeTdIcon(writer, context, HtmlUtil.concatClasses(cssClassPrefix + "-ico", group.getLeftIconClass()), iconCollapsed,
            iconExpanded, getState(group));
    }

    protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group)

File
PanelMenuGroupHeaderRenderer.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

        if (iconExpanded == null || iconExpanded.trim().length() == 0) {
            iconExpanded = PanelIcons.transparent.toString();
        }
<<<<<<< HEAD
        //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment?
        encodeTdIcon(writer, context, HtmlUtil.concatClasses(cssClassPrefix + "-exp-ico", group.getRightIconClass()), iconCollapsed, iconExpanded, getState(group));
=======
        // TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment?
        encodeTdIcon(writer, context, HtmlUtil.concatClasses(cssClassPrefix + "-exp-ico", group.getRightIconClass()),
            iconCollapsed, iconExpanded, getState(group));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }
}

Solution content

        if (iconExpanded == null || iconExpanded.trim().length() == 0) {
            iconExpanded = PanelIcons.transparent.toString();
        }
        // TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment?
        encodeTdIcon(writer, context, HtmlUtil.concatClasses(cssClassPrefix + "-exp-ico", group.getRightIconClass()),
            iconCollapsed, iconExpanded, getState(group));
    }
}

File
PanelMenuGroupHeaderRenderer.java

Developer's decision
Version 1

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content

                (menuGroup.getPanelMenu().isBubbleSelection()
    private void encodeHeader(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup menuGroup) throws IOException {
        writer.startElement(DIV_ELEM, null);
        writer.writeAttribute(ID_ATTRIBUTE, menuGroup.getClientId(context) + ":hdr", null);
<<<<<<< HEAD
        writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses(getCssClass(menuGroup, "-hdr"),
                "rf-pm-hdr-" + (menuGroup.getState() ? "exp" : "colps"), 
                (menuGroup.getPanelMenu().isBubbleSelection() && menuGroup.hasActiveItem(menuGroup, menuGroup.getPanelMenu().getActiveItem()) ? getCssClass(menuGroup, "-sel") : ""),
                PanelMenuItemRenderer.isParentPanelMenuDisabled(menuGroup) || menuGroup.isDisabled() ? getCssClass(menuGroup, "-hdr-dis") : null), null);
=======
        writer.writeAttribute(
            CLASS_ATTRIBUTE,
            concatClasses(
                getCssClass(menuGroup, "-hdr"),
                "rf-pm-hdr-" + (menuGroup.getState() ? "exp" : "colps"),
                    && menuGroup.hasActiveItem(menuGroup, menuGroup.getPanelMenu().getActiveItem()) ? getCssClass(menuGroup,
                    "-sel") : ""),
                PanelMenuItemRenderer.isParentPanelMenuDisabled(menuGroup) || menuGroup.isDisabled() ? getCssClass(menuGroup,
                    "-hdr-dis") : null), null);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

        (menuGroup.isTopItem() ? topHeaderRenderer : headerRenderer).encodeHeader(writer, context, menuGroup);

Solution content

    private void encodeHeader(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup menuGroup) throws IOException {
        writer.startElement(DIV_ELEM, null);
        writer.writeAttribute(ID_ATTRIBUTE, menuGroup.getClientId(context) + ":hdr", null);
        writer.writeAttribute(
            CLASS_ATTRIBUTE,
            concatClasses(
                getCssClass(menuGroup, "-hdr"),
                "rf-pm-hdr-" + (menuGroup.getState() ? "exp" : "colps"),
                (menuGroup.getPanelMenu().isBubbleSelection()
                    && menuGroup.hasActiveItem(menuGroup, menuGroup.getPanelMenu().getActiveItem()) ? getCssClass(menuGroup,
                    "-sel") : ""),
                PanelMenuItemRenderer.isParentPanelMenuDisabled(menuGroup) || menuGroup.isDisabled() ? getCssClass(menuGroup,
                    "-hdr-dis") : null), null);

        (menuGroup.isTopItem() ? topHeaderRenderer : headerRenderer).encodeHeader(writer, context, menuGroup);

File
PanelMenuGroupRenderer.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

        throws IOException {
        writer.startElement(DIV_ELEM, null);
        writer.writeAttribute(ID_ATTRIBUTE, menuGroup.getClientId(context) + ":cnt", null);
<<<<<<< HEAD
        writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses(getCssClass(menuGroup, "-cnt"), menuGroup.getState() ? "rf-pm-exp" : "rf-pm-colps"), null);
=======
        writer.writeAttribute(CLASS_ATTRIBUTE,
            concatClasses(getCssClass(menuGroup, "-cnt"), menuGroup.getState() ? "rf-pm-exp" : "rf-pm-colps"), null);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

        writeJavaScript(writer, context, menuGroup);
    }

Solution content

        throws IOException {
        writer.startElement(DIV_ELEM, null);
        writer.writeAttribute(ID_ATTRIBUTE, menuGroup.getClientId(context) + ":cnt", null);
        writer.writeAttribute(CLASS_ATTRIBUTE,
            concatClasses(getCssClass(menuGroup, "-cnt"), menuGroup.getState() ? "rf-pm-exp" : "rf-pm-colps"), null);

        writeJavaScript(writer, context, menuGroup);
    }

File
PanelMenuGroupRenderer.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

    public boolean getRendersChildren() {
        return true;
    }
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    @Override
    protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {

Solution content
public boolean getRendersChildren() { return true; } @Override protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {

File
PanelMenuGroupRenderer.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        AbstractPanelMenuGroup group = (AbstractPanelMenuGroup) component;

        boolean isClientMode = group.getMode() == PanelMenuMode.client;
<<<<<<< HEAD
        
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        if (isClientMode || group.getState()) {
            renderChildren(context, component);
        }

Solution content

        AbstractPanelMenuGroup group = (AbstractPanelMenuGroup) component;

        boolean isClientMode = group.getMode() == PanelMenuMode.client;

        if (isClientMode || group.getState()) {
            renderChildren(context, component);
        }

File
PanelMenuGroupRenderer.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        return concatClasses(
            getCssClass(menuItem, ""),
            attributeAsString(component, "styleClass"),
<<<<<<< HEAD
            PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? getCssClass(menuItem, "-dis") : "",
                (menuItem.isActiveItem() ? getCssClass(menuItem, "-sel") : ""),
                PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? attributeAsString(component, "disabledClass") : "");
=======
            PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? getCssClass(menuItem, "-dis")
                : "",
            (menuItem.isActiveItem() ? getCssClass(menuItem, "-sel") : ""),
            PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? attributeAsString(component,
                "disabledClass") : "");
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }

    public String getCssClass(AbstractPanelMenuItem item, String postfix) {

Solution content

        return concatClasses(
            getCssClass(menuItem, ""),
            attributeAsString(component, "styleClass"),
            PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? getCssClass(menuItem, "-dis")
                : "",
            (menuItem.isActiveItem() ? getCssClass(menuItem, "-sel") : ""),
            PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? attributeAsString(component,
                "disabledClass") : "");
    }

    public String getCssClass(AbstractPanelMenuItem item, String postfix) {

File
PanelMenuItemRenderer.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

    private static final String STYLE = STYLE_ATTRIBUTE;
    private static final String CLASS = CLASS_ATTRIBUTE;

<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    protected static void addOnCompleteParam(FacesContext context, String newValue, String panelId) {
        StringBuilder onComplete = new StringBuilder();
        onComplete.append("RichFaces.$('").append(panelId).append("').onCompleteHandler('").append(newValue).append("');");

Solution content

    private static final String STYLE = STYLE_ATTRIBUTE;
    private static final String CLASS = CLASS_ATTRIBUTE;

    protected static void addOnCompleteParam(FacesContext context, String newValue, String panelId) {
        StringBuilder onComplete = new StringBuilder();
        onComplete.append("RichFaces.$('").append(panelId).append("').onCompleteHandler('").append(newValue).append("');");

File
TabPanelRenderer.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        @ResourceDependency(library = "org.richfaces", name = "togglePanel.js") })
@JsfRenderer(type = "org.richfaces.TogglePanelRenderer", family = AbstractTogglePanel.COMPONENT_FAMILY)
public class TogglePanelRenderer extends DivPanelRenderer implements MetaComponentRenderer {
<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public static final String VALUE_POSTFIX = "-value";
    protected static final String ITEM_CHANGE = "itemchange";
    protected static final String BEFORE_ITEM_CHANGE = "beforeitemchange";

Solution content

        @ResourceDependency(library = "org.richfaces", name = "togglePanel.js") })
@JsfRenderer(type = "org.richfaces.TogglePanelRenderer", family = AbstractTogglePanel.COMPONENT_FAMILY)
public class TogglePanelRenderer extends DivPanelRenderer implements MetaComponentRenderer {
    public static final String VALUE_POSTFIX = "-value";
    protected static final String ITEM_CHANGE = "itemchange";
    protected static final String BEFORE_ITEM_CHANGE = "beforeitemchange";

File
TogglePanelRenderer.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        String newValue = requestParameterMap.get(getValueRequestParamName(context, component));
        if (newValue != null) {
            panel.setSubmittedActiveItem(newValue);
<<<<<<< HEAD
        }
        
        if (requestMap.get("javax.faces.partial.ajax") != null) {
            PartialViewContext pvc = context.getPartialViewContext();
            pvc.getRenderIds().add(
                component.getClientId(context) + MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR
                    + AbstractTogglePanel.ACTIVE_ITEM_META_COMPONENT);
=======

            if (isSubmitted(context, panel)) {
                PartialViewContext pvc = context.getPartialViewContext();

                pvc.getRenderIds().add(
                    component.getClientId(context) + MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR
                        + AbstractTogglePanel.ACTIVE_ITEM_META_COMPONENT);
            }
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        }
    }

Solution content

        String newValue = requestParameterMap.get(getValueRequestParamName(context, component));
        if (newValue != null) {
            panel.setSubmittedActiveItem(newValue);

            if (isSubmitted(context, panel)) {
                PartialViewContext pvc = context.getPartialViewContext();

                pvc.getRenderIds().add(
                    component.getClientId(context) + MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR
                        + AbstractTogglePanel.ACTIVE_ITEM_META_COMPONENT);
            }
        }
    }

File
TogglePanelRenderer.java

Developer's decision
Version 2

Kind of conflict
If statement
Method invocation
Variable

Chunk

Conflicting content

<<<<<<< HEAD
    }
    protected Class getComponentClass() {
        return AbstractTogglePanel.class;

    public void encodeMetaComponent(FacesContext context, UIComponent component, String metaComponentId)
        throws IOException {
        if (AbstractTogglePanel.ACTIVE_ITEM_META_COMPONENT.equals(metaComponentId)) {
            AbstractTogglePanel panel = (AbstractTogglePanel)component;
            AbstractTogglePanelItemInterface item = panel.getItem(panel.getActiveItem());
            
            if (item != null) {
                partialStart(context, ((UIComponent)item).getClientId(context));
                ((UIComponent)item).encodeAll(context);
                partialEnd(context);
                addOnCompleteParam(context, item.getName(), panel.getClientId(context));
            } else {
                partialStart(context, component.getClientId(context));
                component.encodeAll(context);
                partialEnd(context);
                addOnCompleteParam(context, panel.getActiveItem(), panel.getClientId(context));
            }
        } else {
            throw new IllegalArgumentException(metaComponentId);
        }
    }

    public void decodeMetaComponent(FacesContext context, UIComponent component, String metaComponentId) {
        // TODO Auto-generated method stub
    }
    
    protected void partialStart(FacesContext facesContext, String id) throws IOException {
        facesContext.getPartialViewContext().getPartialResponseWriter().startUpdate(id);
    }
    
    protected void partialEnd(FacesContext facesContext) throws IOException {
        facesContext.getPartialViewContext().getPartialResponseWriter().endUpdate();   
    }    
}
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

    public void encodeMetaComponent(FacesContext context, UIComponent component, String metaComponentId) throws IOException {
        if (AbstractTogglePanel.ACTIVE_ITEM_META_COMPONENT.equals(metaComponentId)) {

Solution content

    protected Class getComponentClass() {
        return AbstractTogglePanel.class;
    }

    public void encodeMetaComponent(FacesContext context, UIComponent component, String metaComponentId) throws IOException {
        if (AbstractTogglePanel.ACTIVE_ITEM_META_COMPONENT.equals(metaComponentId)) {

File
TogglePanelRenderer.java

Developer's decision
Version 2

Kind of conflict
Method declaration

Chunk

Conflicting content
public class ValueDescriptor { private final String name; private final Class beanType; <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 /** * @param beanType * @param name

Solution content
public class ValueDescriptor { private final String name; private final Class beanType; /** * @param beanType * @param name

File
ValueDescriptor.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
* (non-Javadoc) return beanType; } <<<<<<< HEAD /* (non-Javadoc) ======= /* * >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 * @see java.lang.Object#hashCode() */ @Override

Solution content
return beanType; } /* * (non-Javadoc) * * @see java.lang.Object#hashCode() */ @Override

File
ValueDescriptor.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content

 *
 */
public interface ValueExpressionAnalayser {
<<<<<<< HEAD
    
    ValueDescriptor getPropertyDescriptor(FacesContext context, ValueExpression expression) throws ELException;

    ValueDescriptor updateValueAndGetPropertyDescriptor(FacesContext context, ValueExpression expression, Object newValue) throws ELException;
    
=======
    ValueDescriptor getPropertyDescriptor(FacesContext context, ValueExpression expression) throws ELException;

    ValueDescriptor updateValueAndGetPropertyDescriptor(FacesContext context, ValueExpression expression, Object newValue)
        throws ELException;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
}

Solution content

 *
 */
public interface ValueExpressionAnalayser {
    ValueDescriptor getPropertyDescriptor(FacesContext context, ValueExpression expression) throws ELException;

    ValueDescriptor updateValueAndGetPropertyDescriptor(FacesContext context, ValueExpression expression, Object newValue)
        throws ELException;
}

File
ValueExpressionAnalayser.java

Developer's decision
Version 1

Kind of conflict
Method interface

Chunk

Conflicting content

 *
 */
public interface FacesConverterService {
<<<<<<< HEAD

    ConverterDescriptor getConverterDescription(FacesContext context,EditableValueHolder input, Converter converter);
    
=======
    ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter,
        String converterMessage);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
}

Solution content
* */ public interface FacesConverterService { ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter, String converterMessage); }

File
FacesConverterService.java

Developer's decision
Version 2

Kind of conflict
Method interface

Chunk

Conflicting content

import javax.faces.validator.Validator;

public interface FacesValidatorService {
<<<<<<< HEAD

    ValidatorDescriptor getValidatorDescription(FacesContext context,EditableValueHolder component, Validator validator);
=======
    ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder component, Validator validator,
        String message);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
}

Solution content

import javax.faces.validator.Validator;

public interface FacesValidatorService {
    ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder component, Validator validator,
        String message);
}

File
FacesValidatorService.java

Developer's decision
Version 2

Kind of conflict
Method interface

Chunk

Conflicting content

import java.util.Map;

import javax.faces.context.FacesContext;
<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

public final class GraphValidatorState {
    public static final String STATE_ATTRIBUTE = "org.richfaces.GraphValidator:";

Solution content
import java.util.Map; import javax.faces.context.FacesContext; public final class GraphValidatorState { public static final String STATE_ATTRIBUTE = "org.richfaces.GraphValidator:";

File
GraphValidatorState.java

Developer's decision
Version 1

Kind of conflict
Other

Chunk

Conflicting content

    public static final String STATE_ATTRIBUTE = "org.richfaces.GraphValidator:";
    private boolean active = false;
    private final Object cloned;
<<<<<<< HEAD
    
    
    public GraphValidatorState(Object cloned) {
        this.cloned = cloned;
    }
    
=======

    public GraphValidatorState(Object cloned) {
        this.cloned = cloned;
    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    /**
     * @return the active
     */

Solution content

    public static final String STATE_ATTRIBUTE = "org.richfaces.GraphValidator:";
    private boolean active = false;
    private final Object cloned;

    public GraphValidatorState(Object cloned) {
        this.cloned = cloned;
    }

    /**
     * @return the active
     */

File
GraphValidatorState.java

Developer's decision
Version 1

Kind of conflict
Method declaration

Chunk

Conflicting content

        return cloned;
    }

<<<<<<< HEAD
    public static Object getActiveClone(FacesContext context,Object base){
        GraphValidatorState state = getState(context, base);
        if(null == state || !state.isActive()){
=======
    public static Object getActiveClone(FacesContext context, Object base) {
        GraphValidatorState state = getState(context, base);
        if (null == state || !state.isActive()) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            return null;
        }
        return state.getCloned();

Solution content

        return cloned;
    }

    public static Object getActiveClone(FacesContext context, Object base) {
        GraphValidatorState state = getState(context, base);
        if (null == state || !state.isActive()) {
            return null;
        }
        return state.getCloned();

File
GraphValidatorState.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation
Method signature
Variable

Chunk

Conflicting content

        return state.getCloned();
    }

<<<<<<< HEAD
    public static GraphValidatorState getState(FacesContext context,Object base){
        return getStateMap(context).get(base);
    }

    public static void setState(FacesContext context,Object base,GraphValidatorState state){
        getStateMap(context).put(base, state);
    }
    
    private static Map getStateMap(FacesContext context){
        IdentityHashMap statesMap = (IdentityHashMap) context.getAttributes().get(STATE_ATTRIBUTE);
        if(null == statesMap){
=======
    public static GraphValidatorState getState(FacesContext context, Object base) {
        return getStateMap(context).get(base);
    }

    public static void setState(FacesContext context, Object base, GraphValidatorState state) {
        getStateMap(context).put(base, state);
    }

    public static Map getStateMap(FacesContext context) {
        IdentityHashMap statesMap = (IdentityHashMap) context
            .getAttributes().get(STATE_ATTRIBUTE);
        if (null == statesMap) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            statesMap = new IdentityHashMap();
            context.getAttributes().put(STATE_ATTRIBUTE, statesMap);
        }

Solution content

        return state.getCloned();
    }

    public static GraphValidatorState getState(FacesContext context, Object base) {
        return getStateMap(context).get(base);
    }

    public static void setState(FacesContext context, Object base, GraphValidatorState state) {
        getStateMap(context).put(base, state);
    }

    public static Map getStateMap(FacesContext context) {
        IdentityHashMap statesMap = (IdentityHashMap) context
            .getAttributes().get(STATE_ATTRIBUTE);
        if (null == statesMap) {
            statesMap = new IdentityHashMap();
            context.getAttributes().put(STATE_ATTRIBUTE, statesMap);
        }

File
GraphValidatorState.java

Developer's decision
Version 2

Kind of conflict
Cast expression
If statement
Method declaration
Method signature
Variable

Chunk

Conflicting content

 * JSF component class
 *
 */
<<<<<<< HEAD
@JsfComponent(tag=@Tag(name="graphValidator",type=TagType.Facelets, handler = "org.richfaces.view.facelets.html.GraphValidatorHandler"))
=======
@JsfComponent(tag = @Tag(name = "graphValidator", type = TagType.Facelets, handler = "org.richfaces.view.facelets.html.GraphValidatorHandler"))
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public abstract class AbstractGraphValidator extends UIComponentBase {
    public static final String COMPONENT_TYPE = "org.richfaces.GraphValidator";
    public static final String COMPONENT_FAMILY = "org.richfaces.GraphValidator";

Solution content

 * JSF component class
 *
 */
@JsfComponent(tag = @Tag(name = "graphValidator", type = TagType.Facelets, handler = "org.richfaces.view.facelets.html.GraphValidatorHandler"))
public abstract class AbstractGraphValidator extends UIComponentBase {
    public static final String COMPONENT_TYPE = "org.richfaces.GraphValidator";
    public static final String COMPONENT_FAMILY = "org.richfaces.GraphValidator";

File
AbstractGraphValidator.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

public abstract class AbstractGraphValidator extends UIComponentBase {
    public static final String COMPONENT_TYPE = "org.richfaces.GraphValidator";
    public static final String COMPONENT_FAMILY = "org.richfaces.GraphValidator";
<<<<<<< HEAD
    
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private static final Logger LOG = RichfacesLogger.COMPONENTS.getLogger();

    /**

Solution content

public abstract class AbstractGraphValidator extends UIComponentBase {
    public static final String COMPONENT_TYPE = "org.richfaces.GraphValidator";
    public static final String COMPONENT_FAMILY = "org.richfaces.GraphValidator";
    private static final Logger LOG = RichfacesLogger.COMPONENTS.getLogger();

    /**

File
AbstractGraphValidator.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
} } <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 protected GraphValidatorState getValidatorState(FacesContext context) { Object value = getValue(); if (null != value) {

Solution content
} } protected GraphValidatorState getValidatorState(FacesContext context) { Object value = getValue(); if (null != value) {

File
AbstractGraphValidator.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

            validatorState.setActive(true);
            super.processValidators(context);
            validatorState.setActive(wasActive);
<<<<<<< HEAD
            if(!context.isValidationFailed()){
=======
            if (!context.isValidationFailed()) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                validateObject(context, validatorState.getCloned());
            }
        } else {

Solution content

            validatorState.setActive(true);
            super.processValidators(context);
            validatorState.setActive(wasActive);
            if (!context.isValidationFailed()) {
                validateObject(context, validatorState.getCloned());
            }
        } else {

File
AbstractGraphValidator.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

        }
    }

<<<<<<< HEAD
    public Validator createChildrenValidator(FacesContext context) {
        FacesBeanValidator validator = (FacesBeanValidator) context.getApplication().createValidator(getType());
=======
    public Validator createChildrenValidator() {
        FacesBeanValidator validator = (FacesBeanValidator) getFacesContext().getApplication().createValidator(getType());
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        validator.setSummary(getSummary());
        ValueExpression expression = getValueExpression("groups");
        if (null != expression) {

Solution content

        }
    }

    public Validator createChildrenValidator() {
        FacesBeanValidator validator = (FacesBeanValidator) getFacesContext().getApplication().createValidator(getType());
        validator.setSummary(getSummary());
        ValueExpression expression = getValueExpression("groups");
        if (null != expression) {

File
AbstractGraphValidator.java

Developer's decision
Version 2

Kind of conflict
Cast expression
Method signature
Variable

Chunk

Conflicting content
} return validator; } <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 }

Solution content
} return validator; } }

File
AbstractGraphValidator.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        PartialViewContext partialViewContext = facesContext.getPartialViewContext();
        if (partialViewContext.isAjaxRequest()) {
            UIComponent component = event.getComponent();
<<<<<<< HEAD
            if(component instanceof EditableValueHolder){
                String clientId = component.getClientId(facesContext);
                Iterator messages = facesContext.getMessages(clientId);
                JavaScriptService javaScriptService = ServiceTracker.getService(JavaScriptService.class);
                javaScriptService.addPageReadyScript(facesContext, new MessageUpdateScript(clientId,messages));
=======
            if (component instanceof EditableValueHolder) {
                String clientId = component.getClientId(facesContext);
                Iterator messages = facesContext.getMessages(clientId);
                JavaScriptService javaScriptService = ServiceTracker.getService(JavaScriptService.class);
                javaScriptService.addPageReadyScript(facesContext, new MessageUpdateScript(clientId, messages));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            }
        }
        super.broadcast(event);

Solution content

        PartialViewContext partialViewContext = facesContext.getPartialViewContext();
        if (partialViewContext.isAjaxRequest()) {
            UIComponent component = event.getComponent();
            if (component instanceof EditableValueHolder) {
                String clientId = component.getClientId(facesContext);
                Iterator messages = facesContext.getMessages(clientId);
                JavaScriptService javaScriptService = ServiceTracker.getService(JavaScriptService.class);
                javaScriptService.addPageReadyScript(facesContext, new MessageUpdateScript(clientId, messages));
            }
        }
        super.broadcast(event);

File
ClientValidatorImpl.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation
Variable

Chunk

Conflicting content

            }
            if (null != converter) {
                FacesConverterService converterService = ServiceTracker.getService(facesContext, FacesConverterService.class);
<<<<<<< HEAD
                return converterService.getConverterDescription(facesContext, input, converter);
=======
                String converterMessage = (String) component.getAttributes().get("converterMessage");
                return converterService.getConverterDescription(facesContext, input, converter, converterMessage);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            } else {
                return null;
            }

Solution content

            }
            if (null != converter) {
                FacesConverterService converterService = ServiceTracker.getService(facesContext, FacesConverterService.class);
                String converterMessage = (String) component.getAttributes().get("converterMessage");
                return converterService.getConverterDescription(facesContext, input, converter, converterMessage);
            } else {
                return null;
            }

File
ClientValidatorImpl.java

Developer's decision
Version 2

Kind of conflict
Cast expression
Method invocation
Return statement
Variable

Chunk

Conflicting content

            Validator[] facesValidators = input.getValidators();
            FacesContext facesContext = context.getFacesContext();
            if (facesValidators.length > 0) {
<<<<<<< HEAD
=======
                String validatorMessage = (String) component.getAttributes().get("validatorMessage");
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                boolean beanValidatorsProcessed = false;
                FacesValidatorService facesValidatorService = ServiceTracker.getService(facesContext,
                    FacesValidatorService.class);

Solution content

            Validator[] facesValidators = input.getValidators();
            FacesContext facesContext = context.getFacesContext();
            if (facesValidators.length > 0) {
                String validatorMessage = (String) component.getAttributes().get("validatorMessage");
                boolean beanValidatorsProcessed = false;
                FacesValidatorService facesValidatorService = ServiceTracker.getService(facesContext,
                    FacesValidatorService.class);

File
ClientValidatorImpl.java

Developer's decision
Version 2

Kind of conflict
Cast expression
Variable

Chunk

Conflicting content

                        if (null != valueExpression && !beanValidatorsProcessed) {
                            BeanValidatorService beanValidatorService = ServiceTracker.getService(facesContext,
                                BeanValidatorService.class);
<<<<<<< HEAD
                            validators.addAll(beanValidatorService.getConstrains(facesContext, valueExpression, getGroups()));
                            beanValidatorsProcessed = true;
                        }
                    } else {
                        validators.add(facesValidatorService.getValidatorDescription(facesContext, input, validator));
=======
                            validators.addAll(beanValidatorService.getConstrains(facesContext, valueExpression,
                                validatorMessage, getGroups()));
                            beanValidatorsProcessed = true;
                        }
                    } else {
                        validators.add(facesValidatorService.getValidatorDescription(facesContext, input, validator,
                            validatorMessage));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                    }
                }
            }

Solution content

                        if (null != valueExpression && !beanValidatorsProcessed) {
                            BeanValidatorService beanValidatorService = ServiceTracker.getService(facesContext,
                                BeanValidatorService.class);
                            validators.addAll(beanValidatorService.getConstrains(facesContext, valueExpression,
                                validatorMessage, getGroups()));
                            beanValidatorsProcessed = true;
                        }
                    } else {
                        validators.add(facesValidatorService.getValidatorDescription(facesContext, input, validator,
                            validatorMessage));
                    }
                }
            }

File
ClientValidatorImpl.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

        private boolean clonedObject;
        private final Map states;

<<<<<<< HEAD
        private ELResolver delegate;
        private boolean clonedObject;

        public InterceptingResolver(ELResolver delegate) {
=======
        public InterceptingResolver(ELResolver delegate, Map states) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            this.delegate = delegate;
            this.states = states;
        }

Solution content
private boolean clonedObject; private final Map states; public InterceptingResolver(ELResolver delegate, Map states) { this.delegate = delegate; this.states = states; }

File
CapturingELContext.java

Developer's decision
Version 2

Kind of conflict
Attribute
Method signature

Chunk

Conflicting content

        public Object getValue(ELContext context, Object base, Object property) {
            reference = new ValueReference(base, property, reference);
            Object value = delegate.getValue(context, base, property);
<<<<<<< HEAD
            if (null != value && context.isPropertyResolved()) {
                FacesContext facesContext = (FacesContext) context.getContext(FacesContext.class);
                Object clone = GraphValidatorState.getActiveClone(facesContext, value);
                if (null != clone) {
                    this.clonedObject = true;
=======
            if (null != value && context.isPropertyResolved() && states.containsKey(value)) {
                GraphValidatorState graphValidatorState = states.get(value);
                if (graphValidatorState.isActive()) {
                    this.clonedObject = true;
                    Object clone = graphValidatorState.getCloned();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                    return clone;
                }
            }

Solution content

        public Object getValue(ELContext context, Object base, Object property) {
            reference = new ValueReference(base, property, reference);
            Object value = delegate.getValue(context, base, property);
            if (null != value && context.isPropertyResolved() && states.containsKey(value)) {
                GraphValidatorState graphValidatorState = states.get(value);
                if (graphValidatorState.isActive()) {
                    this.clonedObject = true;
                    Object clone = graphValidatorState.getCloned();
                    return clone;
                }
            }

File
CapturingELContext.java

Developer's decision
Version 2

Kind of conflict
Attribute
Cast expression
If statement
Method invocation
Variable

Chunk

Conflicting content

        private ValueDescriptor valueDescriptor;
    private abstract static class ValueResolutionCommand {

<<<<<<< HEAD
    private abstract static class ValueResolutionCommand {
        
        private ValueDescriptor valueDescriptor;
        
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        public ValueDescriptor getValueDescriptor() {
            return valueDescriptor;
        }

Solution content
private abstract static class ValueResolutionCommand { private ValueDescriptor valueDescriptor; public ValueDescriptor getValueDescriptor() { return valueDescriptor; }

File
ValueExpressionAnalayserImpl.java

Developer's decision
Version 2

Kind of conflict
Attribute
Class signature

Chunk

Conflicting content

        void setValueDescriptor(ValueDescriptor valueDescriptor) {
            this.valueDescriptor = valueDescriptor;
        }
<<<<<<< HEAD
        
        public abstract void resolve(ValueExpression expression, ELContext context);
        
    }
    
    private static final class GetTypeCommand extends ValueResolutionCommand {

=======

        public abstract void resolve(ValueExpression expression, ELContext context);
    }

    private static final class GetTypeCommand extends ValueResolutionCommand {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        @Override
        public void resolve(ValueExpression expression, ELContext context) {
            expression.getType(context);

Solution content

        void setValueDescriptor(ValueDescriptor valueDescriptor) {
            this.valueDescriptor = valueDescriptor;
        }

        public abstract void resolve(ValueExpression expression, ELContext context);
    }

    private static final class GetTypeCommand extends ValueResolutionCommand {
        @Override
        public void resolve(ValueExpression expression, ELContext context) {
            expression.getType(context);

File
ValueExpressionAnalayserImpl.java

Developer's decision
Version 1

Kind of conflict
Class signature
Method interface

Chunk

Conflicting content

    
    private static final class SetValueCommand extends ValueResolutionCommand {

<<<<<<< HEAD
        private Object value;
        
=======
    private static final class SetValueCommand extends ValueResolutionCommand {
        private Object value;

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        public SetValueCommand(Object value) {
            super();
            this.value = value;

Solution content
private static final class SetValueCommand extends ValueResolutionCommand { private Object value; public SetValueCommand(Object value) { super(); this.value = value;

File
ValueExpressionAnalayserImpl.java

Developer's decision
Version 1

Kind of conflict
Attribute
Class signature

Chunk

Conflicting content

        public void resolve(ValueExpression expression, ELContext context) {
            expression.setValue(context, value);
        }
<<<<<<< HEAD
        
    }
    
=======
    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private void checkNotNull(FacesContext context, ValueExpression expression) {
        if (context == null) {
            throw new NullPointerException("facesContext");

Solution content

        public void resolve(ValueExpression expression, ELContext context) {
            expression.setValue(context, value);
        }
    }

    private void checkNotNull(FacesContext context, ValueExpression expression) {
        if (context == null) {
            throw new NullPointerException("facesContext");

File
ValueExpressionAnalayserImpl.java

Developer's decision
Version 1

Kind of conflict
Other

Chunk

Conflicting content

        if (context == null) {
            throw new NullPointerException("facesContext");
        }
<<<<<<< HEAD
        
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        if (expression == null) {
            throw new NullPointerException("expression");
        }

Solution content
if (context == null) { throw new NullPointerException("facesContext"); } if (expression == null) { throw new NullPointerException("expression"); }

File
ValueExpressionAnalayserImpl.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

            throw new NullPointerException("expression");
        }
    }
<<<<<<< HEAD
    
    private void resolveValue(FacesContext context, ValueExpression initialExpression, ValueResolutionCommand command) throws ELException {
        checkNotNull(context, initialExpression);
        
        ValueExpression expression = initialExpression;
        
        while (expression != null) {
            CapturingELContext capturingContext = new CapturingELContext(context.getELContext());
=======

    private void resolveValue(FacesContext context, ValueExpression initialExpression, ValueResolutionCommand command)
        throws ELException {
        checkNotNull(context, initialExpression);

        ValueExpression expression = initialExpression;

        while (expression != null) {
            CapturingELContext capturingContext = new CapturingELContext(context.getELContext(),GraphValidatorState.getStateMap(context));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            command.resolve(expression, capturingContext);

            if (capturingContext.hasReferenceExpression()) {

Solution content

            throw new NullPointerException("expression");
        }
    }

    private void resolveValue(FacesContext context, ValueExpression initialExpression, ValueResolutionCommand command)
        throws ELException {
        checkNotNull(context, initialExpression);

        ValueExpression expression = initialExpression;

        while (expression != null) {
            CapturingELContext capturingContext = new CapturingELContext(context.getELContext(),GraphValidatorState.getStateMap(context));
            command.resolve(expression, capturingContext);

            if (capturingContext.hasReferenceExpression()) {

File
ValueExpressionAnalayserImpl.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Method signature
Variable
While statement

Chunk

Conflicting content

                if (result == null) {
                    throw new ELException("Cannot determine property for expression " + initialExpression.getExpressionString());
                }
<<<<<<< HEAD
                
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                command.setValueDescriptor(result);
                break;
            }

Solution content
if (result == null) { throw new ELException("Cannot determine property for expression " + initialExpression.getExpressionString()); } command.setValueDescriptor(result); break; }

File
ValueExpressionAnalayserImpl.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

            }
        }
    }
<<<<<<< HEAD
    
=======

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public ValueDescriptor getPropertyDescriptor(FacesContext context, ValueExpression expression) throws ELException {
        ValueResolutionCommand command = new GetTypeCommand();
        resolveValue(context, expression, command);

Solution content

            }
        }
    }

    public ValueDescriptor getPropertyDescriptor(FacesContext context, ValueExpression expression) throws ELException {
        ValueResolutionCommand command = new GetTypeCommand();
        resolveValue(context, expression, command);

File
ValueExpressionAnalayserImpl.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

        return command.getValueDescriptor();
    }

<<<<<<< HEAD
    public ValueDescriptor updateValueAndGetPropertyDescriptor(FacesContext context, ValueExpression expression, Object newValue) throws ELException {
=======
    public ValueDescriptor updateValueAndGetPropertyDescriptor(FacesContext context, ValueExpression expression, Object newValue)
        throws ELException {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        ValueResolutionCommand command = new SetValueCommand(newValue);
        resolveValue(context, expression, command);
        return command.getValueDescriptor();

Solution content

        return command.getValueDescriptor();
    }

    public ValueDescriptor updateValueAndGetPropertyDescriptor(FacesContext context, ValueExpression expression, Object newValue)
        throws ELException {
        ValueResolutionCommand command = new SetValueCommand(newValue);
        resolveValue(context, expression, command);
        return command.getValueDescriptor();

File
ValueExpressionAnalayserImpl.java

Developer's decision
Version 1

Kind of conflict
Method signature

Chunk

Conflicting content
resolveValue(context, expression, command); return command.getValueDescriptor(); } <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 }

Solution content
resolveValue(context, expression, command); return command.getValueDescriptor(); } }

File
ValueExpressionAnalayserImpl.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

public class ClientScriptServiceImpl implements ClientScriptService {
    private static final String TEXT_JAVASCRIPT = "text/javascript";
    private static final String ORG_RICHFACES_CSV = "org.richfaces.csv";
<<<<<<< HEAD
    
    private static final LibraryFunction NO_SCRIPT = new LibraryFunction() {
        
        public Iterable getResources() {
            return Collections.emptySet();
        }
        
        public String getName() {
            return null;
        }
    };

    private static final Function, ? extends LibraryFunction> RESOURCE_SCRIPT_FUNCTION = new Function, LibraryFunction>() {

        public LibraryFunction apply(Class arg0) {
            return getScriptResource(FacesContext.getCurrentInstance(), arg0);
        }
    };
    
    private static final Function, ? extends LibraryFunction> ANNOTATION_SCRIPT_FUNCTION = new Function, LibraryFunction>() {

        public LibraryFunction apply(Class arg0) {
            return getScriptFromAnnotation(arg0);
        }
    };

    private final ConcurrentMap, LibraryFunction> resourcesMapping;

    private final ConcurrentMap, LibraryFunction> annotationsMapping;
=======
    private static final LibraryFunction NO_SCRIPT = new LibraryFunction() {
        public Iterable getResources() {
            return Collections.emptySet();
        }
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

        public String getName() {
            return null;

Solution content

public class ClientScriptServiceImpl implements ClientScriptService {
    private static final String TEXT_JAVASCRIPT = "text/javascript";
    private static final String ORG_RICHFACES_CSV = "org.richfaces.csv";
    private static final LibraryFunction NO_SCRIPT = new LibraryFunction() {
        public Iterable getResources() {
            return Collections.emptySet();
        }

        public String getName() {
            return null;

File
ClientScriptServiceImpl.java

Developer's decision
Version 2

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content

            throw new NullPointerException();
        }
        LibraryFunction function = NO_SCRIPT;// RF-10719, temporary disable. getFromComputationMap(resourcesMapping, javaClass);
<<<<<<< HEAD
        if(NO_SCRIPT == function) {
=======
        if (NO_SCRIPT == function) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            if (defaultMapping.containsKey(javaClass)) {
                function = defaultMapping.get(javaClass);
            } else {

Solution content

            throw new NullPointerException();
        }
        LibraryFunction function = NO_SCRIPT;// RF-10719, temporary disable. getFromComputationMap(resourcesMapping, javaClass);
        if (NO_SCRIPT == function) {
            if (defaultMapping.containsKey(javaClass)) {
                function = defaultMapping.get(javaClass);
            } else {

File
ClientScriptServiceImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

                function = getFromComputationMap(annotationsMapping, javaClass);
            }
        }
<<<<<<< HEAD
        if(NO_SCRIPT == function) {
            throw new ScriptNotFoundException("No client-side script for class "+javaClass.getName());
=======
        if (NO_SCRIPT == function) {
            throw new ScriptNotFoundException("No client-side script for class " + javaClass.getName());
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        }
        return function;
    }

Solution content

                function = getFromComputationMap(annotationsMapping, javaClass);
            }
        }
        if (NO_SCRIPT == function) {
            throw new ScriptNotFoundException("No client-side script for class " + javaClass.getName());
        }
        return function;
    }

File
ClientScriptServiceImpl.java

Developer's decision
Version 1

Kind of conflict
If statement
Throw statement

Chunk

Conflicting content

        }
    }

<<<<<<< HEAD
=======
    private LibraryFunction getFromComputationMap(ConcurrentMap, LibraryFunction> map, Class clazz) {
        try {
            return map.get(clazz);
        } catch (ComputationException e) {
            Throwable cause = e.getCause();
            throw new FacesException(cause);
        }
    }
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private static LibraryFunction getScriptFromAnnotation(Class javaClass) {
        if (javaClass.isAnnotationPresent(ClientSideScript.class)) {
            ClientSideScript clientSideScript = javaClass.getAnnotation(ClientSideScript.class);

Solution content

    private LibraryFunction getFromComputationMap(ConcurrentMap, LibraryFunction> map, Class clazz) {
        try {
            return map.get(clazz);
        } catch (ComputationException e) {
            Throwable cause = e.getCause();
            throw new FacesException(cause);
        }
    }

    private static LibraryFunction getScriptFromAnnotation(Class javaClass) {
        if (javaClass.isAnnotationPresent(ClientSideScript.class)) {
            ClientSideScript clientSideScript = javaClass.getAnnotation(ClientSideScript.class);

File
ClientScriptServiceImpl.java

Developer's decision
Version 2

Kind of conflict
Method declaration

Chunk

Conflicting content

        }
    }

<<<<<<< HEAD
    private static LibraryFunction getScriptResource(FacesContext facesContext, Class javaClass){
=======
    private static LibraryFunction getScriptResource(FacesContext facesContext, Class javaClass) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        ResourceHandler resourceHandler = facesContext.getApplication().getResourceHandler();
        String resourceName = javaClass.getSimpleName() + ".js";
        Resource facesResource = resourceHandler.createResource(resourceName, ORG_RICHFACES_CSV, TEXT_JAVASCRIPT);

Solution content

        }
    }

    private static LibraryFunction getScriptResource(FacesContext facesContext, Class javaClass) {
        ResourceHandler resourceHandler = facesContext.getApplication().getResourceHandler();
        String resourceName = javaClass.getSimpleName() + ".js";
        Resource facesResource = resourceHandler.createResource(resourceName, ORG_RICHFACES_CSV, TEXT_JAVASCRIPT);

File
ClientScriptServiceImpl.java

Developer's decision
Version 1

Kind of conflict
Method signature

Chunk

Conflicting content

 *
 */
public class MessageRendererBase extends Renderer {
<<<<<<< HEAD

    private static final ImmutableMap SEVERITY_MAP = ImmutableMap.of(
        FacesMessage.SEVERITY_INFO, attrs("info", "inf"), FacesMessage.SEVERITY_WARN, attrs("warn", "wrn"),
        FacesMessage.SEVERITY_ERROR, attrs("error", "err"), FacesMessage.SEVERITY_FATAL,
        attrs("fatal", "ftl"));
=======
    private static final ImmutableMap SEVERITY_MAP = ImmutableMap.of(FacesMessage.SEVERITY_INFO,
        attrs("info", "inf"), FacesMessage.SEVERITY_WARN, attrs("warn", "wrn"), FacesMessage.SEVERITY_ERROR,
        attrs("error", "err"), FacesMessage.SEVERITY_FATAL, attrs("fatal", "ftl"));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

    protected Iterator getMessages(FacesContext context, String forClientId, UIComponent component) {

Solution content

 *
 */
public class MessageRendererBase extends Renderer {
    private static final ImmutableMap SEVERITY_MAP = ImmutableMap.of(FacesMessage.SEVERITY_INFO,
        attrs("info", "inf"), FacesMessage.SEVERITY_WARN, attrs("warn", "wrn"), FacesMessage.SEVERITY_ERROR,
        attrs("error", "err"), FacesMessage.SEVERITY_FATAL, attrs("fatal", "ftl"));

    protected Iterator getMessages(FacesContext context, String forClientId, UIComponent component) {

File
MessageRendererBase.java

Developer's decision
Version 1

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content

        responseWriter.writeAttribute("id", component.getClientId() + ':' + message.getSourceId(), null);
        // tooltip
        boolean wroteTooltip = RendererUtils.getInstance().isBooleanAttribute(component, "tooltip");
<<<<<<< HEAD
        if(wroteTooltip && !Strings.isNullOrEmpty(summary)){
            responseWriter.writeAttribute("title", summary,null);
        }
        if (!wroteTooltip && showSummary) {
            writeMessageLabel(responseWriter, summary, isMessages ?  "rf-msgs-sum" : "rf-msg-sum");
=======
        if (wroteTooltip && !Strings.isNullOrEmpty(summary)) {
            responseWriter.writeAttribute("title", summary, null);
        }
        if (!wroteTooltip && showSummary) {
            writeMessageLabel(responseWriter, summary, isMessages ? "rf-msgs-sum" : "rf-msg-sum");
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        }
        if (showDetail) {
            writeMessageLabel(responseWriter, detail, isMessages ? "rf-msgs-det" : "rf-msg-det");

Solution content

        responseWriter.writeAttribute("id", component.getClientId() + ':' + message.getSourceId(), null);
        // tooltip
        boolean wroteTooltip = RendererUtils.getInstance().isBooleanAttribute(component, "tooltip");
        if (wroteTooltip && !Strings.isNullOrEmpty(summary)) {
            responseWriter.writeAttribute("title", summary, null);
        }
        if (!wroteTooltip && showSummary) {
            writeMessageLabel(responseWriter, summary, isMessages ? "rf-msgs-sum" : "rf-msg-sum");
        }
        if (showDetail) {
            writeMessageLabel(responseWriter, detail, isMessages ? "rf-msgs-det" : "rf-msg-det");

File
MessageRendererBase.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content

        if (FacesMessage.SEVERITY_INFO != level) {
            parametersBuilder.put("level", level.getOrdinal());
        }
<<<<<<< HEAD
        if(!rendererUtils.isBooleanAttribute(component, "showSummary")){
            parametersBuilder.put("showSummary", false);
        }
        if(rendererUtils.isBooleanAttribute(component, "showDetail")){
            parametersBuilder.put("showDetail", true);
        }
        if(rendererUtils.isBooleanAttribute(component, "tooltip")){
=======
        if (!rendererUtils.isBooleanAttribute(component, "showSummary")) {
            parametersBuilder.put("showSummary", false);
        }
        if (rendererUtils.isBooleanAttribute(component, "showDetail")) {
            parametersBuilder.put("showDetail", true);
        }
        if (rendererUtils.isBooleanAttribute(component, "tooltip")) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
            parametersBuilder.put("tooltip", true);
        }
        if (component instanceof UIMessages) {

Solution content

        if (FacesMessage.SEVERITY_INFO != level) {
            parametersBuilder.put("level", level.getOrdinal());
        }
        if (!rendererUtils.isBooleanAttribute(component, "showSummary")) {
            parametersBuilder.put("showSummary", false);
        }
        if (rendererUtils.isBooleanAttribute(component, "showDetail")) {
            parametersBuilder.put("showDetail", true);
        }
        if (rendererUtils.isBooleanAttribute(component, "tooltip")) {
            parametersBuilder.put("tooltip", true);
        }
        if (component instanceof UIMessages) {

File
MessageRendererBase.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

    protected String getMsgClass(FacesContext facesContext, UIComponent component, Object msg) throws IOException {
        MessageForRender message = (MessageForRender) msg;
        SeverityAttributes severityAttributes = SEVERITY_MAP.get(message.getSeverity());
<<<<<<< HEAD
        
        boolean isMessages = (component instanceof UIMessages);
        
        String styleClass =
            buildSeverityAttribute(component, (isMessages ? severityAttributes.messagesSkinClass : severityAttributes.messageSkinClass), 
                severityAttributes.classAttribute, ' ');
=======

        boolean isMessages = (component instanceof UIMessages);

        String styleClass = buildSeverityAttribute(component, (isMessages ? severityAttributes.messagesSkinClass
            : severityAttributes.messageSkinClass), severityAttributes.classAttribute, ' ');
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        return styleClass;
    }

Solution content

    protected String getMsgClass(FacesContext facesContext, UIComponent component, Object msg) throws IOException {
        MessageForRender message = (MessageForRender) msg;
        SeverityAttributes severityAttributes = SEVERITY_MAP.get(message.getSeverity());

        boolean isMessages = (component instanceof UIMessages);

        String styleClass = buildSeverityAttribute(component, (isMessages ? severityAttributes.messagesSkinClass
            : severityAttributes.messageSkinClass), severityAttributes.classAttribute, ' ');
        return styleClass;
    }

File
MessageRendererBase.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

    protected String getMsgStyle(FacesContext facesContext, UIComponent component, Object msg) throws IOException {
        MessageForRender message = (MessageForRender) msg;
        SeverityAttributes severityAttributes = SEVERITY_MAP.get(message.getSeverity());
<<<<<<< HEAD
        String style =
            buildSeverityAttribute(component, null, severityAttributes.styleAttribute, ';');
=======
        String style = buildSeverityAttribute(component, null, severityAttributes.styleAttribute, ';');
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        return style;
    }

Solution content

    protected String getMsgStyle(FacesContext facesContext, UIComponent component, Object msg) throws IOException {
        MessageForRender message = (MessageForRender) msg;
        SeverityAttributes severityAttributes = SEVERITY_MAP.get(message.getSeverity());
        String style = buildSeverityAttribute(component, null, severityAttributes.styleAttribute, ';');
        return style;
    }

File
MessageRendererBase.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

import org.richfaces.resource.ResourceKey;

import com.google.common.collect.ImmutableSet;
<<<<<<< HEAD

public class AjaxOnlyScript extends ValidatorScriptBase {

    public static final ResourceKey AJAX_RESOURCE = ResourceKey.create("ajax.reslib",
            "org.richfaces");

    public static final Iterable AJAX_LIBRARIES = ImmutableSet.of(AJAX_RESOURCE,ClientOnlyScript.CSV_RESOURCE);
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

public class AjaxOnlyScript extends ValidatorScriptBase {
    public static final ResourceKey AJAX_RESOURCE = ResourceKey.create("ajax.reslib", "org.richfaces");

Solution content

import org.richfaces.resource.ResourceKey;

import com.google.common.collect.ImmutableSet;

public class AjaxOnlyScript extends ValidatorScriptBase {
    public static final ResourceKey AJAX_RESOURCE = ResourceKey.create("ajax.reslib", "org.richfaces");

File
AjaxOnlyScript.java

Developer's decision
Version 2

Kind of conflict
Attribute
Class signature
Method invocation

Chunk

Conflicting content

import com.google.common.collect.UnmodifiableIterator;

public class ClientOnlyScript extends ValidatorScriptBase {
<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    public static final ResourceKey CSV_RESOURCE = ResourceKey.create("csv.reslib", "org.richfaces");
    protected final LibraryScriptFunction converter;
    protected final ImmutableList validators;

Solution content

import com.google.common.collect.UnmodifiableIterator;

public class ClientOnlyScript extends ValidatorScriptBase {
    public static final ResourceKey CSV_RESOURCE = ResourceKey.create("csv.reslib", "org.richfaces");
    protected final LibraryScriptFunction converter;
    protected final ImmutableList validators;

File
ClientOnlyScript.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

import javax.validation.metadata.ElementDescriptor.ConstraintFinder;
import javax.validation.metadata.PropertyDescriptor;

<<<<<<< HEAD
=======
import org.richfaces.component.util.Strings;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
import org.richfaces.el.ValueDescriptor;
import org.richfaces.el.ValueExpressionAnalayser;

Solution content

import javax.validation.metadata.ElementDescriptor.ConstraintFinder;
import javax.validation.metadata.PropertyDescriptor;

import org.richfaces.component.util.Strings;
import org.richfaces.el.ValueDescriptor;
import org.richfaces.el.ValueExpressionAnalayser;

File
BeanValidatorServiceImpl.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

        Class... groups) {
        try {
            ValueDescriptor propertyDescriptor = analayser.getPropertyDescriptor(context, expression);
<<<<<<< HEAD
            
            if (propertyDescriptor == null) {
                return Collections.emptySet();
            }
            
            return processBeanAttribute(context, propertyDescriptor, groups);
=======

            if (propertyDescriptor == null) {
                return Collections.emptySet();
            }

            return processBeanAttribute(context, propertyDescriptor, message, groups);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        } catch (ELException e) {
            return Collections.emptySet();
        }

Solution content

        Class... groups) {
        try {
            ValueDescriptor propertyDescriptor = analayser.getPropertyDescriptor(context, expression);

            if (propertyDescriptor == null) {
                return Collections.emptySet();
            }

            return processBeanAttribute(context, propertyDescriptor, message, groups);
        } catch (ELException e) {
            return Collections.emptySet();
        }

File
BeanValidatorServiceImpl.java

Developer's decision
Version 2

Kind of conflict
If statement
Method invocation
Return statement

Chunk

Conflicting content

    public Collection validateExpression(FacesContext context, ValueExpression expression, Object newValue,
        Class... groups) {
<<<<<<< HEAD
        
        if (null == context) {
            throw new FacesException(INPUT_PARAMETERS_IS_NOT_CORRECT);
        }
        
=======

        if (null == context) {
            throw new FacesException(INPUT_PARAMETERS_IS_NOT_CORRECT);
        }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        Collection validationMessages = null;
        if (null != expression) {
            ValueDescriptor valueDescriptor;

Solution content

    public Collection validateExpression(FacesContext context, ValueExpression expression, Object newValue,
        Class... groups) {

        if (null == context) {
            throw new FacesException(INPUT_PARAMETERS_IS_NOT_CORRECT);
        }

        Collection validationMessages = null;
        if (null != expression) {
            ValueDescriptor valueDescriptor;

File
BeanValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

            } catch (ELException e) {
                throw new FacesException(e);
            }
<<<<<<< HEAD

            if (valueDescriptor != null) {
                validationMessages = validate(context, valueDescriptor.getBeanType(), valueDescriptor.getName(), newValue, groups);
            }
            
        }
        
        if (validationMessages == null) {
            validationMessages = Collections.emptySet();
        }
        
        return validationMessages;
    }


=======

            if (valueDescriptor != null) {
                validationMessages = validate(context, valueDescriptor.getBeanType(), valueDescriptor.getName(), newValue,
                    groups);
            }
        }

        if (validationMessages == null) {
            validationMessages = Collections.emptySet();
        }

        return validationMessages;
    }
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

    /**
     * Class for identify validator instance by locale

Solution content

            } catch (ELException e) {
                throw new FacesException(e);
            }

            if (valueDescriptor != null) {
                validationMessages = validate(context, valueDescriptor.getBeanType(), valueDescriptor.getName(), newValue,
                    groups);
            }
        }

        if (validationMessages == null) {
            validationMessages = Collections.emptySet();
        }

        return validationMessages;
    }

    /**
     * Class for identify validator instance by locale

File
BeanValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
If statement
Return statement
Variable

Chunk

Conflicting content

        }
    }

<<<<<<< HEAD

    protected Collection validate(FacesContext facesContext, Class beanType, String property, Object value,
        Class[] groups) {
        
        @SuppressWarnings("unchecked")
        Set> constrains =
            getValidator(facesContext).validateValue((Class

Solution content

        }
    }

    protected Collection validate(FacesContext facesContext, Class beanType, String property, Object value,
        Class[] groups) {

        @SuppressWarnings("unchecked")
        Set> constrains = getValidator(facesContext).validateValue((Class

File
BeanValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method invocation
Method signature
Variable

Chunk

Conflicting content

            for (ConstraintViolation constraintViolation : violations) {
                messages.add(constraintViolation.getMessage());
            }
<<<<<<< HEAD

=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        } else {
            messages = Collections.emptySet();
        }

Solution content
for (ConstraintViolation constraintViolation : violations) { messages.add(constraintViolation.getMessage()); } } else { messages = Collections.emptySet(); }

File
BeanValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

<<<<<<< HEAD
     */
     * @see org.richfaces.validator.FacesConverterService#getConverterDescription(javax.faces.context.FacesContext,
     * javax.faces.convert.Converter)
    public ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter) {
        // determine converter message.
        FacesMessage message = getMessage(context, converter, input);
=======
    public ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter,
        String converterMessage) {
        // determine converter message.
        FacesMessage message = getMessage(context, converter, input, converterMessage);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        ConverterDescriptorImpl descriptor = new ConverterDescriptorImpl(converter.getClass(), message);
        fillParameters(descriptor, converter);
        descriptor.makeImmutable();

Solution content

     * @see org.richfaces.validator.FacesConverterService#getConverterDescription(javax.faces.context.FacesContext,
     * javax.faces.convert.Converter)
     */
    public ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter,
        String converterMessage) {
        // determine converter message.
        FacesMessage message = getMessage(context, converter, input, converterMessage);
        ConverterDescriptorImpl descriptor = new ConverterDescriptorImpl(converter.getClass(), message);
        fillParameters(descriptor, converter);
        descriptor.makeImmutable();

File
ConverterServiceImpl.java

Developer's decision
Version 2

Kind of conflict
Comment
Method invocation
Method signature
Variable

Chunk

Conflicting content

 * @author asmirnov
 *
 */
<<<<<<< HEAD
@JsfValidator(id=FacesBeanValidator.BEAN_VALIDATOR_TYPE)
=======
@JsfValidator(id = FacesBeanValidator.BEAN_VALIDATOR_TYPE)
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
public class FacesBeanValidator implements Serializable, Validator, GraphValidator {
    public static final String BEAN_VALIDATOR_TYPE = "org.richfaces.BeanValidator";
    /**

Solution content

 * @author asmirnov
 *
 */
@JsfValidator(id = FacesBeanValidator.BEAN_VALIDATOR_TYPE)
public class FacesBeanValidator implements Serializable, Validator, GraphValidator {
    public static final String BEAN_VALIDATOR_TYPE = "org.richfaces.BeanValidator";
    /**

File
FacesBeanValidator.java

Developer's decision
Version 1

Kind of conflict
Annotation

Chunk

Conflicting content

     * @param context
     * @param component
     * @param input TODO
<<<<<<< HEAD
     * @return
     */
    public FacesMessage getMessage(FacesContext context, T component, EditableValueHolder input) {
        String messageId = getMessageId(component);
        return MessageFactory.createMessage(context, messageId);
    }


=======
     * @param msg
     * @return
     */
    public FacesMessage getMessage(FacesContext context, T component, EditableValueHolder input, String msg) {
        if (null == msg) {
            String messageId = getMessageId(component);
            return MessageFactory.createMessage(context, messageId);
        } else {
            return new FacesMessage(FacesMessage.SEVERITY_ERROR, msg, msg);
        }
    }

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    protected void setLabelParameter(EditableValueHolder input, FacesValidatorDescriptor descriptor) {
        if (input instanceof UIComponent) {
            UIComponent component = (UIComponent) input;

Solution content

     * @param context
     * @param component
     * @param input TODO
     * @param msg
     * @return
     */
    public FacesMessage getMessage(FacesContext context, T component, EditableValueHolder input, String msg) {
        if (null == msg) {
            String messageId = getMessageId(component);
            return MessageFactory.createMessage(context, messageId);
        } else {
            return new FacesMessage(FacesMessage.SEVERITY_ERROR, msg, msg);
        }
    }

    protected void setLabelParameter(EditableValueHolder input, FacesValidatorDescriptor descriptor) {
        if (input instanceof UIComponent) {
            UIComponent component = (UIComponent) input;

File
FacesServiceBase.java

Developer's decision
Version 2

Kind of conflict
Comment
Method declaration

Chunk

Conflicting content

        if (input instanceof UIComponent) {
            UIComponent component = (UIComponent) input;
            Object label = component.getAttributes().get("label");
<<<<<<< HEAD
            if(null!=label){
=======
            if (null != label) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                descriptor.addParameter("label", label);
            }
        }

Solution content

        if (input instanceof UIComponent) {
            UIComponent component = (UIComponent) input;
            Object label = component.getAttributes().get("label");
            if (null != label) {
                descriptor.addParameter("label", label);
            }
        }

File
FacesServiceBase.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content
} } } <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 }

Solution content
} } } }

File
FacesServiceBase.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

     * @see org.richfaces.validator.FacesValidatorService#getValidatorDescription(javax.faces.context.FacesContext,
     * javax.faces.validator.Validator)
     */
<<<<<<< HEAD
    public ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder input, Validator validator) {
        FacesMessage message = getMessage(context, validator, input);
=======
    public ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder input, Validator validator,
        String validatorMessage) {
        FacesMessage message = getMessage(context, validator, input, validatorMessage);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        FacesValidatorDescriptor descriptor = new FacesValidatorDescriptor(validator.getClass(), message);
        setLabelParameter(input, descriptor);
        fillParameters(descriptor, validator);

Solution content

     * @see org.richfaces.validator.FacesValidatorService#getValidatorDescription(javax.faces.context.FacesContext,
     * javax.faces.validator.Validator)
     */
    public ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder input, Validator validator,
        String validatorMessage) {
        FacesMessage message = getMessage(context, validator, input, validatorMessage);
        FacesValidatorDescriptor descriptor = new FacesValidatorDescriptor(validator.getClass(), message);
        setLabelParameter(input, descriptor);
        fillParameters(descriptor, validator);

File
FacesValidatorServiceImpl.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Method signature
Variable

Chunk

Conflicting content

=======
        String messageId;
        if (component instanceof DoubleRangeValidator) {
            DoubleRangeValidator validator = (DoubleRangeValidator) component;
<<<<<<< HEAD
            if(validator.getMaximum() < Double.MAX_VALUE){
                if(validator.getMinimum()> Double.MIN_VALUE){
            if (validator.getMaximum() < Double.MAX_VALUE) {
                if (validator.getMinimum() > Double.MIN_VALUE) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                    messageId = DoubleRangeValidator.NOT_IN_RANGE_MESSAGE_ID;
                } else {
                    messageId = DoubleRangeValidator.MAXIMUM_MESSAGE_ID;

Solution content

        String messageId;
        if (component instanceof DoubleRangeValidator) {
            DoubleRangeValidator validator = (DoubleRangeValidator) component;
            if (validator.getMaximum() < Double.MAX_VALUE) {
                if (validator.getMinimum() > Double.MIN_VALUE) {
                    messageId = DoubleRangeValidator.NOT_IN_RANGE_MESSAGE_ID;
                } else {
                    messageId = DoubleRangeValidator.MAXIMUM_MESSAGE_ID;

File
FacesValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

                } else {
            }
        } else if (component instanceof LongRangeValidator) {
            LongRangeValidator validator = (LongRangeValidator) component;
<<<<<<< HEAD
            if(validator.getMaximum() !=0){
                if(validator.getMinimum()!=0){
=======
            if (validator.getMaximum() != 0) {
                if (validator.getMinimum() != 0) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                    messageId = DoubleRangeValidator.NOT_IN_RANGE_MESSAGE_ID;
                    messageId = LongRangeValidator.MAXIMUM_MESSAGE_ID;

Solution content

            }
        } else if (component instanceof LongRangeValidator) {
            LongRangeValidator validator = (LongRangeValidator) component;
            if (validator.getMaximum() != 0) {
                if (validator.getMinimum() != 0) {
                    messageId = DoubleRangeValidator.NOT_IN_RANGE_MESSAGE_ID;
                } else {
                    messageId = LongRangeValidator.MAXIMUM_MESSAGE_ID;

File
FacesValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

                } else {
                    messageId = LongRangeValidator.MAXIMUM_MESSAGE_ID;
                }
<<<<<<< HEAD
            } else if( validator.getMinimum()!=0){
=======
            } else if (validator.getMinimum() != 0) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                messageId = LongRangeValidator.MINIMUM_MESSAGE_ID;
            } else {
                messageId = DoubleRangeValidator.NOT_IN_RANGE_MESSAGE_ID;// What to use for that case ( no min/max set,

Solution content

                } else {
                    messageId = LongRangeValidator.MAXIMUM_MESSAGE_ID;
                }
            } else if (validator.getMinimum() != 0) {
                messageId = LongRangeValidator.MINIMUM_MESSAGE_ID;
            } else {
                messageId = DoubleRangeValidator.NOT_IN_RANGE_MESSAGE_ID;// What to use for that case ( no min/max set,

File
FacesValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

    protected void fillParameters(BaseFacesObjectDescriptor descriptor, Validator component) {
        if (component instanceof DoubleRangeValidator) {
            DoubleRangeValidator validator = (DoubleRangeValidator) component;
<<<<<<< HEAD
            if(validator.getMaximum() < Double.MAX_VALUE){
                descriptor.addParameter(MAXIMUM, validator.getMaximum());
            }
            if( validator.getMinimum()>Double.MIN_VALUE){
=======
            if (validator.getMaximum() < Double.MAX_VALUE) {
                descriptor.addParameter(MAXIMUM, validator.getMaximum());
            }
            if (validator.getMinimum() > Double.MIN_VALUE) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                descriptor.addParameter(MINIMUM, validator.getMinimum());
            }
        } else if (component instanceof LengthValidator) {

Solution content

    protected void fillParameters(BaseFacesObjectDescriptor descriptor, Validator component) {
        if (component instanceof DoubleRangeValidator) {
            DoubleRangeValidator validator = (DoubleRangeValidator) component;
            if (validator.getMaximum() < Double.MAX_VALUE) {
                descriptor.addParameter(MAXIMUM, validator.getMaximum());
            }
            if (validator.getMinimum() > Double.MIN_VALUE) {
                descriptor.addParameter(MINIMUM, validator.getMinimum());
            }
        } else if (component instanceof LengthValidator) {

File
FacesValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

            }
        } else if (component instanceof LengthValidator) {
            LengthValidator validator = (LengthValidator) component;
<<<<<<< HEAD
            if(validator.getMaximum() >0){
                descriptor.addParameter(MAXIMUM, validator.getMaximum());
            } 
            if( validator.getMinimum()>0){
=======
            if (validator.getMaximum() > 0) {
                descriptor.addParameter(MAXIMUM, validator.getMaximum());
            }
            if (validator.getMinimum() > 0) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                descriptor.addParameter(MINIMUM, validator.getMinimum());
            }
        } else if (component instanceof LongRangeValidator) {

Solution content

            }
        } else if (component instanceof LengthValidator) {
            LengthValidator validator = (LengthValidator) component;
            if (validator.getMaximum() > 0) {
                descriptor.addParameter(MAXIMUM, validator.getMaximum());
            }
            if (validator.getMinimum() > 0) {
                descriptor.addParameter(MINIMUM, validator.getMinimum());
            }
        } else if (component instanceof LongRangeValidator) {

File
FacesValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

            }
        } else if (component instanceof LongRangeValidator) {
            LongRangeValidator validator = (LongRangeValidator) component;
<<<<<<< HEAD
            if(validator.getMaximum() !=0){
                descriptor.addParameter(MAXIMUM, validator.getMaximum());
            } 
            if( validator.getMinimum()!=0){
=======
            if (validator.getMaximum() != 0) {
                descriptor.addParameter(MAXIMUM, validator.getMaximum());
            }
            if (validator.getMinimum() != 0) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                descriptor.addParameter(MINIMUM, validator.getMinimum());
            }
        } else if (component instanceof RegexValidator) {

Solution content

            }
        } else if (component instanceof LongRangeValidator) {
            LongRangeValidator validator = (LongRangeValidator) component;
            if (validator.getMaximum() != 0) {
                descriptor.addParameter(MAXIMUM, validator.getMaximum());
            }
            if (validator.getMinimum() != 0) {
                descriptor.addParameter(MINIMUM, validator.getMinimum());
            }
        } else if (component instanceof RegexValidator) {

File
FacesValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content
} else { super.fillParameters(descriptor, component); } <<<<<<< HEAD ======= >>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8 } }

Solution content
} else { super.fillParameters(descriptor, component); } } }

File
FacesValidatorServiceImpl.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

    public void setupService() {
        expect(factory.getInstance(FacesConverterService.class)).andStubReturn(converterService);
        converterCapture = new Capture();
<<<<<<< HEAD
        expect(converterService.getConverterDescription(same(environment.getFacesContext()), same(input), capture(converterCapture)))
            .andStubReturn(descriptor);
=======
        expect(
            converterService.getConverterDescription(same(environment.getFacesContext()), same(input),
                capture(converterCapture), EasyMock.isNull())).andStubReturn(descriptor);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        ServiceTracker.setFactory(factory);
    }

Solution content

    public void setupService() {
        expect(factory.getInstance(FacesConverterService.class)).andStubReturn(converterService);
        converterCapture = new Capture();
        expect(
            converterService.getConverterDescription(same(environment.getFacesContext()), same(input),
                capture(converterCapture), EasyMock.isNull())).andStubReturn(descriptor);
        ServiceTracker.setFactory(factory);
    }

File
BehaviorGetConverterTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

            ValidatorDescriptor validatorDescriptor = environment.createMock(ValidatorDescriptor.class);
            expect((Class) validatorDescriptor.getImplementationClass()).andStubReturn(validator.getClass());
            expect(validatorDescriptor.getMessage()).andStubReturn(VALIDATION_ERROR);
<<<<<<< HEAD
            expect(facesValidatorService.getValidatorDescription(environment.getFacesContext(), input, validator))
=======
            expect(facesValidatorService.getValidatorDescription(environment.getFacesContext(), input, validator, null))
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                .andStubReturn(validatorDescriptor);
        }
    }

Solution content

            ValidatorDescriptor validatorDescriptor = environment.createMock(ValidatorDescriptor.class);
            expect((Class) validatorDescriptor.getImplementationClass()).andStubReturn(validator.getClass());
            expect(validatorDescriptor.getMessage()).andStubReturn(VALIDATION_ERROR);
            expect(facesValidatorService.getValidatorDescription(environment.getFacesContext(), input, validator, null))
                .andStubReturn(validatorDescriptor);
        }
    }

File
BehaviorGetValidatorTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

import static org.easymock.EasyMock.expect;
import static org.junit.Assert.assertEquals;

<<<<<<< HEAD
import static org.easymock.EasyMock.expect;
import static org.junit.Assert.assertEquals;
=======
import java.util.HashMap;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

import javax.el.ELException;
import javax.el.ValueExpression;

Solution content
import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; import java.util.HashMap; import javax.el.ELException; import javax.el.ValueExpression;

File
ValueExpressionAnalayserTest.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

    

@RunWith(MockTestRunner.class)
public class ValueExpressionAnalayserTest extends ELTestBase {
<<<<<<< HEAD
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    private ValueExpressionAnalayser analayser;
    @Mock
    @Environment(Feature.EXTERNAL_CONTEXT)

Solution content
@RunWith(MockTestRunner.class) public class ValueExpressionAnalayserTest extends ELTestBase { private ValueExpressionAnalayser analayser; @Mock @Environment(Feature.EXTERNAL_CONTEXT)

File
ValueExpressionAnalayserTest.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content

    @Mock
    @Environment(Feature.EXTERNAL_CONTEXT)
    private MockFacesEnvironment facesEnvironment;
<<<<<<< HEAD
=======
    private FacesContext facesContext;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

    private FacesContext facesContext;

Solution content
@Mock @Environment(Feature.EXTERNAL_CONTEXT) private MockFacesEnvironment facesEnvironment; private FacesContext facesContext;

File
ValueExpressionAnalayserTest.java

Developer's decision
Version 1

Kind of conflict
Attribute

Chunk

Conflicting content

    @Test
    public void testGetDescriptionPositive() throws Exception {
        ValueExpression expression = parse("#{bean.string}");
<<<<<<< HEAD
        expect(facesContext.getELContext()).andReturn(elContext);
        FacesMock.replay(facesEnvironment);
=======
        recordFacesContextExpectations();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        ValueDescriptor propertyDescriptor = analayser.getPropertyDescriptor(facesContext, expression);
        assertEquals(Bean.class, propertyDescriptor.getBeanType());
        assertEquals("string", propertyDescriptor.getName());

Solution content

    @Test
    public void testGetDescriptionPositive() throws Exception {
        ValueExpression expression = parse("#{bean.string}");
        recordFacesContextExpectations();
        ValueDescriptor propertyDescriptor = analayser.getPropertyDescriptor(facesContext, expression);
        assertEquals(Bean.class, propertyDescriptor.getBeanType());
        assertEquals("string", propertyDescriptor.getName());

File
ValueExpressionAnalayserTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

        assertEquals(Bean.class, propertyDescriptor.getBeanType());
        assertEquals("string", propertyDescriptor.getName());
        FacesMock.verify(facesEnvironment);
<<<<<<< HEAD
=======
    }

    private void recordFacesContextExpectations() {
        expect(facesContext.getELContext()).andReturn(elContext);
        expect(facesContext.getAttributes()).andStubReturn(new HashMap());
        FacesMock.replay(facesEnvironment);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }

    @Test(expected = ELException.class)

Solution content

        assertEquals(Bean.class, propertyDescriptor.getBeanType());
        assertEquals("string", propertyDescriptor.getName());
        FacesMock.verify(facesEnvironment);
    }

    private void recordFacesContextExpectations() {
        expect(facesContext.getELContext()).andReturn(elContext);
        expect(facesContext.getAttributes()).andStubReturn(new HashMap());
        FacesMock.replay(facesEnvironment);
    }

    @Test(expected = ELException.class)

File
ValueExpressionAnalayserTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Method signature

Chunk

Conflicting content

    @Test(expected = ELException.class)
    public void testGetDescriptionNegative() throws Exception {
        ValueExpression expression = parse("#{bean}");
<<<<<<< HEAD
        expect(facesContext.getELContext()).andReturn(elContext);
        FacesMock.replay(facesEnvironment);
=======
        recordFacesContextExpectations();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        ValueDescriptor propertyDescriptor = analayser.getPropertyDescriptor(facesContext, expression);
        assertNull(propertyDescriptor);
    }

Solution content

    @Test(expected = ELException.class)
    public void testGetDescriptionNegative() throws Exception {
        ValueExpression expression = parse("#{bean}");
        recordFacesContextExpectations();
        ValueDescriptor propertyDescriptor = analayser.getPropertyDescriptor(facesContext, expression);
        assertNull(propertyDescriptor);
    }

File
ValueExpressionAnalayserTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

    }

    private LibraryFunction getScript(Resource resource, Class serverSideType) throws ScriptNotFoundException {
<<<<<<< HEAD
//        expect(resourceHandler.createResource(serverSideType.getSimpleName() + ".js", ORG_RICHFACES_CSV, TEXT_JAVASCRIPT)).andReturn(resource);
=======
        // expect(resourceHandler.createResource(serverSideType.getSimpleName() + ".js", ORG_RICHFACES_CSV,
        // TEXT_JAVASCRIPT)).andReturn(resource);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        controller.replay();
        LibraryFunction script = serviceImpl.getScript(environment.getFacesContext(), serverSideType);
        return script;

Solution content

    }

    private LibraryFunction getScript(Resource resource, Class serverSideType) throws ScriptNotFoundException {
        // expect(resourceHandler.createResource(serverSideType.getSimpleName() + ".js", ORG_RICHFACES_CSV,
        // TEXT_JAVASCRIPT)).andReturn(resource);
        controller.replay();
        LibraryFunction script = serviceImpl.getScript(environment.getFacesContext(), serverSideType);
        return script;

File
ClientScriptServiceTest.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content

    @Before
    public void setUp() {
<<<<<<< HEAD
        this.facesEnvironment = MockFacesEnvironment.createEnvironment().withApplication().resetToNice();        
=======
        this.facesEnvironment = MockFacesEnvironment.createEnvironment().withApplication().resetToNice();
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        input = facesEnvironment.createMock(UIInput.class);
        recordMocks();
        facesEnvironment.replay();

Solution content

    @Before
    public void setUp() {
        this.facesEnvironment = MockFacesEnvironment.createEnvironment().withApplication().resetToNice();
        input = facesEnvironment.createMock(UIInput.class);
        recordMocks();
        facesEnvironment.replay();

File
MockTestBase.java

Developer's decision
Version 1

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content

    @Parameters
    public static List getRunParameterss() {
<<<<<<< HEAD
        return options(pass("true"), pass("ok"), pass("123"),pass("0"),pass("1"),pass("no"));
=======
        return options(pass("true"), pass("ok"), pass("123"), pass("0"), pass("1"), pass("no"));
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    }
}

Solution content
@Parameters public static List getRunParameterss() { return options(pass("true"), pass("ok"), pass("123"), pass("0"), pass("1"), pass("no")); } }

File
BooleanConverterTest.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Return statement

Chunk

Conflicting content

package org.richfaces.javascript.client.converter;

<<<<<<< HEAD
import static org.junit.Assert.*;
=======
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8

import javax.faces.application.FacesMessage;
import javax.faces.convert.Converter;

Solution content

package org.richfaces.javascript.client.converter;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import javax.faces.application.FacesMessage;
import javax.faces.convert.Converter;

File
ConverterTestBase.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

    public void testConvert() throws Exception {
        Converter converter = createConverter();
        try {
<<<<<<< HEAD
            Object convertedValue =
                converter.getAsObject(facesEnvironment.getFacesContext(), input, criteria.getValue().toString());
            Object jsConvertedValue =
                convertOnClient(converter);
            if(null != convertedValue || null != jsConvertedValue){
=======
            Object convertedValue = converter.getAsObject(facesEnvironment.getFacesContext(), input, criteria.getValue()
                .toString());
            Object jsConvertedValue = convertOnClient(converter);
            if (null != convertedValue || null != jsConvertedValue) {
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
                compareResult(convertedValue, jsConvertedValue);
            }
        } catch (ConverterException e) {

Solution content

    public void testConvert() throws Exception {
        Converter converter = createConverter();
        try {
            Object convertedValue = converter.getAsObject(facesEnvironment.getFacesContext(), input, criteria.getValue()
                .toString());
            Object jsConvertedValue = convertOnClient(converter);
            if (null != convertedValue || null != jsConvertedValue) {
                compareResult(convertedValue, jsConvertedValue);
            }
        } catch (ConverterException e) {

File
ConverterTestBase.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation
Variable

Chunk

Conflicting content

    private Object getErrorMessage(Converter converter) {
        ConverterServiceImpl converterService = new ConverterServiceImpl();
<<<<<<< HEAD
        FacesMessage message = converterService.getMessage(facesEnvironment.getFacesContext(), converter, input);
=======
        FacesMessage message = converterService.getMessage(facesEnvironment.getFacesContext(), converter, input, null);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        return new Message(message);
    }

Solution content

    private Object getErrorMessage(Converter converter) {
        ConverterServiceImpl converterService = new ConverterServiceImpl();
        FacesMessage message = converterService.getMessage(facesEnvironment.getFacesContext(), converter, input, null);
        return new Message(message);
    }

File
ConverterTestBase.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

import java.util.List;
import java.util.Map;

<<<<<<< HEAD
import javax.faces.convert.NumberConverter;
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
import javax.faces.convert.Converter;
import javax.faces.convert.NumberConverter;

Solution content
import java.util.List; import java.util.Map; import javax.faces.convert.Converter; import javax.faces.convert.NumberConverter;

File
NumberConverterTest.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

package org.richfaces.javascript.client.converter;

<<<<<<< HEAD

import java.util.List;

import javax.faces.convert.ShortConverter;
=======
import java.util.List;

>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
import javax.faces.convert.Converter;
import javax.faces.convert.ShortConverter;

Solution content
package org.richfaces.javascript.client.converter; import java.util.List; import javax.faces.convert.Converter; import javax.faces.convert.ShortConverter;

File
ShortConverterTest.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

    private static final String MINIMUM = "min";
    private static final String MAXIMUM = "max";

<<<<<<< HEAD
    private static final String MINIMUM = "min";
    private static final String MAXIMUM = "max";
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    /**
     * @param criteria
     */

Solution content
private static final String MINIMUM = "min"; private static final String MAXIMUM = "max"; /** * @param criteria */

File
DoubleRangeValidatorTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

    private static final String MINIMUM = "min";
    private static final String MAXIMUM = "max";

<<<<<<< HEAD
    private static final String MINIMUM = "min";
    private static final String MAXIMUM = "max";
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    /**
     * @param criteria
     */

Solution content
private static final String MINIMUM = "min"; private static final String MAXIMUM = "max"; /** * @param criteria */

File
LengthValidatorTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

    private static final String MINIMUM = "min";
    private static final String MAXIMUM = "max";

<<<<<<< HEAD
    private static final String MINIMUM = "min";
    private static final String MAXIMUM = "max";
=======
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
    /**
     * @param criteria
     */

Solution content
/** private static final String MINIMUM = "min"; private static final String MAXIMUM = "max"; * @param criteria */

File
LongRangeValidatorTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

    private Object getErrorMessage(Validator validator) {
        FacesValidatorServiceImpl validatorService = new FacesValidatorServiceImpl();
<<<<<<< HEAD
        FacesMessage message = validatorService.getMessage(facesEnvironment.getFacesContext(), validator, input);
=======
        FacesMessage message = validatorService.getMessage(facesEnvironment.getFacesContext(), validator, input, null);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        return new Message(message);
    }

Solution content

    private Object getErrorMessage(Validator validator) {
        FacesValidatorServiceImpl validatorService = new FacesValidatorServiceImpl();
        FacesMessage message = validatorService.getMessage(facesEnvironment.getFacesContext(), validator, input, null);
        return new Message(message);
    }

File
ValidatorTestBase.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

    public void getConverterClass() throws Exception {
        converter = new BooleanConverter();
        controller.replay();
<<<<<<< HEAD
        ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter);
=======
        ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input,
            converter, null);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        assertEquals(converter.getClass(), converterDescription.getImplementationClass());
    }

Solution content

    public void getConverterClass() throws Exception {
        converter = new BooleanConverter();
        controller.replay();
        ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input,
            converter, null);
        assertEquals(converter.getClass(), converterDescription.getImplementationClass());
    }

File
FacesConverterServiceTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

            facesMessage = e.getFacesMessage();
        }
        assertNotNull(facesMessage);
<<<<<<< HEAD
        ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter);
=======
        ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input,
            converter, null);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        String summary = converterDescription.getMessage().getSummary();
        summary = summary.replace("{2}", "foo");
        summary = summary.replace("'{0}'", "abc");

Solution content

            facesMessage = e.getFacesMessage();
        }
        assertNotNull(facesMessage);
        ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input,
            converter, null);
        String summary = converterDescription.getMessage().getSummary();
        summary = summary.replace("{2}", "foo");
        summary = summary.replace("'{0}'", "abc");

File
FacesConverterServiceTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

        converter.setType("both");
        converter.setTimeZone(TimeZone.getTimeZone("EST"));
        controller.replay();
<<<<<<< HEAD
        ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter);
=======
        ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input,
            converter, null);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        Map additionalParameters = converterDescription.getAdditionalParameters();
        assertEquals("short", additionalParameters.get("dateStyle"));
        assertEquals("MM/DD/YYYY", additionalParameters.get("pattern"));

Solution content

        converter.setType("both");
        converter.setTimeZone(TimeZone.getTimeZone("EST"));
        controller.replay();
        ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input,
            converter, null);
        Map additionalParameters = converterDescription.getAdditionalParameters();
        assertEquals("short", additionalParameters.get("dateStyle"));
        assertEquals("MM/DD/YYYY", additionalParameters.get("pattern"));

File
FacesConverterServiceTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

    public void getConverterClass() throws Exception {
        validator = new LengthValidator();
        controller.replay();
<<<<<<< HEAD
        ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator);
=======
        ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input,
            validator, null);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        assertEquals(validator.getClass(), validatorDescription.getImplementationClass());
    }

Solution content

    public void getConverterClass() throws Exception {
        validator = new LengthValidator();
        controller.replay();
        ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input,
            validator, null);
        assertEquals(validator.getClass(), validatorDescription.getImplementationClass());
    }

File
FacesValidatorServiceTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

            facesMessage = e.getFacesMessage();
        }
        assertNotNull(facesMessage);
<<<<<<< HEAD
        ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator);
=======
        ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input,
            validator, null);
>>>>>>> 871d01b7312cb7705c56a98c24b26d8ae74038a8
        String summary = validatorDescription.getMessage().getSummary();
        summary = summary.replace("{0}", "foo");
        assertEquals(facesMessage.getSummary(), summary);

Solution content

            facesMessage = e.getFacesMessage();
        }
        assertNotNull(facesMessage);
        ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input,
            validator, null);
        String summary = validatorDescription.getMessage().getSummary();
        summary = summary.replace("{0}", "foo");
        assertEquals(facesMessage.getSummary(), summary);

File
FacesValidatorServiceTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Projects >> components >>c9318bc177ead88ad65ac6f8e82a9f1fdbc8ab1b