Skip to content

Commit e48b288

Browse files
Remove fields syntax, type and time
1 parent c2f04d6 commit e48b288

15 files changed

Lines changed: 17 additions & 258 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>cc.wordview.gengolex</groupId>
88
<artifactId>Gengolex</artifactId>
9-
<version>2.5.2</version>
9+
<version>2.5.3</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/kotlin/cc/wordview/gengolex/word/Syntax.kt

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/main/kotlin/cc/wordview/gengolex/word/Time.kt

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/main/kotlin/cc/wordview/gengolex/word/Type.kt

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/main/kotlin/cc/wordview/gengolex/word/Word.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,12 @@ package cc.wordview.gengolex.word
55
*
66
* @property parent Identifier used to associate a word to a global equivalent of it (basically the translation of it in english)
77
* @property word The word itself in the respective language
8-
* @property type Which kind of word is (e.g. Verb, Noun)
9-
* @property time Which time the verb is conjugated (null if not a verb)
108
* @property representable Indicates whether this word is representable by an image/illustration
119
* @property pronunciation How the word is spelled
1210
*/
1311
open class Word(
1412
val parent: String,
1513
val word: String,
16-
val syntax: Syntax? = null,
17-
val type: String = Type.NOUN.name,
18-
val time: String? = null,
1914
val representable: Boolean = false,
2015
val pronunciation: String? = null,
2116
)

src/test/kotlin/MockValues.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const val englishDictionaryJsonString =
2-
"[{\"parent\":\"run\",\"word\":\"run\",\"type\":\"VERB\",\"time\":\"PRESENT\",\"representation\":\"DESCRIPTION\",\"derivations\":[{\"parent\":\"running\",\"word\":\"running\",\"type\":\"VERB\",\"time\":\"PRESENT\",\"representation\":\"DESCRIPTION\"},{\"parent\":\"ran\",\"word\":\"ran\",\"type\":\"VERB\",\"time\":\"PAST\",\"representation\":\"DESCRIPTION\"}]}]"
2+
"[{\"parent\":\"run\",\"word\":\"run\",\"derivations\":[{\"parent\":\"running\",\"word\":\"running\"},{\"parent\":\"ran\",\"word\":\"ran\"}]}]"
33
const val kanjiDictionaryJsonString =
4-
"[{\"parent\":\"run\",\"word\":\"\",\"type\":\"VERB\",\"time\":\"PRESENT\",\"representation\":\"BOTH\",\"derivations\":[{\"parent\":\"run\",\"word\":\"走る\",\"type\":\"VERB\",\"time\":\"PRESENT\",\"representation\":\"BOTH\"},{\"parent\":\"ran\",\"word\":\"走ってた\",\"type\":\"VERB\",\"time\":\"PAST\",\"representation\":\"BOTH\"},{\"parent\":\"running\",\"word\":\"走っています\",\"type\":\"VERB\",\"time\":\"PRESENT\",\"representation\":\"BOTH\"}]},{\"parent\":\"rain\",\"word\":\"\",\"type\":\"NOUN\",\"representable\":true,\"representation\":\"ILLUSTRATION\",\"pronunciation\":\"ame\"},{\"parent\":\"i\",\"word\":\"\",\"type\":\"NOUN\",\"representation\":\"DESCRIPTION\",\"description\":\"Me, i\"}]"
4+
"[{\"parent\":\"run\",\"word\":\"\",\"derivations\":[{\"parent\":\"run\",\"word\":\"走る\"},{\"parent\":\"ran\",\"word\":\"走ってた\"},{\"parent\":\"running\",\"word\":\"走っています\"}]},{\"parent\":\"rain\",\"word\":\"\",\"representable\":true,\"pronunciation\":\"ame\"},{\"parent\":\"i\",\"word\":\"\"}]"
55
const val portugueseDictionaryJsonString =
6-
"[{\"parent\":\"run\",\"word\":\"correr\",\"type\":\"VERB\",\"time\":\"PRESENT\",\"representation\":\"DESCRIPTION\",\"derivations\":[{\"parent\":\"ran\",\"word\":\"corri\",\"type\":\"VERB\",\"time\":\"PAST\",\"representation\":\"DESCRIPTION\"},{\"parent\":\"running\",\"word\":\"correndo\",\"type\":\"VERB\",\"time\":\"PRESENT\",\"representation\":\"DESCRIPTION\"},{\"parent\":\"run\",\"word\":\"corra\",\"type\":\"VERB\",\"time\":\"PRESENT\",\"representation\":\"DESCRIPTION\"}]},{\"parent\":\"umbrella\",\"word\":\"guarda-chuva\",\"type\":\"NOUN\",\"representable\":true,\"representation\":\"ILLUSTRATION\"}]"
6+
"[{\"parent\":\"run\",\"word\":\"correr\",\"derivations\":[{\"parent\":\"ran\",\"word\":\"corri\"},{\"parent\":\"running\",\"word\":\"correndo\"},{\"parent\":\"run\",\"word\":\"corra\"}]},{\"parent\":\"umbrella\",\"word\":\"guarda-chuva\",\"representable\":true}]"

src/test/kotlin/parser/RepresentableFieldTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class RepresentableFieldTest : GengolexTest() {
1515
testRepresentability("僕は走る", false, Language.JAPANESE)
1616
testRepresentability("私は", false, Language.JAPANESE)
1717
testRepresentability("雨が降る", true, Language.JAPANESE)
18-
testRepresentability("変わらないよ", true, Language.JAPANESE)
18+
testRepresentability("変わらないよ", false, Language.JAPANESE)
1919
testRepresentability("近付いたら壊れてしまいそう", true, Language.JAPANESE)
2020
}
2121

src/test/kotlin/parser/SyntaxFieldTest.kt

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/test/kotlin/parser/TimeFieldTest.kt

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/test/kotlin/parser/TypeFieldTest.kt

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)