/*
 * Copyright 2011-2016 B2i Healthcare Pte Ltd, http://b2i.sg
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.b2international.snowowl.core.merge;

import java.util.List;

/**
 * @since 4.7
 */
public interface MergeConflict {

	public enum ConflictType {
		CONFLICTING_CHANGE,
		DELETED_WHILE_CHANGED,
		CHANGED_WHILE_DELETED,
		HAS_MISSING_REFERENCE,
		CAUSES_MISSING_REFERENCE,
		HAS_INACTIVE_REFERENCE,
		CAUSES_INACTIVE_REFERENCE
	}
	
	String getArtefactId();
	
	String getArtefactType();
	
	List<String> getConflictingAttributes();
	
	ConflictType getType();
	
	String getMessage();
	
}

@@ -967,133 +967,916 @@
 %0A%09%0A%09
-String getArtefactId();%0A%09%0A%09String getArtefactType();%0A%09%0A%09List%3CString%3E getConflictingAttributes();%0A%09%0A%09ConflictType getType();%0A%09
+/**%0A%09 * Returns the unique identifier of the artefact that induced this merge conflict.%0A%09 * %0A%09 * @return unique identifier of the artefact%0A%09 */%0A%09String getArtefactId();%0A%09%0A%09/**%0A%09 * Returns the type of the artefact that induced this merge conflict.%0A%09 * %0A%09 * @return the type of the artefact%0A%09 */%0A%09String getArtefactType();%0A%09%0A%09/**%0A%09 * Returns a list of attributes represented as %7B@link String%7Ds, all of which was involved in causing the conflict.%0A%09 * %0A%09 * @return the list of attributes involved in causing the conflict%0A%09 */%0A%09List%3CString%3E getConflictingAttributes();%0A%09%0A%09/**%0A%09 * Returns the type of the conflict, which reflects the nature of problem causing the merge to fail.%0A%09 * %0A%09 * @return the conflict type%0A%09 */%0A%09ConflictType getType();%0A%09%0A%09/**%0A%09 * Returns an interpretable message about the conflict, built using it's properties.%0A%09 * %0A%09 * @return a summarizing, interpretable message about the conflict%0A%09 */
 %0A%09St

Add javadoc to MergeConflict