Remove unused images and XML sections.

[Dictionary.git] / src / com / hughes / android / dictionary / engine / EntryTypeName.java

diff --git a/src/com/hughes/android/dictionary/engine/EntryTypeName.java b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
index 0df2727242b38d014cce63772e407d3bd151fdae..4206265397e05a12b2fea5e492a193ac75e23559 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/EntryTypeName.java
+++ b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
@@ -14,58 +14,71 @@
 
 package com.hughes.android.dictionary.engine;
 
-
 public enum EntryTypeName {
 
-//  WIKTIONARY_TITLE_ONE_WORD(0),
-//  WIKTIONARY_MEANING_ONE_WORD(0),
-//  WIKTIONARY_TRANSLATION_ONE_WORD(0),
+    WIKTIONARY_TITLE_SINGLE_DETAIL(true, true, null),
+    WIKTIONARY_TITLE_SINGLE(true, true, null),
+    WIKTIONARY_INFLECTD_FORM_SINGLE(false, true, null),
+
+    ONE_WORD(true, true, null),
+    MULTIROW_HEAD_ONE_WORD(true, true, null),
+    MULTIROW_TAIL_ONE_WORD(false, true, null),
+
+    SYNONYM_SINGLE(false, true, null),
+    ANTONYM_SINGLE(false, true, null),
+
+    WIKTIONARY_TITLE_MULTI_DETAIL(false, true, WIKTIONARY_TITLE_SINGLE_DETAIL),
+    WIKTIONARY_TITLE_MULTI(false, true, WIKTIONARY_TITLE_SINGLE),
+    WIKTIONARY_TRANSLITERATION(),
+    // How we file "casa {f}, case {pl}" under "case"
+    WIKTIONARY_INFLECTED_FORM_MULTI(false, true, WIKTIONARY_INFLECTD_FORM_SINGLE),
+    WIKTIONARY_ENGLISH_DEF_WIKI_LINK(),
+    WIKTIONARY_ENGLISH_DEF_OTHER_LANG(),
+    WIKTIONARY_ENGLISH_DEF(),
+
+    SYNONYM_MULTI(false, true, SYNONYM_SINGLE),
+    ANTONYM_MULTI(false, true, ANTONYM_SINGLE),
+    DERIVED_TERM(false, true, null),
+
+    TWO_WORDS(),
+    THREE_WORDS(),
+    FOUR_WORDS(),
+    FIVE_OR_MORE_WORDS(),
+    WIKTIONARY_TRANSLATION_WIKI_TEXT(),
+    WIKTIONARY_TRANSLATION_OTHER_TEXT(),
 
-  WIKTIONARY_TITLE_SINGLE(0, true),
-  WIKTIONARY_FORM_SINGLE(0, true),
+    // How we file entries like: "sono: {form of|essere}" under "sono.".
+    WIKTIONARY_IS_FORM_OF_SOMETHING_ELSE(false, true, null),
 
-  NOUN(0),
-  VERB(0),
-  ADJ(0),
-  ADV(0),
-  ONE_WORD(0, true),
-  MULTIROW_HEAD_ONE_WORD(0, true),
-  MULTIROW_TAIL_ONE_WORD(0, true),
+    MULTIROW_HEAD_MANY_WORDS(),
+    MULTIROW_TAIL_MANY_WORDS(),
+    WIKTIONARY_EXAMPLE(),
 
-  WIKTIONARY_TITLE_MULTI(0, true),
-  WIKTIONARY_FORM_MULTI(0, true),
-  WIKTIONARY_TRANSLATION_SENSE(0),
-  WIKTIONARY_ENGLISH_DEF_WIKI_LINK(0),
-  WIKTIONARY_ENGLISH_DEF_OTHER_LANG(0),
-  WIKTIONARY_ENGLISH_DEF(0),
+    // The next two are how we file entries like: "sono: {form of|essere}" under
+    // "essere".
+    WIKTIONARY_BASE_FORM_SINGLE(), // These two should be eligible for removal
+    // if the links are otherwise present.
+    WIKTIONARY_BASE_FORM_MULTI(false, false, WIKTIONARY_BASE_FORM_SINGLE),
+    PART_OF_HYPHENATED(),
+    BRACKETED(),
+    PARENTHESIZED(),
+    WIKTIONARY_TRANSLATION_SENSE(),
+    SEE_ALSO(),
+    WIKTIONARY_MENTIONED(false, true, null), ;
 
-  TWO_WORDS(0),
-  THREE_WORDS(0),
-  FOUR_WORDS(0),
-  FIVE_OR_MORE_WORDS(0),
-  WIKTIONARY_TRANSLATION_WIKI_TEXT(0),
-  WIKTIONARY_TRANSLATION_OTHER_TEXT(0),
-//  WIKTIONARY_EXAMPLE_OTHER_WORDS(0),
-  
-  MULTIROW_HEAD_MANY_WORDS(0),
-  MULTIROW_TAIL_MANY_WORDS(0),
-  PART_OF_HYPHENATED(0),
-  BRACKETED(0),
-  PARENTHESIZED(0),
-  SEE_ALSO(0), 
-  WIKTIONARY_TRANSLITERATION(0),
-  ;
+    final boolean mainWord;
+    final boolean overridesStopList;
+    final EntryTypeName singleWordInstance;
 
-  final int nameResId;
-  final boolean overridesStopList;
-  
-  private EntryTypeName(final int nameResId) {
-    this(nameResId, false);
-  }
+    EntryTypeName() {
+        this(false, false, null);
+    }
 
-  private EntryTypeName(final int nameResId, final boolean overridesStopList) {
-    this.nameResId = nameResId;
-    this.overridesStopList = overridesStopList;
-  }
+    EntryTypeName(final boolean mainWord, final boolean overridesStopList,
+    final EntryTypeName singleWordInstance) {
+        this.mainWord = mainWord;
+        this.overridesStopList = overridesStopList;
+        this.singleWordInstance = singleWordInstance == null ? this : singleWordInstance;
+    }
 
 }