Projects >> SemWiktionary >>fb881ef6adb15bb0da303474dbbe444f8d9c2cbb

Chunk
Conflicting content 
		for (Word tro : word.getTroponyms())
			println("∋ " + tro.getTitle());
		
<<<<<<< HEAD
		println("\n-=[ HYPONYMS ]=-  (words which meaning is included by this one’s)");
=======
		println("--------------------");

		for (Word rel : word.getRelatedVoc())
			println("↔ " + rel.getTitle());
		
		println("--------------------");

>>>>>>> bfe823e8c79ac2bf693b7d897a05c457a4903dcc
		
		for (Word hyp1 : word.getHyponyms()) {
			println("> " + hyp1.getTitle());
Solution content 
		for (Word tro : word.getTroponyms())
			println("∋ " + tro.getTitle());
		
		println("\n-=[ HYPONYMS ]=-  (words which meaning is included by this one’s)");
		
		for (Word hyp1 : word.getHyponyms()) {
			println("> " + hyp1.getTitle());
File
SemWiktionary.java
Developer's decision
Version 1
Kind of conflict
For statement
Method invocation
Chunk
Conflicting content 
	SYNONYM(Word.class),
	ANTONYM(Word.class),
	TROPONYM(Word.class),
<<<<<<< HEAD
	HYPONYM(Word.class),
	MERONYM(Word.class);
=======
	RELATEDVOC(Word.class);
>>>>>>> bfe823e8c79ac2bf693b7d897a05c457a4903dcc
	
	public Class getDestinationType() {
		return this.maps;
Solution content 
	SYNONYM(Word.class),
	ANTONYM(Word.class),
	TROPONYM(Word.class),
	HYPONYM(Word.class),
	MERONYM(Word.class),
	RELATEDVOC(Word.class);
	
	public Class getDestinationType() {
		return this.maps;
File
Relation.java
Developer's decision
Manual
Kind of conflict
Enum value
Chunk
Conflicting content 
		return this.get(Relation.TROPONYM);
	}
	
<<<<<<< HEAD
	/** Returns all hyponyms of this Word.
	 */
	public Collection getHyponyms() {
		return this.get(Relation.HYPONYM, Direction.OUTGOING);
	}
	
	/** Returns all hyperonyms of this Word.
	 */
	public Collection getHyperonyms() {
		return this.get(Relation.HYPONYM, Direction.INCOMING);
	}
	
	/** Returns all meronyms of this Word.
	 */
	public Collection getMeronyms() {
		return this.get(Relation.MERONYM, Direction.OUTGOING);
	}
	
	/** Returns all holonyms of this Word.
	 */
	public Collection getHolonyms() {
		return this.get(Relation.MERONYM, Direction.INCOMING);
	}
	
=======
	/** Returns all words with a related meaning of this Word.
	 */
	public Collection getRelatedVoc() {
		return this.get(Relation.RELATEDVOC);
	}

>>>>>>> bfe823e8c79ac2bf693b7d897a05c457a4903dcc
// DATABASE ACCESS
	
	/** Loads the definitions for this Word from the database.
Solution content 
		return this.get(Relation.TROPONYM);
	}
	
	/** Returns all hyponyms of this Word.
	 */
	public Collection getHyponyms() {
		return this.get(Relation.HYPONYM, Direction.OUTGOING);
	}
	
	/** Returns all hyperonyms of this Word.
	 */
	public Collection getHyperonyms() {
		return this.get(Relation.HYPONYM, Direction.INCOMING);
	}
	
	/** Returns all meronyms of this Word.
	 */
	public Collection getMeronyms() {
		return this.get(Relation.MERONYM, Direction.OUTGOING);
	}
	
	/** Returns all holonyms of this Word.
	 */
	public Collection getHolonyms() {
		return this.get(Relation.MERONYM, Direction.INCOMING);
	}
	
	/** Returns all words with a related meaning of this Word.
	 */
	public Collection getRelatedVoc() {
		return this.get(Relation.RELATEDVOC);
	}

// DATABASE ACCESS
	
	/** Loads the definitions for this Word from the database.
File
Word.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
	edu.unice.polytech.kis.semwiktionary.model.SynonymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.AntonymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.TroponymsTest.class,
<<<<<<< HEAD
	edu.unice.polytech.kis.semwiktionary.model.HyponymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.HyperonymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.MeronymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.HolonymsTest.class
=======
	edu.unice.polytech.kis.semwiktionary.model.RelatedVocTest.class
>>>>>>> bfe823e8c79ac2bf693b7d897a05c457a4903dcc

	//database cleanup is done in the @AfterClass below
})
Solution content 
	edu.unice.polytech.kis.semwiktionary.model.SynonymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.AntonymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.TroponymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.HyponymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.HyperonymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.MeronymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.HolonymsTest.class,
	edu.unice.polytech.kis.semwiktionary.model.RelatedVocTest.class

	//database cleanup is done in the @AfterClass below
})
File
RunAndPray.java
Developer's decision
Manual
Kind of conflict
Annotation