Skip to content

Commit

Permalink
Restructured the generator package hierarchy
Browse files Browse the repository at this point in the history
  • Loading branch information
UO289845 committed Apr 18, 2024
1 parent b59fe08 commit d65ca31
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main.java.questionGenerator.generator;
package main.java.questionGenerator.generator.answersAreEntites;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -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;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main.java.questionGenerator.generator;
package main.java.questionGenerator.generator.answersAreEntites.withSubProperties;

import java.util.List;
import java.util.Map;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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{
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main.java.questionGenerator.generator.specificGenerators;
package main.java.questionGenerator.generator.answersAreNotEntites;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package main.java.questionGenerator.generator.specificGenerators;
package main.java.questionGenerator.generator.answersAreNotEntites;

import java.util.List;
import java.util.Map;

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;
Expand Down

0 comments on commit d65ca31

Please sign in to comment.