X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FEntryTypeName.java;h=356a4339e31f3f37cf386a3b46d98cf9784c96ad;hb=9babb854fd0ab5925c3eb6660cc8d60358ffeec9;hp=6e03a9ba04d79fff4ab8adc600c5d585b5aff84a;hpb=ec41a2b17c280999e264d7fcded56d323f5da9f8;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/engine/EntryTypeName.java b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
index 6e03a9b..356a433 100644
--- a/src/com/hughes/android/dictionary/engine/EntryTypeName.java
+++ b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
@@ -17,17 +17,17 @@ package com.hughes.android.dictionary.engine;
 
 public enum EntryTypeName {
 
-  WIKTIONARY_TITLE_SINGLE(true, null),
-  WIKTIONARY_INFLECTD_FORM_SINGLE(true, null),
+  WIKTIONARY_TITLE_SINGLE(true, true, null),
+  WIKTIONARY_INFLECTD_FORM_SINGLE(false, true, null),
 
 
-  ONE_WORD(true, null),
-  MULTIROW_HEAD_ONE_WORD(true, null),
-  MULTIROW_TAIL_ONE_WORD(true, null),
+  ONE_WORD(true, true, null),
+  MULTIROW_HEAD_ONE_WORD(true, true, null),
+  MULTIROW_TAIL_ONE_WORD(false, true, null),
 
-  WIKTIONARY_TITLE_MULTI(true, WIKTIONARY_TITLE_SINGLE),
+  WIKTIONARY_TITLE_MULTI(false, true, WIKTIONARY_TITLE_SINGLE),
   WIKTIONARY_TRANSLITERATION(),
-  WIKTIONARY_INFLECTED_FORM_MULTI(true, WIKTIONARY_INFLECTD_FORM_SINGLE),
+  WIKTIONARY_INFLECTED_FORM_MULTI(false, true, WIKTIONARY_INFLECTD_FORM_SINGLE),
   WIKTIONARY_ENGLISH_DEF_WIKI_LINK(),
   WIKTIONARY_ENGLISH_DEF_OTHER_LANG(),
   WIKTIONARY_ENGLISH_DEF(),
@@ -39,13 +39,13 @@ public enum EntryTypeName {
   WIKTIONARY_TRANSLATION_WIKI_TEXT(),
   WIKTIONARY_TRANSLATION_OTHER_TEXT(),
 
-  WIKTIONARY_IS_FORM_OF_SOMETHING_ELSE(true, null),
+  WIKTIONARY_IS_FORM_OF_SOMETHING_ELSE(false, true, null),
 
   MULTIROW_HEAD_MANY_WORDS(),
   MULTIROW_TAIL_MANY_WORDS(),
   WIKTIONARY_EXAMPLE(),
   WIKTIONARY_BASE_FORM_SINGLE(),  // These two should be eligible for removal if the links are otherwise present.
-  WIKTIONARY_BASE_FORM_MULTI(false, WIKTIONARY_BASE_FORM_SINGLE),
+  WIKTIONARY_BASE_FORM_MULTI(false, false, WIKTIONARY_BASE_FORM_SINGLE),
   PART_OF_HYPHENATED(),
   BRACKETED(),
   PARENTHESIZED(),
@@ -53,14 +53,16 @@ public enum EntryTypeName {
   SEE_ALSO(), 
   ;
 
+  final boolean mainWord;
   final boolean overridesStopList;
   final EntryTypeName singleWordInstance;
   
   private EntryTypeName() {
-    this(false, null);
+    this(false, false, null);
   }
 
-  private EntryTypeName(final boolean overridesStopList, final EntryTypeName singleWordInstance) {
+  private EntryTypeName(final boolean mainWord, final boolean overridesStopList, final EntryTypeName singleWordInstance) {
+    this.mainWord = mainWord;
     this.overridesStopList = overridesStopList;
     this.singleWordInstance = singleWordInstance == null ? this : singleWordInstance;
   }