Projects >> akvo-flow >>bd53b36065346dd0cb634918b37b8fd9ec65573e

Chunk
Conflicting content 
        this.localeLocationFlag = localeLocationFlag;
    }

<<<<<<< HEAD
    public Boolean getAllowExternalSources() {
        return this.allowExternalSources;
    }

    public void setAllowExternalSources(Boolean allowExternalSources) {
        this.allowExternalSources = allowExternalSources;
    }

=======
    /**
     * Compare question entities based on Key
     *
     * @param q
     * @return true if the Key of the two entities is the same
     */
    public boolean equals(Question q) {
        return key != null && q.getKey() != null && key.equals(q.getKey());
    }

    public String getQuestionId() {
        return questionId;
    }

    public void setQuestionId(String questionId) {
        this.questionId = questionId;
    }
>>>>>>> feb03a83585cd138407630e66d5d8a8e784b8d35
}
Solution content 
        this.localeLocationFlag = localeLocationFlag;
    }

    /**
     * Compare question entities based on Key
     *
     * @param q
     * @return true if the Key of the two entities is the same
     */
    public boolean equals(Question q) {
        return key != null && q.getKey() != null && key.equals(q.getKey());
    }

    public String getQuestionId() {
        return questionId;
    }

    public void setQuestionId(String questionId) {
        this.questionId = questionId;
    }

    public Boolean getAllowExternalSources() {
        return this.allowExternalSources;
    }

    public void setAllowExternalSources(Boolean allowExternalSources) {
        this.allowExternalSources = allowExternalSources;
    }

}
File
Question.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    @XmlSchemaType(name = "NMTOKEN")
    protected String id;

<<<<<<< HEAD
    @XmlAttribute(required = false)
    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    @XmlSchemaType(name = "NMTOKEN")
    protected String sourceId;

    @XmlAttribute(required = false)
    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    protected String allowExternalSources;

    public String getSourceId() {
        return sourceId;
    }

    public void setSourceId(String sourceId) {
        this.sourceId = sourceId;
    }

=======
>>>>>>> feb03a83585cd138407630e66d5d8a8e784b8d35
    public List getAltText() {
        if (altText == null) {
            altText = new ArrayList();
Solution content 
    @XmlSchemaType(name = "NMTOKEN")
    protected String id;

    @XmlAttribute(required = false)
    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    protected String allowExternalSources;

    public List getAltText() {
        if (altText == null) {
            altText = new ArrayList();
File
Question.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Method declaration
Chunk
Conflicting content 
        this.requireDoubleEntry = requireDoubleEntry;
    }

<<<<<<< HEAD
    public Boolean getAllowExternalSources() {
        return allowExternalSources;
    }

    public void setAllowExternalSources(Boolean allowExternalSources) {
        this.allowExternalSources = allowExternalSources;
=======
    public String getQuestionId() {
	return questionId;
    }

    public void setQuestionId(String questionId) {
	this.questionId = questionId;
>>>>>>> feb03a83585cd138407630e66d5d8a8e784b8d35
    }
}
Solution content 
        this.requireDoubleEntry = requireDoubleEntry;
    }

    public Boolean getAllowExternalSources() {
        return allowExternalSources;
    public String getQuestionId() {
	return questionId;
    }

    public void setAllowExternalSources(Boolean allowExternalSources) {
        this.allowExternalSources = allowExternalSources;
    public void setQuestionId(String questionId) {
	this.questionId = questionId;
    }
}
File
QuestionDto.java
Developer's decision
Combination
Kind of conflict
Attribute
Method declaration
Method signature
Chunk
Conflicting content 
            }
        }

<<<<<<< HEAD
        if ("true".equalsIgnoreCase(String.valueOf(q.getAllowExternalSources()))) {
            qXML.setAllowExternalSources(String.valueOf(q.getAllowExternalSources()));
        }

        if (q.getSourceId() != null) {
            qXML.setSourceId(q.getSourceId().toString());
        }

=======
>>>>>>> feb03a83585cd138407630e66d5d8a8e784b8d35
        String questionDocument = null;
        try {
            questionDocument = sax.marshal(qXML);
Solution content 
            }
        }

        if ("true".equalsIgnoreCase(String.valueOf(q.getAllowExternalSources()))) {
            qXML.setAllowExternalSources(String.valueOf(q.getAllowExternalSources()));
        }

        String questionDocument = null;
        try {
            questionDocument = sax.marshal(qXML);
File
SurveyAssemblyServlet.java
Developer's decision
Combination
Kind of conflict
If statement