diff --git a/questionGenerator/src/main/java/questionGenerator/QuestionGenerator.java b/questionGenerator/src/main/java/questionGenerator/QuestionGenerator.java index 66791f58..aaa4981b 100644 --- a/questionGenerator/src/main/java/questionGenerator/QuestionGenerator.java +++ b/questionGenerator/src/main/java/questionGenerator/QuestionGenerator.java @@ -7,12 +7,12 @@ 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.DirectorGenerator; -import main.java.questionGenerator.generator.specificGenerators.HeadOfGovernmentGenerator; -import main.java.questionGenerator.generator.specificGenerators.LanguageGenerator; -import main.java.questionGenerator.generator.specificGenerators.PopulationGenerator; -import main.java.questionGenerator.generator.specificGenerators.SizeGenerator; +import main.java.questionGenerator.generator.answersAreEntites.withSubProperties.CapitalGenerator; +import main.java.questionGenerator.generator.answersAreEntites.withSubProperties.HeadOfGovernmentGenerator; +import main.java.questionGenerator.generator.answersAreEntites.withSubProperties.LanguageGenerator; +import main.java.questionGenerator.generator.answersAreEntites.withoutSubProperties.DirectorGenerator; +import main.java.questionGenerator.generator.answersAreNotEntites.PopulationGenerator; +import main.java.questionGenerator.generator.answersAreNotEntites.SizeGenerator; import main.java.questionGenerator.question.Question; import main.java.questionGenerator.question.QuestionType; diff --git a/questionGenerator/src/main/java/questionGenerator/generator/AbstractAnswersAreEntites.java b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/AbstractAnswersAreEntites.java similarity index 95% rename from questionGenerator/src/main/java/questionGenerator/generator/AbstractAnswersAreEntites.java rename to questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/AbstractAnswersAreEntites.java index 87cdebcb..33f20339 100644 --- a/questionGenerator/src/main/java/questionGenerator/generator/AbstractAnswersAreEntites.java +++ b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/AbstractAnswersAreEntites.java @@ -1,4 +1,4 @@ -package main.java.questionGenerator.generator; +package main.java.questionGenerator.generator.answersAreEntites; import java.io.IOException; import java.util.ArrayList; @@ -10,6 +10,7 @@ import org.wikidata.wdtk.wikibaseapi.apierrors.MediaWikiApiErrorException; import main.java.questionGenerator.entityGenerator.EntityGenerator; +import main.java.questionGenerator.generator.AbstractGenerator; import main.java.questionGenerator.question.QuestionType; diff --git a/questionGenerator/src/main/java/questionGenerator/generator/AnswersAreEntitiesWithSubProperties.java b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/AnswersAreEntitiesWithSubProperties.java similarity index 88% rename from questionGenerator/src/main/java/questionGenerator/generator/AnswersAreEntitiesWithSubProperties.java rename to questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/AnswersAreEntitiesWithSubProperties.java index 66bb47af..b78db818 100644 --- a/questionGenerator/src/main/java/questionGenerator/generator/AnswersAreEntitiesWithSubProperties.java +++ b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/AnswersAreEntitiesWithSubProperties.java @@ -1,4 +1,4 @@ -package main.java.questionGenerator.generator; +package main.java.questionGenerator.generator.answersAreEntites.withSubProperties; import java.util.List; import java.util.Map; @@ -7,6 +7,7 @@ import org.wikidata.wdtk.datamodel.interfaces.SnakGroup; import org.wikidata.wdtk.datamodel.interfaces.Statement; +import main.java.questionGenerator.generator.answersAreEntites.AbstractAnswersAreEntites; import main.java.questionGenerator.question.QuestionType; public abstract class AnswersAreEntitiesWithSubProperties extends AbstractAnswersAreEntites { diff --git a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/CapitalGenerator.java b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/CapitalGenerator.java similarity index 73% rename from questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/CapitalGenerator.java rename to questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/CapitalGenerator.java index 8ae71ccc..b1ecdf67 100644 --- a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/CapitalGenerator.java +++ b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/CapitalGenerator.java @@ -1,6 +1,5 @@ -package main.java.questionGenerator.generator.specificGenerators; +package main.java.questionGenerator.generator.answersAreEntites.withSubProperties; -import main.java.questionGenerator.generator.AnswersAreEntitiesWithSubProperties; import main.java.questionGenerator.question.QuestionType; public class CapitalGenerator extends AnswersAreEntitiesWithSubProperties { diff --git a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/HeadOfGovernmentGenerator.java b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/HeadOfGovernmentGenerator.java similarity index 74% rename from questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/HeadOfGovernmentGenerator.java rename to questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/HeadOfGovernmentGenerator.java index 62839247..33818e4e 100644 --- a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/HeadOfGovernmentGenerator.java +++ b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/HeadOfGovernmentGenerator.java @@ -1,6 +1,5 @@ -package main.java.questionGenerator.generator.specificGenerators; +package main.java.questionGenerator.generator.answersAreEntites.withSubProperties; -import main.java.questionGenerator.generator.AnswersAreEntitiesWithSubProperties; import main.java.questionGenerator.question.QuestionType; public class HeadOfGovernmentGenerator extends AnswersAreEntitiesWithSubProperties { diff --git a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/LanguageGenerator.java b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/LanguageGenerator.java similarity index 83% rename from questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/LanguageGenerator.java rename to questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/LanguageGenerator.java index e4e31bf1..b43ad0b7 100644 --- a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/LanguageGenerator.java +++ b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withSubProperties/LanguageGenerator.java @@ -1,8 +1,7 @@ -package main.java.questionGenerator.generator.specificGenerators; +package main.java.questionGenerator.generator.answersAreEntites.withSubProperties; import java.util.List; -import main.java.questionGenerator.generator.AnswersAreEntitiesWithSubProperties; import main.java.questionGenerator.question.QuestionType; import main.java.questionGenerator.question.answers.AnswerFormater; import main.java.questionGenerator.question.answers.formatAnswers.CapitalLetersFormater; diff --git a/questionGenerator/src/main/java/questionGenerator/generator/AnswersAreEntitiesWithoutSubProperties.java b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withoutSubProperties/AnswersAreEntitiesWithoutSubProperties.java similarity index 86% rename from questionGenerator/src/main/java/questionGenerator/generator/AnswersAreEntitiesWithoutSubProperties.java rename to questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withoutSubProperties/AnswersAreEntitiesWithoutSubProperties.java index 39cb32fc..8eff8ff8 100644 --- a/questionGenerator/src/main/java/questionGenerator/generator/AnswersAreEntitiesWithoutSubProperties.java +++ b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withoutSubProperties/AnswersAreEntitiesWithoutSubProperties.java @@ -1,10 +1,11 @@ -package main.java.questionGenerator.generator; +package main.java.questionGenerator.generator.answersAreEntites.withoutSubProperties; import java.util.List; import java.util.Map; import org.wikidata.wdtk.datamodel.interfaces.Statement; +import main.java.questionGenerator.generator.answersAreEntites.AbstractAnswersAreEntites; import main.java.questionGenerator.question.QuestionType; public abstract class AnswersAreEntitiesWithoutSubProperties extends AbstractAnswersAreEntites { diff --git a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/DirectorGenerator.java b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withoutSubProperties/DirectorGenerator.java similarity index 69% rename from questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/DirectorGenerator.java rename to questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withoutSubProperties/DirectorGenerator.java index 04609671..4ca7a794 100644 --- a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/DirectorGenerator.java +++ b/questionGenerator/src/main/java/questionGenerator/generator/answersAreEntites/withoutSubProperties/DirectorGenerator.java @@ -1,6 +1,5 @@ -package main.java.questionGenerator.generator.specificGenerators; +package main.java.questionGenerator.generator.answersAreEntites.withoutSubProperties; -import main.java.questionGenerator.generator.AnswersAreEntitiesWithoutSubProperties; import main.java.questionGenerator.question.QuestionType; public class DirectorGenerator extends AnswersAreEntitiesWithoutSubProperties{ diff --git a/questionGenerator/src/main/java/questionGenerator/generator/AnswersAreNotEntites.java b/questionGenerator/src/main/java/questionGenerator/generator/answersAreNotEntites/AnswersAreNotEntites.java similarity index 91% rename from questionGenerator/src/main/java/questionGenerator/generator/AnswersAreNotEntites.java rename to questionGenerator/src/main/java/questionGenerator/generator/answersAreNotEntites/AnswersAreNotEntites.java index 7b14459b..70d16c01 100644 --- a/questionGenerator/src/main/java/questionGenerator/generator/AnswersAreNotEntites.java +++ b/questionGenerator/src/main/java/questionGenerator/generator/answersAreNotEntites/AnswersAreNotEntites.java @@ -1,14 +1,14 @@ -package main.java.questionGenerator.generator; +package main.java.questionGenerator.generator.answersAreNotEntites; import java.util.ArrayList; import java.util.List; import java.util.Random; +import main.java.questionGenerator.generator.AbstractGenerator; import main.java.questionGenerator.question.QuestionType; public abstract class AnswersAreNotEntites extends AbstractGenerator{ - //Open to changes if needed. public AnswersAreNotEntites(String propertyId, QuestionType type, String message) { super(propertyId, type, message); } diff --git a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/PopulationGenerator.java b/questionGenerator/src/main/java/questionGenerator/generator/answersAreNotEntites/PopulationGenerator.java similarity index 91% rename from questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/PopulationGenerator.java rename to questionGenerator/src/main/java/questionGenerator/generator/answersAreNotEntites/PopulationGenerator.java index 187a8617..2cf74a79 100644 --- a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/PopulationGenerator.java +++ b/questionGenerator/src/main/java/questionGenerator/generator/answersAreNotEntites/PopulationGenerator.java @@ -1,4 +1,4 @@ -package main.java.questionGenerator.generator.specificGenerators; +package main.java.questionGenerator.generator.answersAreNotEntites; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,6 @@ import org.wikidata.wdtk.datamodel.interfaces.Statement; import org.wikidata.wdtk.datamodel.interfaces.Value; -import main.java.questionGenerator.generator.AnswersAreNotEntites; import main.java.questionGenerator.question.QuestionType; import main.java.questionGenerator.question.answers.AnswerFormater; import main.java.questionGenerator.question.answers.formatAnswers.EmbellishNumbersFormater; diff --git a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/SizeGenerator.java b/questionGenerator/src/main/java/questionGenerator/generator/answersAreNotEntites/SizeGenerator.java similarity index 90% rename from questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/SizeGenerator.java rename to questionGenerator/src/main/java/questionGenerator/generator/answersAreNotEntites/SizeGenerator.java index aa391d8c..24a40c44 100644 --- a/questionGenerator/src/main/java/questionGenerator/generator/specificGenerators/SizeGenerator.java +++ b/questionGenerator/src/main/java/questionGenerator/generator/answersAreNotEntites/SizeGenerator.java @@ -1,4 +1,4 @@ -package main.java.questionGenerator.generator.specificGenerators; +package main.java.questionGenerator.generator.answersAreNotEntites; import java.util.List; import java.util.Map; @@ -6,7 +6,6 @@ import org.wikidata.wdtk.datamodel.interfaces.Statement; import org.wikidata.wdtk.datamodel.interfaces.Value; -import main.java.questionGenerator.generator.AnswersAreNotEntites; import main.java.questionGenerator.question.QuestionType; import main.java.questionGenerator.question.answers.AnswerFormater; import main.java.questionGenerator.question.answers.formatAnswers.EmbellishNumbersFormater;