Projects >> visural-wicket >>abce17cc6d8f29f02f13da586c59ed429666b344

Chunk
Conflicting content 
public class ExamplesApplication extends WebApplication {

    public ExamplesApplication() {
<<<<<<< HEAD
=======
        addRenderHeadListener(JavascriptPackageResource.getHeaderContribution(new JQueryResourceReference(Version.V1_6_3)));
>>>>>>> 4d470a10e4b4113afc286a63c86106135bfbf94c
    }

    @Override
Solution content 
public class ExamplesApplication extends WebApplication {

    public ExamplesApplication() {
    }

    @Override
File
ExamplesApplication.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    private String getJS() {
        StringBuilder sb = new StringBuilder();
<<<<<<< HEAD
        for (Component com : componentIds) {
            sb.append("jQuery('#").append(com.getMarkupId()).append("').bt(").append(getOptionsJSON()).append(");");
=======
        for (String id : componentIds) {
            sb.append("jQuery(document.getElementById('").append(id).append("')).bt(").append(getOptionsJSON()).append(");");
>>>>>>> 4d470a10e4b4113afc286a63c86106135bfbf94c
        }
        return sb.toString();
    }
Solution content 
    private String getJS() {
        StringBuilder sb = new StringBuilder();
        for (Component com : componentIds) {
            sb.append("jQuery(document.getElementById('").append(com.getMarkupId()).append("')).bt(").append(getOptionsJSON()).append(");");
        }
        return sb.toString();
    }
File
BeautyTipBehavior.java
Developer's decision
Manual
Kind of conflict
For statement
Method invocation
Chunk
Conflicting content 
public class DropDown extends TextField implements Serializable, ISecureEnableInstance, ISecureRenderInstance {
    private static final long serialVersionUID = 1L;
    
<<<<<<< HEAD
=======
    private final boolean outputPath;
    
    private final String origMarkupId;
>>>>>>> 4d470a10e4b4113afc286a63c86106135bfbf94c
    private final DropDownDataSource source;
    private final boolean requireListValue;
    private String origMarkupId;
Solution content 
public class DropDown extends TextField implements Serializable, ISecureEnableInstance, ISecureRenderInstance {
    private static final long serialVersionUID = 1L;
    
    private final boolean outputPath;    
    private final DropDownDataSource source;
    private final boolean requireListValue;
    private String origMarkupId;
File
DropDown.java
Developer's decision
Combination
Kind of conflict
Attribute