Removed old code remaining of the film director

Arquisoft · Apr 18, 2024 · e807bf1 · e807bf1
1 parent 2aef92a
commit e807bf1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/questionGenerator/src/main/java/questionGenerator/QuestionGenerator.java b/questionGenerator/src/main/java/questionGenerator/QuestionGenerator.java
@@ -8,7 +8,7 @@
 import main.java.questionGenerator.entityGenerator.EntityGenerator;
 import main.java.questionGenerator.generator.Generator;
 import main.java.questionGenerator.generator.specificGenerators.CapitalGenerator;
-import main.java.questionGenerator.generator.specificGenerators.FilmDirectorGenerator;
+import main.java.questionGenerator.generator.specificGenerators.DirectorGenerator;
 import main.java.questionGenerator.generator.specificGenerators.HeadOfGovernmentGenerator;
 import main.java.questionGenerator.generator.specificGenerators.LanguageGenerator;
 import main.java.questionGenerator.generator.specificGenerators.PopulationGenerator;
@@ -85,7 +85,7 @@ private void setGenerator(QuestionType type) {
 				break;
 			}
 			case DIRECTOR: {
-				generator = new FilmDirectorGenerator();
+				generator = new DirectorGenerator();
 				break;
 			}
 		}

diff --git a/...tor/src/main/java/questionGenerator/generator/AnswersAreEntitiesWithoutSubProperties.java b/...tor/src/main/java/questionGenerator/generator/AnswersAreEntitiesWithoutSubProperties.java
@@ -10,28 +10,27 @@
 public abstract class AnswersAreEntitiesWithoutSubProperties extends AbstractAnswersAreEntites {
 
 	private static final String INSTANCE_OF_PROPERTY = "P31";
-	private String instanceOf;
 
-	public AnswersAreEntitiesWithoutSubProperties(String propertyId, QuestionType type, String message, 
-			String instanceOfPropertyValue) {
+	public AnswersAreEntitiesWithoutSubProperties(String propertyId, QuestionType type, String message) {
 		super(propertyId, type, message);
-		this.instanceOf = instanceOfPropertyValue;
 	}
 
 	@Override
 	public String getRightAnswer(Map<String, List<Statement>> claims) throws Exception {
 		if(claims.get(super.getPropertyId())==null) {
 			throw new Exception("Claims does not have the property " + super.getPropertyId());
 		}
-
-		String value = processRightAnswer(claims.get(INSTANCE_OF_PROPERTY).get(0));
-		if(!value.equals(instanceOf)) {
-			throw new RuntimeException("The entity is not a " + instanceOf);
-		}
 
 		List<Statement> stms = claims.get(getPropertyId());
 		Statement stm = stms.get(stms.size()-1);
 		return processRightAnswer(stm);
 	}
 
+	@Override
+	public String getQuestion(String name, Map<String, List<Statement>> claims) {
+		String value = processRightAnswer(claims.get(INSTANCE_OF_PROPERTY).get(0));
+		String q = getMessages().getString(getMessage());
+		return String.format(q, value, name);
+	}
+
 }
diff --git a/...ificGenerators/FilmDirectorGenerator.java → ...specificGenerators/DirectorGenerator.java b/...ificGenerators/FilmDirectorGenerator.java → ...specificGenerators/DirectorGenerator.java
@@ -3,14 +3,13 @@
 import main.java.questionGenerator.generator.AnswersAreEntitiesWithoutSubProperties;
 import main.java.questionGenerator.question.QuestionType;
 
-public class FilmDirectorGenerator extends AnswersAreEntitiesWithoutSubProperties{
+public class DirectorGenerator extends AnswersAreEntitiesWithoutSubProperties{
 
     private final static String PROPERTY = "P57";
 	private final static String MESSAGE = "question.director";
-	private final static String INSTANCE_OF = "film";
 
-	public FilmDirectorGenerator() {
-		super(PROPERTY, QuestionType.DIRECTOR, MESSAGE, INSTANCE_OF);
+	public DirectorGenerator() {
+		super(PROPERTY, QuestionType.DIRECTOR, MESSAGE);
 	}
 
 }