From d398e86fa0cf7e96c79629e5159512353bc460fc Mon Sep 17 00:00:00 2001 From: travismccauley Date: Mon, 5 Jan 2004 21:51:04 +0000 Subject: [PATCH] Removed property, 'precedence', from all components and modified Controller accordingly --- build.xml | 4 +- src/java/org/thdl/lex/DisplayHelper.java | 9 +- .../lex/commands/GetInsertFormCommand.java | 2 +- .../org/thdl/lex/commands/InsertCommand.java | 2 +- .../lex/component/BaseAnalyticalNote.java | 28 +- .../thdl/lex/component/BaseDefinition.java | 71 +- .../component/BaseEncyclopediaArticle.java | 34 +- .../org/thdl/lex/component/BaseEtymology.java | 68 +- .../org/thdl/lex/component/BaseGloss.java | 34 +- .../component/BaseGrammaticalFunction.java | 28 +- .../org/thdl/lex/component/BaseKeyword.java | 28 +- .../thdl/lex/component/BaseLexComponent.java | 18 +- src/java/org/thdl/lex/component/BaseMeta.java | 71 +- .../thdl/lex/component/BaseModelSentence.java | 38 +- .../org/thdl/lex/component/BasePassage.java | 58 +- .../thdl/lex/component/BasePronunciation.java | 34 +- .../thdl/lex/component/BaseRelatedTerm.java | 34 +- .../lex/component/BaseSpeechRegister.java | 28 +- .../org/thdl/lex/component/BaseSpelling.java | 34 +- .../thdl/lex/component/BaseSubdefinition.java | 620 +++++------------- src/java/org/thdl/lex/component/BaseTerm.java | 96 +-- .../lex/component/BaseTransitionalData.java | 40 +- .../component/BaseTranslationEquivalent.java | 28 +- .../org/thdl/lex/component/IDefinition.java | 19 +- .../org/thdl/lex/component/ILexComponent.java | 14 - src/java/org/thdl/lex/component/ITerm.java | 19 - .../thdl/lex/component/LexComponent.hbm.xml | 34 +- .../org/thdl/lex/component/LexComponent.java | 15 - .../org/thdl/lex/component/child/Author.java | 14 +- .../org/thdl/lex/component/child/Dialect.java | 6 +- .../lex/component/child/EtymologyType.java | 14 +- .../thdl/lex/component/child/Function.java | 6 +- .../lex/component/child/FunctionGeneral.java | 14 +- .../lex/component/child/FunctionSpecific.java | 14 +- .../thdl/lex/component/child/Language.java | 14 +- .../lex/component/child/LiteraryForm.java | 14 +- .../lex/component/child/LiteraryGenre.java | 14 +- .../lex/component/child/LiteraryPeriod.java | 14 +- .../lex/component/child/LiterarySource.java | 89 +-- .../component/child/MajorDialectFamily.java | 14 +- .../lex/component/child/PhoneticsType.java | 14 +- .../lex/component/child/ProjectSubject.java | 28 +- .../thdl/lex/component/child/Register.java | 14 +- .../lex/component/child/RelatedTermType.java | 14 +- .../org/thdl/lex/component/child/Script.java | 14 +- .../org/thdl/lex/component/child/Source.java | 22 +- .../lex/component/child/SpecificDialect.java | 14 +- .../lex/component/child/SpellingType.java | 14 +- .../child/TransitionalDataLabel.java | 14 +- src/jsp/jsp/displayTreeToc.jsf | 4 +- src/jsp/jsp/metaForm.jsf | 6 +- src/jsp/jsp/termForm.jsf | 9 +- 52 files changed, 679 insertions(+), 1223 deletions(-) diff --git a/build.xml b/build.xml index 6b6e727..26680ca 100644 --- a/build.xml +++ b/build.xml @@ -226,13 +226,13 @@ jmeter.save.saveservice.output_format=xml - + diff --git a/src/java/org/thdl/lex/DisplayHelper.java b/src/java/org/thdl/lex/DisplayHelper.java index ff749a3..15d45dc 100644 --- a/src/java/org/thdl/lex/DisplayHelper.java +++ b/src/java/org/thdl/lex/DisplayHelper.java @@ -335,10 +335,15 @@ public class DisplayHelper return getCollection().hashCode(); } - + public String getIndexOfComponent() + { + int i = ((List)getCollection()).indexOf( getComponent() ) + 1; + return "" + i; + } + /** *Constructor for the DisplayHelper object */ - public DisplayHelper() { } + public DisplayHelper() { } } diff --git a/src/java/org/thdl/lex/commands/GetInsertFormCommand.java b/src/java/org/thdl/lex/commands/GetInsertFormCommand.java index 81c0571..234380d 100644 --- a/src/java/org/thdl/lex/commands/GetInsertFormCommand.java +++ b/src/java/org/thdl/lex/commands/GetInsertFormCommand.java @@ -89,7 +89,7 @@ public class GetInsertFormCommand extends LexCommand implements Command AnalyticalNote note = new AnalyticalNote(); note.setParentId( component.getMetaId() ); //note.setAnalyticalNote( req.getParameter( "analyticalNote" ) ); - note.setPrecedence( new Integer( 0 ) ); + //note.setPrecedence( new Integer( 0 ) ); component.setAnalyticalNotes( new LinkedList() ); component.getAnalyticalNotes().add( note ); meta = new Meta( user, prefs ); diff --git a/src/java/org/thdl/lex/commands/InsertCommand.java b/src/java/org/thdl/lex/commands/InsertCommand.java index adbe179..42b2642 100644 --- a/src/java/org/thdl/lex/commands/InsertCommand.java +++ b/src/java/org/thdl/lex/commands/InsertCommand.java @@ -151,7 +151,7 @@ public class InsertCommand extends LexCommand implements Command AnalyticalNote note = new AnalyticalNote(); note.setAnalyticalNote( req.getParameter( "analyticalNote" ) ); note.setParentId( component.getMetaId() ); - note.setPrecedence( new Integer( 0 ) ); + //note.setPrecedence( new Integer( 0 ) ); component.setAnalyticalNotes( new LinkedList() ); component.getAnalyticalNotes().add( note ); meta = new Meta( user, prefs ); diff --git a/src/java/org/thdl/lex/component/BaseAnalyticalNote.java b/src/java/org/thdl/lex/component/BaseAnalyticalNote.java index 27c2929..e3bd662 100644 --- a/src/java/org/thdl/lex/component/BaseAnalyticalNote.java +++ b/src/java/org/thdl/lex/component/BaseAnalyticalNote.java @@ -8,22 +8,18 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseAnalyticalNote extends LexComponent implements Serializable,org.thdl.lex.component.IAnalyticalNote { /** nullable persistent field */ - private java.lang.Integer parentId; + private Integer parentId; /** nullable persistent field */ - private java.lang.Integer precedence; - - /** nullable persistent field */ - private java.lang.String analyticalNote; + private String analyticalNote; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BaseAnalyticalNote(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String analyticalNote, org.thdl.lex.component.ILexComponent parent) { + public BaseAnalyticalNote(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String analyticalNote, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.analyticalNote = analyticalNote; this.parent = parent; } @@ -33,31 +29,23 @@ abstract public class BaseAnalyticalNote extends LexComponent implements Seriali } /** minimal constructor */ - public BaseAnalyticalNote(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) { + public BaseAnalyticalNote(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) { super(deleted, analyticalNotes, meta); } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getAnalyticalNote() { + public String getAnalyticalNote() { return this.analyticalNote; } - public void setAnalyticalNote(java.lang.String analyticalNote) { + public void setAnalyticalNote(String analyticalNote) { this.analyticalNote = analyticalNote; } diff --git a/src/java/org/thdl/lex/component/BaseDefinition.java b/src/java/org/thdl/lex/component/BaseDefinition.java index e52c320..31d25c3 100644 --- a/src/java/org/thdl/lex/component/BaseDefinition.java +++ b/src/java/org/thdl/lex/component/BaseDefinition.java @@ -8,16 +8,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseDefinition extends LexComponent implements org.thdl.lex.component.IDefinition,org.thdl.lex.component.Translatable, org.thdl.lex.component.LexComponentNode,Serializable { /** nullable persistent field */ - private java.lang.Integer parentId; - - /** persistent field */ - private java.lang.Integer precedence; + private Integer parentId; /** nullable persistent field */ - private java.lang.String definition; + private String definition; /** nullable persistent field */ - private java.lang.Integer translationOf; + private Integer translationOf; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; @@ -50,10 +47,9 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le private List registers; /** full constructor */ - public BaseDefinition(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String definition, java.lang.Integer translationOf, org.thdl.lex.component.ILexComponent parent, List translations, List subdefinitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) { + public BaseDefinition(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String definition, Integer translationOf, org.thdl.lex.component.ILexComponent parent, List translations, List subdefinitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.definition = definition; this.translationOf = translationOf; this.parent = parent; @@ -73,9 +69,8 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le } /** minimal constructor */ - public BaseDefinition(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer precedence, List translations, List subdefinitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) { + public BaseDefinition(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, List translations, List subdefinitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) { super(deleted, analyticalNotes, meta); - this.precedence = precedence; this.translations = translations; this.subdefinitions = subdefinitions; this.glosses = glosses; @@ -87,35 +82,27 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le this.registers = registers; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getDefinition() { + public String getDefinition() { return this.definition; } - public void setDefinition(java.lang.String definition) { + public void setDefinition(String definition) { this.definition = definition; } - public java.lang.Integer getTranslationOf() { + public Integer getTranslationOf() { return this.translationOf; } - public void setTranslationOf(java.lang.Integer translationOf) { + public void setTranslationOf(Integer translationOf) { this.translationOf = translationOf; } @@ -127,75 +114,75 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le this.parent = parent; } - public java.util.List getTranslations() { + public List getTranslations() { return this.translations; } - public void setTranslations(java.util.List translations) { + public void setTranslations(List translations) { this.translations = translations; } - public java.util.List getSubdefinitions() { + public List getSubdefinitions() { return this.subdefinitions; } - public void setSubdefinitions(java.util.List subdefinitions) { + public void setSubdefinitions(List subdefinitions) { this.subdefinitions = subdefinitions; } - public java.util.List getGlosses() { + public List getGlosses() { return this.glosses; } - public void setGlosses(java.util.List glosses) { + public void setGlosses(List glosses) { this.glosses = glosses; } - public java.util.List getKeywords() { + public List getKeywords() { return this.keywords; } - public void setKeywords(java.util.List keywords) { + public void setKeywords(List keywords) { this.keywords = keywords; } - public java.util.List getModelSentences() { + public List getModelSentences() { return this.modelSentences; } - public void setModelSentences(java.util.List modelSentences) { + public void setModelSentences(List modelSentences) { this.modelSentences = modelSentences; } - public java.util.List getTranslationEquivalents() { + public List getTranslationEquivalents() { return this.translationEquivalents; } - public void setTranslationEquivalents(java.util.List translationEquivalents) { + public void setTranslationEquivalents(List translationEquivalents) { this.translationEquivalents = translationEquivalents; } - public java.util.List getRelatedTerms() { + public List getRelatedTerms() { return this.relatedTerms; } - public void setRelatedTerms(java.util.List relatedTerms) { + public void setRelatedTerms(List relatedTerms) { this.relatedTerms = relatedTerms; } - public java.util.List getPassages() { + public List getPassages() { return this.passages; } - public void setPassages(java.util.List passages) { + public void setPassages(List passages) { this.passages = passages; } - public java.util.List getRegisters() { + public List getRegisters() { return this.registers; } - public void setRegisters(java.util.List registers) { + public void setRegisters(List registers) { this.registers = registers; } diff --git a/src/java/org/thdl/lex/component/BaseEncyclopediaArticle.java b/src/java/org/thdl/lex/component/BaseEncyclopediaArticle.java index f061b4b..1e8e84c 100644 --- a/src/java/org/thdl/lex/component/BaseEncyclopediaArticle.java +++ b/src/java/org/thdl/lex/component/BaseEncyclopediaArticle.java @@ -8,25 +8,21 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseEncyclopediaArticle extends LexComponent implements org.thdl.lex.component.IEncyclopediaArticle,Serializable { /** nullable persistent field */ - private java.lang.Integer parentId; - - /** nullable persistent field */ - private java.lang.Integer precedence; + private Integer parentId; /** persistent field */ - private java.lang.String article; + private String article; /** persistent field */ - private java.lang.String articleTitle; + private String articleTitle; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BaseEncyclopediaArticle(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String article, java.lang.String articleTitle, org.thdl.lex.component.ILexComponent parent) { + public BaseEncyclopediaArticle(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String article, String articleTitle, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.article = article; this.articleTitle = articleTitle; this.parent = parent; @@ -37,41 +33,33 @@ abstract public class BaseEncyclopediaArticle extends LexComponent implements or } /** minimal constructor */ - public BaseEncyclopediaArticle(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String article, java.lang.String articleTitle) { + public BaseEncyclopediaArticle(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, String article, String articleTitle) { super(deleted, analyticalNotes, meta); this.article = article; this.articleTitle = articleTitle; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getArticle() { + public String getArticle() { return this.article; } - public void setArticle(java.lang.String article) { + public void setArticle(String article) { this.article = article; } - public java.lang.String getArticleTitle() { + public String getArticleTitle() { return this.articleTitle; } - public void setArticleTitle(java.lang.String articleTitle) { + public void setArticleTitle(String articleTitle) { this.articleTitle = articleTitle; } diff --git a/src/java/org/thdl/lex/component/BaseEtymology.java b/src/java/org/thdl/lex/component/BaseEtymology.java index 032190a..290e9b9 100644 --- a/src/java/org/thdl/lex/component/BaseEtymology.java +++ b/src/java/org/thdl/lex/component/BaseEtymology.java @@ -8,25 +8,22 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseEtymology extends LexComponent implements org.thdl.lex.component.Translatable,Serializable,org.thdl.lex.component.IEtymology { /** nullable persistent field */ - private java.lang.Integer parentId; + private Integer parentId; /** nullable persistent field */ - private java.lang.Integer precedence; + private Integer loanLanguage; + + /** persistent field */ + private Integer etymologyType; + + /** persistent field */ + private String derivation; + + /** persistent field */ + private String etymologyDescription; /** nullable persistent field */ - private java.lang.Integer loanLanguage; - - /** persistent field */ - private java.lang.Integer etymologyType; - - /** persistent field */ - private java.lang.String derivation; - - /** persistent field */ - private java.lang.String etymologyDescription; - - /** nullable persistent field */ - private java.lang.Integer translationOf; + private Integer translationOf; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; @@ -35,10 +32,9 @@ abstract public class BaseEtymology extends LexComponent implements org.thdl.lex private List translations; /** full constructor */ - public BaseEtymology(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.Integer loanLanguage, java.lang.Integer etymologyType, java.lang.String derivation, java.lang.String etymologyDescription, java.lang.Integer translationOf, org.thdl.lex.component.ILexComponent parent, List translations) { + public BaseEtymology(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, Integer loanLanguage, Integer etymologyType, String derivation, String etymologyDescription, Integer translationOf, org.thdl.lex.component.ILexComponent parent, List translations) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.loanLanguage = loanLanguage; this.etymologyType = etymologyType; this.derivation = derivation; @@ -53,7 +49,7 @@ abstract public class BaseEtymology extends LexComponent implements org.thdl.lex } /** minimal constructor */ - public BaseEtymology(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer etymologyType, java.lang.String derivation, java.lang.String etymologyDescription, List translations) { + public BaseEtymology(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer etymologyType, String derivation, String etymologyDescription, List translations) { super(deleted, analyticalNotes, meta); this.etymologyType = etymologyType; this.derivation = derivation; @@ -61,59 +57,51 @@ abstract public class BaseEtymology extends LexComponent implements org.thdl.lex this.translations = translations; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.Integer getLoanLanguage() { + public Integer getLoanLanguage() { return this.loanLanguage; } - public void setLoanLanguage(java.lang.Integer loanLanguage) { + public void setLoanLanguage(Integer loanLanguage) { this.loanLanguage = loanLanguage; } - public java.lang.Integer getEtymologyType() { + public Integer getEtymologyType() { return this.etymologyType; } - public void setEtymologyType(java.lang.Integer etymologyType) { + public void setEtymologyType(Integer etymologyType) { this.etymologyType = etymologyType; } - public java.lang.String getDerivation() { + public String getDerivation() { return this.derivation; } - public void setDerivation(java.lang.String derivation) { + public void setDerivation(String derivation) { this.derivation = derivation; } - public java.lang.String getEtymologyDescription() { + public String getEtymologyDescription() { return this.etymologyDescription; } - public void setEtymologyDescription(java.lang.String etymologyDescription) { + public void setEtymologyDescription(String etymologyDescription) { this.etymologyDescription = etymologyDescription; } - public java.lang.Integer getTranslationOf() { + public Integer getTranslationOf() { return this.translationOf; } - public void setTranslationOf(java.lang.Integer translationOf) { + public void setTranslationOf(Integer translationOf) { this.translationOf = translationOf; } @@ -125,11 +113,11 @@ abstract public class BaseEtymology extends LexComponent implements org.thdl.lex this.parent = parent; } - public java.util.List getTranslations() { + public List getTranslations() { return this.translations; } - public void setTranslations(java.util.List translations) { + public void setTranslations(List translations) { this.translations = translations; } diff --git a/src/java/org/thdl/lex/component/BaseGloss.java b/src/java/org/thdl/lex/component/BaseGloss.java index 47e9a41..5890c5c 100644 --- a/src/java/org/thdl/lex/component/BaseGloss.java +++ b/src/java/org/thdl/lex/component/BaseGloss.java @@ -8,25 +8,21 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseGloss extends LexComponent implements org.thdl.lex.component.IGloss,Serializable { /** nullable persistent field */ - private java.lang.Integer parentId; + private Integer parentId; /** nullable persistent field */ - private java.lang.Integer precedence; + private String gloss; /** nullable persistent field */ - private java.lang.String gloss; - - /** nullable persistent field */ - private java.lang.String translation; + private String translation; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BaseGloss(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String gloss, java.lang.String translation, org.thdl.lex.component.ILexComponent parent) { + public BaseGloss(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String gloss, String translation, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.gloss = gloss; this.translation = translation; this.parent = parent; @@ -37,39 +33,31 @@ abstract public class BaseGloss extends LexComponent implements org.thdl.lex.com } /** minimal constructor */ - public BaseGloss(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) { + public BaseGloss(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) { super(deleted, analyticalNotes, meta); } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getGloss() { + public String getGloss() { return this.gloss; } - public void setGloss(java.lang.String gloss) { + public void setGloss(String gloss) { this.gloss = gloss; } - public java.lang.String getTranslation() { + public String getTranslation() { return this.translation; } - public void setTranslation(java.lang.String translation) { + public void setTranslation(String translation) { this.translation = translation; } diff --git a/src/java/org/thdl/lex/component/BaseGrammaticalFunction.java b/src/java/org/thdl/lex/component/BaseGrammaticalFunction.java index 44b07b7..2bc835f 100644 --- a/src/java/org/thdl/lex/component/BaseGrammaticalFunction.java +++ b/src/java/org/thdl/lex/component/BaseGrammaticalFunction.java @@ -8,22 +8,18 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseGrammaticalFunction extends LexComponent implements org.thdl.lex.component.IFunction,Serializable { /** nullable persistent field */ - private java.lang.Integer parentId; - - /** nullable persistent field */ - private java.lang.Integer precedence; + private Integer parentId; /** persistent field */ - private java.lang.Integer function; + private Integer function; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BaseGrammaticalFunction(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.Integer function, org.thdl.lex.component.ILexComponent parent) { + public BaseGrammaticalFunction(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, Integer function, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.function = function; this.parent = parent; } @@ -33,32 +29,24 @@ abstract public class BaseGrammaticalFunction extends LexComponent implements or } /** minimal constructor */ - public BaseGrammaticalFunction(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer function) { + public BaseGrammaticalFunction(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer function) { super(deleted, analyticalNotes, meta); this.function = function; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.Integer getFunction() { + public Integer getFunction() { return this.function; } - public void setFunction(java.lang.Integer function) { + public void setFunction(Integer function) { this.function = function; } diff --git a/src/java/org/thdl/lex/component/BaseKeyword.java b/src/java/org/thdl/lex/component/BaseKeyword.java index b3c540e..a2bb9c7 100644 --- a/src/java/org/thdl/lex/component/BaseKeyword.java +++ b/src/java/org/thdl/lex/component/BaseKeyword.java @@ -8,22 +8,18 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseKeyword extends LexComponent implements org.thdl.lex.component.IKeyword,Serializable { /** nullable persistent field */ - private java.lang.Integer parentId; + private Integer parentId; /** nullable persistent field */ - private java.lang.Integer precedence; - - /** nullable persistent field */ - private java.lang.String keyword; + private String keyword; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BaseKeyword(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String keyword, org.thdl.lex.component.ILexComponent parent) { + public BaseKeyword(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String keyword, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.keyword = keyword; this.parent = parent; } @@ -33,31 +29,23 @@ abstract public class BaseKeyword extends LexComponent implements org.thdl.lex.c } /** minimal constructor */ - public BaseKeyword(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) { + public BaseKeyword(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) { super(deleted, analyticalNotes, meta); } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getKeyword() { + public String getKeyword() { return this.keyword; } - public void setKeyword(java.lang.String keyword) { + public void setKeyword(String keyword) { this.keyword = keyword; } diff --git a/src/java/org/thdl/lex/component/BaseLexComponent.java b/src/java/org/thdl/lex/component/BaseLexComponent.java index 8766cca..f93f70e 100644 --- a/src/java/org/thdl/lex/component/BaseLexComponent.java +++ b/src/java/org/thdl/lex/component/BaseLexComponent.java @@ -10,10 +10,10 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseLexComponent implements org.thdl.lex.component.ILexComponent,Serializable { /** identifier field */ - private java.lang.Integer metaId; + private Integer metaId; /** persistent field */ - private java.lang.Boolean deleted; + private Boolean deleted; /** persistent field */ private List analyticalNotes; @@ -22,7 +22,7 @@ abstract public class BaseLexComponent implements org.thdl.lex.component.ILexCom private org.thdl.lex.component.Meta meta; /** full constructor */ - public BaseLexComponent(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) { + public BaseLexComponent(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) { this.deleted = deleted; this.analyticalNotes = analyticalNotes; this.meta = meta; @@ -32,27 +32,27 @@ abstract public class BaseLexComponent implements org.thdl.lex.component.ILexCom public BaseLexComponent() { } - public java.lang.Integer getMetaId() { + public Integer getMetaId() { return this.metaId; } - public void setMetaId(java.lang.Integer metaId) { + public void setMetaId(Integer metaId) { this.metaId = metaId; } - public java.lang.Boolean getDeleted() { + public Boolean getDeleted() { return this.deleted; } - public void setDeleted(java.lang.Boolean deleted) { + public void setDeleted(Boolean deleted) { this.deleted = deleted; } - public java.util.List getAnalyticalNotes() { + public List getAnalyticalNotes() { return this.analyticalNotes; } - public void setAnalyticalNotes(java.util.List analyticalNotes) { + public void setAnalyticalNotes(List analyticalNotes) { this.analyticalNotes = analyticalNotes; } diff --git a/src/java/org/thdl/lex/component/BaseMeta.java b/src/java/org/thdl/lex/component/BaseMeta.java index d98aadc..8a1213e 100644 --- a/src/java/org/thdl/lex/component/BaseMeta.java +++ b/src/java/org/thdl/lex/component/BaseMeta.java @@ -1,46 +1,47 @@ package org.thdl.lex.component; import java.io.Serializable; +import java.util.Date; import org.apache.commons.lang.builder.ToStringBuilder; /** @author Hibernate CodeGenerator */ abstract public class BaseMeta implements Serializable { /** persistent field */ - private java.lang.Integer createdBy; + private Integer createdBy; /** persistent field */ - private java.lang.Integer modifiedBy; + private Integer modifiedBy; /** persistent field */ - private java.lang.Integer createdByProjSub; + private Integer createdByProjSub; /** persistent field */ - private java.lang.Integer modifiedByProjSub; + private Integer modifiedByProjSub; /** nullable persistent field */ - private java.util.Date createdOn; + private Date createdOn; /** nullable persistent field */ - private java.util.Date modifiedOn; + private Date modifiedOn; /** persistent field */ - private java.lang.Integer source; + private Integer source; /** persistent field */ - private java.lang.Integer language; + private Integer language; /** persistent field */ - private java.lang.Integer script; + private Integer script; /** persistent field */ - private java.lang.Integer dialect; + private Integer dialect; /** nullable persistent field */ - private java.lang.String note; + private String note; /** full constructor */ - public BaseMeta(java.lang.Integer createdBy, java.lang.Integer modifiedBy, java.lang.Integer createdByProjSub, java.lang.Integer modifiedByProjSub, java.util.Date createdOn, java.util.Date modifiedOn, java.lang.Integer source, java.lang.Integer language, java.lang.Integer script, java.lang.Integer dialect, java.lang.String note) { + public BaseMeta(Integer createdBy, Integer modifiedBy, Integer createdByProjSub, Integer modifiedByProjSub, Date createdOn, Date modifiedOn, Integer source, Integer language, Integer script, Integer dialect, String note) { this.createdBy = createdBy; this.modifiedBy = modifiedBy; this.createdByProjSub = createdByProjSub; @@ -59,7 +60,7 @@ abstract public class BaseMeta implements Serializable { } /** minimal constructor */ - public BaseMeta(java.lang.Integer createdBy, java.lang.Integer modifiedBy, java.lang.Integer createdByProjSub, java.lang.Integer modifiedByProjSub, java.lang.Integer source, java.lang.Integer language, java.lang.Integer script, java.lang.Integer dialect) { + public BaseMeta(Integer createdBy, Integer modifiedBy, Integer createdByProjSub, Integer modifiedByProjSub, Integer source, Integer language, Integer script, Integer dialect) { this.createdBy = createdBy; this.modifiedBy = modifiedBy; this.createdByProjSub = createdByProjSub; @@ -70,91 +71,91 @@ abstract public class BaseMeta implements Serializable { this.dialect = dialect; } - public java.lang.Integer getCreatedBy() { + public Integer getCreatedBy() { return this.createdBy; } - public void setCreatedBy(java.lang.Integer createdBy) { + public void setCreatedBy(Integer createdBy) { this.createdBy = createdBy; } - public java.lang.Integer getModifiedBy() { + public Integer getModifiedBy() { return this.modifiedBy; } - public void setModifiedBy(java.lang.Integer modifiedBy) { + public void setModifiedBy(Integer modifiedBy) { this.modifiedBy = modifiedBy; } - public java.lang.Integer getCreatedByProjSub() { + public Integer getCreatedByProjSub() { return this.createdByProjSub; } - public void setCreatedByProjSub(java.lang.Integer createdByProjSub) { + public void setCreatedByProjSub(Integer createdByProjSub) { this.createdByProjSub = createdByProjSub; } - public java.lang.Integer getModifiedByProjSub() { + public Integer getModifiedByProjSub() { return this.modifiedByProjSub; } - public void setModifiedByProjSub(java.lang.Integer modifiedByProjSub) { + public void setModifiedByProjSub(Integer modifiedByProjSub) { this.modifiedByProjSub = modifiedByProjSub; } - public java.util.Date getCreatedOn() { + public Date getCreatedOn() { return this.createdOn; } - public void setCreatedOn(java.util.Date createdOn) { + public void setCreatedOn(Date createdOn) { this.createdOn = createdOn; } - public java.util.Date getModifiedOn() { + public Date getModifiedOn() { return this.modifiedOn; } - public void setModifiedOn(java.util.Date modifiedOn) { + public void setModifiedOn(Date modifiedOn) { this.modifiedOn = modifiedOn; } - public java.lang.Integer getSource() { + public Integer getSource() { return this.source; } - public void setSource(java.lang.Integer source) { + public void setSource(Integer source) { this.source = source; } - public java.lang.Integer getLanguage() { + public Integer getLanguage() { return this.language; } - public void setLanguage(java.lang.Integer language) { + public void setLanguage(Integer language) { this.language = language; } - public java.lang.Integer getScript() { + public Integer getScript() { return this.script; } - public void setScript(java.lang.Integer script) { + public void setScript(Integer script) { this.script = script; } - public java.lang.Integer getDialect() { + public Integer getDialect() { return this.dialect; } - public void setDialect(java.lang.Integer dialect) { + public void setDialect(Integer dialect) { this.dialect = dialect; } - public java.lang.String getNote() { + public String getNote() { return this.note; } - public void setNote(java.lang.String note) { + public void setNote(String note) { this.note = note; } diff --git a/src/java/org/thdl/lex/component/BaseModelSentence.java b/src/java/org/thdl/lex/component/BaseModelSentence.java index 2c9ee58..390beb7 100644 --- a/src/java/org/thdl/lex/component/BaseModelSentence.java +++ b/src/java/org/thdl/lex/component/BaseModelSentence.java @@ -8,16 +8,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseModelSentence extends LexComponent implements org.thdl.lex.component.IModelSentence,Serializable,org.thdl.lex.component.Translatable { /** nullable persistent field */ - private java.lang.Integer parentId; + private Integer parentId; /** nullable persistent field */ - private java.lang.Integer precedence; + private String modelSentence; /** nullable persistent field */ - private java.lang.String modelSentence; - - /** nullable persistent field */ - private java.lang.Integer translationOf; + private Integer translationOf; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; @@ -26,10 +23,9 @@ abstract public class BaseModelSentence extends LexComponent implements org.thdl private List translations; /** full constructor */ - public BaseModelSentence(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String modelSentence, java.lang.Integer translationOf, org.thdl.lex.component.ILexComponent parent, List translations) { + public BaseModelSentence(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String modelSentence, Integer translationOf, org.thdl.lex.component.ILexComponent parent, List translations) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.modelSentence = modelSentence; this.translationOf = translationOf; this.parent = parent; @@ -41,40 +37,32 @@ abstract public class BaseModelSentence extends LexComponent implements org.thdl } /** minimal constructor */ - public BaseModelSentence(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, List translations) { + public BaseModelSentence(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, List translations) { super(deleted, analyticalNotes, meta); this.translations = translations; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getModelSentence() { + public String getModelSentence() { return this.modelSentence; } - public void setModelSentence(java.lang.String modelSentence) { + public void setModelSentence(String modelSentence) { this.modelSentence = modelSentence; } - public java.lang.Integer getTranslationOf() { + public Integer getTranslationOf() { return this.translationOf; } - public void setTranslationOf(java.lang.Integer translationOf) { + public void setTranslationOf(Integer translationOf) { this.translationOf = translationOf; } @@ -86,11 +74,11 @@ abstract public class BaseModelSentence extends LexComponent implements org.thdl this.parent = parent; } - public java.util.List getTranslations() { + public List getTranslations() { return this.translations; } - public void setTranslations(java.util.List translations) { + public void setTranslations(List translations) { this.translations = translations; } diff --git a/src/java/org/thdl/lex/component/BasePassage.java b/src/java/org/thdl/lex/component/BasePassage.java index c2391da..a9d7e5a 100644 --- a/src/java/org/thdl/lex/component/BasePassage.java +++ b/src/java/org/thdl/lex/component/BasePassage.java @@ -5,28 +5,25 @@ import java.util.List; import org.apache.commons.lang.builder.ToStringBuilder; /** @author Hibernate CodeGenerator */ -abstract public class BasePassage extends LexComponent implements org.thdl.lex.component.IPassage,Serializable,org.thdl.lex.component.Translatable { +abstract public class BasePassage extends LexComponent implements org.thdl.lex.component.IPassage,org.thdl.lex.component.Translatable,Serializable { /** nullable persistent field */ - private java.lang.Integer parentId; + private Integer parentId; /** nullable persistent field */ - private java.lang.Integer precedence; + private String literarySource; /** nullable persistent field */ - private java.lang.String literarySource; + private String spelling; /** nullable persistent field */ - private java.lang.String spelling; + private String pagination; /** nullable persistent field */ - private java.lang.String pagination; + private String passage; /** nullable persistent field */ - private java.lang.String passage; - - /** nullable persistent field */ - private java.lang.Integer translationOf; + private Integer translationOf; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; @@ -35,10 +32,9 @@ abstract public class BasePassage extends LexComponent implements org.thdl.lex.c private List translations; /** full constructor */ - public BasePassage(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String literarySource, java.lang.String spelling, java.lang.String pagination, java.lang.String passage, java.lang.Integer translationOf, org.thdl.lex.component.ILexComponent parent, List translations) { + public BasePassage(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String literarySource, String spelling, String pagination, String passage, Integer translationOf, org.thdl.lex.component.ILexComponent parent, List translations) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.literarySource = literarySource; this.spelling = spelling; this.pagination = pagination; @@ -53,64 +49,56 @@ abstract public class BasePassage extends LexComponent implements org.thdl.lex.c } /** minimal constructor */ - public BasePassage(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, List translations) { + public BasePassage(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, List translations) { super(deleted, analyticalNotes, meta); this.translations = translations; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getLiterarySource() { + public String getLiterarySource() { return this.literarySource; } - public void setLiterarySource(java.lang.String literarySource) { + public void setLiterarySource(String literarySource) { this.literarySource = literarySource; } - public java.lang.String getSpelling() { + public String getSpelling() { return this.spelling; } - public void setSpelling(java.lang.String spelling) { + public void setSpelling(String spelling) { this.spelling = spelling; } - public java.lang.String getPagination() { + public String getPagination() { return this.pagination; } - public void setPagination(java.lang.String pagination) { + public void setPagination(String pagination) { this.pagination = pagination; } - public java.lang.String getPassage() { + public String getPassage() { return this.passage; } - public void setPassage(java.lang.String passage) { + public void setPassage(String passage) { this.passage = passage; } - public java.lang.Integer getTranslationOf() { + public Integer getTranslationOf() { return this.translationOf; } - public void setTranslationOf(java.lang.Integer translationOf) { + public void setTranslationOf(Integer translationOf) { this.translationOf = translationOf; } @@ -122,11 +110,11 @@ abstract public class BasePassage extends LexComponent implements org.thdl.lex.c this.parent = parent; } - public java.util.List getTranslations() { + public List getTranslations() { return this.translations; } - public void setTranslations(java.util.List translations) { + public void setTranslations(List translations) { this.translations = translations; } diff --git a/src/java/org/thdl/lex/component/BasePronunciation.java b/src/java/org/thdl/lex/component/BasePronunciation.java index 9c23860..ade625a 100644 --- a/src/java/org/thdl/lex/component/BasePronunciation.java +++ b/src/java/org/thdl/lex/component/BasePronunciation.java @@ -8,25 +8,21 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BasePronunciation extends LexComponent implements org.thdl.lex.component.IPronunciation,Serializable { /** nullable persistent field */ - private java.lang.Integer parentId; - - /** nullable persistent field */ - private java.lang.Integer precedence; + private Integer parentId; /** persistent field */ - private java.lang.String phonetics; + private String phonetics; /** persistent field */ - private java.lang.Integer phoneticsType; + private Integer phoneticsType; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BasePronunciation(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String phonetics, java.lang.Integer phoneticsType, org.thdl.lex.component.ILexComponent parent) { + public BasePronunciation(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String phonetics, Integer phoneticsType, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.phonetics = phonetics; this.phoneticsType = phoneticsType; this.parent = parent; @@ -37,41 +33,33 @@ abstract public class BasePronunciation extends LexComponent implements org.thdl } /** minimal constructor */ - public BasePronunciation(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String phonetics, java.lang.Integer phoneticsType) { + public BasePronunciation(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, String phonetics, Integer phoneticsType) { super(deleted, analyticalNotes, meta); this.phonetics = phonetics; this.phoneticsType = phoneticsType; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getPhonetics() { + public String getPhonetics() { return this.phonetics; } - public void setPhonetics(java.lang.String phonetics) { + public void setPhonetics(String phonetics) { this.phonetics = phonetics; } - public java.lang.Integer getPhoneticsType() { + public Integer getPhoneticsType() { return this.phoneticsType; } - public void setPhoneticsType(java.lang.Integer phoneticsType) { + public void setPhoneticsType(Integer phoneticsType) { this.phoneticsType = phoneticsType; } diff --git a/src/java/org/thdl/lex/component/BaseRelatedTerm.java b/src/java/org/thdl/lex/component/BaseRelatedTerm.java index 8c55e59..e796b82 100644 --- a/src/java/org/thdl/lex/component/BaseRelatedTerm.java +++ b/src/java/org/thdl/lex/component/BaseRelatedTerm.java @@ -8,25 +8,21 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseRelatedTerm extends LexComponent implements Serializable,org.thdl.lex.component.IRelatedTerm { /** nullable persistent field */ - private java.lang.Integer parentId; + private Integer parentId; /** nullable persistent field */ - private java.lang.Integer precedence; - - /** nullable persistent field */ - private java.lang.String relatedTerm; + private String relatedTerm; /** persistent field */ - private java.lang.Integer relatedTermType; + private Integer relatedTermType; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BaseRelatedTerm(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String relatedTerm, java.lang.Integer relatedTermType, org.thdl.lex.component.ILexComponent parent) { + public BaseRelatedTerm(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String relatedTerm, Integer relatedTermType, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.relatedTerm = relatedTerm; this.relatedTermType = relatedTermType; this.parent = parent; @@ -37,40 +33,32 @@ abstract public class BaseRelatedTerm extends LexComponent implements Serializab } /** minimal constructor */ - public BaseRelatedTerm(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer relatedTermType) { + public BaseRelatedTerm(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer relatedTermType) { super(deleted, analyticalNotes, meta); this.relatedTermType = relatedTermType; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getRelatedTerm() { + public String getRelatedTerm() { return this.relatedTerm; } - public void setRelatedTerm(java.lang.String relatedTerm) { + public void setRelatedTerm(String relatedTerm) { this.relatedTerm = relatedTerm; } - public java.lang.Integer getRelatedTermType() { + public Integer getRelatedTermType() { return this.relatedTermType; } - public void setRelatedTermType(java.lang.Integer relatedTermType) { + public void setRelatedTermType(Integer relatedTermType) { this.relatedTermType = relatedTermType; } diff --git a/src/java/org/thdl/lex/component/BaseSpeechRegister.java b/src/java/org/thdl/lex/component/BaseSpeechRegister.java index 4dc82e8..ee5a2a8 100644 --- a/src/java/org/thdl/lex/component/BaseSpeechRegister.java +++ b/src/java/org/thdl/lex/component/BaseSpeechRegister.java @@ -8,22 +8,18 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseSpeechRegister extends LexComponent implements org.thdl.lex.component.IRegister,Serializable { /** nullable persistent field */ - private java.lang.Integer parentId; - - /** nullable persistent field */ - private java.lang.Integer precedence; + private Integer parentId; /** persistent field */ - private java.lang.Integer register; + private Integer register; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BaseSpeechRegister(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.Integer register, org.thdl.lex.component.ILexComponent parent) { + public BaseSpeechRegister(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, Integer register, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.register = register; this.parent = parent; } @@ -33,32 +29,24 @@ abstract public class BaseSpeechRegister extends LexComponent implements org.thd } /** minimal constructor */ - public BaseSpeechRegister(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer register) { + public BaseSpeechRegister(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer register) { super(deleted, analyticalNotes, meta); this.register = register; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.Integer getRegister() { + public Integer getRegister() { return this.register; } - public void setRegister(java.lang.Integer register) { + public void setRegister(Integer register) { this.register = register; } diff --git a/src/java/org/thdl/lex/component/BaseSpelling.java b/src/java/org/thdl/lex/component/BaseSpelling.java index 8ee7f0a..4974e1e 100644 --- a/src/java/org/thdl/lex/component/BaseSpelling.java +++ b/src/java/org/thdl/lex/component/BaseSpelling.java @@ -8,25 +8,21 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseSpelling extends LexComponent implements Serializable,org.thdl.lex.component.ISpelling { /** nullable persistent field */ - private java.lang.Integer parentId; - - /** nullable persistent field */ - private java.lang.Integer precedence; + private Integer parentId; /** persistent field */ - private java.lang.String spelling; + private String spelling; /** persistent field */ - private java.lang.Integer spellingType; + private Integer spellingType; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BaseSpelling(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String spelling, java.lang.Integer spellingType, org.thdl.lex.component.ILexComponent parent) { + public BaseSpelling(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String spelling, Integer spellingType, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.spelling = spelling; this.spellingType = spellingType; this.parent = parent; @@ -37,41 +33,33 @@ abstract public class BaseSpelling extends LexComponent implements Serializable, } /** minimal constructor */ - public BaseSpelling(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String spelling, java.lang.Integer spellingType) { + public BaseSpelling(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, String spelling, Integer spellingType) { super(deleted, analyticalNotes, meta); this.spelling = spelling; this.spellingType = spellingType; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getSpelling() { + public String getSpelling() { return this.spelling; } - public void setSpelling(java.lang.String spelling) { + public void setSpelling(String spelling) { this.spelling = spelling; } - public java.lang.Integer getSpellingType() { + public Integer getSpellingType() { return this.spellingType; } - public void setSpellingType(java.lang.Integer spellingType) { + public void setSpellingType(Integer spellingType) { this.spellingType = spellingType; } diff --git a/src/java/org/thdl/lex/component/BaseSubdefinition.java b/src/java/org/thdl/lex/component/BaseSubdefinition.java index e193ea2..929d525 100644 --- a/src/java/org/thdl/lex/component/BaseSubdefinition.java +++ b/src/java/org/thdl/lex/component/BaseSubdefinition.java @@ -4,451 +4,179 @@ import java.io.Serializable; import java.util.List; import org.apache.commons.lang.builder.ToStringBuilder; - -/** - * @author Hibernate CodeGenerator - * @created December 20, 2003 - */ -public abstract class BaseSubdefinition extends LexComponent implements org.thdl.lex.component.ISubdefinition, org.thdl.lex.component.Translatable, org.thdl.lex.component.LexComponentNode, Serializable -{ - - /** - * nullable persistent field - */ - private java.lang.Integer parentId; - - /** - * nullable persistent field - */ - private java.lang.Integer precedence; - - /** - * nullable persistent field - */ - private java.lang.String subdefinition; - - /** - * nullable persistent field - */ - private java.lang.Integer translationOf; - - /** - * nullable persistent field - */ - private org.thdl.lex.component.ILexComponent parent; - - /** - * persistent field - */ - private List translations; - - /** - * persistent field - */ - private List glosses; - - /** - * persistent field - */ - private List keywords; - - /** - * persistent field - */ - private List modelSentences; - - /** - * persistent field - */ - private List translationEquivalents; - - /** - * persistent field - */ - private List relatedTerms; - - /** - * persistent field - */ - private List passages; - - /** - * persistent field - */ - private List registers; - - - /** - * full constructor - * - * @param deleted Description of the Parameter - * @param analyticalNotes Description of the Parameter - * @param meta Description of the Parameter - * @param parentId Description of the Parameter - * @param precedence Description of the Parameter - * @param subdefinition Description of the Parameter - * @param translationOf Description of the Parameter - * @param parent Description of the Parameter - * @param translations Description of the Parameter - * @param glosses Description of the Parameter - * @param keywords Description of the Parameter - * @param modelSentences Description of the Parameter - * @param translationEquivalents Description of the Parameter - * @param relatedTerms Description of the Parameter - * @param passages Description of the Parameter - * @param registers Description of the Parameter - */ - public BaseSubdefinition( java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String subdefinition, java.lang.Integer translationOf, org.thdl.lex.component.ILexComponent parent, List translations, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers ) - { - super( deleted, analyticalNotes, meta ); - this.parentId = parentId; - this.precedence = precedence; - this.subdefinition = subdefinition; - this.translationOf = translationOf; - this.parent = parent; - this.translations = translations; - this.glosses = glosses; - this.keywords = keywords; - this.modelSentences = modelSentences; - this.translationEquivalents = translationEquivalents; - this.relatedTerms = relatedTerms; - this.passages = passages; - this.registers = registers; - } - - - /** - * default constructor - */ - public BaseSubdefinition() { } - - - /** - * minimal constructor - * - * @param deleted Description of the Parameter - * @param analyticalNotes Description of the Parameter - * @param meta Description of the Parameter - * @param translations Description of the Parameter - * @param glosses Description of the Parameter - * @param keywords Description of the Parameter - * @param modelSentences Description of the Parameter - * @param translationEquivalents Description of the Parameter - * @param relatedTerms Description of the Parameter - * @param passages Description of the Parameter - * @param registers Description of the Parameter - */ - public BaseSubdefinition( java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, List translations, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers ) - { - super( deleted, analyticalNotes, meta ); - this.translations = translations; - this.glosses = glosses; - this.keywords = keywords; - this.modelSentences = modelSentences; - this.translationEquivalents = translationEquivalents; - this.relatedTerms = relatedTerms; - this.passages = passages; - this.registers = registers; - } - - - /** - * Gets the parentId attribute of the BaseSubdefinition object - * - * @return The parentId value - */ - public java.lang.Integer getParentId() - { - return this.parentId; - } - - - /** - * Sets the parentId attribute of the BaseSubdefinition object - * - * @param parentId The new parentId value - */ - public void setParentId( java.lang.Integer parentId ) - { - this.parentId = parentId; - } - - - /** - * Gets the precedence attribute of the BaseSubdefinition object - * - * @return The precedence value - */ - public java.lang.Integer getPrecedence() - { - return this.precedence; - } - - - /** - * Sets the precedence attribute of the BaseSubdefinition object - * - * @param precedence The new precedence value - */ - public void setPrecedence( java.lang.Integer precedence ) - { - this.precedence = precedence; - } - - - /** - * Gets the subdefinition attribute of the BaseSubdefinition object - * - * @return The subdefinition value - */ - public java.lang.String getSubdefinition() - { - return this.subdefinition; - } - - - /** - * Sets the subdefinition attribute of the BaseSubdefinition object - * - * @param subdefinition The new subdefinition value - */ - public void setSubdefinition( java.lang.String subdefinition ) - { - this.subdefinition = subdefinition; - } - - - /** - * Gets the translationOf attribute of the BaseSubdefinition object - * - * @return The translationOf value - */ - public java.lang.Integer getTranslationOf() - { - return this.translationOf; - } - - - /** - * Sets the translationOf attribute of the BaseSubdefinition object - * - * @param translationOf The new translationOf value - */ - public void setTranslationOf( java.lang.Integer translationOf ) - { - this.translationOf = translationOf; - } - - - /** - * Gets the parent attribute of the BaseSubdefinition object - * - * @return The parent value - */ - public org.thdl.lex.component.ILexComponent getParent() - { - return this.parent; - } - - - /** - * Sets the parent attribute of the BaseSubdefinition object - * - * @param parent The new parent value - */ - public void setParent( org.thdl.lex.component.ILexComponent parent ) - { - this.parent = parent; - } - - - /** - * Gets the translations attribute of the BaseSubdefinition object - * - * @return The translations value - */ - public java.util.List getTranslations() - { - return this.translations; - } - - - /** - * Sets the translations attribute of the BaseSubdefinition object - * - * @param translations The new translations value - */ - public void setTranslations( java.util.List translations ) - { - this.translations = translations; - } - - - /** - * Gets the glosses attribute of the BaseSubdefinition object - * - * @return The glosses value - */ - public java.util.List getGlosses() - { - return this.glosses; - } - - - /** - * Sets the glosses attribute of the BaseSubdefinition object - * - * @param glosses The new glosses value - */ - public void setGlosses( java.util.List glosses ) - { - this.glosses = glosses; - } - - - /** - * Gets the keywords attribute of the BaseSubdefinition object - * - * @return The keywords value - */ - public java.util.List getKeywords() - { - return this.keywords; - } - - - /** - * Sets the keywords attribute of the BaseSubdefinition object - * - * @param keywords The new keywords value - */ - public void setKeywords( java.util.List keywords ) - { - this.keywords = keywords; - } - - - /** - * Gets the modelSentences attribute of the BaseSubdefinition object - * - * @return The modelSentences value - */ - public java.util.List getModelSentences() - { - return this.modelSentences; - } - - - /** - * Sets the modelSentences attribute of the BaseSubdefinition object - * - * @param modelSentences The new modelSentences value - */ - public void setModelSentences( java.util.List modelSentences ) - { - this.modelSentences = modelSentences; - } - - - /** - * Gets the translationEquivalents attribute of the BaseSubdefinition object - * - * @return The translationEquivalents value - */ - public java.util.List getTranslationEquivalents() - { - return this.translationEquivalents; - } - - - /** - * Sets the translationEquivalents attribute of the BaseSubdefinition object - * - * @param translationEquivalents The new translationEquivalents value - */ - public void setTranslationEquivalents( java.util.List translationEquivalents ) - { - this.translationEquivalents = translationEquivalents; - } - - - /** - * Gets the relatedTerms attribute of the BaseSubdefinition object - * - * @return The relatedTerms value - */ - public java.util.List getRelatedTerms() - { - return this.relatedTerms; - } - - - /** - * Sets the relatedTerms attribute of the BaseSubdefinition object - * - * @param relatedTerms The new relatedTerms value - */ - public void setRelatedTerms( java.util.List relatedTerms ) - { - this.relatedTerms = relatedTerms; - } - - - /** - * Gets the passages attribute of the BaseSubdefinition object - * - * @return The passages value - */ - public java.util.List getPassages() - { - return this.passages; - } - - - /** - * Sets the passages attribute of the BaseSubdefinition object - * - * @param passages The new passages value - */ - public void setPassages( java.util.List passages ) - { - this.passages = passages; - } - - - /** - * Gets the registers attribute of the BaseSubdefinition object - * - * @return The registers value - */ - public java.util.List getRegisters() - { - return this.registers; - } - - - /** - * Sets the registers attribute of the BaseSubdefinition object - * - * @param registers The new registers value - */ - public void setRegisters( java.util.List registers ) - { - this.registers = registers; - } - - - /** - * Description of the Method - * - * @return Description of the Return Value - */ - public String toString() - { - return new ToStringBuilder( this ) - .append( "metaId", getMetaId() ) - .toString(); - } +/** @author Hibernate CodeGenerator */ +abstract public class BaseSubdefinition extends LexComponent implements org.thdl.lex.component.ISubdefinition,org.thdl.lex.component.Translatable, org.thdl.lex.component.LexComponentNode,Serializable { + + /** nullable persistent field */ + private Integer parentId; + + /** nullable persistent field */ + private String subdefinition; + + /** nullable persistent field */ + private Integer translationOf; + + /** nullable persistent field */ + private org.thdl.lex.component.ILexComponent parent; + + /** persistent field */ + private List translations; + + /** persistent field */ + private List glosses; + + /** persistent field */ + private List keywords; + + /** persistent field */ + private List modelSentences; + + /** persistent field */ + private List translationEquivalents; + + /** persistent field */ + private List relatedTerms; + + /** persistent field */ + private List passages; + + /** persistent field */ + private List registers; + + /** full constructor */ + public BaseSubdefinition(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String subdefinition, Integer translationOf, org.thdl.lex.component.ILexComponent parent, List translations, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) { + super(deleted, analyticalNotes, meta); + this.parentId = parentId; + this.subdefinition = subdefinition; + this.translationOf = translationOf; + this.parent = parent; + this.translations = translations; + this.glosses = glosses; + this.keywords = keywords; + this.modelSentences = modelSentences; + this.translationEquivalents = translationEquivalents; + this.relatedTerms = relatedTerms; + this.passages = passages; + this.registers = registers; + } + + /** default constructor */ + public BaseSubdefinition() { + } + + /** minimal constructor */ + public BaseSubdefinition(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, List translations, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) { + super(deleted, analyticalNotes, meta); + this.translations = translations; + this.glosses = glosses; + this.keywords = keywords; + this.modelSentences = modelSentences; + this.translationEquivalents = translationEquivalents; + this.relatedTerms = relatedTerms; + this.passages = passages; + this.registers = registers; + } + + public Integer getParentId() { + return this.parentId; + } + + public void setParentId(Integer parentId) { + this.parentId = parentId; + } + + public String getSubdefinition() { + return this.subdefinition; + } + + public void setSubdefinition(String subdefinition) { + this.subdefinition = subdefinition; + } + + public Integer getTranslationOf() { + return this.translationOf; + } + + public void setTranslationOf(Integer translationOf) { + this.translationOf = translationOf; + } + + public org.thdl.lex.component.ILexComponent getParent() { + return this.parent; + } + + public void setParent(org.thdl.lex.component.ILexComponent parent) { + this.parent = parent; + } + + public List getTranslations() { + return this.translations; + } + + public void setTranslations(List translations) { + this.translations = translations; + } + + public List getGlosses() { + return this.glosses; + } + + public void setGlosses(List glosses) { + this.glosses = glosses; + } + + public List getKeywords() { + return this.keywords; + } + + public void setKeywords(List keywords) { + this.keywords = keywords; + } + + public List getModelSentences() { + return this.modelSentences; + } + + public void setModelSentences(List modelSentences) { + this.modelSentences = modelSentences; + } + + public List getTranslationEquivalents() { + return this.translationEquivalents; + } + + public void setTranslationEquivalents(List translationEquivalents) { + this.translationEquivalents = translationEquivalents; + } + + public List getRelatedTerms() { + return this.relatedTerms; + } + + public void setRelatedTerms(List relatedTerms) { + this.relatedTerms = relatedTerms; + } + + public List getPassages() { + return this.passages; + } + + public void setPassages(List passages) { + this.passages = passages; + } + + public List getRegisters() { + return this.registers; + } + + public void setRegisters(List registers) { + this.registers = registers; + } + + public String toString() { + return new ToStringBuilder(this) + .append("metaId", getMetaId()) + .toString(); + } } - diff --git a/src/java/org/thdl/lex/component/BaseTerm.java b/src/java/org/thdl/lex/component/BaseTerm.java index 026bac8..387000e 100644 --- a/src/java/org/thdl/lex/component/BaseTerm.java +++ b/src/java/org/thdl/lex/component/BaseTerm.java @@ -8,10 +8,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseTerm extends LexComponent implements org.thdl.lex.component.ITerm,Serializable,org.thdl.lex.component.LexComponentNode { /** persistent field */ - private java.lang.String term; - - /** nullable persistent field */ - private java.lang.Integer precedence; + private String term; /** persistent field */ private List pronunciations; @@ -56,10 +53,9 @@ abstract public class BaseTerm extends LexComponent implements org.thdl.lex.comp private List registers; /** full constructor */ - public BaseTerm(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String term, java.lang.Integer precedence, List pronunciations, List etymologies, List spellings, List functions, List encyclopediaArticles, List transitionalData, List definitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) { + public BaseTerm(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, String term, List pronunciations, List etymologies, List spellings, List functions, List encyclopediaArticles, List transitionalData, List definitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) { super(deleted, analyticalNotes, meta); this.term = term; - this.precedence = precedence; this.pronunciations = pronunciations; this.etymologies = etymologies; this.spellings = spellings; @@ -80,151 +76,123 @@ abstract public class BaseTerm extends LexComponent implements org.thdl.lex.comp public BaseTerm() { } - /** minimal constructor */ - public BaseTerm(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String term, List pronunciations, List etymologies, List spellings, List functions, List encyclopediaArticles, List transitionalData, List definitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) { - super(deleted, analyticalNotes, meta); - this.term = term; - this.pronunciations = pronunciations; - this.etymologies = etymologies; - this.spellings = spellings; - this.functions = functions; - this.encyclopediaArticles = encyclopediaArticles; - this.transitionalData = transitionalData; - this.definitions = definitions; - this.glosses = glosses; - this.keywords = keywords; - this.modelSentences = modelSentences; - this.translationEquivalents = translationEquivalents; - this.relatedTerms = relatedTerms; - this.passages = passages; - this.registers = registers; - } - - public java.lang.String getTerm() { + public String getTerm() { return this.term; } - public void setTerm(java.lang.String term) { + public void setTerm(String term) { this.term = term; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.util.List getPronunciations() { + public List getPronunciations() { return this.pronunciations; } - public void setPronunciations(java.util.List pronunciations) { + public void setPronunciations(List pronunciations) { this.pronunciations = pronunciations; } - public java.util.List getEtymologies() { + public List getEtymologies() { return this.etymologies; } - public void setEtymologies(java.util.List etymologies) { + public void setEtymologies(List etymologies) { this.etymologies = etymologies; } - public java.util.List getSpellings() { + public List getSpellings() { return this.spellings; } - public void setSpellings(java.util.List spellings) { + public void setSpellings(List spellings) { this.spellings = spellings; } - public java.util.List getFunctions() { + public List getFunctions() { return this.functions; } - public void setFunctions(java.util.List functions) { + public void setFunctions(List functions) { this.functions = functions; } - public java.util.List getEncyclopediaArticles() { + public List getEncyclopediaArticles() { return this.encyclopediaArticles; } - public void setEncyclopediaArticles(java.util.List encyclopediaArticles) { + public void setEncyclopediaArticles(List encyclopediaArticles) { this.encyclopediaArticles = encyclopediaArticles; } - public java.util.List getTransitionalData() { + public List getTransitionalData() { return this.transitionalData; } - public void setTransitionalData(java.util.List transitionalData) { + public void setTransitionalData(List transitionalData) { this.transitionalData = transitionalData; } - public java.util.List getDefinitions() { + public List getDefinitions() { return this.definitions; } - public void setDefinitions(java.util.List definitions) { + public void setDefinitions(List definitions) { this.definitions = definitions; } - public java.util.List getGlosses() { + public List getGlosses() { return this.glosses; } - public void setGlosses(java.util.List glosses) { + public void setGlosses(List glosses) { this.glosses = glosses; } - public java.util.List getKeywords() { + public List getKeywords() { return this.keywords; } - public void setKeywords(java.util.List keywords) { + public void setKeywords(List keywords) { this.keywords = keywords; } - public java.util.List getModelSentences() { + public List getModelSentences() { return this.modelSentences; } - public void setModelSentences(java.util.List modelSentences) { + public void setModelSentences(List modelSentences) { this.modelSentences = modelSentences; } - public java.util.List getTranslationEquivalents() { + public List getTranslationEquivalents() { return this.translationEquivalents; } - public void setTranslationEquivalents(java.util.List translationEquivalents) { + public void setTranslationEquivalents(List translationEquivalents) { this.translationEquivalents = translationEquivalents; } - public java.util.List getRelatedTerms() { + public List getRelatedTerms() { return this.relatedTerms; } - public void setRelatedTerms(java.util.List relatedTerms) { + public void setRelatedTerms(List relatedTerms) { this.relatedTerms = relatedTerms; } - public java.util.List getPassages() { + public List getPassages() { return this.passages; } - public void setPassages(java.util.List passages) { + public void setPassages(List passages) { this.passages = passages; } - public java.util.List getRegisters() { + public List getRegisters() { return this.registers; } - public void setRegisters(java.util.List registers) { + public void setRegisters(List registers) { this.registers = registers; } diff --git a/src/java/org/thdl/lex/component/BaseTransitionalData.java b/src/java/org/thdl/lex/component/BaseTransitionalData.java index f231661..817472f 100644 --- a/src/java/org/thdl/lex/component/BaseTransitionalData.java +++ b/src/java/org/thdl/lex/component/BaseTransitionalData.java @@ -8,28 +8,24 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseTransitionalData extends LexComponent implements org.thdl.lex.component.ITransitionalData,Serializable { /** nullable persistent field */ - private java.lang.Integer parentId; + private Integer parentId; /** nullable persistent field */ - private java.lang.Integer precedence; - - /** nullable persistent field */ - private java.lang.Integer transitionalDataLabel; + private Integer transitionalDataLabel; /** persistent field */ - private java.lang.String forPublicConsumption; + private String forPublicConsumption; /** nullable persistent field */ - private java.lang.String transitionalDataText; + private String transitionalDataText; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BaseTransitionalData(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.Integer transitionalDataLabel, java.lang.String forPublicConsumption, java.lang.String transitionalDataText, org.thdl.lex.component.ILexComponent parent) { + public BaseTransitionalData(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, Integer transitionalDataLabel, String forPublicConsumption, String transitionalDataText, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.transitionalDataLabel = transitionalDataLabel; this.forPublicConsumption = forPublicConsumption; this.transitionalDataText = transitionalDataText; @@ -41,48 +37,40 @@ abstract public class BaseTransitionalData extends LexComponent implements org.t } /** minimal constructor */ - public BaseTransitionalData(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String forPublicConsumption) { + public BaseTransitionalData(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, String forPublicConsumption) { super(deleted, analyticalNotes, meta); this.forPublicConsumption = forPublicConsumption; } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.Integer getTransitionalDataLabel() { + public Integer getTransitionalDataLabel() { return this.transitionalDataLabel; } - public void setTransitionalDataLabel(java.lang.Integer transitionalDataLabel) { + public void setTransitionalDataLabel(Integer transitionalDataLabel) { this.transitionalDataLabel = transitionalDataLabel; } - public java.lang.String getForPublicConsumption() { + public String getForPublicConsumption() { return this.forPublicConsumption; } - public void setForPublicConsumption(java.lang.String forPublicConsumption) { + public void setForPublicConsumption(String forPublicConsumption) { this.forPublicConsumption = forPublicConsumption; } - public java.lang.String getTransitionalDataText() { + public String getTransitionalDataText() { return this.transitionalDataText; } - public void setTransitionalDataText(java.lang.String transitionalDataText) { + public void setTransitionalDataText(String transitionalDataText) { this.transitionalDataText = transitionalDataText; } diff --git a/src/java/org/thdl/lex/component/BaseTranslationEquivalent.java b/src/java/org/thdl/lex/component/BaseTranslationEquivalent.java index 7e58df0..6a70f34 100644 --- a/src/java/org/thdl/lex/component/BaseTranslationEquivalent.java +++ b/src/java/org/thdl/lex/component/BaseTranslationEquivalent.java @@ -8,22 +8,18 @@ import org.apache.commons.lang.builder.ToStringBuilder; abstract public class BaseTranslationEquivalent extends LexComponent implements org.thdl.lex.component.ITranslationEquivalent,Serializable { /** nullable persistent field */ - private java.lang.Integer parentId; + private Integer parentId; /** nullable persistent field */ - private java.lang.Integer precedence; - - /** nullable persistent field */ - private java.lang.String translationEquivalent; + private String translationEquivalent; /** nullable persistent field */ private org.thdl.lex.component.ILexComponent parent; /** full constructor */ - public BaseTranslationEquivalent(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Integer precedence, java.lang.String translationEquivalent, org.thdl.lex.component.ILexComponent parent) { + public BaseTranslationEquivalent(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Integer parentId, String translationEquivalent, org.thdl.lex.component.ILexComponent parent) { super(deleted, analyticalNotes, meta); this.parentId = parentId; - this.precedence = precedence; this.translationEquivalent = translationEquivalent; this.parent = parent; } @@ -33,31 +29,23 @@ abstract public class BaseTranslationEquivalent extends LexComponent implements } /** minimal constructor */ - public BaseTranslationEquivalent(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) { + public BaseTranslationEquivalent(Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) { super(deleted, analyticalNotes, meta); } - public java.lang.Integer getParentId() { + public Integer getParentId() { return this.parentId; } - public void setParentId(java.lang.Integer parentId) { + public void setParentId(Integer parentId) { this.parentId = parentId; } - public java.lang.Integer getPrecedence() { - return this.precedence; - } - - public void setPrecedence(java.lang.Integer precedence) { - this.precedence = precedence; - } - - public java.lang.String getTranslationEquivalent() { + public String getTranslationEquivalent() { return this.translationEquivalent; } - public void setTranslationEquivalent(java.lang.String translationEquivalent) { + public void setTranslationEquivalent(String translationEquivalent) { this.translationEquivalent = translationEquivalent; } diff --git a/src/java/org/thdl/lex/component/IDefinition.java b/src/java/org/thdl/lex/component/IDefinition.java index ae0f933..0c850c6 100644 --- a/src/java/org/thdl/lex/component/IDefinition.java +++ b/src/java/org/thdl/lex/component/IDefinition.java @@ -55,24 +55,7 @@ public interface IDefinition extends LexComponentNode public void setDefinition( java.lang.String definition ); - /** - * Gets the precedence attribute of the IDefinition object - * - * @return The precedence value - * @since - */ - public java.lang.Integer getPrecedence(); - - - /** - * Sets the precedence attribute of the IDefinition object - * - * @param precedence The new precedence value - * @since - */ - public void setPrecedence( java.lang.Integer precedence ); - - + /** * Gets the subdefinitions attribute of the IDefinition object * diff --git a/src/java/org/thdl/lex/component/ILexComponent.java b/src/java/org/thdl/lex/component/ILexComponent.java index 879d32d..e24f312 100644 --- a/src/java/org/thdl/lex/component/ILexComponent.java +++ b/src/java/org/thdl/lex/component/ILexComponent.java @@ -50,20 +50,6 @@ public interface ILexComponent public java.lang.Integer getParentId(); - /** - * Gets the precedence attribute of the ILexComponent object - * - * @return The precedence value - */ - public java.lang.Integer getPrecedence(); - - - /** - * Sets the precedence attribute of the LexComponent object - * - * @param precedence The new precedence value - */ - public void setPrecedence( java.lang.Integer precedence ); /** diff --git a/src/java/org/thdl/lex/component/ITerm.java b/src/java/org/thdl/lex/component/ITerm.java index 47372b2..2b25538 100644 --- a/src/java/org/thdl/lex/component/ITerm.java +++ b/src/java/org/thdl/lex/component/ITerm.java @@ -26,25 +26,6 @@ public interface ITerm extends LexComponentNode */ public void setTerm( java.lang.String term ); - - /** - * Gets the precedence attribute of the ITerm object - * - * @return The precedence value - * @since - */ - public java.lang.Integer getPrecedence(); - - - /** - * Sets the precedence attribute of the ITerm object - * - * @param precedence The new precedence value - * @since - */ - public void setPrecedence( java.lang.Integer precedence ); - - /** * Gets the pronunciations attribute of the ITerm object * diff --git a/src/java/org/thdl/lex/component/LexComponent.hbm.xml b/src/java/org/thdl/lex/component/LexComponent.hbm.xml index 3438332..672f973 100644 --- a/src/java/org/thdl/lex/component/LexComponent.hbm.xml +++ b/src/java/org/thdl/lex/component/LexComponent.hbm.xml @@ -45,7 +45,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -270,7 +270,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -306,7 +306,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -333,7 +333,7 @@ - + @@ -347,7 +347,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -380,7 +380,7 @@ - + @@ -393,7 +393,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -430,7 +430,7 @@ - + @@ -443,7 +443,7 @@ - + diff --git a/src/java/org/thdl/lex/component/LexComponent.java b/src/java/org/thdl/lex/component/LexComponent.java index a3e2fb7..6d40599 100644 --- a/src/java/org/thdl/lex/component/LexComponent.java +++ b/src/java/org/thdl/lex/component/LexComponent.java @@ -79,21 +79,6 @@ public abstract class LexComponent extends BaseLexComponent implements Serializa } - /** - * Gets the precedence attribute of the LexComponent object - * - * @return The precedence value - */ - public abstract java.lang.Integer getPrecedence(); - - - /** - * Sets the precedence attribute of the LexComponent object - * - * @param precedence The new precedence value - */ - public abstract void setPrecedence( java.lang.Integer precedence ); - /** * Sets the parent attribute of the LexComponent object diff --git a/src/java/org/thdl/lex/component/child/Author.java b/src/java/org/thdl/lex/component/child/Author.java index cedd060..ecd3b9c 100644 --- a/src/java/org/thdl/lex/component/child/Author.java +++ b/src/java/org/thdl/lex/component/child/Author.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class Author implements Serializable { /** identifier field */ - private java.lang.Integer id; + private Integer id; /** persistent field */ - private java.lang.String author; + private String author; /** full constructor */ - public Author(java.lang.String author) { + public Author(String author) { this.author = author; } @@ -23,19 +23,19 @@ public class Author implements Serializable { public Author() { } - public java.lang.Integer getId() { + public Integer getId() { return this.id; } - public void setId(java.lang.Integer id) { + public void setId(Integer id) { this.id = id; } - public java.lang.String getAuthor() { + public String getAuthor() { return this.author; } - public void setAuthor(java.lang.String author) { + public void setAuthor(String author) { this.author = author; } diff --git a/src/java/org/thdl/lex/component/child/Dialect.java b/src/java/org/thdl/lex/component/child/Dialect.java index 6973adc..5458f09 100644 --- a/src/java/org/thdl/lex/component/child/Dialect.java +++ b/src/java/org/thdl/lex/component/child/Dialect.java @@ -9,7 +9,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class Dialect implements Serializable { /** identifier field */ - private java.lang.Integer id; + private Integer id; /** persistent field */ private short majorDialectFamily; @@ -27,11 +27,11 @@ public class Dialect implements Serializable { public Dialect() { } - public java.lang.Integer getId() { + public Integer getId() { return this.id; } - public void setId(java.lang.Integer id) { + public void setId(Integer id) { this.id = id; } diff --git a/src/java/org/thdl/lex/component/child/EtymologyType.java b/src/java/org/thdl/lex/component/child/EtymologyType.java index 6cbd036..b11d009 100644 --- a/src/java/org/thdl/lex/component/child/EtymologyType.java +++ b/src/java/org/thdl/lex/component/child/EtymologyType.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class EtymologyType implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** persistent field */ - private java.lang.String etymologyType; + private String etymologyType; /** full constructor */ - public EtymologyType(java.lang.String etymologyType) { + public EtymologyType(String etymologyType) { this.etymologyType = etymologyType; } @@ -23,19 +23,19 @@ public class EtymologyType implements Serializable { public EtymologyType() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getEtymologyType() { + public String getEtymologyType() { return this.etymologyType; } - public void setEtymologyType(java.lang.String etymologyType) { + public void setEtymologyType(String etymologyType) { this.etymologyType = etymologyType; } diff --git a/src/java/org/thdl/lex/component/child/Function.java b/src/java/org/thdl/lex/component/child/Function.java index da2c355..18650dd 100644 --- a/src/java/org/thdl/lex/component/child/Function.java +++ b/src/java/org/thdl/lex/component/child/Function.java @@ -9,7 +9,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class Function implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** persistent field */ private short functionGeneral; @@ -27,11 +27,11 @@ public class Function implements Serializable { public Function() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } diff --git a/src/java/org/thdl/lex/component/child/FunctionGeneral.java b/src/java/org/thdl/lex/component/child/FunctionGeneral.java index 9afa24c..aec6588 100644 --- a/src/java/org/thdl/lex/component/child/FunctionGeneral.java +++ b/src/java/org/thdl/lex/component/child/FunctionGeneral.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class FunctionGeneral implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** persistent field */ - private java.lang.String functionGeneral; + private String functionGeneral; /** full constructor */ - public FunctionGeneral(java.lang.String functionGeneral) { + public FunctionGeneral(String functionGeneral) { this.functionGeneral = functionGeneral; } @@ -23,19 +23,19 @@ public class FunctionGeneral implements Serializable { public FunctionGeneral() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getFunctionGeneral() { + public String getFunctionGeneral() { return this.functionGeneral; } - public void setFunctionGeneral(java.lang.String functionGeneral) { + public void setFunctionGeneral(String functionGeneral) { this.functionGeneral = functionGeneral; } diff --git a/src/java/org/thdl/lex/component/child/FunctionSpecific.java b/src/java/org/thdl/lex/component/child/FunctionSpecific.java index 765b056..8945781 100644 --- a/src/java/org/thdl/lex/component/child/FunctionSpecific.java +++ b/src/java/org/thdl/lex/component/child/FunctionSpecific.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class FunctionSpecific implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** persistent field */ - private java.lang.String functionSpecific; + private String functionSpecific; /** full constructor */ - public FunctionSpecific(java.lang.String functionSpecific) { + public FunctionSpecific(String functionSpecific) { this.functionSpecific = functionSpecific; } @@ -23,19 +23,19 @@ public class FunctionSpecific implements Serializable { public FunctionSpecific() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getFunctionSpecific() { + public String getFunctionSpecific() { return this.functionSpecific; } - public void setFunctionSpecific(java.lang.String functionSpecific) { + public void setFunctionSpecific(String functionSpecific) { this.functionSpecific = functionSpecific; } diff --git a/src/java/org/thdl/lex/component/child/Language.java b/src/java/org/thdl/lex/component/child/Language.java index 9928e33..09bc784 100644 --- a/src/java/org/thdl/lex/component/child/Language.java +++ b/src/java/org/thdl/lex/component/child/Language.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class Language implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** persistent field */ - private java.lang.String language; + private String language; /** full constructor */ - public Language(java.lang.String language) { + public Language(String language) { this.language = language; } @@ -23,19 +23,19 @@ public class Language implements Serializable { public Language() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getLanguage() { + public String getLanguage() { return this.language; } - public void setLanguage(java.lang.String language) { + public void setLanguage(String language) { this.language = language; } diff --git a/src/java/org/thdl/lex/component/child/LiteraryForm.java b/src/java/org/thdl/lex/component/child/LiteraryForm.java index b6c0290..67dd6b5 100644 --- a/src/java/org/thdl/lex/component/child/LiteraryForm.java +++ b/src/java/org/thdl/lex/component/child/LiteraryForm.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class LiteraryForm implements Serializable { /** identifier field */ - private java.lang.Integer id; + private Integer id; /** persistent field */ - private java.lang.String literaryForm; + private String literaryForm; /** full constructor */ - public LiteraryForm(java.lang.String literaryForm) { + public LiteraryForm(String literaryForm) { this.literaryForm = literaryForm; } @@ -23,19 +23,19 @@ public class LiteraryForm implements Serializable { public LiteraryForm() { } - public java.lang.Integer getId() { + public Integer getId() { return this.id; } - public void setId(java.lang.Integer id) { + public void setId(Integer id) { this.id = id; } - public java.lang.String getLiteraryForm() { + public String getLiteraryForm() { return this.literaryForm; } - public void setLiteraryForm(java.lang.String literaryForm) { + public void setLiteraryForm(String literaryForm) { this.literaryForm = literaryForm; } diff --git a/src/java/org/thdl/lex/component/child/LiteraryGenre.java b/src/java/org/thdl/lex/component/child/LiteraryGenre.java index 03ddc2f..271c2a1 100644 --- a/src/java/org/thdl/lex/component/child/LiteraryGenre.java +++ b/src/java/org/thdl/lex/component/child/LiteraryGenre.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class LiteraryGenre implements Serializable { /** identifier field */ - private java.lang.Integer id; + private Integer id; /** persistent field */ - private java.lang.String literaryGenre; + private String literaryGenre; /** full constructor */ - public LiteraryGenre(java.lang.String literaryGenre) { + public LiteraryGenre(String literaryGenre) { this.literaryGenre = literaryGenre; } @@ -23,19 +23,19 @@ public class LiteraryGenre implements Serializable { public LiteraryGenre() { } - public java.lang.Integer getId() { + public Integer getId() { return this.id; } - public void setId(java.lang.Integer id) { + public void setId(Integer id) { this.id = id; } - public java.lang.String getLiteraryGenre() { + public String getLiteraryGenre() { return this.literaryGenre; } - public void setLiteraryGenre(java.lang.String literaryGenre) { + public void setLiteraryGenre(String literaryGenre) { this.literaryGenre = literaryGenre; } diff --git a/src/java/org/thdl/lex/component/child/LiteraryPeriod.java b/src/java/org/thdl/lex/component/child/LiteraryPeriod.java index 8da7ae3..b01191b 100644 --- a/src/java/org/thdl/lex/component/child/LiteraryPeriod.java +++ b/src/java/org/thdl/lex/component/child/LiteraryPeriod.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class LiteraryPeriod implements Serializable { /** identifier field */ - private java.lang.Integer id; + private Integer id; /** persistent field */ - private java.lang.String literaryPeriod; + private String literaryPeriod; /** full constructor */ - public LiteraryPeriod(java.lang.String literaryPeriod) { + public LiteraryPeriod(String literaryPeriod) { this.literaryPeriod = literaryPeriod; } @@ -23,19 +23,19 @@ public class LiteraryPeriod implements Serializable { public LiteraryPeriod() { } - public java.lang.Integer getId() { + public Integer getId() { return this.id; } - public void setId(java.lang.Integer id) { + public void setId(Integer id) { this.id = id; } - public java.lang.String getLiteraryPeriod() { + public String getLiteraryPeriod() { return this.literaryPeriod; } - public void setLiteraryPeriod(java.lang.String literaryPeriod) { + public void setLiteraryPeriod(String literaryPeriod) { this.literaryPeriod = literaryPeriod; } diff --git a/src/java/org/thdl/lex/component/child/LiterarySource.java b/src/java/org/thdl/lex/component/child/LiterarySource.java index 925950b..8ea6244 100644 --- a/src/java/org/thdl/lex/component/child/LiterarySource.java +++ b/src/java/org/thdl/lex/component/child/LiterarySource.java @@ -1,6 +1,7 @@ package org.thdl.lex.component.child; import java.io.Serializable; +import java.util.Date; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; @@ -9,49 +10,49 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class LiterarySource implements Serializable { /** identifier field */ - private java.lang.Integer id; + private Integer id; /** nullable persistent field */ - private java.lang.Integer literaryPeriod; + private Integer literaryPeriod; /** nullable persistent field */ - private java.lang.Integer literaryGenre; + private Integer literaryGenre; /** nullable persistent field */ - private java.lang.Integer literaryForm; + private Integer literaryForm; /** nullable persistent field */ - private java.lang.Integer author; + private Integer author; /** nullable persistent field */ - private java.lang.String sourceNormalizedTitle; + private String sourceNormalizedTitle; /** nullable persistent field */ - private java.lang.String tibetanDate; + private String tibetanDate; /** nullable persistent field */ - private java.lang.String internationalDate; + private String internationalDate; /** nullable persistent field */ - private java.lang.String edition; + private String edition; /** nullable persistent field */ - private java.lang.String publisher; + private String publisher; /** nullable persistent field */ - private java.lang.String isbn; + private String isbn; /** nullable persistent field */ - private java.util.Date yearPublished; + private Date yearPublished; /** persistent field */ - private java.lang.Integer volumeNumber; + private Integer volumeNumber; /** nullable persistent field */ - private java.lang.String pagination; + private String pagination; /** full constructor */ - public LiterarySource(java.lang.Integer literaryPeriod, java.lang.Integer literaryGenre, java.lang.Integer literaryForm, java.lang.Integer author, java.lang.String sourceNormalizedTitle, java.lang.String tibetanDate, java.lang.String internationalDate, java.lang.String edition, java.lang.String publisher, java.lang.String isbn, java.util.Date yearPublished, java.lang.Integer volumeNumber, java.lang.String pagination) { + public LiterarySource(Integer literaryPeriod, Integer literaryGenre, Integer literaryForm, Integer author, String sourceNormalizedTitle, String tibetanDate, String internationalDate, String edition, String publisher, String isbn, Date yearPublished, Integer volumeNumber, String pagination) { this.literaryPeriod = literaryPeriod; this.literaryGenre = literaryGenre; this.literaryForm = literaryForm; @@ -72,119 +73,119 @@ public class LiterarySource implements Serializable { } /** minimal constructor */ - public LiterarySource(java.lang.Integer volumeNumber) { + public LiterarySource(Integer volumeNumber) { this.volumeNumber = volumeNumber; } - public java.lang.Integer getId() { + public Integer getId() { return this.id; } - public void setId(java.lang.Integer id) { + public void setId(Integer id) { this.id = id; } - public java.lang.Integer getLiteraryPeriod() { + public Integer getLiteraryPeriod() { return this.literaryPeriod; } - public void setLiteraryPeriod(java.lang.Integer literaryPeriod) { + public void setLiteraryPeriod(Integer literaryPeriod) { this.literaryPeriod = literaryPeriod; } - public java.lang.Integer getLiteraryGenre() { + public Integer getLiteraryGenre() { return this.literaryGenre; } - public void setLiteraryGenre(java.lang.Integer literaryGenre) { + public void setLiteraryGenre(Integer literaryGenre) { this.literaryGenre = literaryGenre; } - public java.lang.Integer getLiteraryForm() { + public Integer getLiteraryForm() { return this.literaryForm; } - public void setLiteraryForm(java.lang.Integer literaryForm) { + public void setLiteraryForm(Integer literaryForm) { this.literaryForm = literaryForm; } - public java.lang.Integer getAuthor() { + public Integer getAuthor() { return this.author; } - public void setAuthor(java.lang.Integer author) { + public void setAuthor(Integer author) { this.author = author; } - public java.lang.String getSourceNormalizedTitle() { + public String getSourceNormalizedTitle() { return this.sourceNormalizedTitle; } - public void setSourceNormalizedTitle(java.lang.String sourceNormalizedTitle) { + public void setSourceNormalizedTitle(String sourceNormalizedTitle) { this.sourceNormalizedTitle = sourceNormalizedTitle; } - public java.lang.String getTibetanDate() { + public String getTibetanDate() { return this.tibetanDate; } - public void setTibetanDate(java.lang.String tibetanDate) { + public void setTibetanDate(String tibetanDate) { this.tibetanDate = tibetanDate; } - public java.lang.String getInternationalDate() { + public String getInternationalDate() { return this.internationalDate; } - public void setInternationalDate(java.lang.String internationalDate) { + public void setInternationalDate(String internationalDate) { this.internationalDate = internationalDate; } - public java.lang.String getEdition() { + public String getEdition() { return this.edition; } - public void setEdition(java.lang.String edition) { + public void setEdition(String edition) { this.edition = edition; } - public java.lang.String getPublisher() { + public String getPublisher() { return this.publisher; } - public void setPublisher(java.lang.String publisher) { + public void setPublisher(String publisher) { this.publisher = publisher; } - public java.lang.String getIsbn() { + public String getIsbn() { return this.isbn; } - public void setIsbn(java.lang.String isbn) { + public void setIsbn(String isbn) { this.isbn = isbn; } - public java.util.Date getYearPublished() { + public Date getYearPublished() { return this.yearPublished; } - public void setYearPublished(java.util.Date yearPublished) { + public void setYearPublished(Date yearPublished) { this.yearPublished = yearPublished; } - public java.lang.Integer getVolumeNumber() { + public Integer getVolumeNumber() { return this.volumeNumber; } - public void setVolumeNumber(java.lang.Integer volumeNumber) { + public void setVolumeNumber(Integer volumeNumber) { this.volumeNumber = volumeNumber; } - public java.lang.String getPagination() { + public String getPagination() { return this.pagination; } - public void setPagination(java.lang.String pagination) { + public void setPagination(String pagination) { this.pagination = pagination; } diff --git a/src/java/org/thdl/lex/component/child/MajorDialectFamily.java b/src/java/org/thdl/lex/component/child/MajorDialectFamily.java index 9865d81..69c58b9 100644 --- a/src/java/org/thdl/lex/component/child/MajorDialectFamily.java +++ b/src/java/org/thdl/lex/component/child/MajorDialectFamily.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class MajorDialectFamily implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** nullable persistent field */ - private java.lang.String majorDialectFamily; + private String majorDialectFamily; /** full constructor */ - public MajorDialectFamily(java.lang.String majorDialectFamily) { + public MajorDialectFamily(String majorDialectFamily) { this.majorDialectFamily = majorDialectFamily; } @@ -23,19 +23,19 @@ public class MajorDialectFamily implements Serializable { public MajorDialectFamily() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getMajorDialectFamily() { + public String getMajorDialectFamily() { return this.majorDialectFamily; } - public void setMajorDialectFamily(java.lang.String majorDialectFamily) { + public void setMajorDialectFamily(String majorDialectFamily) { this.majorDialectFamily = majorDialectFamily; } diff --git a/src/java/org/thdl/lex/component/child/PhoneticsType.java b/src/java/org/thdl/lex/component/child/PhoneticsType.java index f3640a6..0a4392a 100644 --- a/src/java/org/thdl/lex/component/child/PhoneticsType.java +++ b/src/java/org/thdl/lex/component/child/PhoneticsType.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class PhoneticsType implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** persistent field */ - private java.lang.String phoneticsType; + private String phoneticsType; /** full constructor */ - public PhoneticsType(java.lang.String phoneticsType) { + public PhoneticsType(String phoneticsType) { this.phoneticsType = phoneticsType; } @@ -23,19 +23,19 @@ public class PhoneticsType implements Serializable { public PhoneticsType() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getPhoneticsType() { + public String getPhoneticsType() { return this.phoneticsType; } - public void setPhoneticsType(java.lang.String phoneticsType) { + public void setPhoneticsType(String phoneticsType) { this.phoneticsType = phoneticsType; } diff --git a/src/java/org/thdl/lex/component/child/ProjectSubject.java b/src/java/org/thdl/lex/component/child/ProjectSubject.java index e8a8802..1f50cb7 100644 --- a/src/java/org/thdl/lex/component/child/ProjectSubject.java +++ b/src/java/org/thdl/lex/component/child/ProjectSubject.java @@ -9,19 +9,19 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class ProjectSubject implements Serializable { /** identifier field */ - private java.lang.Integer id; + private Integer id; /** nullable persistent field */ - private java.lang.String projectSubject; + private String projectSubject; /** persistent field */ - private java.lang.Integer leader; + private Integer leader; /** nullable persistent field */ - private java.lang.String participantList; + private String participantList; /** full constructor */ - public ProjectSubject(java.lang.String projectSubject, java.lang.Integer leader, java.lang.String participantList) { + public ProjectSubject(String projectSubject, Integer leader, String participantList) { this.projectSubject = projectSubject; this.leader = leader; this.participantList = participantList; @@ -32,39 +32,39 @@ public class ProjectSubject implements Serializable { } /** minimal constructor */ - public ProjectSubject(java.lang.Integer leader) { + public ProjectSubject(Integer leader) { this.leader = leader; } - public java.lang.Integer getId() { + public Integer getId() { return this.id; } - public void setId(java.lang.Integer id) { + public void setId(Integer id) { this.id = id; } - public java.lang.String getProjectSubject() { + public String getProjectSubject() { return this.projectSubject; } - public void setProjectSubject(java.lang.String projectSubject) { + public void setProjectSubject(String projectSubject) { this.projectSubject = projectSubject; } - public java.lang.Integer getLeader() { + public Integer getLeader() { return this.leader; } - public void setLeader(java.lang.Integer leader) { + public void setLeader(Integer leader) { this.leader = leader; } - public java.lang.String getParticipantList() { + public String getParticipantList() { return this.participantList; } - public void setParticipantList(java.lang.String participantList) { + public void setParticipantList(String participantList) { this.participantList = participantList; } diff --git a/src/java/org/thdl/lex/component/child/Register.java b/src/java/org/thdl/lex/component/child/Register.java index 7396683..01bb0ae 100644 --- a/src/java/org/thdl/lex/component/child/Register.java +++ b/src/java/org/thdl/lex/component/child/Register.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class Register implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** persistent field */ - private java.lang.String register; + private String register; /** full constructor */ - public Register(java.lang.String register) { + public Register(String register) { this.register = register; } @@ -23,19 +23,19 @@ public class Register implements Serializable { public Register() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getRegister() { + public String getRegister() { return this.register; } - public void setRegister(java.lang.String register) { + public void setRegister(String register) { this.register = register; } diff --git a/src/java/org/thdl/lex/component/child/RelatedTermType.java b/src/java/org/thdl/lex/component/child/RelatedTermType.java index fb5d73e..3b80f87 100644 --- a/src/java/org/thdl/lex/component/child/RelatedTermType.java +++ b/src/java/org/thdl/lex/component/child/RelatedTermType.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class RelatedTermType implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** persistent field */ - private java.lang.String relatedTermType; + private String relatedTermType; /** full constructor */ - public RelatedTermType(java.lang.String relatedTermType) { + public RelatedTermType(String relatedTermType) { this.relatedTermType = relatedTermType; } @@ -23,19 +23,19 @@ public class RelatedTermType implements Serializable { public RelatedTermType() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getRelatedTermType() { + public String getRelatedTermType() { return this.relatedTermType; } - public void setRelatedTermType(java.lang.String relatedTermType) { + public void setRelatedTermType(String relatedTermType) { this.relatedTermType = relatedTermType; } diff --git a/src/java/org/thdl/lex/component/child/Script.java b/src/java/org/thdl/lex/component/child/Script.java index 981990b..bbe4dcd 100644 --- a/src/java/org/thdl/lex/component/child/Script.java +++ b/src/java/org/thdl/lex/component/child/Script.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class Script implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** persistent field */ - private java.lang.String script; + private String script; /** full constructor */ - public Script(java.lang.String script) { + public Script(String script) { this.script = script; } @@ -23,19 +23,19 @@ public class Script implements Serializable { public Script() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getScript() { + public String getScript() { return this.script; } - public void setScript(java.lang.String script) { + public void setScript(String script) { this.script = script; } diff --git a/src/java/org/thdl/lex/component/child/Source.java b/src/java/org/thdl/lex/component/child/Source.java index ee9f752..d40eca8 100644 --- a/src/java/org/thdl/lex/component/child/Source.java +++ b/src/java/org/thdl/lex/component/child/Source.java @@ -9,16 +9,16 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class Source implements Serializable { /** identifier field */ - private java.lang.Integer id; + private Integer id; /** persistent field */ - private java.lang.String sourceTitle; + private String sourceTitle; /** nullable persistent field */ - private java.lang.String sourceDescription; + private String sourceDescription; /** full constructor */ - public Source(java.lang.String sourceTitle, java.lang.String sourceDescription) { + public Source(String sourceTitle, String sourceDescription) { this.sourceTitle = sourceTitle; this.sourceDescription = sourceDescription; } @@ -28,31 +28,31 @@ public class Source implements Serializable { } /** minimal constructor */ - public Source(java.lang.String sourceTitle) { + public Source(String sourceTitle) { this.sourceTitle = sourceTitle; } - public java.lang.Integer getId() { + public Integer getId() { return this.id; } - public void setId(java.lang.Integer id) { + public void setId(Integer id) { this.id = id; } - public java.lang.String getSourceTitle() { + public String getSourceTitle() { return this.sourceTitle; } - public void setSourceTitle(java.lang.String sourceTitle) { + public void setSourceTitle(String sourceTitle) { this.sourceTitle = sourceTitle; } - public java.lang.String getSourceDescription() { + public String getSourceDescription() { return this.sourceDescription; } - public void setSourceDescription(java.lang.String sourceDescription) { + public void setSourceDescription(String sourceDescription) { this.sourceDescription = sourceDescription; } diff --git a/src/java/org/thdl/lex/component/child/SpecificDialect.java b/src/java/org/thdl/lex/component/child/SpecificDialect.java index bbccfaa..459d4b0 100644 --- a/src/java/org/thdl/lex/component/child/SpecificDialect.java +++ b/src/java/org/thdl/lex/component/child/SpecificDialect.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class SpecificDialect implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** nullable persistent field */ - private java.lang.String specificDialect; + private String specificDialect; /** full constructor */ - public SpecificDialect(java.lang.String specificDialect) { + public SpecificDialect(String specificDialect) { this.specificDialect = specificDialect; } @@ -23,19 +23,19 @@ public class SpecificDialect implements Serializable { public SpecificDialect() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getSpecificDialect() { + public String getSpecificDialect() { return this.specificDialect; } - public void setSpecificDialect(java.lang.String specificDialect) { + public void setSpecificDialect(String specificDialect) { this.specificDialect = specificDialect; } diff --git a/src/java/org/thdl/lex/component/child/SpellingType.java b/src/java/org/thdl/lex/component/child/SpellingType.java index 0e1c628..c8871fd 100644 --- a/src/java/org/thdl/lex/component/child/SpellingType.java +++ b/src/java/org/thdl/lex/component/child/SpellingType.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class SpellingType implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** persistent field */ - private java.lang.String spellingType; + private String spellingType; /** full constructor */ - public SpellingType(java.lang.String spellingType) { + public SpellingType(String spellingType) { this.spellingType = spellingType; } @@ -23,19 +23,19 @@ public class SpellingType implements Serializable { public SpellingType() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getSpellingType() { + public String getSpellingType() { return this.spellingType; } - public void setSpellingType(java.lang.String spellingType) { + public void setSpellingType(String spellingType) { this.spellingType = spellingType; } diff --git a/src/java/org/thdl/lex/component/child/TransitionalDataLabel.java b/src/java/org/thdl/lex/component/child/TransitionalDataLabel.java index 08c832d..397e6ba 100644 --- a/src/java/org/thdl/lex/component/child/TransitionalDataLabel.java +++ b/src/java/org/thdl/lex/component/child/TransitionalDataLabel.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class TransitionalDataLabel implements Serializable { /** identifier field */ - private java.lang.Short id; + private Short id; /** nullable persistent field */ - private java.lang.String transitionalDataLabel; + private String transitionalDataLabel; /** full constructor */ - public TransitionalDataLabel(java.lang.String transitionalDataLabel) { + public TransitionalDataLabel(String transitionalDataLabel) { this.transitionalDataLabel = transitionalDataLabel; } @@ -23,19 +23,19 @@ public class TransitionalDataLabel implements Serializable { public TransitionalDataLabel() { } - public java.lang.Short getId() { + public Short getId() { return this.id; } - public void setId(java.lang.Short id) { + public void setId(Short id) { this.id = id; } - public java.lang.String getTransitionalDataLabel() { + public String getTransitionalDataLabel() { return this.transitionalDataLabel; } - public void setTransitionalDataLabel(java.lang.String transitionalDataLabel) { + public void setTransitionalDataLabel(String transitionalDataLabel) { this.transitionalDataLabel = transitionalDataLabel; } diff --git a/src/jsp/jsp/displayTreeToc.jsf b/src/jsp/jsp/displayTreeToc.jsf index 7c6bcc3..e48feae 100644 --- a/src/jsp/jsp/displayTreeToc.jsf +++ b/src/jsp/jsp/displayTreeToc.jsf @@ -56,7 +56,7 @@ - +
    @@ -66,7 +66,7 @@
  1. - +
      diff --git a/src/jsp/jsp/metaForm.jsf b/src/jsp/jsp/metaForm.jsf index 8e7f007..5e613f1 100644 --- a/src/jsp/jsp/metaForm.jsf +++ b/src/jsp/jsp/metaForm.jsf @@ -12,7 +12,7 @@ - + <%-- --%> @@ -22,7 +22,7 @@ - + <%-- --%> @@ -41,7 +41,7 @@ --%> - +<%-- --%> diff --git a/src/jsp/jsp/termForm.jsf b/src/jsp/jsp/termForm.jsf index 79d0ed8..352e83f 100644 --- a/src/jsp/jsp/termForm.jsf +++ b/src/jsp/jsp/termForm.jsf @@ -9,20 +9,20 @@ - + <%-- --%> - + <%-- --%> - + <%-- --%> @@ -38,8 +38,7 @@ Term: ' escapeXml='false' /> - +<%-- --%>