thdltools/Dictionary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Here is a large batch of updated classes and jsps.

Browse source
This commit is contained in:
dubtraxis 2003-10-17 22:55:25 +00:00
parent e89a54a612
commit 40200a18df
114 changed files with 4504 additions and 2327 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build.xml
View file

@ -115,7 +115,12 @@
<target name="compile" description="Compile web application" depends="copy">
<mkdir dir="${build}/WEB-INF/classes"/>
<javac srcdir="${source}/java" destdir="${build}/WEB-INF/classes" classpathref="classpath" debug="on" listfiles="no"/>
<javac destdir="${build}/WEB-INF/classes" classpathref="classpath" debug="on" listfiles="no">
<src path="${source}/java"/>
<include name="org/thdl/lex/**"/>
<exclude name="**/old/**"/>
</javac>
</target>
<target name="test" description="Testing" depends="compile">

153
src/css/lex-advanced.css
View file

@ -1,123 +1,32 @@
/* ID Selectors */
#header
{
position: absolute;
top: 80px;
left: 0px;
width: 98%;
height: 25px;
margin-top: 10px;
margin-left: 5px;
background-color: #ffffff;
font-size:.9em;
border-left:1px solid #000;
border-right:1px solid #000;
border-top:1px solid #000;
padding: 3px 0 0 3px;
}
#label p
{
color:white;
}
#label
{
position: absolute;
top: 115px;
left: 0px;
margin-left: 5px;
width: 98%;
height: 25px;
background-color: #666666;
color:white;
font-size:.9em;
border-left:1px solid #000;
border-right:1px solid #000;
border-top:1px solid #000;
padding: 3px 0 0 3px;
}
#message
{
position: absolute;
top: 140px;
left: 0px;
margin-left: 5px;
width: 98%;
height: 25px;
font-size:.9em;
background-color: #999999;
border-left:1px solid #000;
border-right:1px solid #000;
border-top:1px solid #000;
padding: 3px 0 0 3px;
}
#columnSingle
#results
{
position:absolute;
top:166px;
left: 0;
margin-left: 5px;
padding-bottom:10px;
width: 98%;
background-color: white;
border:1px solid #000;
padding: 0 0 0 3px;
}
#columnSingle #menu
#toc
{
float:right;
border-left:1px solid #000;
border-bottom:1px solid #000;
width: 230px;
background:#eee;
margin:0px 0px 10px 10px;
padding-top: 5px;
padding-bottom: 5px;
padding: 0;
}
/* #columnSingle #menu
#entry
{
float:left;
border-right:1px solid #000;
border-bottom:1px solid #000;
width: 230px;
background:#eee;
margin:0px 10px 10px 0px;
padding-top: 5px;
padding-bottom: 5px;
} */
#columnSingle form, #columnSingle h1
{
margin:5px 5px 5px 5px;
}
#menu > form
{
border-left: 0;
border-bottom: 0;
margin-left:10px;
}
#termChildren, #defChildren, #subdefChildren
{
margin-left: 35px;
margin-right: 0;
}
#columnMain textarea
{
border: black solid 1px;
}
#backButton
{
float:right;
margin-right: 25px;
margin-top: 25px;
}
#newCompForm, #preferencesForm
@ -133,6 +42,11 @@ margin: 5px 5px 5px 5px;
}
/* Class Selectors.*/
.highlightBox ol
{
margin: 0 0 0 20px;
}
.label
{
font-weight: bold;
@ -167,20 +81,16 @@ margin-right: 2px;
.metadata, .translation, .analysis
{
display: none;
/* font-size: .75em; */
margin-left: 1.5em;
margin-top: .5em;
/* color: gray; */
}
.data input
{
/* font-size: .9em; */
padding: 0px;
}
/* CSS Rollovers */
p.data a:hover
{
/*
@ -208,11 +118,9 @@ text-decoration: none !important;
position: absolute;
margin: 5px 0px 0px 20px;
background-color: beige;
/* width: auto; */
max-width: 300px;
padding: 2px 10px 2px 10px;
border: 1px solid #C0C0C0;
/* color: #000; */
text-align:left;
display: block;
}
@ -222,46 +130,5 @@ p.data a:hover span.translation span.metadata, p.data a:hover span.analysis span
width: 300px;
}
/* TEMP WORK TESTING DEBUG AREA */
#debug
{
display:none;
position: absolute;
top: 0;
margin-left: 105%;
font-size:.8em;
width: 60%;
height: auto;
z-index: 4;
background-color: white;
}
#debug table
{
position:absolute;
top: 0px;
left: 0px;
width: 100%;
border: black solid 2px;
color: black;
background-color: cyan;
margin: 0 0 15px 0;}
#debug th, #debug td
{
border-collapse: collapse;
border-spacing: 0;
background-color: cyan;
font-size: .9em;
text-align: left;
vertical-align: top;
margin: 0;
}
#debug h3
{
background-color: #99ccff;
}
/* END OF CSS*/

4
src/css/lex.css
View file

@ -1,4 +1,6 @@
@import url( "http://iris.lib.virginia.edu/tibet/style/thdl-styles.css" );
/* IMPORTS */
@import url( "thdl-styles.css" );
@import url( "lex-advanced.css" );

363
src/css/thdl-advanced.css Normal file
View file

@ -0,0 +1,363 @@
/*--------
ID Selectors --primarily used for page layout
----------*/
#banner
{
margin: 0px 0px 0px 0px;
padding: 0px 0px 0px 0px;
height : 55px;
background-color: #E5E5E5;
}
#logo
{
position: absolute;
top: 2px;
left: 0;
border: 0;
background-color: transparent;
margin-left : 5px;
width: 50px;
margin-right: 5%;
z-index: 11;
}
#banner h1 {
margin-right: 25%;
position: absolute;
top: 0px;
left: 65px;
color: #003366;
font-size: 14px;
font-weight: bold;
text-transform: uppercase;
}
#menubar {
position: absolute;
top: 33px;
left: 65px;
height: 21px;
}
body>#menubar {
height: 22px;
}
#MenuPos {
height: 22px;
font-size: .9em;
z-index: 2;
}
#sub_banner
{
top: 50px;
padding: 0px 0px 0px 0px;
height : 25px;
background-color: #CCCCCC;
z-index: 1;
}
#breadcrumbs {
position:absolute;
left: 10px;
top: 60px;
font-size: 12px;
}
#search {
margin-right: 13px;
text-align: right;
}
#search form {
font-size: 9px;
margin: 0;
display: inline;
text-align: right;
}
#search form p
{
margin: 0;
display: inline;
text-align: right;
}
/* #sa, #q - These are Google Search form-parameter names */
#sa
{
margin-top: 5px;
padding: 0;
height: 16px;
width: 50px;
background-color: #666666;
color: white;
font-size: 10px;
border-top: solid 1px white;
border-left: solid 1px white;
border-bottom: solid 1px gray;
border-right: solid 1px gray;
}
p>#sa
{
height: 14px;
}
#q
{
padding: 0;
height: 14px;
width: 90px;
font-size: 10px;
border-top: solid 1px silver;
border-left: solid 1px silver;
border-bottom: solid 1px silver;
border-right: solid 1px silver;
}
#main {
width: 96%;
margin: 2px 1% 10px 1%;
background-color : #ffffff;
}
body>#main {
margin-top: 6px;
}
#columnLeft {
position: absolute;
left:10px;
top:82px;
width:200px;
}
#columnCenter {
background:#fff;
margin-left: 216px;
margin-right:210px;
}
#columnRight {
position: absolute;
right:10px;
top:82px;
width:200px;
margin-right: 10px;
margin-top: 0px;
}
#columnMain {
background: #ffffff;
margin-left: 216px;
margin-right: 10px;
}
#main p, #columnMain p{
max-width: 700px;
min-width: 10px;
text-align: justify;
}
#main p.illustratedBlurb
{
max-width: none !important;
}
#main ul, #main dl, #main ol {
max-width: 620px;
min-width: 10px;
text-align: justify;
}
#columnLeft p, #columnCenter p, #columnRight p,
#columnLeft ul, #columnCenter ul, #columnRight ul,
#columnLeft ol, #columnCenter ol, #columnRight ol,
#columnLeft dl, #columnCenter dl, #columnRight dl
{
text-align: left;
}
.low-emph, .low-emph * {
color: gray;
text-decoration: none !important;
}
.caption {
font-size: .9em;
font-style: italic;
font-weight: normal;
color: #000033;
}
.smallgray {
font-size: .9em;
font-weight: normal;
color: #333333;
}
.smalllink {
font-size: .9em;
color: #333399;
}
.bodytext {
font-size: 1em;
text-align: justify;
}
.label, .bold {
font-weight: bold;
color: black;
}
.credits {
font-size: 1.1em;
color: #660033;
text-align: justify;
font-weight: bold;
}
.highlightBox, .spotlightBox {
width: 100%;
margin: 5px 0 0 0;
padding: 0 0 0 0;
background-color: #e1e1e1;
border: solid 1px gray;
}
.spotlightBox {
background-color: white;
}
.highlightBox h2, .spotlightBox h2 {
color: white;
background-color: #336699;
margin: 0;
text-align: center;
}
.highlightBox li
{
margin: 2px 0 2px 10px;
}
.highlightBox ul, .highlightBox ol
{
margin: 0 0 0 10px;
padding-left: 0px;
}
.spotlightBox h2 {
color: #000033;
background-color: #E5E5E5;
}
.highlightBox a:hover, #breadcrumbs a:hover {
background-color: white !important;
}
ul.member {
list-style-type: none;
}
.menu0 {
font-size: 1em;
margin-left: 0em;
text-align: left;
color: #FFFFFF;
background-color: #000066;
}
a.menu {
font-size: 1em;
color: #FFFFFF;
}
.selected {
margin: 0px;
font-size: 1em;
/*font-style: italic;*/
font-weight: 900;
color: #009933;
background-color: #ffff99;
padding: .1em;
}
.selected:hover {
background-color: #ffff99 !important;
}
p.illustratedBlurb {
clear: none;
}
div.caption
{
text-align: left !important;
margin-top: 1px !important;
}
div.captionedImage {
float: right;
clear: right;
margin: 4px 0 10px 10px;
}
div.captionedImage img {
float: left;
border: solid 1px gray;
}
div.captionedImage div {
clear: left;
width: 240px;
text-align: center;
margin-top: 20px;
}
div.captionedImageLeft {
float: left;
clear: left;
margin: 0 10px 10px 5px;
}
div.captionedImageLeft img {
float: left;
border: solid 1px gray;
}
div.captionedImageLeft div {
clear: left;
width: 240px;
}
img
{
border: 0;
}
.footer
{
text-align: center;
font-size: .9em;
margin-right: 240px;
margin-left: 240px;
border-top: 1px dotted gray;
}
#main img
{
border: solid 1px silver;
}
img.text-illustration
{
margin: 8px 8px 8px 8px;
float: right;
}

108
src/css/thdl-styles.css Normal file
View file

@ -0,0 +1,108 @@
/*------------------
IMPORT STYLESHEETS
This import hides layout rules from the following older browsers
--------------------*/
@import url( "thdl-advanced.css" );
/*-------------
Element Selectors
---------------*/
body {
margin:0;
padding:0;
color: #000033;
background-color: #FFFFFF;
font-size: small;
font-family: Arial, sans-serif !important;
}
a {
color: #0033CC;
border: 0;
text-decoration: none;
}
a:hover {
background-color: #e1e1e1;
}
p, pre {
color: #000033;
font-size: 1em;
margin: 5px 5px 5px 10px;
}
p {
text-align: justify;
margin: 5px 5px 7px 5px;
}
h1, h2, h3, h4, h5, h6 {
font-family: Verdana, sans-serif !important;
font-style: normal;
font-weight: bold;
font-variant: normal;
font-size: 1em;
margin: 5px 5px 5px 3px;
padding:0;
text-transform: none;
line-height: normal;
border-style: none;
}
h1 {
font-size: 1.2em;
text-transform: uppercase;
}
h2 {
font-size: 1.1em;
}
h3 {
font-size: 1em;
}
form {
margin: 0;
padding: 0;
}
li {
margin-top: 5px;
font-size: 1em;
font-style: normal;
font-weight: normal;
color: #000033;
}
blockquote {
font-style: normal;
font-weight: normal;
}
dt {
font-weight: bold;
}
.alert, .warning, .dangerous {
font-style: normal;
color: red;
}
.alert .label, .warning .label, .dangerous .label {
color: red;
}
.message
{
color: #006666;
}
.inline-help
{
color: #006666;
}

245
src/java/org/thdl/lex/DisplayHelper.java Normal file
View file

@ -0,0 +1,245 @@
package org.thdl.lex;
import java.util.*;
import org.apache.commons.beanutils.*;
import org.thdl.lex.component.*;
/**
* Description of the Class
*
* @author travis
* @created October 14, 2003
*/
public class DisplayHelper
{
private Collection collection;
private ILexComponent component;
private ILexComponent note;
private boolean showNotes;
private boolean showMeta;
private boolean showEditOptions;
private boolean showTranslations;
/**
* Sets the note attribute of the DisplayHelper object
*
* @param note The new note value
*/
public void setNote( ILexComponent note )
{
this.note = note;
}
/**
* Gets the note attribute of the DisplayHelper object
*
* @return The note value
*/
public ILexComponent getNote()
{
return note;
}
/**
* Sets the component attribute of the DisplayHelper object
*
* @param component The new component value
*/
public void setComponent( ILexComponent component )
{
this.component = component;
}
/**
* Gets the component attribute of the DisplayHelper object
*
* @return The component value
*/
public ILexComponent getComponent()
{
return component;
}
/**
* Sets the showEditOptions attribute of the DisplayHelper object
*
* @param showEditOptions The new showEditOptions value
*/
public void setShowEditOptions( boolean showEditOptions )
{
this.showEditOptions = showEditOptions;
}
/**
* Gets the showEditOptions attribute of the DisplayHelper object
*
* @return The showEditOptions value
*/
public boolean getShowEditOptions()
{
return showEditOptions;
}
/**
* Sets the showTranslations attribute of the DisplayHelper object
*
* @param showTranslations The new showTranslations value
*/
public void setShowTranslations( boolean showTranslations )
{
this.showTranslations = showTranslations;
}
/**
* Gets the showTranslations attribute of the DisplayHelper object
*
* @return The showTranslations value
*/
public boolean getShowTranslations()
{
return showTranslations;
}
/**
* Sets the showNotes attribute of the DisplayHelper object
*
* @param showNotes The new showNotes value
*/
public void setShowNotes( boolean showNotes )
{
this.showNotes = showNotes;
}
/**
* Sets the showMeta attribute of the DisplayHelper object
*
* @param showMeta The new showMeta value
*/
public void setShowMeta( boolean showMeta )
{
this.showMeta = showMeta;
}
/**
* Gets the showNotes attribute of the DisplayHelper object
*
* @return The showNotes value
*/
public boolean getShowNotes()
{
return showNotes;
}
/**
* Gets the showMeta attribute of the DisplayHelper object
*
* @return The showMeta value
*/
public boolean getShowMeta()
{
return showMeta;
}
/**
* Sets the collection attribute of the DisplayHelper object
*
* @param collection The new collection value
*/
public void setCollection( Collection collection )
{
this.collection = collection;
}
/**
* Gets the collection attribute of the DisplayHelper object
*
* @return The collection value
*/
public Collection getCollection()
{
return collection;
}
/**
* Gets the collectionSize attribute of the DisplayHelper object
*
* @return The collectionSize value
*/
public int getCollectionSize()
{
int size = 0;
if ( null != getCollection() )
{
size = getCollection().size();
}
return size;
}
/**
* Gets the componentIsTranslation attribute of the DisplayHelper object
*
* @return The componentIsTranslation value
*/
public boolean getComponentIsTranslation()
{
boolean b = false;
if ( null != getComponent() && getComponent() instanceof Translatable )
{
Translatable t = (Translatable) getComponent();
b = t.getTranslationOf() != null ? true : false;
}
return b;
}
// helpers
/**
* Description of the Method
*/
public void clear()
{
setShowEditOptions( false );
setShowMeta( false );
setShowTranslations( false );
setShowNotes( false );
}
/**
* Description of the Method
*
* @param map Description of the Parameter
* @exception Exception Description of the Exception
*/
public void populate( Map map ) throws Exception
{
clear();
BeanUtils.populate( this, map );
}
/**
*Constructor for the DisplayHelper object
*/
public DisplayHelper() { }
}

7
src/java/org/thdl/lex/HibernateTransaction.java
View file

@ -48,15 +48,18 @@ public class HibernateTransaction
{
Transaction t = (Transaction) transaction.get();
transaction.set( null );
if ( t != null && commit )
if ( t != null )
{
if ( commit )
{
t.commit();
}
else if ( t != null )
else
{
t.rollback();
}
}
}
}

44
src/java/org/thdl/lex/LexActionServlet.java
View file

@ -106,10 +106,11 @@ public class LexActionServlet extends HttpServlet
*/
public void service( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException
{
/*
LexLogger.debug( "Checking Request state at start of LexActionServlet.service()" );
LexLogger.logRequestState( req );
LexLogger.logSessionState( req );
*/
String next;
try
{
@ -196,23 +197,38 @@ public class LexActionServlet extends HttpServlet
commands.put( "logout", new NullCommand( "logout.jsp" ) );
commands.put( "getMetaPrefsForm", new NullCommand( "metaPrefsForm.jsp" ) );
commands.put( "getMetaDefaultsForm", new NullCommand( "metaDefaultsForm.jsp" ) );
commands.put( "find", new FindCommand() );
commands.put( "getInsertForm", new GetFormCommand( "displayForm.jsp?formMode=insert", Boolean.TRUE ) );
commands.put( "getUpdateForm", new GetFormCommand( "displayForm.jsp?formMode=update", Boolean.FALSE ) );
commands.put( "getInsertTermForm", new GetFormCommand( "displayForm.jsp?formMode=insert", Boolean.TRUE, Boolean.TRUE ) );
commands.put( "getUpdateTermForm", new GetFormCommand( "displayForm.jsp?formMode=update", Boolean.FALSE, Boolean.TRUE ) );
commands.put( "getTranslationForm", new GetFormCommand( "displayForm.jsp?formMode=insert", Boolean.TRUE ) );
commands.put( "annotate", new GetFormCommand( "displayForm.jsp?formMode=insert", Boolean.FALSE ) );
commands.put( "insert", new UpdateCommand( "displayEntry.jsp", Boolean.TRUE ) );
commands.put( "find", new FindCommand( "displayEntry.jsp" ) );
commands.put( "getInsertForm", new GetInsertFormCommand( "displayForm.jsp?formMode=insert", Boolean.FALSE ) );
commands.put( "getInsertTermForm", new GetInsertFormCommand( "displayForm.jsp?formMode=insert", Boolean.TRUE ) );
commands.put( "getTranslationForm", new GetInsertFormCommand( "displayForm.jsp?formMode=insert", Boolean.FALSE ) );
commands.put( "getAnnotationForm", new GetInsertFormCommand( "displayForm.jsp?formMode=insert", Boolean.FALSE ) );
commands.put( "getUpdateForm", new GetUpdateFormCommand( "displayForm.jsp?formMode=update", Boolean.FALSE ) );
commands.put( "getUpdateTermForm", new GetUpdateFormCommand( "displayForm.jsp?formMode=update", Boolean.TRUE ) );
/*
commands.put( "getAnnotationForm", new AnnotateCommand( "displayForm.jsp?formMode=insert" ) );
commands.put( "addAnnotation", new AddAnnotationCommand( "displayEntry.jsp", Boolean.TRUE ) );
*/
commands.put( "insert", new InsertCommand( "displayEntry.jsp", Boolean.FALSE ) );
commands.put( "addAnnotation", new InsertCommand( "displayEntry.jsp", Boolean.FALSE ) );
commands.put( "insertTerm", new InsertCommand( "displayEntry.jsp", Boolean.TRUE ) );
commands.put( "update", new UpdateCommand( "displayEntry.jsp", Boolean.FALSE ) );
commands.put( "display", new DisplayCommand() );
commands.put( "displayFull", new DisplayCommand() );
commands.put( "editEntry", new DisplayCommand() );
commands.put( "remove", new RemoveCommand() );
commands.put( "updateTerm", new UpdateCommand( "displayEntry.jsp", Boolean.TRUE ) );
commands.put( "display", new DisplayCommand( "displayEntry.jsp" ) );
commands.put( "displayFull", new DisplayCommand( "displayEntry.jsp" ) );
commands.put( "editEntry", new DisplayCommand( "displayEntry.jsp" ) );
commands.put( "remove", new RemoveCommand( "displayEntry.jsp" ) );
commands.put( "setMetaPrefs", new PreferencesCommand( "menu.jsp" ) );
commands.put( "setMetaDefaults", new PreferencesCommand( "menu.jsp" ) );
commands.put( "abort", new AbortCommand( "menu.jsp" ) );
commands.put( "testing", new TestingCommand( "displayEntry.jsp" ) );
setCommands( commands );
}

14
src/java/org/thdl/lex/LexComponentFilter.java
View file

@ -143,12 +143,12 @@ public class LexComponentFilter implements Filter
String labelValue = req.getParameter( LexConstants.LABEL_REQ_PARAM );
try
{
// this if block is for TESTING ONLY
if ( getBlanks().get( labelValue ) != null )
{
Class glass = getBlanks().get( labelValue ).getClass();
LexComponent component = (LexComponent) glass.newInstance();
//component.appendDebugMap( "LCFilterMadeNewInstance", component );
component.populate( req.getParameterMap() );
component.getMeta().populate( req.getParameterMap() );
req.setAttribute( LexConstants.COMPONENT_REQ_ATTR, component );
}
else
@ -158,11 +158,15 @@ public class LexComponentFilter implements Filter
}
catch ( InstantiationException ie )
{
throw new ServletException( ie.getMessage() );
throw new ServletException( ie );
}
catch ( IllegalAccessException iae )
{
throw new ServletException( iae.getMessage() );
throw new ServletException( iae );
}
catch ( LexComponentException lce )
{
throw new ServletException( lce );
}
}
else
@ -179,9 +183,11 @@ public class LexComponentFilter implements Filter
{
throw new ServletException( lre );
}
/*
LexLogger.debug( "Checking Request state at end of LexComponentFilter.doFilter()" );
LexLogger.logRequestState( req );
LexLogger.logSessionState( req );
*/
long dur = System.currentTimeMillis() - start;
LexLogger.debug( "Total Request took: " + dur / 1000 + " seconds.\n\n" );
}

74
src/java/org/thdl/lex/LexComponentRepository.java
View file

@ -226,6 +226,11 @@ public class LexComponentRepository
lexQuery.getResults().clear();
lexQuery.getResults().put( term.getMetaId(), term.getTerm() );
}
else
{
lexQuery.setEntry( null );
lexQuery.getResults().clear();
}
while ( it.hasNext() )
{
term = (ITerm) it.next();
@ -300,6 +305,30 @@ public class LexComponentRepository
}
/**
* Description of the Method
*
* @param component Description of the Parameter
* @param pk Description of the Parameter
* @exception LexRepositoryException Description of the Exception
*/
public static void loadByPk( ILexComponent component, Integer pk ) throws LexRepositoryException
{
try
{
beginTransaction();
getSession().load( component, pk );
endTransaction( false );
}
catch ( HibernateException he )
{
throw new LexRepositoryException( he );
}
}
/**
* Description of the Method
*
@ -322,6 +351,50 @@ public class LexComponentRepository
}
/**
* Description of the Method
*
* @param component Description of the Parameter
* @exception LexRepositoryException Description of the Exception
*/
public static void update( ILexComponent component ) throws LexRepositoryException
{
try
{
beginTransaction();
getSession().update( component );
endTransaction( true );
}
catch ( HibernateException he )
{
throw new LexRepositoryException( he );
}
}
/**
* Description of the Method
*
* @param component Description of the Parameter
* @exception LexRepositoryException Description of the Exception
*/
public static void refresh( ILexComponent component ) throws LexRepositoryException
{
try
{
beginTransaction();
getSession().refresh( component );
endTransaction( true );
}
catch ( HibernateException he )
{
throw new LexRepositoryException( he );
}
}
/**
* Description of the Method
*
@ -332,6 +405,7 @@ public class LexComponentRepository
{
try
{
endTransaction( false );
HibernateSession.closeSession();
}
catch ( HibernateException he )

5
src/java/org/thdl/lex/LexConstants.java
View file

@ -234,6 +234,11 @@ public class LexConstants
*/
public final static String HIBERNATE_SESSION_KEY = "hib";
/**
* Description of the Field
*/
public final static String DISPLAY_HELPER_SESSION_ATT = "helper";
//public final static String URL = "jdbc:mysql://localhost/LexTorque";
}

36
src/java/org/thdl/lex/LexLogger.java
View file

@ -1,8 +1,11 @@
package org.thdl.lex;
import java.io.*;
import java.util.*;
import javax.servlet.http.*;
import org.apache.commons.beanutils.*;
import org.apache.log4j.*;
import org.thdl.lex.component.*;
/**
@ -29,7 +32,7 @@ public class LexLogger
while ( enum.hasMoreElements() )
{
String parm = (String) enum.nextElement();
LOGGER.debug( "Request Parameter " + parm + " = " + req.getParameter( parm ) );
LOGGER.debug( "Request Parameter " + parm + " = '" + req.getParameter( parm ) + "'" );
}
enum = req.getAttributeNames();
while ( enum.hasMoreElements() )
@ -67,7 +70,8 @@ public class LexLogger
LOGGER.debug( "Query Entry: " + query.getEntry() );
LOGGER.debug( "Query QueryComponent: " + query.getQueryComponent() );
LOGGER.debug( "Query UpdateComponent: " + query.getUpdateComponent() );
LOGGER.debug( "Query Results, " + query.getResults() + ", contain: " + query.getResults().values() + "\n" );
LOGGER.debug( "Query Results, " + query.getResults() + "\n" );
}
@ -103,5 +107,33 @@ public class LexLogger
LOGGER.warn( msg );
}
/**
*Constructor for the debugComponent object
*
* @param component Description of the Parameter
*/
public static void debugComponent( ILexComponent component )
{
try
{
LOGGER.debug( "Describing: " + component );
Iterator it = BeanUtils.describe( component ).entrySet().iterator();
while ( it.hasNext() )
{
Map.Entry entry = (Map.Entry) it.next();
LOGGER.debug( component.getLabel() + " property: " + entry.getKey() + " = '" + entry.getValue() + "'" );
}
}
catch ( Exception e )
{
StringWriter writer = new StringWriter();
e.printStackTrace( new PrintWriter( writer ) );
String stackTrace = writer.getBuffer().toString();
LOGGER.debug( "LexLogger caught an Exception: " + stackTrace );
}
}
}

7
src/java/org/thdl/lex/Preferences.java
View file

@ -583,7 +583,7 @@ public class Preferences
sqlBuffer.append( ", dialect = " );
sqlBuffer.append( getDialect() );
sqlBuffer.append( ", note = '" );
sqlBuffer.append( getNote() );
sqlBuffer.append( LexUtilities.escape( getNote() ) );
sqlBuffer.append( "', useDefaultProjSub = '" );
sqlBuffer.append( getUseDefaultProjSub() );
sqlBuffer.append( "', useDefaultSource = '" );
@ -645,11 +645,8 @@ public class Preferences
//constructors
/**
*Constructor for the Preferences object
*
* @exception LexRepositoryException Description of the Exception
* @exception LexComponentException Description of the Exception
*/
public Preferences() throws LexRepositoryException, LexComponentException
public Preferences()
{
setId( new Integer( 0 ) );
setUserId( new Integer( 1 ) );

68
src/java/org/thdl/lex/UserSessionManager.java
View file

@ -1,10 +1,10 @@
package org.thdl.lex;
import org.thdl.users.*;
import org.thdl.lex.component.*;
import java.io.IOException;
import javax.servlet.http.*;
import java.io.IOException;
import org.thdl.lex.component.*;
import org.thdl.users.*;
/**
@ -20,6 +20,34 @@ public class UserSessionManager
private static UserSessionManager INSTANCE = new UserSessionManager();
/**
* Gets the displayHelper attribute of the UserSessionManager object
*
* @param session Description of the Parameter
* @return The displayHelper value
*/
public DisplayHelper getDisplayHelper( HttpSession session )
{
if ( null == session.getAttribute( LexConstants.DISPLAY_HELPER_SESSION_ATT ) )
{
setDisplayHelper( session, new DisplayHelper() );
}
return (DisplayHelper) session.getAttribute( LexConstants.DISPLAY_HELPER_SESSION_ATT );
}
/**
* Sets the displayHelper attribute of the UserSessionManager object
*
* @param session The new displayHelper value
* @param helper The new displayHelper value
*/
public void setDisplayHelper( HttpSession session, DisplayHelper helper )
{
session.setAttribute( LexConstants.DISPLAY_HELPER_SESSION_ATT, helper );
}
/**
* Sets the preferences attribute of the UserSessionManager object
*
@ -102,12 +130,11 @@ public class UserSessionManager
* @since
*/
/*
* public void setEntry( HttpSession session, ITerm entry )
* {
* session.setAttribute( LexConstants.TERMENTRYBEAN_SESS_ATTR, entry );
* }
public void setEntry( HttpSession session, ITerm entry )
{
session.setAttribute( LexConstants.TERMENTRYBEAN_SESS_ATTR, entry );
}
*/
//helper methods
/**
* Gets the instance attribute of the UserSessionManager class
@ -145,10 +172,18 @@ public class UserSessionManager
*
* @param session Description of Parameter
* @return The preferences value
* @exception LexRepositoryException Description of the Exception
* @exception LexComponentException Description of the Exception
* @since
*/
public Preferences getPreferences( HttpSession session )
public Preferences getPreferences( HttpSession session ) throws LexRepositoryException, LexComponentException
{
Object sesAtt = session.getAttribute( LexConstants.PREFERENCES_SESS_ATTR );
if ( null == sesAtt )
{
ThdlUser user = getSessionUser( session );
setPreferences( session, new Preferences( user ) );
}
return (Preferences) session.getAttribute( LexConstants.PREFERENCES_SESS_ATTR );
}
@ -185,18 +220,6 @@ public class UserSessionManager
}
/**
* Gets the entry attribute of the UserSessionManager object
*
*@param session Description of Parameter
*@since
*/
/*
* public ITerm getEntry( HttpSession session )
* {
* return (ITerm) session.getAttribute( LexConstants.TERMENTRYBEAN_SESS_ATTR );
* }
*/
/**
* Description of the Method
@ -211,6 +234,7 @@ public class UserSessionManager
}
/**
* Description of the Method
*

1
src/java/org/thdl/lex/commands/.cvsignore Normal file
View file

@ -0,0 +1 @@
old

1
src/java/org/thdl/lex/commands/Command.java
View file

@ -22,6 +22,5 @@ public interface Command
*@since
*/
public String execute( javax.servlet.http.HttpServletRequest req, ILexComponent component ) throws CommandException;
// public java.util.HashMap initForwards();
}

56
src/java/org/thdl/lex/commands/DisplayCommand.java
View file

@ -1,14 +1,15 @@
package org.thdl.lex.commands;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.commons.beanutils.*;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
/**
* Description of the Class
@ -56,21 +57,27 @@ public class DisplayCommand extends LexCommand implements Command
*/
public String execute( HttpServletRequest req, ILexComponent component ) throws CommandException
{
String msg = null;
String next = getNext();
DisplayHelper displayHelper = getSessionManager().getDisplayHelper( req.getSession( true ) );
try
{
component.populate( req.getParameterMap() );
LexQuery query = getSessionManager().getQuery( req.getSession( true ) );
if ( null != component )
{
component.populate( req.getParameterMap() );
query.setQueryComponent( component );
LexComponentRepository.loadTermByPk( query );
}
else
{
LexComponentRepository.update( query.getEntry() );
}
String msg = null;
String forward = (String) getForwards().get( req.getParameter( LexConstants.LABEL_REQ_PARAM ) );
setNext( forward );
displayHelper.populate( req.getParameterMap() );
req.setAttribute( LexConstants.MESSAGE_REQ_ATTR, msg );
return getNext();
return next;
}
catch ( LexComponentException e )
{
@ -80,21 +87,10 @@ public class DisplayCommand extends LexCommand implements Command
{
throw new CommandException( e );
}
}
/**
* Description of the Method
*
*@return Description of the Returned Value
*@since
*/
public HashMap initForwards()
catch ( Exception e )
{
HashMap map = new HashMap();
map.put( LexConstants.TERMLABEL_VALUE, "displayEntry.jsp" );
map.put( LexConstants.ENCYCLOPEDIA_ARTICLE_LABEL_VALUE, "displayEntry.jsp" );
return map;
throw new CommandException( e );
}
}
@ -102,12 +98,12 @@ public class DisplayCommand extends LexCommand implements Command
/**
* Constructor for the DisplayCommand object
*
* @param next Description of the Parameter
* @since
*/
public DisplayCommand()
public DisplayCommand( String next )
{
super();
setForwards( initForwards() );
super( next );
}
}

52
src/java/org/thdl/lex/commands/FindCommand.java
View file

@ -1,14 +1,14 @@
package org.thdl.lex.commands;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
/**
* Description of the Class
@ -33,38 +33,31 @@ public class FindCommand extends LexCommand implements Command
try
{
String msg = null;
String forward = (String) getForwards().get( req.getParameter( LexConstants.LABEL_REQ_PARAM ) );
component.populate( req.getParameterMap() );
setNext( forward );
String next = getNext();
DisplayHelper displayHelper = getSessionManager().getDisplayHelper( req.getSession( true ) );
LexQuery query = getSessionManager().getQuery( req.getSession( true ) );
if ( component instanceof ITerm )
{
ITerm term = (ITerm) component;
LexQuery query = getSessionManager().getQuery( req.getSession( true ) );
query.setQueryComponent( term );
LexComponentRepository.findTermsByTerm( query );
Iterator iterator = query.getResults().keySet().iterator();
if ( iterator.hasNext() )
{
setNext( "displayEntry.jsp" );
getSessionManager().setQuery( req.getSession( true ), query );
msg = "There are " + query.getResults().size() + " terms matching " + term.getTerm();
}
else
{
setNext( "menu.jsp" );
next = "menu.jsp";
msg = "There were no terms matching " + term.getTerm();
}
}
req.setAttribute( LexConstants.MESSAGE_REQ_ATTR, msg );
return getNext();
}
catch ( LexComponentException e )
{
throw new CommandException( e );
query.setQueryComponent( null );
return next;
}
catch ( LexRepositoryException e )
{
@ -73,32 +66,17 @@ public class FindCommand extends LexCommand implements Command
}
/**
* Description of the Method
*
*@return Description of the Returned Value
*@since
*/
public HashMap initForwards()
{
HashMap map = new HashMap();
map.put( LexConstants.TERMLABEL_VALUE, "displayEntry.jsp" );
// map.put( LexConstants.DEFINITIONLABEL_VALUE, "displayEntry.jsp" );
// map.put( LexConstants.PASSAGELABEL_VALUE, "displayEntry.jsp" );
return map;
}
//constructors
/**
* Constructor for the FindCommand object
*
* @param next Description of the Parameter
* @since
*/
public FindCommand()
public FindCommand( String next )
{
super();
setForwards( initForwards() );
super( next );
}
}

251
src/java/org/thdl/lex/commands/GetFormCommand.java
View file

@ -1,251 +0,0 @@
package org.thdl.lex.commands;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import org.thdl.users.*;
/**
* Description of the Class
*
* @author travis
* @created October 6, 2003
*/
public class GetFormCommand extends LexCommand implements Command
{
private boolean insertMode;
private boolean termMode;
/**
* Sets the termMode attribute of the GetFormCommand object
*
* @param termMode The new termMode value
*/
public void setTermMode( boolean termMode )
{
this.termMode = termMode;
}
/**
* Gets the termMode attribute of the GetFormCommand object
*
* @return The termMode value
*/
public boolean isTermMode()
{
return termMode;
}
/**
* Sets the insertMode attribute of the GetFormCommand object
*
* @param insertMode The new insertMode value
*/
public void setInsertMode( boolean insertMode )
{
this.insertMode = insertMode;
}
/**
* Gets the insertMode attribute of the GetFormCommand object
*
* @return The insertMode value
*/
public boolean isInsertMode()
{
return insertMode;
}
//helper methods
/**
* Description of the Method
*
* @param req Description of the Parameter
* @param component Description of the Parameter
* @return Description of the Return Value
* @exception CommandException Description of the Exception
*/
public String execute( HttpServletRequest req, ILexComponent component ) throws CommandException
{
String defaultNext = getNext();
LexQuery query = getSessionManager().getQuery( req.getSession( true ) );
ITerm term = query.getEntry();
String msg = null;
try
{
component.populate( req.getParameterMap() );
if ( isInsertMode() && !isTermMode() )
{
term.addChild( component );
}
else if ( isInsertMode() && isTermMode() )
{
Term newTerm = new Term();
newTerm.populate( component );
LexQuery newTermQuery = new LexQuery( newTerm, LexComponentRepository.EXACT );
if ( termExists( newTermQuery ) )
{
msg = newTerm.getTerm() + " is present in the dictionary, please add to this term.";
setNext( "displayEntry.jsp" );
getSessionManager().setQuery( req.getSession( true ), query );
}
else
{
query.setEntry( newTerm );
}
}
else if ( !isTermMode() )
{
LexComponentRepository.loadByPk( component );
//find the persistent copy of this component from the term stored in session.query
component = term.findChild( component );
}
query.setUpdateComponent( component );
req.setAttribute( LexConstants.COMPONENT_REQ_ATTR, component );
}
catch ( LexRepositoryException e )
{
throw new CommandException( e );
}
catch ( LexComponentException e )
{
throw new CommandException( e );
}
finally
{
setNext( defaultNext );
}
//if the component is a translation of another component get the original as well to assist in editing
if ( component instanceof Translatable )
{
Translatable translatable = (Translatable) component;
if ( null != translatable.getTranslationOf() && translatable.getTranslationOf().intValue() > 0 )
{
try
{
LexComponent source = (LexComponent) translatable.getClass().newInstance();
Integer sourcePk = translatable.getTranslationOf();
source.setMetaId( sourcePk );
LexComponentRepository.loadByPk( source );
req.setAttribute( LexConstants.ORIGINALBEAN_REQ_ATTR, source );
}
catch ( InstantiationException ie )
{
throw new CommandException( ie );
}
catch ( IllegalAccessException iae )
{
throw new CommandException( iae );
}
catch ( LexRepositoryException lre )
{
throw new CommandException( lre );
}
}
}
if ( false == isInsertMode() )
{
Integer creator = component.getMeta().getCreatedBy();
ThdlUser user = getSessionManager().getSessionUser( req.getSession( true ) );
if ( user.getId().equals( creator ) || user.hasRole( "admin" ) || user.hasRole( "dev" ) )
{
msg = "You have reached the Update Form";
getSessionManager().setDisplayMode( req.getSession( true ), "addEditForm" );
}
else
{
msg = "A dictionary component can only be edited by the person who created it or an administrator.";
setNext( "displayEntry.jsp" );
}
}
else
{
msg = "You have reached the Insert Form";
getSessionManager().setDisplayMode( req.getSession( true ), "addEditForm" );
}
req.setAttribute( LexConstants.MESSAGE_REQ_ATTR, msg );
return getNext();
}
/**
* Description of the Method
*
* @param query Description of the Parameter
* @return The newTerm value
* @exception LexRepositoryException Description of the Exception
*/
public boolean termExists( LexQuery query ) throws LexRepositoryException
{
boolean termExists = false;
query.setFindMode( LexComponentRepository.EXACT );
LexComponentRepository.findTermsByTerm( query );
if ( query.getResults().keySet().size() > 0 )
{
termExists = true;
}
return termExists;
}
/**
* Description of the Method
*
* @return Description of the Return Value
*/
public HashMap initForwards()
{
HashMap map = new HashMap();
//map.put( LexConstants.TERMLABEL_VALUE, "displayEntry.jsp?formMode=update" );
//map.put( LexConstants.SUBDEFINITIONLABEL_VALUE, "displayEntry.jsp?formMode=update" );
//map.put( LexConstants.TRANSLATIONLABEL_VALUE, "displayEntry.jsp?formMode=update" );
// map.put( LexConstants.DEFINITIONLABEL_VALUE, "displayEntry.jsp" );
// map.put( LexConstants.PASSAGELABEL_VALUE, "displayEntry.jsp" );
return map;
}
//constructors
/**
*Constructor for the GetFormCommand object
*
* @param next Description of the Parameter
* @param insertMode Description of the Parameter
* @param termMode Description of the Parameter
*/
public GetFormCommand( String next, Boolean insertMode, Boolean termMode )
{
super( next );
setInsertMode( insertMode.booleanValue() );
setTermMode( termMode.booleanValue() );
}
/**
*Constructor for the GetFormCommand object
*
* @param next Description of the Parameter
* @param insertMode Description of the Parameter
*/
public GetFormCommand( String next, Boolean insertMode )
{
this( next, insertMode, Boolean.FALSE );
}
}

189
src/java/org/thdl/lex/commands/GetInsertFormCommand.java Normal file
View file

@ -0,0 +1,189 @@
package org.thdl.lex.commands;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import org.thdl.users.*;
/**
* Description of the Class
*
* @author travis
* @created October 6, 2003
*/
public class GetInsertFormCommand extends LexCommand implements Command
{
private boolean termMode;
/**
* Sets the termMode attribute of the GetInsertFormCommand object
*
* @param termMode The new termMode value
*/
public void setTermMode( boolean termMode )
{
this.termMode = termMode;
}
/**
* Gets the termMode attribute of the GetInsertFormCommand object
*
* @return The termMode value
*/
public boolean isTermMode()
{
return termMode;
}
//helper methods
/**
* Description of the Method
*
* @param req Description of the Parameter
* @param component Description of the Parameter
* @return Description of the Return Value
* @exception CommandException Description of the Exception
*/
public String execute( HttpServletRequest req, ILexComponent component ) throws CommandException
{
String next = getNext();
HttpSession ses = req.getSession( true );
LexQuery query = getSessionManager().getQuery( ses );
ITerm term = query.getEntry();
String msg = null;
try
{
LexUser user = (LexUser) getSessionManager().getSessionUser( ses );
Preferences prefs = getSessionManager().getPreferences( ses );
if ( isTermMode() )
{
Term newTerm = new Term();
newTerm.populate( component );
query.setQueryComponent( newTerm );
if ( termExists( query ) )
{
msg = newTerm.getTerm() + " is present in the dictionary, please add to this term.";
next = "displayEntry.jsp";
getSessionManager().setQuery( req.getSession( true ), query );
}
component = newTerm;
}
Meta meta = new Meta( user, prefs );
meta.populate( req.getParameterMap() );
component.setMeta( meta );
if ( req.getParameter( "cmd" ).equals( "getAnnotationForm" ) )
{
AnalyticalNote note = new AnalyticalNote();
note.setParentId( component.getMetaId() );
note.setAnalyticalNote( req.getParameter( "analyticalNote" ) );
note.setPrecedence( new Integer( 0 ) );
component.setAnalyticalNotes( new LinkedList() );
component.getAnalyticalNotes().add( note );
meta = new Meta( user, prefs );
meta.populate( req.getParameterMap() );
note.setMeta( meta );
req.setAttribute( LexConstants.ORIGINALBEAN_REQ_ATTR, component );
component = note;
}
req.setAttribute( LexConstants.COMPONENT_REQ_ATTR, component );
}
catch ( LexRepositoryException e )
{
throw new CommandException( e );
}
catch ( LexComponentException e )
{
throw new CommandException( e );
}
//if the component is a translation of another component get the original as well to assist in editing
if ( component instanceof Translatable )
{
Translatable translatable = (Translatable) component;
if ( null != translatable.getTranslationOf() && translatable.getTranslationOf().intValue() > 0 )
{
try
{
LexComponent source = (LexComponent) translatable.getClass().newInstance();
Integer sourcePk = translatable.getTranslationOf();
source.setMetaId( sourcePk );
LexComponentRepository.loadByPk( source );
req.setAttribute( LexConstants.ORIGINALBEAN_REQ_ATTR, source );
}
catch ( InstantiationException ie )
{
throw new CommandException( ie );
}
catch ( IllegalAccessException iae )
{
throw new CommandException( iae );
}
catch ( LexRepositoryException lre )
{
throw new CommandException( lre );
}
}
}
msg = "You have reached the Insert Form";
getSessionManager().setDisplayMode( req.getSession( true ), "addEditForm" );
req.setAttribute( LexConstants.MESSAGE_REQ_ATTR, msg );
return next;
}
/**
* Description of the Method
*
* @param query Description of the Parameter
* @return The newTerm value
* @exception LexRepositoryException Description of the Exception
*/
public boolean termExists( LexQuery query ) throws LexRepositoryException
{
boolean termExists = false;
query.setFindMode( LexComponentRepository.EXACT );
LexComponentRepository.findTermsByTerm( query );
if ( query.getResults().keySet().size() > 0 )
{
termExists = true;
}
query.setFindMode( LexComponentRepository.STARTS_WITH );
return termExists;
}
//constructors
/**
*Constructor for the GetInsertFormCommand object
*
* @param next Description of the Parameter
* @param termMode Description of the Parameter
*/
public GetInsertFormCommand( String next, Boolean termMode )
{
super( next );
setTermMode( termMode.booleanValue() );
}
}

155
src/java/org/thdl/lex/commands/GetUpdateFormCommand.java Normal file
View file

@ -0,0 +1,155 @@
package org.thdl.lex.commands;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import org.thdl.users.*;
/**
* Description of the Class
*
* @author travis
* @created October 6, 2003
*/
public class GetUpdateFormCommand extends LexCommand implements Command
{
private boolean termMode;
/**
* Sets the termMode attribute of the GetFormCommand object
*
* @param termMode The new termMode value
*/
public void setTermMode( boolean termMode )
{
this.termMode = termMode;
}
/**
* Gets the termMode attribute of the GetFormCommand object
*
* @return The termMode value
*/
public boolean isTermMode()
{
return termMode;
}
//helper methods
/**
* Description of the Method
*
* @param req Description of the Parameter
* @param component Description of the Parameter
* @return Description of the Return Value
* @exception CommandException Description of the Exception
*/
public String execute( HttpServletRequest req, ILexComponent component ) throws CommandException
{
String next = getNext();
HttpSession ses = req.getSession( true );
LexQuery query = getSessionManager().getQuery( ses );
ITerm term = query.getEntry();
String msg = null;
ThdlUser user = getSessionManager().getSessionUser( req.getSession( true ) );
if ( validate( user, component ) )
{
try
{
LexLogger.debug( "Checking component state from getUpdateFormCommand BEFORE component assignment" );
LexLogger.debugComponent( component );
if ( isTermMode() )
{
component = query.getEntry();
}
else
{
LexComponentRepository.update( term );
component = term.findChild( component.getMetaId() );
}
req.setAttribute( LexConstants.COMPONENT_REQ_ATTR, component );
LexLogger.debug( "Checking component state from getUpdateFormCommand AFTER component assignment" );
LexLogger.debugComponent( component );
}
catch ( LexRepositoryException e )
{
throw new CommandException( e );
}
catch ( LexComponentException e )
{
throw new CommandException( e );
}
//if the component is a translation of another component get the original as well to assist in editing
if ( component instanceof Translatable )
{
Translatable translatable = (Translatable) component;
if ( null != translatable.getTranslationOf() && translatable.getTranslationOf().intValue() > 0 )
{
try
{
LexComponent source = (LexComponent) translatable.getClass().newInstance();
Integer sourcePk = translatable.getTranslationOf();
source.setMetaId( sourcePk );
LexComponentRepository.loadByPk( source );
req.setAttribute( LexConstants.ORIGINALBEAN_REQ_ATTR, source );
}
catch ( InstantiationException ie )
{
throw new CommandException( ie );
}
catch ( IllegalAccessException iae )
{
throw new CommandException( iae );
}
catch ( LexRepositoryException lre )
{
throw new CommandException( lre );
}
}
}
msg = "You have reached the Update Form";
getSessionManager().setDisplayMode( req.getSession( true ), "addEditForm" );
}
else
{
msg = "A dictionary component can only be edited by the person who created it or an administrator.";
next = "displayEntry.jsp";
}
req.setAttribute( LexConstants.MESSAGE_REQ_ATTR, msg );
return next;
}
//constructors
/**
*Constructor for the GetFormCommand object
*
* @param next Description of the Parameter
* @param termMode Description of the Parameter
*/
public GetUpdateFormCommand( String next, Boolean termMode )
{
super( next );
setTermMode( termMode.booleanValue() );
}
}

164
src/java/org/thdl/lex/commands/InsertCommand.java Normal file
View file

@ -0,0 +1,164 @@
package org.thdl.lex.commands;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import org.thdl.users.*;
/**
* Description of the Class
*
* @author travis
* @created October 6, 2003
*/
public class InsertCommand extends LexCommand implements Command
{
private boolean termMode;
/**
* Sets the termMode attribute of the GetFormCommand object
*
* @param termMode The new termMode value
*/
public void setTermMode( boolean termMode )
{
this.termMode = termMode;
}
/**
* Gets the termMode attribute of the GetFormCommand object
*
* @return The termMode value
*/
public boolean isTermMode()
{
return termMode;
}
//helper methods
/**
* Description of the Method
*
* @param req Description of the Parameter
* @param component Description of the Parameter
* @return Description of the Return Value
* @exception CommandException Description of the Exception
*/
public String execute( HttpServletRequest req, ILexComponent component ) throws CommandException
{
String msg = null;
String next = getNext();
DisplayHelper displayHelper = getSessionManager().getDisplayHelper( req.getSession( true ) );
try
{
HttpSession ses = req.getSession( false );
if ( null == ses )
{
throw new CommandException( "Could not update component, user's session has expired" );
}
LexQuery query = getSessionManager().getQuery( ses );
ITerm term = query.getEntry();
LexUser user = (LexUser) getSessionManager().getSessionUser( ses );
Preferences prefs = getSessionManager().getPreferences( ses );
if ( CommandToken.isValid( req ) && validate( user, component ) )
{
LexComponentRepository.update( term );
if ( isTermMode() )
{
term.populate( req.getParameterMap() );
component = term;
}
else if ( component instanceof AnalyticalNote )
{
ILexComponent parent = term.findParent( component.getParentId() );
parent.getAnalyticalNotes().add( component );
}
else
{
term.addChild( component );
}
Meta meta = new Meta( user, prefs );
meta.populate( req.getParameterMap() );
component.setMeta( meta );
Date now = new Date( System.currentTimeMillis() );
component.getMeta().setCreatedOn( now );
component.getMeta().setModifiedOn( now );
component.getMeta().setCreatedBy( user.getId() );
component.getMeta().setModifiedBy( user.getId() );
if ( !isTermMode() )
{
term.getMeta().setModifiedOn( now );
term.getMeta().setModifiedBy( user.getId() );
}
if ( !( component instanceof AnalyticalNote ) && null != req.getParameter( "analyticalNote" ) && req.getParameter( "analyticalNote" ).length() > 0 )
{
AnalyticalNote note = new AnalyticalNote();
note.setAnalyticalNote( req.getParameter( "analyticalNote" ) );
note.setPrecedence( new Integer( 0 ) );
component.setAnalyticalNotes( new LinkedList() );
component.getAnalyticalNotes().add( note );
meta = new Meta( user, prefs );
meta.populate( req.getParameterMap() );
note.setMeta( meta );
LexLogger.debug( "Adding analytical note to " + component.getLabel() );
}
LexLogger.debugComponent( component );
LexLogger.debugComponent( term );
LexComponentRepository.saveOrUpdate( term );
msg = "Successful Update";
getSessionManager().setDisplayMode( req.getSession( true ), "edit" );
}
else
{
msg = CommandToken.isValid( req ) ? "Unauthorized update attempted" : "Invalid reload attempted.";
}
return next;
}
catch ( LexComponentException e )
{
throw new CommandException( e );
}
catch ( LexRepositoryException e )
{
throw new CommandException( "Command had trouble processing " + component, e );
}
finally
{
req.setAttribute( LexConstants.MESSAGE_REQ_ATTR, msg );
}
}
//constructors
/**
*Constructor for the GetFormCommand object
*
* @param next Description of the Parameter
* @param termMode Description of the Parameter
*/
public InsertCommand( String next, Boolean termMode )
{
super( next );
setTermMode( termMode.booleanValue() );
}
}

144
src/java/org/thdl/lex/commands/LexCommand.java
View file

@ -1,13 +1,14 @@
package org.thdl.lex.commands;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
//import org.apache.commons.beanutils.*;
import javax.servlet.http.HttpServletRequest;
import java.util.LinkedList;
import java.util.HashMap;
import java.util.Map;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import org.thdl.users.ThdlUser;
/**
@ -19,60 +20,20 @@ import java.util.Map;
public abstract class LexCommand implements Command
{
//attributes
private String defaultNext;
private String next;
private ILexComponent component;
private LinkedList resultsList;
private HashMap forwards;
private UserSessionManager sessionMgr;
private UserSessionManager sessionManager;
//accessors
/**
* Sets the sessionMgr attribute of the LexCommand object
* Sets the sessionManager attribute of the LexCommand object
*
*@param sessionMgr The new sessionMgr value
* @param sessionManager The new sessionManager value
* @since
*/
public void setSessionManager( UserSessionManager sessionMgr )
public void setSessionManager( UserSessionManager sessionManager )
{
this.sessionMgr = sessionMgr;
}
/**
* Sets the defaultNext attribute of the LexCommand object
*
*@param defaultNext The new defaultNext value
*@since
*/
public void setDefaultNext( String defaultNext )
{
this.defaultNext = defaultNext;
}
/**
* Sets the forwards attribute of the LexCommand object
*
*@param forwards The new forwards value
*@since
*/
public void setForwards( HashMap forwards )
{
this.forwards = forwards;
}
/**
* Sets the resultsList attribute of the LexCommand object
*
*@param resultsList The new resultsList value
*@since
*/
public void setResultsList( LinkedList resultsList )
{
this.resultsList = resultsList;
this.sessionManager = sessionManager;
}
@ -88,70 +49,23 @@ public abstract class LexCommand implements Command
}
/**
* Sets the component attribute of the LexCommand object
*
*@return The sessionMgr value
*@since
*/
/*
* public void setComponent( ILexComponent component )
* {
* this.component = component;
* }
*/
/**
* Gets the sessionMgr attribute of the LexCommand object
* Gets the sessionManager attribute of the LexCommand object
*
*@return The sessionMgr value
* @return The sessionManager value
* @since
*/
public UserSessionManager getSessionManager()
{
if ( null == sessionMgr )
if ( null == sessionManager )
{
setSessionManager( UserSessionManager.getInstance() );
}
return sessionMgr;
return sessionManager;
}
/**
* Gets the defaultNext attribute of the LexCommand object
*
*@return The defaultNext value
*@since
*/
public String getDefaultNext()
{
return defaultNext;
}
/**
* Gets the forwards attribute of the LexCommand object
*
*@return The forwards value
*@since
*/
public HashMap getForwards()
{
return forwards;
}
/**
* Gets the resultsList attribute of the LexCommand object
*
*@return The resultsList value
*@since
*/
public LinkedList getResultsList()
{
return resultsList;
}
/**
* Gets the next attribute of the LexCommand object
@ -168,17 +82,30 @@ public abstract class LexCommand implements Command
/**
* Gets the component attribute of the LexCommand object
*
*@param next Description of Parameter
* @param user Description of the Parameter
* @param component Description of the Parameter
* @return Description of the Return Value
* @since
*/
/*
* public ILexComponent getComponent()
* {
* return component;
* }
public ILexComponent getComponent()
{
return component;
}
*/
//helpers
public boolean validate( ThdlUser user, ILexComponent component )
{
boolean valid = false;
Integer creator = component.getMeta().getCreatedBy();
if ( user.getId().equals( creator ) || user.hasRole( "admin" ) || user.hasRole( "dev" ) )
{
valid = true;
}
return valid;
}
//constructors
/**
@ -189,8 +116,7 @@ public abstract class LexCommand implements Command
*/
public LexCommand( String next )
{
setDefaultNext( next );
setNext( getDefaultNext() );
setNext( next );
}

76
src/java/org/thdl/lex/commands/NewComponentCommand.java
View file

@ -1,76 +0,0 @@
package org.thdl.lex.commands;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
public class NewComponentCommand extends LexCommand implements Command
{
//helper methods
public String execute(HttpServletRequest req, ILexComponent component) throws CommandException
{
/* try
{
setComponent( (LexComponent)component );
getComponent().scrapeRequest( req );
String msg="You have reached the form for creating a New " +getComponent().getLabel() +" Entry.";
String forward = (String)getForwards().get( req.getParameter( LexConstants.LABEL_REQ_PARAM ) );
setNext( forward );
if ( getComponent() instanceof Term )
{
Term term = (Term)getComponent();
LexComponent[] results = term.find();
req.setAttribute( "term", term.getTerm() );
if ( results.length > 0)
{
component=results[0];
msg="There are already " + results.length + " entries for " + term.getTerm() +".";
getSessionMgr().setEntry( req.getSession( true), new TermEntry( component ) );
}
else
{
//REQUEST SHOULD BE FORWARDED TO /lex/action?cmd=getInsertForm HERE
results = new LexComponent[1];
results[0] = component;
msg="Click the 'New Entry' button to add " + term.getTerm() +" to the dictionary.";
getSessionMgr().setEntry( req.getSession( true), null );
}
setNext( "displayEntry.jsp?mode=newTerm");
getSessionMgr().setResults( req.getSession( true ), results );
}
req.setAttribute(LexConstants.MESSAGE_REQ_ATTR, msg);
*/ return getNext();
/* }
catch (LexComponentException e)
{
throw new CommandException("Lex Action Exception: " + e.getMessage());
}
catch (LexEntryException e)
{
throw new CommandException("Lex Entry Exception: " + e.getMessage());
}
*/ }
public HashMap initForwards()
{
HashMap map = new HashMap();
map.put( LexConstants.TERMLABEL_VALUE, "displayEntry.jsp" );
map.put( LexConstants.DEFINITIONLABEL_VALUE, "displayEntry.jsp" );
map.put( LexConstants.PASSAGELABEL_VALUE, "displayEntry.jsp" );
return map;
}
//constructors
public NewComponentCommand()
{
super();
setForwards( initForwards() );
}
}

1
src/java/org/thdl/lex/commands/NullCommand.java
View file

@ -16,7 +16,6 @@ public class NullCommand extends LexCommand implements Command
setNext("menu.jsp");
return getNext();
}
public java.util.HashMap initForwards() { return null;}
public NullCommand(String next)
{
super(next);

19
src/java/org/thdl/lex/commands/PreferencesCommand.java
View file

@ -24,6 +24,9 @@ public class PreferencesCommand extends LexCommand implements Command
*/
public String execute( HttpServletRequest req, ILexComponent component ) throws CommandException
{
try
{
Preferences isb = UserSessionManager.getInstance().getPreferences( req.getSession( true ) );
if ( req.getParameter( LexConstants.COMMAND_REQ_PARAM ).equals( "setMetaPrefs" ) )
{
@ -90,28 +93,20 @@ public class PreferencesCommand extends LexCommand implements Command
isb.setUseDefaultNote( false );
}
}
try
{
isb.save();
}
catch ( LexComponentException lre )
{
throw new CommandException( "LexComponentException says: " + lre.getMessage() );
}
catch ( LexRepositoryException lre )
{
throw new CommandException( "LexComponentException says: " + lre.getMessage() );
}
return getNext();
}
/**
* Description of the Method
*
* @return Description of the Return Value
*/
public java.util.HashMap initForwards()
{
return null;
}
/**
*Constructor for the PreferencesCommand object

62
src/java/org/thdl/lex/commands/RemoveCommand.java
View file

@ -1,26 +1,42 @@
package org.thdl.lex.commands;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
/**
* Description of the Class
*
* @author travis
* @created October 14, 2003
*/
public class RemoveCommand extends LexCommand implements Command
{
//helper methods
/**
* Description of the Method
*
* @param req Description of the Parameter
* @param component Description of the Parameter
* @return Description of the Return Value
* @exception CommandException Description of the Exception
*/
public String execute( HttpServletRequest req, ILexComponent component ) throws CommandException
{
/* try
DisplayHelper displayHelper = getSessionManager().getDisplayHelper( req.getSession( true ) );
/*
try
{
setComponent( (LexComponent)component );
getComponent().query( Integer.parseInt( req.getParameter("id") ) );
String msg=null;
String forward = (String)getForwards().get( req.getParameter( LexConstants.LABEL_REQ_PARAM ) );
setNext( forward );
int successCode = getComponent().remove();
msg=null;
String label = req.getParameter( LexConstants.LABEL_REQ_PARAM );
@ -28,29 +44,29 @@ public class RemoveCommand extends LexCommand implements Command
{ msg = "The " + label +" was successfully removed."; }
else
{ msg = "Failure: The " + getComponent().getLabel() +" was not removed."; }
req.setAttribute(LexConstants.MESSAGE_REQ_ATTR, msg);
*/ return getNext();
/* }
*/
return getNext();
/*
}
catch (LexComponentException e)
{
throw new CommandException("Lex Action Exception: " + e.getMessage());
}
*/ }
public HashMap initForwards()
{
HashMap map = new HashMap();
map.put( LexConstants.TERMLABEL_VALUE, "menu.jsp" );
// map.put( LexConstants.DEFINITIONLABEL_VALUE, "displayEntry.jsp" );
// map.put( LexConstants.PASSAGELABEL_VALUE, "displayEntry.jsp" );
return map;
*/
}
//constructors
public RemoveCommand()
/**
*Constructor for the RemoveCommand object
*
* @param next Description of the Parameter
*/
public RemoveCommand( String next )
{
super();
setForwards( initForwards() );
super( next );
}
}

30
src/java/org/thdl/lex/commands/TestingCommand.java
View file

@ -1,30 +0,0 @@
package org.thdl.lex.commands;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import javax.servlet.http.HttpServletRequest;
public class TestingCommand extends LexCommand implements Command
{
public String execute(HttpServletRequest req, ILexComponent component) throws CommandException
{
try {
/* Term term = new Term();
term.setId( 1 );
term.setTerm( "this is a word" );
term.setAnalyticalNotes( new java.util.Vector() );
term.getAnalyticalNotes().add( "hi" );
term.getAnalyticalNotes().add( "there" );
req.setAttribute( "term", term ); */
return getNext();
}
catch (Exception e) { throw new CommandException( e.toString() + e.getMessage() ); }
}
public java.util.HashMap initForwards() { return null;}
public TestingCommand(String next)
{
super(next);
}
}

111
src/java/org/thdl/lex/commands/UpdateCommand.java
View file

@ -20,7 +20,6 @@ import org.thdl.users.*;
public class UpdateCommand extends LexCommand implements Command
{
private boolean insertMode;
private boolean termMode;
@ -46,26 +45,6 @@ public class UpdateCommand extends LexCommand implements Command
}
/**
* Sets the insertMode attribute of the GetFormCommand object
*
* @param insertMode The new insertMode value
*/
public void setInsertMode( boolean insertMode )
{
this.insertMode = insertMode;
}
/**
* Gets the insertMode attribute of the GetFormCommand object
*
* @return The insertMode value
*/
public boolean isInsertMode()
{
return insertMode;
}
//helper methods
/**
@ -79,39 +58,61 @@ public class UpdateCommand extends LexCommand implements Command
public String execute( HttpServletRequest req, ILexComponent component ) throws CommandException
{
String msg = null;
String next = getNext();
DisplayHelper displayHelper = getSessionManager().getDisplayHelper( req.getSession( true ) );
try
{
if ( CommandToken.isValid( req ) )
{
HttpSession ses = req.getSession( false );
if ( null == ses )
{
throw new CommandException( "Could not update component, uses session has expired" );
throw new CommandException( "Could not update component, user's session has expired" );
}
ThdlUser user = getSessionManager().getSessionUser( ses );
LexQuery query = getSessionManager().getQuery( ses );
Map params = req.getParameterMap();
query.getUpdateComponent().populate( params );
query.getUpdateComponent().getMeta().populate( params );
Date now = new Date( System.currentTimeMillis() );
query.getUpdateComponent().getMeta().setModifiedOn( now );
query.getUpdateComponent().getMeta().setModifiedBy( user.getId() );
if ( isInsertMode() )
{
query.getUpdateComponent().getMeta().setCreatedOn( now );
query.getUpdateComponent().getMeta().setCreatedBy( user.getId() );
}
ITerm term = query.getEntry();
LexComponentRepository.saveOrUpdate( term );
if ( CommandToken.isValid( req ) && validate( user, component ) )
{
LexComponentRepository.update( term );
LexLogger.debug( "Checking component state from updateCommand BEFORE component assignment" );
LexLogger.debugComponent( component );
if ( isTermMode() )
{
term.populate( req.getParameterMap() );
term.getMeta().populate( req.getParameterMap() );
component = term;
}
else
{
ILexComponent ilc = term.findChild( component.getMetaId() );
ilc.populate( req.getParameterMap() );
ilc.getMeta().populate( req.getParameterMap() );
component = ilc;
}
LexLogger.debug( "Checking component state from updateCommand AFTER component assignment" );
LexLogger.debugComponent( component );
Date now = new Date( System.currentTimeMillis() );
component.getMeta().setModifiedOn( now );
component.getMeta().setModifiedBy( user.getId() );
term.getMeta().setModifiedOn( now );
term.getMeta().setModifiedBy( user.getId() );
LexLogger.debugComponent( component );
LexLogger.debugComponent( term );
LexComponentRepository.update( term );
msg = "Successful Update";
getSessionManager().setDisplayMode( req.getSession( true ), "edit" );
}
else
{
msg = "Invalid Reload Attempted.";
msg = CommandToken.isValid( req ) ? "Unauthorized update attempted" : "Invalid reload attempted.";
}
return getNext();
return next;
}
catch ( LexComponentException e )
{
@ -127,48 +128,18 @@ public class UpdateCommand extends LexCommand implements Command
}
}
/**
* Description of the Method
*
* @return Description of the Return Value
*/
public HashMap initForwards()
{
HashMap map = new HashMap();
// map.put( LexConstants.TERMLABEL_VALUE, "displayEntry.jsp" );
// map.put( LexConstants.SUBDEFINITIONLABEL_VALUE, "displayEntry.jsp" );
// map.put( LexConstants.TRANSLATIONLABEL_VALUE, "displayEntry.jsp" );
// map.put( LexConstants.DEFINITIONLABEL_VALUE, "displayEntry.jsp" );
// map.put( LexConstants.PASSAGELABEL_VALUE, "displayEntry.jsp" );
return map;
}
//constructors
/**
*Constructor for the GetFormCommand object
*
* @param next Description of the Parameter
* @param insertMode Description of the Parameter
* @param termMode Description of the Parameter
*/
public UpdateCommand( String next, Boolean insertMode, Boolean termMode )
public UpdateCommand( String next, Boolean termMode )
{
super( next );
setInsertMode( insertMode.booleanValue() );
setTermMode( termMode.booleanValue() );
}
/**
*Constructor for the GetFormCommand object
*
* @param next Description of the Parameter
* @param insertMode Description of the Parameter
*/
public UpdateCommand( String next, Boolean insertMode )
{
this( next, insertMode, Boolean.FALSE );
}
}

8
src/java/org/thdl/lex/component/BaseAnalyticalNote.java
View file

@ -11,7 +11,7 @@ abstract public class BaseAnalyticalNote extends LexComponent implements Seriali
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.String analyticalNote;
@ -20,7 +20,7 @@ abstract public class BaseAnalyticalNote extends LexComponent implements Seriali
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.Short precedence, java.lang.String analyticalNote, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -45,11 +45,11 @@ abstract public class BaseAnalyticalNote extends LexComponent implements Seriali
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}

12
src/java/org/thdl/lex/component/BaseDefinition.java
View file

@ -6,13 +6,13 @@ import java.util.Set;
import org.apache.commons.lang.builder.ToStringBuilder;
/** @author Hibernate CodeGenerator */
abstract public class BaseDefinition extends LexComponent implements org.thdl.lex.component.IDefinition,Serializable,org.thdl.lex.component.Translatable {
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.Short precedence;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.String definition;
@ -51,7 +51,7 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le
private Set translations;
/** full constructor */
public BaseDefinition(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Short precedence, java.lang.String definition, java.lang.Integer translationOf, org.thdl.lex.component.ILexComponent parent, List subdefinitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers, Set translations) {
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 subdefinitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers, Set translations) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -74,7 +74,7 @@ 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.Short precedence, List subdefinitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers, Set translations) {
public BaseDefinition(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer precedence, List subdefinitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers, Set translations) {
super(deleted, analyticalNotes, meta);
this.precedence = precedence;
this.subdefinitions = subdefinitions;
@ -96,11 +96,11 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}

8
src/java/org/thdl/lex/component/BaseEncyclopediaArticle.java
View file

@ -11,7 +11,7 @@ abstract public class BaseEncyclopediaArticle extends LexComponent implements or
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** persistent field */
private java.lang.String article;
@ -23,7 +23,7 @@ abstract public class BaseEncyclopediaArticle extends LexComponent implements or
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.Short precedence, java.lang.String article, java.lang.String articleTitle, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -51,11 +51,11 @@ abstract public class BaseEncyclopediaArticle extends LexComponent implements or
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}

24
src/java/org/thdl/lex/component/BaseEtymology.java
View file

@ -6,19 +6,19 @@ import java.util.Set;
import org.apache.commons.lang.builder.ToStringBuilder;
/** @author Hibernate CodeGenerator */
abstract public class BaseEtymology extends LexComponent implements Serializable,org.thdl.lex.component.IEtymology,org.thdl.lex.component.Translatable {
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;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.Short loanLanguage;
private java.lang.Integer loanLanguage;
/** persistent field */
private java.lang.Short etymologyType;
private java.lang.Integer etymologyType;
/** persistent field */
private java.lang.String derivation;
@ -36,7 +36,7 @@ abstract public class BaseEtymology extends LexComponent implements Serializable
private Set translations;
/** full constructor */
public BaseEtymology(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Short precedence, java.lang.Short loanLanguage, java.lang.Short etymologyType, java.lang.String derivation, java.lang.String etymologyDescription, java.lang.Integer translationOf, org.thdl.lex.component.ILexComponent parent, Set translations) {
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, Set translations) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -54,7 +54,7 @@ abstract public class BaseEtymology extends LexComponent implements Serializable
}
/** minimal constructor */
public BaseEtymology(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Short etymologyType, java.lang.String derivation, java.lang.String etymologyDescription, Set translations) {
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, Set translations) {
super(deleted, analyticalNotes, meta);
this.etymologyType = etymologyType;
this.derivation = derivation;
@ -70,27 +70,27 @@ abstract public class BaseEtymology extends LexComponent implements Serializable
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}
public java.lang.Short getLoanLanguage() {
public java.lang.Integer getLoanLanguage() {
return this.loanLanguage;
}
public void setLoanLanguage(java.lang.Short loanLanguage) {
public void setLoanLanguage(java.lang.Integer loanLanguage) {
this.loanLanguage = loanLanguage;
}
public java.lang.Short getEtymologyType() {
public java.lang.Integer getEtymologyType() {
return this.etymologyType;
}
public void setEtymologyType(java.lang.Short etymologyType) {
public void setEtymologyType(java.lang.Integer etymologyType) {
this.etymologyType = etymologyType;
}

80
src/java/org/thdl/lex/component/BaseFunction.java
View file

@ -1,80 +0,0 @@
package org.thdl.lex.component;
import java.io.Serializable;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang.builder.ToStringBuilder;
/** @author Hibernate CodeGenerator */
abstract public class BaseFunction extends LexComponent implements org.thdl.lex.component.IFunction,Serializable {
/** nullable persistent field */
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
/** persistent field */
private java.lang.Short function;
/** nullable persistent field */
private org.thdl.lex.component.ILexComponent parent;
/** full constructor */
public BaseFunction(java.lang.Integer translationOf, java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Short precedence, java.lang.Short function, org.thdl.lex.component.ILexComponent parent) {
super(translationOf, deleted, analyticalNotes, translations, meta);
this.parentId = parentId;
this.precedence = precedence;
this.function = function;
this.parent = parent;
}
/** default constructor */
public BaseFunction() {
}
/** minimal constructor */
public BaseFunction(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, java.lang.Short function) {
super(deleted, analyticalNotes, translations, meta);
this.function = function;
}
public java.lang.Integer getParentId() {
return this.parentId;
}
public void setParentId(java.lang.Integer parentId) {
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
this.precedence = precedence;
}
public java.lang.Short getFunction() {
return this.function;
}
public void setFunction(java.lang.Short function) {
this.function = function;
}
public org.thdl.lex.component.ILexComponent getParent() {
return this.parent;
}
public void setParent(org.thdl.lex.component.ILexComponent parent) {
this.parent = parent;
}
public String toString() {
return new ToStringBuilder(this)
.append("metaId", getMetaId())
.toString();
}
}

8
src/java/org/thdl/lex/component/BaseGloss.java
View file

@ -11,7 +11,7 @@ abstract public class BaseGloss extends LexComponent implements org.thdl.lex.com
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.String gloss;
@ -23,7 +23,7 @@ abstract public class BaseGloss extends LexComponent implements org.thdl.lex.com
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.Short precedence, java.lang.String gloss, java.lang.String translation, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -49,11 +49,11 @@ abstract public class BaseGloss extends LexComponent implements org.thdl.lex.com
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}

16
src/java/org/thdl/lex/component/BaseGrammaticalFunction.java
View file

@ -11,16 +11,16 @@ abstract public class BaseGrammaticalFunction extends LexComponent implements or
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** persistent field */
private java.lang.Short function;
private java.lang.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.Short precedence, java.lang.Short function, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -33,7 +33,7 @@ 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.Short function) {
public BaseGrammaticalFunction(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer function) {
super(deleted, analyticalNotes, meta);
this.function = function;
}
@ -46,19 +46,19 @@ abstract public class BaseGrammaticalFunction extends LexComponent implements or
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}
public java.lang.Short getFunction() {
public java.lang.Integer getFunction() {
return this.function;
}
public void setFunction(java.lang.Short function) {
public void setFunction(java.lang.Integer function) {
this.function = function;
}

8
src/java/org/thdl/lex/component/BaseKeyword.java
View file

@ -11,7 +11,7 @@ abstract public class BaseKeyword extends LexComponent implements org.thdl.lex.c
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.String keyword;
@ -20,7 +20,7 @@ abstract public class BaseKeyword extends LexComponent implements org.thdl.lex.c
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.Short precedence, java.lang.String keyword, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -45,11 +45,11 @@ abstract public class BaseKeyword extends LexComponent implements org.thdl.lex.c
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}

22
src/java/org/thdl/lex/component/BaseMeta.java
View file

@ -28,19 +28,19 @@ abstract public class BaseMeta implements Serializable {
private java.lang.Integer source;
/** persistent field */
private java.lang.Short language;
private java.lang.Integer language;
/** persistent field */
private java.lang.Short script;
private java.lang.Integer script;
/** persistent field */
private java.lang.Short dialect;
private java.lang.Integer dialect;
/** nullable persistent field */
private java.lang.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.Short language, java.lang.Short script, java.lang.Short dialect, java.lang.String note) {
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) {
this.createdBy = createdBy;
this.modifiedBy = modifiedBy;
this.createdByProjSub = createdByProjSub;
@ -59,7 +59,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.Short language, java.lang.Short script, java.lang.Short dialect) {
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) {
this.createdBy = createdBy;
this.modifiedBy = modifiedBy;
this.createdByProjSub = createdByProjSub;
@ -126,27 +126,27 @@ abstract public class BaseMeta implements Serializable {
this.source = source;
}
public java.lang.Short getLanguage() {
public java.lang.Integer getLanguage() {
return this.language;
}
public void setLanguage(java.lang.Short language) {
public void setLanguage(java.lang.Integer language) {
this.language = language;
}
public java.lang.Short getScript() {
public java.lang.Integer getScript() {
return this.script;
}
public void setScript(java.lang.Short script) {
public void setScript(java.lang.Integer script) {
this.script = script;
}
public java.lang.Short getDialect() {
public java.lang.Integer getDialect() {
return this.dialect;
}
public void setDialect(java.lang.Short dialect) {
public void setDialect(java.lang.Integer dialect) {
this.dialect = dialect;
}

25
src/java/org/thdl/lex/component/BaseModelSentence.java
View file

@ -6,16 +6,13 @@ import java.util.Set;
import org.apache.commons.lang.builder.ToStringBuilder;
/** @author Hibernate CodeGenerator */
abstract public class BaseModelSentence extends LexComponent implements org.thdl.lex.component.Translatable,org.thdl.lex.component.IModelSentence,Serializable {
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;
/** nullable persistent field */
private java.lang.Short precedence;
/** persistent field */
private java.lang.Integer subdefinitionId;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.String modelSentence;
@ -30,11 +27,10 @@ abstract public class BaseModelSentence extends LexComponent implements org.thdl
private Set translations;
/** full constructor */
public BaseModelSentence(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Short precedence, java.lang.Integer subdefinitionId, java.lang.String modelSentence, java.lang.Integer translationOf, org.thdl.lex.component.ILexComponent parent, Set translations) {
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, Set translations) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
this.subdefinitionId = subdefinitionId;
this.modelSentence = modelSentence;
this.translationOf = translationOf;
this.parent = parent;
@ -46,9 +42,8 @@ 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, java.lang.Integer subdefinitionId, Set translations) {
public BaseModelSentence(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Set translations) {
super(deleted, analyticalNotes, meta);
this.subdefinitionId = subdefinitionId;
this.translations = translations;
}
@ -60,22 +55,14 @@ abstract public class BaseModelSentence extends LexComponent implements org.thdl
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}
public java.lang.Integer getSubdefinitionId() {
return this.subdefinitionId;
}
public void setSubdefinitionId(java.lang.Integer subdefinitionId) {
this.subdefinitionId = subdefinitionId;
}
public java.lang.String getModelSentence() {
return this.modelSentence;
}

8
src/java/org/thdl/lex/component/BasePassage.java
View file

@ -12,7 +12,7 @@ abstract public class BasePassage extends LexComponent implements org.thdl.lex.c
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.String literarySource;
@ -36,7 +36,7 @@ abstract public class BasePassage extends LexComponent implements org.thdl.lex.c
private Set translations;
/** full constructor */
public BasePassage(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Short 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, Set translations) {
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, Set translations) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -67,11 +67,11 @@ abstract public class BasePassage extends LexComponent implements org.thdl.lex.c
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}

16
src/java/org/thdl/lex/component/BasePronunciation.java
View file

@ -11,19 +11,19 @@ abstract public class BasePronunciation extends LexComponent implements org.thdl
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** persistent field */
private java.lang.String phonetics;
/** persistent field */
private java.lang.Short phoneticsType;
private java.lang.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.Short precedence, java.lang.String phonetics, java.lang.Short phoneticsType, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -37,7 +37,7 @@ 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.Short phoneticsType) {
public BasePronunciation(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String phonetics, java.lang.Integer phoneticsType) {
super(deleted, analyticalNotes, meta);
this.phonetics = phonetics;
this.phoneticsType = phoneticsType;
@ -51,11 +51,11 @@ abstract public class BasePronunciation extends LexComponent implements org.thdl
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}
@ -67,11 +67,11 @@ abstract public class BasePronunciation extends LexComponent implements org.thdl
this.phonetics = phonetics;
}
public java.lang.Short getPhoneticsType() {
public java.lang.Integer getPhoneticsType() {
return this.phoneticsType;
}
public void setPhoneticsType(java.lang.Short phoneticsType) {
public void setPhoneticsType(java.lang.Integer phoneticsType) {
this.phoneticsType = phoneticsType;
}

80
src/java/org/thdl/lex/component/BaseRegister.java
View file

@ -1,80 +0,0 @@
package org.thdl.lex.component;
import java.io.Serializable;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang.builder.ToStringBuilder;
/** @author Hibernate CodeGenerator */
abstract public class BaseRegister extends LexComponent implements org.thdl.lex.component.IRegister,Serializable {
/** nullable persistent field */
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
/** persistent field */
private java.lang.Short register;
/** nullable persistent field */
private org.thdl.lex.component.ILexComponent parent;
/** full constructor */
public BaseRegister(java.lang.Integer translationOf, java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Short precedence, java.lang.Short register, org.thdl.lex.component.ILexComponent parent) {
super(translationOf, deleted, analyticalNotes, translations, meta);
this.parentId = parentId;
this.precedence = precedence;
this.register = register;
this.parent = parent;
}
/** default constructor */
public BaseRegister() {
}
/** minimal constructor */
public BaseRegister(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, java.lang.Short register) {
super(deleted, analyticalNotes, translations, meta);
this.register = register;
}
public java.lang.Integer getParentId() {
return this.parentId;
}
public void setParentId(java.lang.Integer parentId) {
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
this.precedence = precedence;
}
public java.lang.Short getRegister() {
return this.register;
}
public void setRegister(java.lang.Short register) {
this.register = register;
}
public org.thdl.lex.component.ILexComponent getParent() {
return this.parent;
}
public void setParent(org.thdl.lex.component.ILexComponent parent) {
this.parent = parent;
}
public String toString() {
return new ToStringBuilder(this)
.append("metaId", getMetaId())
.toString();
}
}

16
src/java/org/thdl/lex/component/BaseRelatedTerm.java
View file

@ -11,19 +11,19 @@ abstract public class BaseRelatedTerm extends LexComponent implements Serializab
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.String relatedTerm;
/** persistent field */
private java.lang.Short relatedTermType;
private java.lang.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.Short precedence, java.lang.String relatedTerm, java.lang.Short relatedTermType, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -37,7 +37,7 @@ 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.Short relatedTermType) {
public BaseRelatedTerm(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer relatedTermType) {
super(deleted, analyticalNotes, meta);
this.relatedTermType = relatedTermType;
}
@ -50,11 +50,11 @@ abstract public class BaseRelatedTerm extends LexComponent implements Serializab
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}
@ -66,11 +66,11 @@ abstract public class BaseRelatedTerm extends LexComponent implements Serializab
this.relatedTerm = relatedTerm;
}
public java.lang.Short getRelatedTermType() {
public java.lang.Integer getRelatedTermType() {
return this.relatedTermType;
}
public void setRelatedTermType(java.lang.Short relatedTermType) {
public void setRelatedTermType(java.lang.Integer relatedTermType) {
this.relatedTermType = relatedTermType;
}

16
src/java/org/thdl/lex/component/BaseSpeechRegister.java
View file

@ -11,16 +11,16 @@ abstract public class BaseSpeechRegister extends LexComponent implements org.thd
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** persistent field */
private java.lang.Short register;
private java.lang.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.Short precedence, java.lang.Short register, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -33,7 +33,7 @@ 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.Short register) {
public BaseSpeechRegister(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer register) {
super(deleted, analyticalNotes, meta);
this.register = register;
}
@ -46,19 +46,19 @@ abstract public class BaseSpeechRegister extends LexComponent implements org.thd
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}
public java.lang.Short getRegister() {
public java.lang.Integer getRegister() {
return this.register;
}
public void setRegister(java.lang.Short register) {
public void setRegister(java.lang.Integer register) {
this.register = register;
}

16
src/java/org/thdl/lex/component/BaseSpelling.java
View file

@ -11,19 +11,19 @@ abstract public class BaseSpelling extends LexComponent implements Serializable,
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** persistent field */
private java.lang.String spelling;
/** persistent field */
private java.lang.Short spellingType;
private java.lang.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.Short precedence, java.lang.String spelling, java.lang.Short spellingType, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -37,7 +37,7 @@ 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.Short spellingType) {
public BaseSpelling(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String spelling, java.lang.Integer spellingType) {
super(deleted, analyticalNotes, meta);
this.spelling = spelling;
this.spellingType = spellingType;
@ -51,11 +51,11 @@ abstract public class BaseSpelling extends LexComponent implements Serializable,
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}
@ -67,11 +67,11 @@ abstract public class BaseSpelling extends LexComponent implements Serializable,
this.spelling = spelling;
}
public java.lang.Short getSpellingType() {
public java.lang.Integer getSpellingType() {
return this.spellingType;
}
public void setSpellingType(java.lang.Short spellingType) {
public void setSpellingType(java.lang.Integer spellingType) {
this.spellingType = spellingType;
}

10
src/java/org/thdl/lex/component/BaseSubdefinition.java
View file

@ -6,13 +6,13 @@ import java.util.Set;
import org.apache.commons.lang.builder.ToStringBuilder;
/** @author Hibernate CodeGenerator */
abstract public class BaseSubdefinition extends LexComponent implements org.thdl.lex.component.ISubdefinition,Serializable,org.thdl.lex.component.Translatable {
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 java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.String subdefinition;
@ -48,7 +48,7 @@ abstract public class BaseSubdefinition extends LexComponent implements org.thdl
private Set translations;
/** full constructor */
public BaseSubdefinition(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer parentId, java.lang.Short precedence, java.lang.String subdefinition, java.lang.Integer translationOf, org.thdl.lex.component.ILexComponent parent, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers, Set translations) {
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 glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers, Set translations) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -90,11 +90,11 @@ abstract public class BaseSubdefinition extends LexComponent implements org.thdl
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}

10
src/java/org/thdl/lex/component/BaseTerm.java
View file

@ -5,13 +5,13 @@ import java.util.List;
import org.apache.commons.lang.builder.ToStringBuilder;
/** @author Hibernate CodeGenerator */
abstract public class BaseTerm extends LexComponent implements org.thdl.lex.component.ITerm,Serializable {
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.Short precedence;
private java.lang.Integer precedence;
/** persistent field */
private List pronunciations;
@ -56,7 +56,7 @@ 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.Short 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(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) {
super(deleted, analyticalNotes, meta);
this.term = term;
this.precedence = precedence;
@ -108,11 +108,11 @@ abstract public class BaseTerm extends LexComponent implements org.thdl.lex.comp
this.term = term;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}

14
src/java/org/thdl/lex/component/BaseTransitionalData.java
View file

@ -11,10 +11,10 @@ abstract public class BaseTransitionalData extends LexComponent implements org.t
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.Short transitionalDataLabel;
private java.lang.Integer transitionalDataLabel;
/** persistent field */
private java.lang.String forPublicConsumption;
@ -26,7 +26,7 @@ abstract public class BaseTransitionalData extends LexComponent implements org.t
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.Short precedence, java.lang.Short transitionalDataLabel, java.lang.String forPublicConsumption, java.lang.String transitionalDataText, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -54,19 +54,19 @@ abstract public class BaseTransitionalData extends LexComponent implements org.t
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}
public java.lang.Short getTransitionalDataLabel() {
public java.lang.Integer getTransitionalDataLabel() {
return this.transitionalDataLabel;
}
public void setTransitionalDataLabel(java.lang.Short transitionalDataLabel) {
public void setTransitionalDataLabel(java.lang.Integer transitionalDataLabel) {
this.transitionalDataLabel = transitionalDataLabel;
}

8
src/java/org/thdl/lex/component/BaseTranslationEquivalent.java
View file

@ -11,7 +11,7 @@ abstract public class BaseTranslationEquivalent extends LexComponent implements
private java.lang.Integer parentId;
/** nullable persistent field */
private java.lang.Short precedence;
private java.lang.Integer precedence;
/** nullable persistent field */
private java.lang.String translationEquivalent;
@ -20,7 +20,7 @@ abstract public class BaseTranslationEquivalent extends LexComponent implements
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.Short precedence, java.lang.String translationEquivalent, org.thdl.lex.component.ILexComponent parent) {
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) {
super(deleted, analyticalNotes, meta);
this.parentId = parentId;
this.precedence = precedence;
@ -45,11 +45,11 @@ abstract public class BaseTranslationEquivalent extends LexComponent implements
this.parentId = parentId;
}
public java.lang.Short getPrecedence() {
public java.lang.Integer getPrecedence() {
return this.precedence;
}
public void setPrecedence(java.lang.Short precedence) {
public void setPrecedence(java.lang.Integer precedence) {
this.precedence = precedence;
}

127
src/java/org/thdl/lex/component/Definition.java
View file

@ -1,8 +1,9 @@
package org.thdl.lex.component;
import java.io.Serializable;
import java.util.HashMap;
import org.thdl.lex.LexConstants;
import java.util.*;
import org.thdl.lex.*;
/**
* Description of the Class
@ -40,6 +41,128 @@ public class Definition extends BaseDefinition implements Serializable, Translat
return childMap;
}
//helpers
/**
* Description of the Method
*
* @param component Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public List findSiblings( ILexComponent component ) throws LexComponentException
{
List list = null;
if ( null == component.getParent() )
{
component.setParent( findParent( component.getParentId() ) );
}
LexComponentNode node = (LexComponentNode) component.getParent();
list = (List) node.getChildMap().get( component.getLabel() );
/*
if ( null == list )
{
Iterator it = getSubefinitions().iterator();
while ( it.hasNext() )
{
ISubdefinition subdef = (ISubdefinition) it.next();
list = subdef.findSiblings( component );
}
}
*/
return list;
}
/**
* Description of the Method
*
* @param parentPk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findParent( Integer parentPk ) throws LexComponentException
{
LexLogger.debug( "Finding Parent..." );
ILexComponent parent = null;
if ( parentPk.equals( this.getMetaId() ) )
{
parent = this;
}
else
{
parent = findChild( parentPk );
}
return parent;
}
/**
* Gets the persistentChild attribute of the Term object
*
* @param child Description of the Parameter
* @return The persistentChild value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( ILexComponent child ) throws LexComponentException
{
List list = findSiblings( child );
child = findChild( list, child.getMetaId() );
return child;
}
/**
* Description of the Method
*
* @param pk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( Integer pk ) throws LexComponentException
{
ILexComponent child = null;
Iterator childMapValues = getChildMap().values().iterator();
while ( childMapValues.hasNext() && null == child )
{
List list = (List) childMapValues.next();
child = findChild( list, pk );
}
Iterator subdefinitions = getSubdefinitions().iterator();
while ( subdefinitions.hasNext() && null == child )
{
ISubdefinition def = (ISubdefinition) subdefinitions.next();
child = def.findChild( pk );
}
return child;
}
/**
* Description of the Method
*
* @param list Description of the Parameter
* @param pk Description of the Parameter
* @return Description of the Return Value
*/
public ILexComponent findChild( List list, Integer pk )
{
ILexComponent child = null;
for ( Iterator it = list.iterator(); it.hasNext(); )
{
ILexComponent lc = (LexComponent) it.next();
if ( lc.getMetaId().equals( pk ) )
{
child = lc;
break;
}
}
return child;
}
/**
* Description of the Method

5
src/java/org/thdl/lex/component/IAnalyticalNote.java
View file

@ -12,10 +12,9 @@ public interface IAnalyticalNote extends ILexComponent
/**
* Gets the parent attribute of the IAnalyticalNote object
*
*@return The parent value
* @param comp The new parent value
* @since
*/
public ILexComponent getParent();
/**
@ -24,7 +23,7 @@ public interface IAnalyticalNote extends ILexComponent
* @param comp The new parent value
* @since
*/
public void setParent( ILexComponent comp );
/**

54
src/java/org/thdl/lex/component/IDefinition.java
View file

@ -7,23 +7,19 @@ package org.thdl.lex.component;
* @author travis
* @created October 1, 2003
*/
public interface IDefinition extends Translatable
public interface IDefinition extends LexComponentNode
{
/**
* Gets the parent attribute of the IDefinition object
*
* @return The parent value
* @return The parentId value
*/
public ILexComponent getParent();
/**
* Sets the parent attribute of the IDefinition object
*
* @param comp The new parent value
* @return The parentId value
*/
public void setParent( ILexComponent comp );
/**
* Gets the parentId attribute of the IDefinition object
@ -65,7 +61,7 @@ public interface IDefinition extends Translatable
* @return The precedence value
* @since
*/
public java.lang.Short getPrecedence();
public java.lang.Integer getPrecedence();
/**
@ -74,7 +70,7 @@ public interface IDefinition extends Translatable
* @param precedence The new precedence value
* @since
*/
public void setPrecedence( java.lang.Short precedence );
public void setPrecedence( java.lang.Integer precedence );
/**
@ -220,5 +216,45 @@ public interface IDefinition extends Translatable
*/
public void setRegisters( java.util.List registers );
/**
* Description of the Method
*
* @param component Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( ILexComponent component ) throws LexComponentException;
/**
* Description of the Method
*
* @param list Description of the Parameter
* @param pk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( java.util.List list, Integer pk ) throws LexComponentException;
/**
* Description of the Method
*
* @param pk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( Integer pk ) throws LexComponentException;
/**
* Description of the Method
*
* @param parentPk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findParent( Integer parentPk ) throws LexComponentException;
}

58
src/java/org/thdl/lex/component/IEncyclopediaArticle.java
View file

@ -1,13 +1,67 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface IEncyclopediaArticle extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the IEncyclopediaArticle object
*
* @param comp The new parent value
*/
/**
* Gets the parentId attribute of the IEncyclopediaArticle object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the IEncyclopediaArticle object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
/**
* Gets the article attribute of the IEncyclopediaArticle object
*
* @return The article value
*/
public java.lang.String getArticle();
/**
* Sets the article attribute of the IEncyclopediaArticle object
*
* @param article The new article value
*/
public void setArticle( java.lang.String article );
/**
* Gets the articleTitle attribute of the IEncyclopediaArticle object
*
* @return The articleTitle value
*/
public java.lang.String getArticleTitle();
/**
* Sets the articleTitle attribute of the IEncyclopediaArticle object
*
* @param articleTitle The new articleTitle value
*/
public void setArticleTitle( java.lang.String articleTitle );
}

94
src/java/org/thdl/lex/component/IEtymology.java
View file

@ -1,17 +1,99 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface IEtymology extends Translatable
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the IEtymology object
*
* @param comp The new parent value
*/
/**
* Gets the parentId attribute of the IEtymology object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the IEtymology object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
public java.lang.Short getLoanLanguage();
public void setLoanLanguage(java.lang.Short loanLanguage);
public java.lang.Short getEtymologyType();
public void setEtymologyType(java.lang.Short etymologyType);
/**
* Gets the loanLanguage attribute of the IEtymology object
*
* @return The loanLanguage value
*/
public java.lang.Integer getLoanLanguage();
/**
* Sets the loanLanguage attribute of the IEtymology object
*
* @param loanLanguage The new loanLanguage value
*/
public void setLoanLanguage( java.lang.Integer loanLanguage );
/**
* Gets the etymologyType attribute of the IEtymology object
*
* @return The etymologyType value
*/
public java.lang.Integer getEtymologyType();
/**
* Sets the etymologyType attribute of the IEtymology object
*
* @param etymologyType The new etymologyType value
*/
public void setEtymologyType( java.lang.Integer etymologyType );
/**
* Gets the derivation attribute of the IEtymology object
*
* @return The derivation value
*/
public java.lang.String getDerivation();
/**
* Sets the derivation attribute of the IEtymology object
*
* @param derivation The new derivation value
*/
public void setDerivation( java.lang.String derivation );
/**
* Gets the etymologyDescription attribute of the IEtymology object
*
* @return The etymologyDescription value
*/
public java.lang.String getEtymologyDescription();
/**
* Sets the etymologyDescription attribute of the IEtymology object
*
* @param etymologyDescription The new etymologyDescription value
*/
public void setEtymologyDescription( java.lang.String etymologyDescription );
}

48
src/java/org/thdl/lex/component/IFunction.java
View file

@ -1,11 +1,51 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface IFunction extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the IFunction object
*
* @param comp The new parent value
*/
/**
* Gets the parentId attribute of the IFunction object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the IFunction object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
public java.lang.Short getFunction();
public void setFunction(java.lang.Short function);
/**
* Gets the function attribute of the IFunction object
*
* @return The function value
*/
public java.lang.Integer getFunction();
/**
* Sets the function attribute of the IFunction object
*
* @param function The new function value
*/
public void setFunction( java.lang.Integer function );
}

58
src/java/org/thdl/lex/component/IGloss.java
View file

@ -1,13 +1,67 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface IGloss extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the IGloss object
*
* @param comp The new parent value
*/
/**
* Gets the parentId attribute of the IGloss object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the IGloss object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
/**
* Gets the gloss attribute of the IGloss object
*
* @return The gloss value
*/
public java.lang.String getGloss();
/**
* Sets the gloss attribute of the IGloss object
*
* @param gloss The new gloss value
*/
public void setGloss( java.lang.String gloss );
/**
* Gets the translation attribute of the IGloss object
*
* @return The translation value
*/
public java.lang.String getTranslation();
/**
* Sets the translation attribute of the IGloss object
*
* @param translation The new translation value
*/
public void setTranslation( java.lang.String translation );
}

44
src/java/org/thdl/lex/component/IKeyword.java
View file

@ -1,11 +1,51 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface IKeyword extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the IKeyword object
*
* @param comp The new parent value
*/
/**
* Gets the parentId attribute of the IKeyword object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the IKeyword object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
/**
* Gets the keyword attribute of the IKeyword object
*
* @return The keyword value
*/
public java.lang.String getKeyword();
/**
* Sets the keyword attribute of the IKeyword object
*
* @param keyword The new keyword value
*/
public void setKeyword( java.lang.String keyword );
}

44
src/java/org/thdl/lex/component/ILexComponent.java
View file

@ -13,9 +13,17 @@ public interface ILexComponent
/**
* Sets the parent attribute of the ILexComponent object
*
* @param comp The new parent value
* @param parent The new parent value
*/
public void setParent( ILexComponent comp );
public void setParent( ILexComponent parent );
/**
* Gets the parent attribute of the ILexComponent object
*
* @return The parent value
*/
public ILexComponent getParent();
/**
@ -31,8 +39,6 @@ public interface ILexComponent
*
* @return The parent value
*/
public ILexComponent getParent();
/**
* Gets the parentId attribute of the LexComponent object
@ -47,7 +53,7 @@ public interface ILexComponent
*
* @return The precedence value
*/
public java.lang.Short getPrecedence();
public java.lang.Integer getPrecedence();
/**
@ -55,7 +61,7 @@ public interface ILexComponent
*
* @param precedence The new precedence value
*/
public void setPrecedence( java.lang.Short precedence );
public void setPrecedence( java.lang.Integer precedence );
/**
@ -85,23 +91,6 @@ public interface ILexComponent
public void setMetaId( java.lang.Integer metaId );
/**
* Gets the translationOf attribute of the ILexComponent object
*
* @return The translationOf value
* @since
*/
public java.lang.Integer getTranslationOf();
/**
* Sets the translationOf attribute of the ILexComponent object
*
* @param translationOf The new translationOf value
* @since
*/
public void setTranslationOf( java.lang.Integer translationOf );
/**
* Gets the translations attribute of the ILexComponent object
@ -183,5 +172,14 @@ public interface ILexComponent
* @since
*/
public void populate( java.util.Map properties ) throws LexComponentException;
/**
* Description of the Method
*
* @param component Description of the Parameter
* @exception LexComponentException Description of the Exception
*/
public void populate( ILexComponent component ) throws LexComponentException;
}

196
src/java/org/thdl/lex/component/IMeta.java
View file

@ -1,31 +1,211 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface IMeta extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the IMeta object
*
* @param comp The new parent value
*/
/**
* Gets the parentId attribute of the IMeta object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the IMeta object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
/**
* Gets the createdBy attribute of the IMeta object
*
* @return The createdBy value
*/
public java.lang.Integer getCreatedBy();
/**
* Sets the createdBy attribute of the IMeta object
*
* @param createdBy The new createdBy value
*/
public void setCreatedBy( java.lang.Integer createdBy );
/**
* Gets the modifiedBy attribute of the IMeta object
*
* @return The modifiedBy value
*/
public java.lang.Integer getModifiedBy();
/**
* Sets the modifiedBy attribute of the IMeta object
*
* @param modifiedBy The new modifiedBy value
*/
public void setModifiedBy( java.lang.Integer modifiedBy );
/**
* Gets the createdByProjSub attribute of the IMeta object
*
* @return The createdByProjSub value
*/
public java.lang.Integer getCreatedByProjSub();
/**
* Sets the createdByProjSub attribute of the IMeta object
*
* @param createdByProjSub The new createdByProjSub value
*/
public void setCreatedByProjSub( java.lang.Integer createdByProjSub );
/**
* Gets the modifiedByProjSub attribute of the IMeta object
*
* @return The modifiedByProjSub value
*/
public java.lang.Integer getModifiedByProjSub();
/**
* Sets the modifiedByProjSub attribute of the IMeta object
*
* @param modifiedByProjSub The new modifiedByProjSub value
*/
public void setModifiedByProjSub( java.lang.Integer modifiedByProjSub );
/**
* Gets the createdOn attribute of the IMeta object
*
* @return The createdOn value
*/
public java.util.Date getCreatedOn();
/**
* Sets the createdOn attribute of the IMeta object
*
* @param createdOn The new createdOn value
*/
public void setCreatedOn( java.util.Date createdOn );
/**
* Gets the modifiedOn attribute of the IMeta object
*
* @return The modifiedOn value
*/
public java.util.Date getModifiedOn();
/**
* Sets the modifiedOn attribute of the IMeta object
*
* @param modifiedOn The new modifiedOn value
*/
public void setModifiedOn( java.util.Date modifiedOn );
/**
* Gets the source attribute of the IMeta object
*
* @return The source value
*/
public java.lang.Integer getSource();
/**
* Sets the source attribute of the IMeta object
*
* @param source The new source value
*/
public void setSource( java.lang.Integer source );
public java.lang.Short getLanguage();
public void setLanguage(java.lang.Short language);
public java.lang.Short getScript();
public void setScript(java.lang.Short script);
public java.lang.Short getDialect();
public void setDialect(java.lang.Short dialect);
/**
* Gets the language attribute of the IMeta object
*
* @return The language value
*/
public java.lang.Integer getLanguage();
/**
* Sets the language attribute of the IMeta object
*
* @param language The new language value
*/
public void setLanguage( java.lang.Integer language );
/**
* Gets the script attribute of the IMeta object
*
* @return The script value
*/
public java.lang.Integer getScript();
/**
* Sets the script attribute of the IMeta object
*
* @param script The new script value
*/
public void setScript( java.lang.Integer script );
/**
* Gets the dialect attribute of the IMeta object
*
* @return The dialect value
*/
public java.lang.Integer getDialect();
/**
* Sets the dialect attribute of the IMeta object
*
* @param dialect The new dialect value
*/
public void setDialect( java.lang.Integer dialect );
/**
* Gets the note attribute of the IMeta object
*
* @return The note value
*/
public java.lang.String getNote();
/**
* Sets the note attribute of the IMeta object
*
* @param note The new note value
*/
public void setNote( java.lang.String note );
}

45
src/java/org/thdl/lex/component/IModelSentence.java
View file

@ -1,13 +1,50 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface IModelSentence extends Translatable
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the IModelSentence object
*
* @return The parentId value
*/
/**
* Gets the parentId attribute of the IModelSentence object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the IModelSentence object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
public java.lang.Integer getSubdefinitionId();
public void setSubdefinitionId(java.lang.Integer subdefinitionId);
/**
* Gets the modelSentence attribute of the IModelSentence object
*
* @return The modelSentence value
*/
public java.lang.String getModelSentence();
/**
* Sets the modelSentence attribute of the IModelSentence object
*
* @param modelSentence The new modelSentence value
*/
public void setModelSentence( java.lang.String modelSentence );
}

5
src/java/org/thdl/lex/component/IPassage.java
View file

@ -12,9 +12,8 @@ public interface IPassage extends Translatable
/**
* Gets the parent attribute of the IPassage object
*
* @return The parent value
* @param comp The new parent value
*/
public ILexComponent getParent();
/**
@ -22,7 +21,7 @@ public interface IPassage extends Translatable
*
* @param comp The new parent value
*/
public void setParent( ILexComponent comp );
/**

62
src/java/org/thdl/lex/component/IPronunciation.java
View file

@ -1,13 +1,67 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface IPronunciation extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the IPronunciation object
*
* @param comp The new parent value
*/
/**
* Gets the parentId attribute of the IPronunciation object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the IPronunciation object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
/**
* Gets the phonetics attribute of the IPronunciation object
*
* @return The phonetics value
*/
public java.lang.String getPhonetics();
/**
* Sets the phonetics attribute of the IPronunciation object
*
* @param phonetics The new phonetics value
*/
public void setPhonetics( java.lang.String phonetics );
public java.lang.Short getPhoneticsType();
public void setPhoneticsType(java.lang.Short phoneticsType);
/**
* Gets the phoneticsType attribute of the IPronunciation object
*
* @return The phoneticsType value
*/
public java.lang.Integer getPhoneticsType();
/**
* Sets the phoneticsType attribute of the IPronunciation object
*
* @param phoneticsType The new phoneticsType value
*/
public void setPhoneticsType( java.lang.Integer phoneticsType );
}

48
src/java/org/thdl/lex/component/IRegister.java
View file

@ -1,11 +1,51 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface IRegister extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the IRegister object
*
* @param comp The new parent value
*/
/**
* Gets the parentId attribute of the IRegister object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the IRegister object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
public java.lang.Short getRegister();
public void setRegister(java.lang.Short register);
/**
* Gets the register attribute of the IRegister object
*
* @return The register value
*/
public java.lang.Integer getRegister();
/**
* Sets the register attribute of the IRegister object
*
* @param register The new register value
*/
public void setRegister( java.lang.Integer register );
}

62
src/java/org/thdl/lex/component/IRelatedTerm.java
View file

@ -1,13 +1,67 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface IRelatedTerm extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the IRelatedTerm object
*
* @param comp The new parent value
*/
/**
* Gets the parentId attribute of the IRelatedTerm object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the IRelatedTerm object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
/**
* Gets the relatedTerm attribute of the IRelatedTerm object
*
* @return The relatedTerm value
*/
public java.lang.String getRelatedTerm();
/**
* Sets the relatedTerm attribute of the IRelatedTerm object
*
* @param relatedTerm The new relatedTerm value
*/
public void setRelatedTerm( java.lang.String relatedTerm );
public java.lang.Short getRelatedTermType();
public void setRelatedTermType(java.lang.Short relatedTermType);
/**
* Gets the relatedTermType attribute of the IRelatedTerm object
*
* @return The relatedTermType value
*/
public java.lang.Integer getRelatedTermType();
/**
* Sets the relatedTermType attribute of the IRelatedTerm object
*
* @param relatedTermType The new relatedTermType value
*/
public void setRelatedTermType( java.lang.Integer relatedTermType );
}

62
src/java/org/thdl/lex/component/ISpelling.java
View file

@ -1,13 +1,67 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface ISpelling extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Sets the parent attribute of the ISpelling object
*
* @param comp The new parent value
*/
/**
* Gets the parentId attribute of the ISpelling object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the ISpelling object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
/**
* Gets the spelling attribute of the ISpelling object
*
* @return The spelling value
*/
public java.lang.String getSpelling();
/**
* Sets the spelling attribute of the ISpelling object
*
* @param spelling The new spelling value
*/
public void setSpelling( java.lang.String spelling );
public java.lang.Short getSpellingType();
public void setSpellingType(java.lang.Short spellingType);
/**
* Gets the spellingType attribute of the ISpelling object
*
* @return The spellingType value
*/
public java.lang.Integer getSpellingType();
/**
* Sets the spellingType attribute of the ISpelling object
*
* @param spellingType The new spellingType value
*/
public void setSpellingType( java.lang.Integer spellingType );
}

50
src/java/org/thdl/lex/component/ISubdefinition.java
View file

@ -7,23 +7,19 @@ package org.thdl.lex.component;
* @author travis
* @created October 13, 2003
*/
public interface ISubdefinition extends Translatable
public interface ISubdefinition extends LexComponentNode
{
/**
* Gets the parent attribute of the ISubdefinition object
*
* @return The parent value
* @return The parentId value
*/
public ILexComponent getParent();
/**
* Sets the parent attribute of the ISubdefinition object
*
* @param comp The new parent value
* @return The parentId value
*/
public void setParent( ILexComponent comp );
/**
* Gets the parentId attribute of the ISubdefinition object
@ -170,5 +166,45 @@ public interface ISubdefinition extends Translatable
public void setRegisters( java.util.List registers );
/**
* Description of the Method
*
* @param component Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( ILexComponent component ) throws LexComponentException;
/**
* Description of the Method
*
* @param list Description of the Parameter
* @param pk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( java.util.List list, Integer pk ) throws LexComponentException;
/**
* Description of the Method
*
* @param pk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( Integer pk ) throws LexComponentException;
/**
* Description of the Method
*
* @param parentPk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findParent( Integer parentPk ) throws LexComponentException;
}

55
src/java/org/thdl/lex/component/ITerm.java
View file

@ -7,7 +7,7 @@ package org.thdl.lex.component;
* @author travis
* @created October 1, 2003
*/
public interface ITerm extends ILexComponent
public interface ITerm extends LexComponentNode
{
/**
* Gets the term attribute of the ITerm object
@ -33,7 +33,7 @@ public interface ITerm extends ILexComponent
* @return The precedence value
* @since
*/
public java.lang.Short getPrecedence();
public java.lang.Integer getPrecedence();
/**
@ -42,7 +42,7 @@ public interface ITerm extends ILexComponent
* @param precedence The new precedence value
* @since
*/
public void setPrecedence( java.lang.Short precedence );
public void setPrecedence( java.lang.Integer precedence );
/**
@ -296,5 +296,54 @@ public interface ITerm extends ILexComponent
*/
public void setRegisters( java.util.List registers );
/**
* Description of the Method
*
* @param component Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( ILexComponent component ) throws LexComponentException;
/**
* Description of the Method
*
* @param list Description of the Parameter
* @param pk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( java.util.List list, Integer pk ) throws LexComponentException;
/**
* Description of the Method
*
* @param pk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( Integer pk ) throws LexComponentException;
/**
* Description of the Method
*
* @param parentPk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findParent( Integer parentPk ) throws LexComponentException;
/**
* Adds a feature to the Child attribute of the ITerm object
*
* @param component The feature to be added to the Child attribute
* @exception LexComponentException Description of the Exception
*/
public void addChild( ILexComponent component ) throws LexComponentException;
}

72
src/java/org/thdl/lex/component/ITransitionalData.java
View file

@ -1,15 +1,79 @@
package org.thdl.lex.component;
/**
* Description of the Interface
*
* @author travis
* @created October 16, 2003
*/
public interface ITransitionalData extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Gets the parentId attribute of the ITransitionalData object
*
* @return The parentId value
*/
public java.lang.Integer getParentId();
/**
* Sets the parentId attribute of the ITransitionalData object
*
* @param parentId The new parentId value
*/
public void setParentId( java.lang.Integer parentId );
public java.lang.Short getTransitionalDataLabel();
public void setTransitionalDataLabel(java.lang.Short transitionalDataLabel);
/**
* Gets the transitionalDataLabel attribute of the ITransitionalData object
*
* @return The transitionalDataLabel value
*/
public java.lang.Integer getTransitionalDataLabel();
/**
* Sets the transitionalDataLabel attribute of the ITransitionalData object
*
* @param transitionalDataLabel The new transitionalDataLabel value
*/
public void setTransitionalDataLabel( java.lang.Integer transitionalDataLabel );
/**
* Gets the forPublicConsumption attribute of the ITransitionalData object
*
* @return The forPublicConsumption value
*/
public java.lang.String getForPublicConsumption();
/**
* Sets the forPublicConsumption attribute of the ITransitionalData object
*
* @param forPublicConsumption The new forPublicConsumption value
*/
public void setForPublicConsumption( java.lang.String forPublicConsumption );
/**
* Gets the transitionalDataText attribute of the ITransitionalData object
*
* @return The transitionalDataText value
*/
public java.lang.String getTransitionalDataText();
/**
* Sets the transitionalDataText attribute of the ITransitionalData object
*
* @param transitionalDataText The new transitionalDataText value
*/
public void setTransitionalDataText( java.lang.String transitionalDataText );
}

5
src/java/org/thdl/lex/component/ITranslationEquivalent.java
View file

@ -8,8 +8,9 @@ package org.thdl.lex.component;
* @created October 3, 2003
*/
public interface ITranslationEquivalent extends ILexComponent
{ public ILexComponent getParent();
public void setParent( ILexComponent comp );
{
/**
* Gets the translationEquivalent attribute of the ITranslationEquivalent
* object

272
src/java/org/thdl/lex/component/LexComponent.hbm.xml
View file

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 2.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
<hibernate-mapping default-cascade="save-update">
<hibernate-mapping default-cascade="all">
<class name="org.thdl.lex.component.LexComponent" proxy="org.thdl.lex.component.ILexComponent" table="Meta" where="translationOf = 0 AND deleted=0">
<!-- <class name="org.thdl.lex.component.LexComponent" proxy="org.thdl.lex.component.ILexComponent" table="Meta" where="deleted=0" unsaved-value="0"> -->
<class name="org.thdl.lex.component.LexComponent" proxy="org.thdl.lex.component.ILexComponent" table="Meta" where="deleted=0">
<meta attribute="generated-class" inherit="false">org.thdl.lex.component.BaseLexComponent</meta>
@ -14,7 +15,7 @@
<!--<property name="translationOf" type="java.lang.Integer" column="translationOf" length="11"/> -->
<property name="deleted" type="java.lang.Boolean" column="deleted" not-null="true" length="5"/>
<list name="analyticalNotes" table="AnalyticalNotes" lazy="true" cascade="all">
<list name="analyticalNotes" table="AnalyticalNotes" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.AnalyticalNote"/>
@ -29,93 +30,101 @@
<property name="createdOn" type="java.sql.Timestamp" column="createdOn" length="14"/>
<property name="modifiedOn" type="java.sql.Timestamp" column="modifiedOn" length="14"/>
<property name="source" type="java.lang.Integer" column="source" not-null="true" length="11"/>
<property name="language" type="java.lang.Short" column="language" not-null="true" length="6"/>
<property name="script" type="java.lang.Short" column="script" not-null="true" length="6"/>
<property name="dialect" type="java.lang.Short" column="dialect" not-null="true" length="6"/>
<property name="language" type="java.lang.Integer" column="language" not-null="true" length="6"/>
<property name="script" type="java.lang.Integer" column="script" not-null="true" length="6"/>
<property name="dialect" type="java.lang.Integer" column="dialect" not-null="true" length="6"/>
<property name="note" type="java.lang.String" column="note" length="65535"/>
</component>
<joined-subclass name="org.thdl.lex.component.AnalyticalNote" proxy="org.thdl.lex.component.IAnalyticalNote" table="AnalyticalNotes">
<meta attribute="generated-class">org.thdl.lex.component.BaseAnalyticalNote</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="analyticalNote" type="java.lang.String" column="analyticalNote" length="65535"/>
</joined-subclass>
<joined-subclass name="org.thdl.lex.component.Term" proxy="org.thdl.lex.component.ITerm" table="Terms">
<meta attribute="generated-class">org.thdl.lex.component.BaseTerm</meta>
<key column="metaId"/>
<meta attribute="implements">org.thdl.lex.component.LexComponentNode</meta>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="term" type="java.lang.String" column="term" not-null="true" length="255">
<!-- <meta attribute="finder-method">findByTerm</meta> --></property>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<list name="pronunciations" table="Pronunciations" lazy="true" cascade="all">
<!-- <meta attribute="finder-method">findByTerm</meta> -->
</property>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<list name="pronunciations" table="Pronunciations" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Pronunciation"/>
</list>
<list name="etymologies" table="Etymologies" lazy="true" cascade="all">
<list name="etymologies" table="Etymologies" lazy="true" where="translationOf IS NULL">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Etymology"/>
</list>
<list name="spellings" table="Spellings" lazy="true" cascade="all">
<list name="spellings" table="Spellings" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Spelling"/>
</list>
<list name="functions" table="GrammaticalFunctions" lazy="true" cascade="all">
<list name="functions" table="GrammaticalFunctions" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.GrammaticalFunction"/>
</list>
<list name="encyclopediaArticles" table="EncyclopediaArticles" lazy="true" cascade="all">
<list name="encyclopediaArticles" table="EncyclopediaArticles" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.EncyclopediaArticle"/>
</list>
<list name="transitionalData" table="TransitionalData" lazy="true" cascade="all">
<list name="transitionalData" table="TransitionalData" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.TransitionalData"/>
</list>
<list name="definitions" table="Definitions" lazy="true" cascade="all">
<list name="definitions" table="Definitions" lazy="true" where="translationOf IS NULL">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Definition"/>
</list>
<list name="glosses" table="Glosses" lazy="true" cascade="all">
<list name="glosses" table="Glosses" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Gloss"/>
</list>
<list name="keywords" table="Keywords" lazy="true" cascade="all">
<list name="keywords" table="Keywords" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Keyword"/>
</list>
<list name="modelSentences" table="ModelSentences" lazy="true" cascade="all">
<list name="modelSentences" table="ModelSentences" lazy="true" where="translationOf IS NULL">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.ModelSentence"/>
</list>
<list name="translationEquivalents" table="TranslationEquivalents" lazy="true" cascade="all">
<list name="translationEquivalents" table="TranslationEquivalents" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.TranslationEquivalent"/>
</list>
<list name="relatedTerms" table="RelatedTerms" lazy="true" cascade="all">
<list name="relatedTerms" table="RelatedTerms" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.RelatedTerm"/>
</list>
<list name="passages" table="Passages" lazy="true" cascade="all">
<list name="passages" table="Passages" lazy="true" where="translationOf IS NULL">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Passage"/>
</list>
<list name="registers" table="SpeechRegisters" lazy="true" cascade="all">
<list name="registers" table="SpeechRegisters" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.SpeechRegister"/>
@ -124,53 +133,57 @@
<joined-subclass name="org.thdl.lex.component.Definition" proxy="org.thdl.lex.component.IDefinition" table="Definitions">
<meta attribute="generated-class">org.thdl.lex.component.BaseDefinition</meta>
<meta attribute="implements">org.thdl.lex.component.Translatable</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<meta attribute="implements">org.thdl.lex.component.Translatable, org.thdl.lex.component.LexComponentNode</meta>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" not-null="true" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" not-null="true" length="6"/>
<property name="definition" type="java.lang.String" column="definition" length="65535"/>
<property name="translationOf" type="java.lang.Integer" column="translationOf" length="11"/>
<set name="translations" table="Definitions" lazy="true" cascade="all" where="translationOf = 1">
<set name="translations" table="Definitions" lazy="true" where="translationOf IS NOT NULL">
<key column="translationOf"/>
<one-to-many class="org.thdl.lex.component.Definition"/>
</set>
<list name="subdefinitions" table="Subdefinitions" lazy="true" cascade="all">
<list name="subdefinitions" table="Subdefinitions" lazy="true" where="translationOf IS NULL">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Subdefinition"/>
</list>
<list name="glosses" table="Glosses" lazy="true" cascade="all">
<list name="glosses" table="Glosses" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Gloss"/>
</list>
<list name="keywords" table="Keywords" lazy="true" cascade="all">
<list name="keywords" table="Keywords" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Keyword"/>
</list>
<list name="modelSentences" table="ModelSentences" lazy="true" cascade="all">
<list name="modelSentences" table="ModelSentences" lazy="true" where="translationOf IS NULL">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.ModelSentence"/>
</list>
<list name="translationEquivalents" table="TranslationEquivalents" lazy="true" cascade="all">
<list name="translationEquivalents" table="TranslationEquivalents" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.TranslationEquivalent"/>
</list>
<list name="relatedTerms" table="RelatedTerms" lazy="true" cascade="all">
<list name="relatedTerms" table="RelatedTerms" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.RelatedTerm"/>
</list>
<list name="passages" table="Passages" lazy="true" cascade="all">
<list name="passages" table="Passages" lazy="true" where="translationOf IS NULL">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Passage"/>
</list>
<list name="registers" table="SpeechRegisters" lazy="true" cascade="all">
<list name="registers" table="SpeechRegisters" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.SpeechRegister"/>
@ -179,48 +192,52 @@
<joined-subclass name="org.thdl.lex.component.Subdefinition" proxy="org.thdl.lex.component.ISubdefinition" table="Subdefinitions">
<meta attribute="generated-class">org.thdl.lex.component.BaseSubdefinition</meta>
<meta attribute="implements">org.thdl.lex.component.Translatable</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<meta attribute="implements">org.thdl.lex.component.Translatable, org.thdl.lex.component.LexComponentNode</meta>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="subdefinition" type="java.lang.String" column="subdefinition" length="65535"/>
<property name="translationOf" type="java.lang.Integer" column="translationOf" length="11"/>
<set name="translations" table="Subdefinitions" lazy="true" cascade="all" where="translationOf = 1">
<set name="translations" table="Subdefinitions" lazy="true" where="translationOf IS NOT NULL">
<key column="translationOf"/>
<one-to-many class="org.thdl.lex.component.Subdefinition"/>
</set>
<list name="glosses" table="Glosses" lazy="true" cascade="all">
<list name="glosses" table="Glosses" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Gloss"/>
</list>
<list name="keywords" table="Keywords" lazy="true" cascade="all">
<list name="keywords" table="Keywords" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Keyword"/>
</list>
<list name="modelSentences" table="ModelSentences" lazy="true" cascade="all">
<list name="modelSentences" table="ModelSentences" lazy="true" where="translationOf IS NULL">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.ModelSentence"/>
</list>
<list name="translationEquivalents" table="TranslationEquivalents" lazy="true" cascade="all">
<list name="translationEquivalents" table="TranslationEquivalents" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.TranslationEquivalent"/>
</list>
<list name="relatedTerms" table="RelatedTerms" lazy="true" cascade="all">
<list name="relatedTerms" table="RelatedTerms" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.RelatedTerm"/>
</list>
<list name="passages" table="Passages" lazy="true" cascade="all">
<list name="passages" table="Passages" lazy="true" where="translationOf IS NULL">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.Passage"/>
</list>
<list name="registers" table="SpeechRegisters" lazy="true" cascade="all">
<list name="registers" table="SpeechRegisters" lazy="true">
<key column="parentId"/>
<index column="precedence"/>
<one-to-many class="org.thdl.lex.component.SpeechRegister"/>
@ -229,27 +246,35 @@
<joined-subclass name="org.thdl.lex.component.Pronunciation" proxy="org.thdl.lex.component.IPronunciation" table="Pronunciations">
<meta attribute="generated-class">org.thdl.lex.component.BasePronunciation</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="phonetics" type="java.lang.String" column="phonetics" not-null="true" length="65535"/>
<property name="phoneticsType" type="java.lang.Short" column="phoneticsType" not-null="true" length="6"/>
<property name="phoneticsType" type="java.lang.Integer" column="phoneticsType" not-null="true" length="6"/>
</joined-subclass>
<joined-subclass name="org.thdl.lex.component.Etymology" proxy="org.thdl.lex.component.IEtymology" table="Etymologies">
<meta attribute="generated-class">org.thdl.lex.component.BaseEtymology</meta>
<meta attribute="implements">org.thdl.lex.component.Translatable</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="loanLanguage" type="java.lang.Short" column="loanLanguage" length="6"/>
<property name="etymologyType" type="java.lang.Short" column="etymologyType" not-null="true" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="loanLanguage" type="java.lang.Integer" column="loanLanguage" length="6"/>
<property name="etymologyType" type="java.lang.Integer" column="etymologyType" not-null="true" length="6"/>
<property name="derivation" type="java.lang.String" column="derivation" not-null="true" length="255"/>
<property name="etymologyDescription" type="java.lang.String" column="etymologyDescription" not-null="true" length="65535"/>
<property name="translationOf" type="java.lang.Integer" column="translationOf" length="11"/>
<set name="translations" table="Etymologies" lazy="true" cascade="all" where="translationOf = 1">
<set name="translations" table="Etymologies" lazy="true" where="translationOf IS NOT NULL">
<key column="translationOf"/>
<one-to-many class="org.thdl.lex.component.Etymology"/>
</set>
@ -257,63 +282,86 @@
<joined-subclass name="org.thdl.lex.component.Spelling" proxy="org.thdl.lex.component.ISpelling" table="Spellings">
<meta attribute="generated-class">org.thdl.lex.component.BaseSpelling</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="spelling" type="java.lang.String" column="spelling" not-null="true" length="255"/>
<property name="spellingType" type="java.lang.Short" column="spellingType" not-null="true" length="6"/>
<property name="spellingType" type="java.lang.Integer" column="spellingType" not-null="true" length="6"/>
</joined-subclass>
<joined-subclass name="org.thdl.lex.component.GrammaticalFunction" proxy="org.thdl.lex.component.IFunction" table="GrammaticalFunctions">
<meta attribute="generated-class">org.thdl.lex.component.BaseGrammaticalFunction</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="function" type="java.lang.Short" column="function" not-null="true" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="function" type="java.lang.Integer" column="function" not-null="true" length="6"/>
</joined-subclass>
<joined-subclass name="org.thdl.lex.component.EncyclopediaArticle" proxy="org.thdl.lex.component.IEncyclopediaArticle" table="EncyclopediaArticles">
<meta attribute="generated-class">org.thdl.lex.component.BaseEncyclopediaArticle</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="article" type="java.lang.String" column="article" not-null="true" length="65535"/>
<property name="articleTitle" type="java.lang.String" column="articleTitle" not-null="true" length="65535"/>
</joined-subclass>
<joined-subclass name="org.thdl.lex.component.Gloss" proxy="org.thdl.lex.component.IGloss" table="Glosses">
<meta attribute="generated-class">org.thdl.lex.component.BaseGloss</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="gloss" type="java.lang.String" column="gloss" length="65535"/>
<property name="translation" type="java.lang.String" column="translation" length="65535"/>
</joined-subclass>
<joined-subclass name="org.thdl.lex.component.Keyword" proxy="org.thdl.lex.component.IKeyword" table="Keywords">
<meta attribute="generated-class">org.thdl.lex.component.BaseKeyword</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="keyword" type="java.lang.String" column="keyword" length="65535"/>
</joined-subclass>
<joined-subclass name="org.thdl.lex.component.ModelSentence" proxy="org.thdl.lex.component.IModelSentence" table="ModelSentences">
<meta attribute="generated-class">org.thdl.lex.component.BaseModelSentence</meta>
<meta attribute="implements">org.thdl.lex.component.Translatable</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="subdefinitionId" type="java.lang.Integer" column="subdefinitionId" not-null="true" length="11"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="modelSentence" type="java.lang.String" column="modelSentence" length="65535"/>
<property name="translationOf" type="java.lang.Integer" column="translationOf" length="11"/>
<set name="translations" table="ModelSentences" lazy="true" cascade="all" where="translationOf = 1">
<set name="translations" table="ModelSentences" lazy="true" where="translationOf IS NOT NULL">
<key column="translationOf"/>
<one-to-many class="org.thdl.lex.component.ModelSentence"/>
</set>
@ -321,36 +369,48 @@
<joined-subclass name="org.thdl.lex.component.TranslationEquivalent" proxy="org.thdl.lex.component.ITranslationEquivalent" table="TranslationEquivalents">
<meta attribute="generated-class">org.thdl.lex.component.BaseTranslationEquivalent</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="translationEquivalent" type="java.lang.String" column="translationEquivalent" length="65535"/>
</joined-subclass>
<joined-subclass name="org.thdl.lex.component.RelatedTerm" proxy="org.thdl.lex.component.IRelatedTerm" table="RelatedTerms">
<meta attribute="generated-class">org.thdl.lex.component.BaseRelatedTerm</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="relatedTerm" type="java.lang.String" column="relatedTerm" length="65535"/>
<property name="relatedTermType" type="java.lang.Short" column="relatedTermType" not-null="true" length="6"/>
<property name="relatedTermType" type="java.lang.Integer" column="relatedTermType" not-null="true" length="6"/>
</joined-subclass>
<joined-subclass name="org.thdl.lex.component.Passage" proxy="org.thdl.lex.component.IPassage" table="LiteraryQuotations">
<meta attribute="generated-class">org.thdl.lex.component.BasePassage</meta>
<meta attribute="implements">org.thdl.lex.component.Translatable</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="literarySource" type="java.lang.String" column="literarySource" length="65535"/>
<property name="spelling" type="java.lang.String" column="spelling" length="65535"/>
<property name="pagination" type="java.lang.String" column="pagination" length="65535"/>
<property name="passage" type="java.lang.String" column="passage" length="65535"/>
<property name="translationOf" type="java.lang.Integer" column="translationOf" length="11"/>
<set name="translations" table="LiteraryQuotations" lazy="true" cascade="all" where="translationOf = 1">
<set name="translations" table="LiteraryQuotations" lazy="true" where="translationOf IS NOT NULL">
<key column="translationOf"/>
<one-to-many class="org.thdl.lex.component.Passage"/>
</set>
@ -358,20 +418,28 @@
<joined-subclass name="org.thdl.lex.component.SpeechRegister" proxy="org.thdl.lex.component.IRegister" table="SpeechRegisters">
<meta attribute="generated-class">org.thdl.lex.component.BaseSpeechRegister</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="register" type="java.lang.Short" column="register" not-null="true" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="register" type="java.lang.Integer" column="register" not-null="true" length="6"/>
</joined-subclass>
<joined-subclass name="org.thdl.lex.component.TransitionalData" proxy="org.thdl.lex.component.ITransitionalData" table="TransitionalData">
<meta attribute="generated-class">org.thdl.lex.component.BaseTransitionalData</meta>
<key column="metaId"/>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11"/>
<key column="metaId">
<!--<meta attribute="gen-property">false</meta>-->
</key>
<property name="parentId" type="java.lang.Integer" column="parentId" length="11">
<!--<meta attribute="gen-property">false</meta>-->
</property>
<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
<property name="precedence" type="java.lang.Short" column="precedence" length="6"/>
<property name="transitionalDataLabel" type="java.lang.Short" column="transitionalDataLabel" length="6"/>
<property name="precedence" type="java.lang.Integer" column="precedence" length="6"/>
<property name="transitionalDataLabel" type="java.lang.Integer" column="transitionalDataLabel" length="6"/>
<property name="forPublicConsumption" type="java.lang.String" column="forPublicConsumption" not-null="true" length="5"/>
<property name="transitionalDataText" type="java.lang.String" column="transitionalDataText" length="65535"/>
</joined-subclass>

47
src/java/org/thdl/lex/component/LexComponent.java
View file

@ -15,6 +15,8 @@ import org.apache.commons.beanutils.BeanUtils;
public abstract class LexComponent extends BaseLexComponent implements Serializable
{
private Meta meta;
private Integer metaId;
private Integer parentId;
/*
@ -50,12 +52,38 @@ public abstract class LexComponent extends BaseLexComponent implements Serializa
}
/**
* Sets the metaId attribute of the LexComponent object
*
* @param metaId The new metaId value
*/
public void setMetaId( Integer metaId )
{
if ( metaId.intValue() == 0 )
{
this.metaId = null;
}
this.metaId = metaId;
}
/**
* Gets the metaId attribute of the LexComponent object
*
* @return The metaId value
*/
public Integer getMetaId()
{
return metaId;
}
/**
* Gets the precedence attribute of the LexComponent object
*
* @return The precedence value
*/
public abstract java.lang.Short getPrecedence();
public abstract java.lang.Integer getPrecedence();
/**
@ -63,7 +91,7 @@ public abstract class LexComponent extends BaseLexComponent implements Serializa
*
* @param precedence The new precedence value
*/
public abstract void setPrecedence( java.lang.Short precedence );
public abstract void setPrecedence( java.lang.Integer precedence );
/**
@ -79,7 +107,14 @@ public abstract class LexComponent extends BaseLexComponent implements Serializa
*
* @param parentId The new parentId value
*/
public abstract void setParentId( java.lang.Integer parentId );
public void setParentId( java.lang.Integer parentId )
{
if ( parentId.intValue() == 0 )
{
this.parentId = null;
}
this.parentId = parentId;
}
/**
@ -95,7 +130,10 @@ public abstract class LexComponent extends BaseLexComponent implements Serializa
*
* @return The parentId value
*/
public abstract java.lang.Integer getParentId();
public java.lang.Integer getParentId()
{
return this.parentId;
}
/**
@ -188,6 +226,7 @@ public abstract class LexComponent extends BaseLexComponent implements Serializa
public LexComponent()
{
super();
setDeleted( Boolean.FALSE );
}
}

21
src/java/org/thdl/lex/component/Meta.java
View file

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.thdl.lex.*;
/**
@ -55,5 +56,25 @@ public class Meta extends BaseMeta implements Serializable
*/
public Meta() { }
/**
*Constructor for the Meta object
*
* @param user Description of the Parameter
* @param preferences Description of the Parameter
*/
public Meta( LexUser user, Preferences preferences )
{
setCreatedBy( user.getId() );
setModifiedBy( user.getId() );
setCreatedByProjSub( preferences.getProjectSubject() );
setModifiedByProjSub( preferences.getProjectSubject() );
setSource( preferences.getSource() );//default source is Self from Lex.Sources
setLanguage( preferences.getLanguage() );
setScript( preferences.getScript() );
setDialect( preferences.getDialect() );
setNote( preferences.getNote() );
}
}

108
src/java/org/thdl/lex/component/Subdefinition.java
View file

@ -1,8 +1,9 @@
package org.thdl.lex.component;
import java.io.Serializable;
import java.util.HashMap;
import org.thdl.lex.LexConstants;
import java.util.*;
import org.thdl.lex.*;
/**
@ -42,6 +43,109 @@ public class Subdefinition extends BaseSubdefinition implements Serializable, Tr
}
/**
* Description of the Method
*
* @param parentPk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findParent( Integer parentPk ) throws LexComponentException
{
LexLogger.debug( "Finding Parent..." );
ILexComponent parent = null;
if ( parentPk.equals( this.getMetaId() ) )
{
parent = this;
}
else
{
parent = findChild( parentPk );
}
return parent;
}
/**
* Description of the Method
*
* @param component Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public List findSiblings( ILexComponent component ) throws LexComponentException
{
List list = null;
if ( null == component.getParent() )
{
component.setParent( findParent( component.getParentId() ) );
}
LexComponentNode node = (LexComponentNode) component.getParent();
list = (List) node.getChildMap().get( component.getLabel() );
return list;
}
/**
* Gets the persistentChild attribute of the Term object
*
* @param child Description of the Parameter
* @return The persistentChild value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( ILexComponent child ) throws LexComponentException
{
List list = findSiblings( child );
child = findChild( list, child.getMetaId() );
return child;
}
/**
* Description of the Method
*
* @param pk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( Integer pk ) throws LexComponentException
{
ILexComponent child = null;
Iterator childMapValues = getChildMap().values().iterator();
while ( childMapValues.hasNext() && null == child )
{
List list = (List) childMapValues.next();
child = findChild( list, pk );
}
return child;
}
/**
* Description of the Method
*
* @param list Description of the Parameter
* @param pk Description of the Parameter
* @return Description of the Return Value
*/
public ILexComponent findChild( List list, Integer pk )
{
ILexComponent child = null;
for ( Iterator it = list.iterator(); it.hasNext(); )
{
ILexComponent lc = (LexComponent) it.next();
if ( lc.getMetaId().equals( pk ) )
{
child = lc;
break;
}
}
return child;
}
/**
* Description of the Method
*/

130
src/java/org/thdl/lex/component/Term.java
View file

@ -2,8 +2,7 @@ package org.thdl.lex.component;
import java.io.Serializable;
import java.util.*;
import org.thdl.lex.LexConstants;
import org.thdl.lex.LexLogger;
import org.thdl.lex.*;
/**
@ -97,17 +96,52 @@ public class Term extends BaseTerm implements Serializable, LexComponentNode
public List findSiblings( ILexComponent component ) throws LexComponentException
{
List list = null;
if ( null != component.getParent() )
if ( null == component.getParent() )
{
component.setParent( findParent( component.getParentId() ) );
}
LexComponentNode node = (LexComponentNode) component.getParent();
list = (List) node.getChildMap().get( component.getLabel() );
LexLogger.debug( "List derived from " + node + ": " + list );
if ( null == list )
{
LexLogger.debug( "findSiblings returned a null list" );
LexLogger.debugComponent( component );
/*
Iterator it = getDefinitions().iterator();
while ( it.hasNext() )
{
IDefinition def = (IDefinition) it.next();
list = def.findSiblings( component );
}
*/
}
return list;
}
/**
* Description of the Method
*
* @param parentPk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findParent( Integer parentPk ) throws LexComponentException
{
LexLogger.debug( "Finding Parent..." );
ILexComponent parent = null;
if ( parentPk.equals( this.getMetaId() ) )
{
parent = this;
}
else
{
throw new LexComponentException( "Failed to locate a set of siblings in the Term object graph for: " + component );
parent = findChild( parentPk );
}
return list;
return parent;
}
@ -120,17 +154,61 @@ public class Term extends BaseTerm implements Serializable, LexComponentNode
*/
public ILexComponent findChild( ILexComponent child ) throws LexComponentException
{
ILexComponent persistentChild = null;
List list = findSiblings( child );
child = findChild( list, child.getMetaId() );
return child;
}
/**
* Description of the Method
*
* @param pk Description of the Parameter
* @return Description of the Return Value
* @exception LexComponentException Description of the Exception
*/
public ILexComponent findChild( Integer pk ) throws LexComponentException
{
ILexComponent child = null;
Iterator childMapValues = getChildMap().values().iterator();
while ( childMapValues.hasNext() && null == child )
{
List list = (List) childMapValues.next();
child = findChild( list, pk );
}
Iterator definitions = getDefinitions().iterator();
while ( definitions.hasNext() && null == child )
{
IDefinition def = (IDefinition) definitions.next();
child = def.findChild( pk );
}
return child;
}
/**
* Description of the Method
*
* @param list Description of the Parameter
* @param pk Description of the Parameter
* @return Description of the Return Value
*/
public ILexComponent findChild( List list, Integer pk )
{
ILexComponent child = null;
for ( Iterator it = list.iterator(); it.hasNext(); )
{
ILexComponent lc = (ILexComponent) it.next();
if ( lc.getMetaId().equals( child.getMetaId() ) )
ILexComponent lc = (LexComponent) it.next();
if ( lc.getMetaId().equals( pk ) )
{
persistentChild = lc;
child = lc;
break;
}
}
return persistentChild;
return child;
}
@ -147,38 +225,6 @@ public class Term extends BaseTerm implements Serializable, LexComponentNode
}
/**
* The main program for the Term class
*
* @param args The command line arguments
*/
public static void main( String[] args )
{
String[] labels = new String[16];
labels[0] = new Etymology().getLabel();
labels[1] = new GrammaticalFunction().getLabel();
labels[2] = new Pronunciation().getLabel();
labels[3] = new Definition().getLabel();
labels[4] = new EncyclopediaArticle().getLabel();
labels[5] = new Spelling().getLabel();
labels[6] = new AnalyticalNote().getLabel();
labels[7] = new TransitionalData().getLabel();
labels[8] = new Subdefinition().getLabel();
labels[9] = new Gloss().getLabel();
labels[10] = new Keyword().getLabel();
labels[11] = new ModelSentence().getLabel();
labels[12] = new Passage().getLabel();
labels[13] = new SpeechRegister().getLabel();
labels[14] = new RelatedTerm().getLabel();
labels[15] = new TranslationEquivalent().getLabel();
for ( int i = 0; i < labels.length; i++ )
{
System.out.println( labels[i] );
}
}
/**
* Description of the Method
*/

1
src/jsp/jsp/.cvsignore Normal file
View file

@ -0,0 +1 @@
old

7
src/jsp/jsp/analyticalNoteForm.jsf
View file

@ -5,35 +5,30 @@
<c:choose>
<c:when test="${ ! empty param.formMode && param.formMode == 'insert'}">
<c:set var="updateMode" value="${ false }" />
<c:set var="newCmd" value="insert" />
<c:set var="newCmd" value="addAnnotation" />
<c:set var="analyticalNote" value="" />
<c:set var="parentMeta" value="${ component.parentMeta }" />
<c:set var="metaId" value="" />
</c:when>
<c:when test="${ ! empty param.formMode && param.formMode == 'update'}">
<c:set var="updateMode" value="${ true }" />
<c:set var="newCmd" value="update" />
<c:set var="analyticalNote" value="${ component.analyticalNote }" />
<c:set var="parentMeta" value="${ component.parentMeta }" />
<c:set var="metaId" value="${ component.metaId }" />
</c:when>
<c:otherwise>
<c:set var="updateMode" value="${ false }" />
<c:set var="newCmd" value="" />
<c:set var="analyticalNote" value="ERROR" />
<c:set var="parentMeta" value="ERROR" />
</c:otherwise>
</c:choose>
<form id="newCompForm" action="/lex/action" method="post">
<p>
<input type="hidden" name="comp" value="analyticalNote" />
<c:out value=' <input type="hidden" name="parentMeta" value="${ parentMeta }" /> ' escapeXml="false" />
<c:if test="${ updateMode }">
<c:out value=' <input type="hidden" name="metaId" value="${metaId}" /> ' escapeXml="false" />
</c:if>
<c:out value=' <input type="hidden" name="cmd" value="${newCmd}" /> ' escapeXml='false' />
<c:out value=' <input type="hidden" name="parentId" value="${ param.parentId }" /> ' escapeXml='false' />
Analysis: <br />
<textarea name="analyticalNote" rows="8" cols="90"><c:out value='${ analyticalNote }' /></textarea>

12
src/jsp/jsp/definitionForm.jsf
View file

@ -7,24 +7,21 @@
<c:set var="updateMode" value="${ false }" />
<c:set var="newCmd" value="insert" />
<c:set var="definition" value="" />
<c:set var="precedence" value="1" />
<c:set var="metaId" value="" />
<c:set var="note" value="" />
</c:when>
<c:when test="${ ! empty param.formMode && param.formMode == 'update'}">
<c:set var="updateMode" value="${ true }" />
<c:set var="newCmd" value="update" />
<c:set var="definition" value="${ component.definition }" />
<c:set var="metaId" value="${ component.metaId }" />
<c:set var="precedence" value="${ component.precedence }" />
<c:set var="note" value="${ component.note }" />
</c:when>
<c:otherwise>
<c:set var="updateMode" value="${ false }" />
<c:set var="newCmd" value="" />
<c:set var="definition" value="ERROR" />
<c:set var="precedence" value="ERROR" />
<c:set var="note" value="ERROR" />
</c:otherwise>
</c:choose>
<c:set var="translateMode" value="${ false }" />
@ -45,7 +42,6 @@
<c:out value='<input type="hidden" name="metaId" value="${metaId}" />' escapeXml="false" />
</c:if>
<c:out value='<input type="hidden" name="cmd" value="${newCmd}" />' escapeXml='false' />
<c:out value='<input type="hidden" name="parentId" value="${ param.parentId }" />' escapeXml='false' />
<c:out value="${ originalDefinition }" escapeXml='false' />
@ -54,8 +50,6 @@ Definition: <br />
<textarea name="definition" rows="8" cols="90"><c:if test="${ param.cmd != 'getTranslationForm'}"><c:out value='${ definition }' escapeXml='false' /></c:if></textarea>
<br />
Precedence: <c:out value='<input type="text" value="${ precedence }" name="precedence" size="3"/>' escapeXml='false' /> <br />
<jsp:include page="metaForm.jsf" />
<input type="submit" value="Submit Definition" />

52
src/jsp/jsp/displayDefinition.jsf Normal file
View file

@ -0,0 +1,52 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--DEFINITION LOOP-->
<p class="data">
<c:out value='<a name="${ definition.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=definition&amp;metaId=${ definition.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=definition&amp;metaId=${ definition.metaId }" label="Edit this Definition"><img alt="Edit this Definition" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=definition&amp;parentId=${definition.parentId}&amp;translationOf=${definition.metaId}" label="Translate this Definition"><img alt="Translate this Definition" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=subdefinition&amp;parentId=${definition.metaId}" label="Add a Subdefinition"><img alt="Add a Subdefinition" src="/lex/images/subdef.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Definition ${definition.precedence}:</span>-->
<c:out value="${ definition.definition }" escapeXml="false" />
<br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${definition}" />
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.helper.showTranslations }">
<c:forEach var="translation" items="${ definition.translations }" >
<c:set var='href' value='#'/>
<c:if test="${ editMode }">
<c:set var='href' value='/lex/action?cmd=getUpdateForm&amp;comp=definition&amp;metaId=${ translation.metaId }' />
</c:if>
<c:out value='<a class="meta" href="${href} ">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" />
<span class="translation">
<!--<span class="label">Definition ${translation.precedence}:</span>-->
<c:out value="${ translation.definition }" escapeXml="false" /> <br />
</span></a>
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
</c:forEach>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

35
src/jsp/jsp/displayEncyclopediaArticle.jsf Normal file
View file

@ -0,0 +1,35 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--ENCYCLOPEDIA ARTICLES-->
<c:forEach var="encyclopediaArticle" items="${ query.entry.encyclopediaArticles }">
<p class="data">
<c:out value='<a name="${ encyclopediaArticle.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=encyclopediaArticle&amp;metaId=${ encyclopediaArticle.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=encyclopediaArticle&amp;metaId=${ encyclopediaArticle.metaId }" label="Edit this encyclopediaArticle"><img alt="Edit this encyclopediaArticle" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Encyclopedia Article:</span>-->
<c:out value="${ encyclopediaArticle.articleTitle }" escapeXml="false"/> <br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${encyclopediaArticle}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach><!--END ENCYCLOPEDIA ARTICLES-->

110
src/jsp/jsp/displayEntry.jsp
View file

@ -1,54 +1,103 @@
<%-- <%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" %>--%>
<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<jsp:include page="header.jsf" flush="false" />
<!--displayEntry.jsp-->
<c:set var="editMode" value="${ false }" />
<c:if test="${ ! sessionScope.user.guest }">
<c:set var="editMode" value="${ true }" />
<c:set var="editMode" value="${ false }" scope="request" />
<c:if test="${ ! sessionScope.user.guest && sessionScope.helper.showEditOptions }">
<c:set var="editMode" value="${ true }" scope="request"/>
</c:if>
<div id="label"><p>Search Results Page</p></div><!--END label-->
<div id="message">
<p>
<c:choose>
<c:when test="${ ! empty message }">
<c:out value="${ message }"/>. <br/>
</c:when>
<c:when test="${ empty message }">
<%-- <c:out value="Search returned zero results"/> --%>
</c:when>
</c:choose>
</p>
</div><!--END message-->
<c:set var="showNotes" value="${ false }" scope="request" />
<c:if test="${ sessionScope.helper.showNotes }">
<c:set var="showNotes" value="${ true }" scope="request"/>
</c:if>
<div id="columnSingle">
<c:if test="${ ! empty query.results }">
<div id="menu">
<form method="get" action="/lex/action">
<p>
Search Results: <br />
<input type="hidden" name="cmd" value="" />
<input type="hidden" name="comp" value="term" />
<c:set var="multiple" value="multiple='multiple'" />
<c:set var="showMeta" value="${ false }" scope="request" />
<c:if test="${ sessionScope.helper.showMeta }">
<c:set var="showMeta" value="${ true }" scope="request"/>
</c:if>
<c:set var="showTranslations" value="${ false }" scope="request" />
<c:if test="${ sessionScope.helper.showTranslations }">
<c:set var="showTranslations" value="${ true }" scope="request"/>
</c:if>
<div id="columnLeft">
<div id="results" class="highlightBox">
<h2> Search Results </h2>
<ol>
<c:forEach var="resultsMapItem" items="${query.results}">
<c:set var="cls" value="" />
<c:if test="${ resultsMapItem.key == query.entry.metaId }">
<c:set var="cls" value="class='selected'" />
</c:if>
<li>
<c:out value='<a ${cls} href="/lex/action?cmd=displayFull&comp=term&metaId=${resultsMapItem.key}">${ resultsMapItem.value}</a>' escapeXml='false' /><br />
</li>
</c:forEach>
</ol>
</div><!--END MENU-->
<div id="toc" class="highlightBox">
<jsp:include page="displayTreeToc.jsf"/>
</div><!--END TOC-->
Query took: <c:out value="${ session.query.duration }"/> seconds.
</div><!--END COLUMN LEFT-->
<div id="columnMain">
<p id="navLinks"><jsp:include page="navLinks.jsf" /></p>
<p id="message">
<c:choose>
<c:when test="${ ! empty message }">
<c:out value="${ message }"/>. <br/>
</c:when>
<c:when test="${ empty message }">
</c:when>
</c:choose>
</p>
<form action="/lex/action">
<p id="helper">
<span class="label">Display</span>:
<c:set var="ckd" value=""/>
<c:if test="${ sessionScope.helper.showMeta }">
<c:set var="ckd" value='checked="checked"'/>
</c:if>
<c:out value='<input name="showMeta" type="checkbox" value="true" ${ckd}/>' escapeXml='false'/>
credits |
<c:set var="ckd" value=""/>
<c:if test="${ sessionScope.helper.showNotes }">
<c:set var="ckd" value='checked="checked"'/>
</c:if>
<c:out value='<input name="showNotes" type="checkbox" value="true" ${ckd}/>' escapeXml='false'/>
analysis |
<c:set var="ckd" value=""/>
<c:if test="${ sessionScope.helper.showTranslations }">
<c:set var="ckd" value='checked="checked"'/>
</c:if>
<c:out value='<input name="showTranslations" type="checkbox" value="true" ${ckd}/>' escapeXml='false'/>
translations
<c:set var="ckd" value=""/>
<c:if test="${ sessionScope.helper.showEditOptions }">
<c:set var="ckd" value='checked="checked"'/>
</c:if>
<c:out value='<input name="showEditOptions" type="checkbox" value="true" ${ckd}/>' escapeXml='false'/>
edit options
<input type="hidden" name="cmd" value="displayFull"/>
<input type="submit" value="Redisplay"/>
</p>
</form>
</div><!--END MENU-->
</c:if>
<div id="entry">
<c:choose>
<c:when test="${ param.comp == 'encyclopediaArticle' && param.cmd == 'display' }">
<jsp:include page="encyclopedia.jsf" flush="false"/>
@ -57,7 +106,8 @@
<jsp:include page="displayTree.jsf" flush="false"/>
</c:otherwise>
</c:choose>
</div><!--END columnSingle-->
</div><!--END ENTRY-->
</div><!--END columnMain-->
<jsp:include page="footer.jsf" flush="false" />

65
src/jsp/jsp/displayEtymology.jsf Normal file
View file

@ -0,0 +1,65 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--ETYMOLOGY-->
<c:forEach var="etymology" items="${ query.entry.etymologies }">
<p class="data">
<c:out value='<a name="${ etymology.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=etymology&amp;metaId=${etymology.metaId}" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=etymology&amp;metaId=${ etymology.metaId }&amp;parentId=${etymology.parentId}" label="Edit this Etymology"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=etymology&amp;parentId=${etymology.parentId}&amp;translationOf=${etymology.metaId}" label="Translate this Etymology"><img alt="Translate this Etymology" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Etymology:</span>-->
<c:out value="${ etymology.etymologyDescription }" escapeXml="false" /> <br />
<!--<span class="label">Etymology Type:</span>-->
<c:out value="${ applicationScope.flatData.etymologyTypes[ etymology.etymologyType ] }" escapeXml="false" /> <br />
<!--<span class="label">Loan Language:</span>-->
<c:out value="${ applicationScope.flatData.languages[ etymology.loanLanguage ] }" escapeXml="false" /> <br />
<!--<span class="label">Derivation:</span>-->
<c:out value="${ etymology.derivation }" escapeXml="false" /> <br />
</span>
</a>
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${etymology}" />
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.helper.showTranslations }">
<c:forEach var="translation" items="${ etymology.translations }" >
<c:set var='href' value='#'/>
<c:if test="${ editMode }">
<c:set var='href' value='/lex/action?cmd=getUpdateForm&amp;comp=etymology&amp;metaId=${ translation.metaId }' />
</c:if>
<c:out value='<a class="meta" href="${href} ">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" />
<span class="translation">
<!--<span class="label">Etymology:</span>-->
<c:out value="${ translation.etymologyDescription }" escapeXml="false" /> <br />
<!--<span class="label">Etymology Type:</span>-->
<c:out value="${ applicationScope.flatData.etymologyTypes[ translation.etymologyType ] }" escapeXml="false" /> <br />
<!--<span class="label">Loan Language:</span>-->
<c:out value="${ applicationScope.flatData.languages[ translation.loanLanguage ] }" escapeXml="false" /> <br />
<!--<span class="label">Derivation:</span>-->
<c:out value="${ translation.derivation }" escapeXml="false" /> <br />
<!--metadata-->
</span></a>
<c:set target="${ sessionScope.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
</c:forEach>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach>
<!--END ETYMOLOGY-->

6
src/jsp/jsp/displayForm.jsp
View file

@ -26,19 +26,19 @@ Back to:
<c:if test="${ param.cmd != 'getInsertForm'
&& param.cmd != 'getUpdateForm'
&& param.cmd != 'getTranslationForm'
&& param.cmd != 'annotate'}">
&& param.cmd != 'getAnnotationForm'}">
<c:set var="editMode" value="${ true }" />
</c:if>
<c:if test="${ displayMode == 'addEditForm' }">
<c:set var="updateForm" value="${ true }" />
</c:if>
<c:if test="${ displayMode == 'addNewComponent' && param.cmd != 'annotate' }">
<c:if test="${ displayMode == 'addNewComponent' && param.cmd != 'getAnnotationForm' }">
<c:set var="newForm" value="${ true }" />
</c:if>
<c:choose>
<c:when test="${ param.cmd == 'annotate' }">
<c:when test="${ param.cmd == 'getAnnotationForm' }">
<jsp:include page="analyticalNoteForm.jsf" />
</c:when>

32
src/jsp/jsp/displayFunction.jsf Normal file
View file

@ -0,0 +1,32 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--FUNCTIONS-->
<c:forEach var="function" items="${ query.entry.functions }">
<p class="data">
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=grammaticalFunction&amp;metaId=${ function.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=grammaticalFunction&amp;metaId=${ function.metaId }" label="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<c:out value='<a name="${ function.label }" ></a>' escapeXml="false" />
<!--<span class="label">Grammatical Function:</span>-->
<c:out value="${ applicationScope.flatData.functionsGeneral[function.function] }" escapeXml="false" /> <br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${function}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach><!--END FUNCTIONS-->

31
src/jsp/jsp/displayKeyword.jsf Normal file
View file

@ -0,0 +1,31 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<p class="data">
<c:out value='<a name="${ keyword.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=keyword&amp;metaId=${ keyword.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=keyword&amp;metaId=${ keyword.metaId }" label="Edit this keyword"><img alt="Edit this keyword" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Keyword:</span>-->
<c:out value="${ keyword.keyword }" escapeXml="false" />
<br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${keyword}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

20
src/jsp/jsp/displayMeta.jsf
View file

@ -1,9 +1,22 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<c:set var="isNote" value='${ sessionScope.helper.component.label == "analyticalNote" }'/>
<c:set var="isTranslation" value='${ sessionScope.helper.componentIsTranslation }'/>
<c:set var="component" value='${ sessionScope.helper.component }'/>
<c:if test='${ sessionScope.helper.showMeta }'>
<c:if test='${ !( isNote || isTranslation ) }'>
<a class="meta" href="#"><img src="/lex/images/meta.gif" alt=" view metadata" />
</c:if>
<span class="metadata">
<c:if test="${ sessionScope.user.developer }">
<span class="label"> Id: </span><c:out value="${ component.metaId }" />
<br />
</c:if>
<span class="label">Created by </span><c:out value="${ applicationScope.flatData.users[ component.meta.createdBy ] }" escapeXml="false"/>
<c:if test="${ ! sessionScope.user.guest }">
<span class="label">on </span><c:out value="${ component.meta.createdOn }" default="unknown" escapeXml="false"/>
@ -34,3 +47,10 @@ No
<span class="label">Note: </span><c:out value="${ component.meta.note }" default="unknown" escapeXml="false"/> <br />
</c:if>
</span>
<c:if test='${ !( isNote || isTranslation ) }'>
</a>
</c:if>
</c:if>

50
src/jsp/jsp/displayModelSentence.jsf Normal file
View file

@ -0,0 +1,50 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<p class="data">
<c:out value='<a name="${ modelSentence.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=modelSentence&amp;metaId=${ modelSentence.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=modelSentence&amp;metaId=${ modelSentence.metaId }" label="Edit this modelSentence"><img alt="Edit this modelSentence" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=modelSentence&amp;parentId=${modelSentence.parentId}&amp;translationOf=${modelSentence.metaId}" label="Translate this modelSentence"><img alt="Translate this modelSentence" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Model Sentence:</span>-->
<c:out value="${ modelSentence.modelSentence }" escapeXml="false" />
<br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${modelSentence}" />
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.helper.showTranslations }">
<c:forEach var="translation" items="${ modelSentence.translations }" >
<c:set var='href' value='#'/>
<c:if test="${ editMode }">
<c:set var='href' value='/lex/action?cmd=getUpdateForm&amp;comp=modelSentence&amp;metaId=${ translation.metaId }' />
</c:if>
<c:out value='<a class="meta" href="${href} ">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" />
<span class="translation">
<!--<span class="label">Model Sentence:</span>-->
<c:out value="${ translation.modelSentence }" escapeXml="false" /> <br />
</span> </a>
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
</c:forEach>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

22
src/jsp/jsp/displayNotes.jsf Normal file
View file

@ -0,0 +1,22 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayNotes.jsf-->
<c:if test="${ sessionScope.helper.showNotes }">
<c:forEach var="note" items="${ sessionScope.helper.component.analyticalNotes }">
<a class="meta" href="#"><img src="/lex/images/note.gif" alt="analysis" />
<span class="analysis">
<c:out value="${ note.analyticalNote }" escapeXml="false" /><br />
<!--metadata-->
<c:set var="parent" value="${ sessionScope.helper.component }" />
<c:set target="${ sessionScope.helper }" property="component" value="${ note }" />
<jsp:include page="displayMeta.jsf" />
<c:set target="${ sessionScope.helper }" property="component" value="${ parent }" />
</span>
</a>
</c:forEach>
</c:if>

61
src/jsp/jsp/displayPassage.jsf Normal file
View file

@ -0,0 +1,61 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<p class="data">
<c:out value='<a name="${ passage.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=passage&amp;metaId=${ passage.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=passage&amp;metaId=${ passage.metaId }" label="Edit this passage"><img alt="Edit this passage" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=passage&amp;parentId=${passage.parentId}&amp;translationOf=${passage.metaId}" label="Translate this passage"><img alt="Translate this passage" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Literary Source:</span>-->
<c:out value="${ passage.literarySource }" escapeXml="false" /> <br />
<!--<span class="label">Spelling:</span>-->
<c:out value="${ passage.spelling }" escapeXml="false" /> <br />
<!--<span class="label">Pagination:</span> -->
<c:out value="${ passage.pagination }" escapeXml="false" /> <br />
<!--<span class="label">Passage:</span>-->
<c:out value="${ passage.passage }" escapeXml="false" /> <br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${passage}" />
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.helper.showTranslations }">
<c:forEach var="translation" items="${ passage.translations }" >
<c:set var='href' value='#'/>
<c:if test="${ editMode }">
<c:set var='href' value='/lex/action?cmd=getUpdateForm&amp;comp=passage&amp;metaId=${ translation.metaId }' />
</c:if>
<c:out value='<a class="meta" href="${href} ">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" />
<span class="translation">
<!--<span class="label">Literary Source:</span>-->
<c:out value="${ translation.literarySource }" escapeXml="false" /> <br />
<!--<span class="label">Spelling:</span>-->
<c:out value="${ translation.spelling }" escapeXml="false" /> <br />
<!--<span class="label">Pagination:</span>-->
<c:out value="${ translation.pagination }" escapeXml="false" /> <br />
<!--<span class="label">Passage:</span>-->
<c:out value="${ translation.passage }" escapeXml="false" /> <br />
</span></a>
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
</c:forEach>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

33
src/jsp/jsp/displayPronunciation.jsf Normal file
View file

@ -0,0 +1,33 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--PRONUNCIATION-->
<c:forEach var="pronunciation" items="${ query.entry.pronunciations }">
<p class="data">
<c:out value='<a name="${ pronunciation.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=pronunciation&amp;metaId=${ pronunciation.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=pronunciation&amp;metaId=${ pronunciation.metaId }" label="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Phonetic Rendering:</span>-->
<c:out value="${ pronunciation.phonetics }" escapeXml="false"/> <br />
<!--<span class="label">Type of Phonetics:</span> -->
<c:out value="${ applicationScope.flatData.phoneticsTypes[ pronunciation.phoneticsType ] }" escapeXml="false"/> <br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${pronunciation}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach><!--END PRONUNCIATION-->

31
src/jsp/jsp/displayRegister.jsf Normal file
View file

@ -0,0 +1,31 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<p class="data">
<c:out value='<a name="${ register.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=speechRegister&amp;metaId=${ register.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=speechRegister&amp;metaId=${ register.metaId }" label="Edit this speechRegister"><img alt="Edit this speechRegister" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Speech Register:</span>-->
<c:out value="${ applicationScope.flatData.registers[register.register] }" escapeXml="false" />
<br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${register}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

33
src/jsp/jsp/displayRelatedTerm.jsf Normal file
View file

@ -0,0 +1,33 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<p class="data">
<c:out value='<a name="${ relatedTerm.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=relatedTerm&amp;metaId=${ relatedTerm.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=relatedTerm&amp;metaId=${ relatedTerm.metaId }" label="Edit this relatedTerm"><img alt="Edit this relatedTerm" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Related Term:</span>-->
<c:out value="${ relatedTerm.relatedTerm }" escapeXml="false" /> <br />
<!--<span class="label">Related Term Type:</span> -->
<c:out value="${ applicationScope.flatData.relatedTermTypes[relatedTerm.relatedTermType] }" escapeXml="false" />
<br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${relatedTerm}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

34
src/jsp/jsp/displaySpelling.jsf Normal file
View file

@ -0,0 +1,34 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--SPELLINGS-->
<c:forEach var="spelling" items="${ query.entry.spellings }">
<p class="data">
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=spelling&amp;metaId=${ spelling.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=spelling&amp;metaId=${ spelling.metaId }" label="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<c:out value='<a name="${ spelling.label }" ></a>' escapeXml="false" />
<!--<span class="label">Spelling:</span> --> <c:out value="${ spelling.spelling }" escapeXml="false" /> <br />
<!--<span class="label">Spelling Type:</span> --> <c:out value="${ applicationScope.flatData.spellingTypes[ spelling.spellingType ] }" escapeXml="false" /> <br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${spelling}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach>
<!--END SPELLINGS-->

58
src/jsp/jsp/displaySubdefinition.jsf Normal file
View file

@ -0,0 +1,58 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--SUBDEFINITION-->
<p class="data">
<c:out value='<a name="${ subdefinition.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=subdefinition&amp;metaId=${ subdefinition.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=subdefinition&amp;metaId=${ subdefinition.metaId }" label="Edit this subdefinition"><img alt="Edit this subdefinition" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=subdefinition&amp;parentId=${subdefinition.parentId}&amp;translationOf=${subdefinition.metaId}" label="Translate this subdefinition"><img alt="Translate this subdefinition" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=keyword&amp;parentId=${subdefinition.metaId}" label="Add a Keyword"><img alt="Add a Keyword" src="/lex/images/key.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=modelSentence&amp;parentId=${subdefinition.metaId}" label="Add a Model Sentence"><img alt="Add a Model Sentence" src="/lex/images/sent.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=translationEquivalent&amp;parentId=${subdefinition.metaId}" label="Add a Translation Equivalent"><img alt="Add a Translation Equivalent" src="/lex/images/trans-eqv.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=relatedTerm&amp;parentId=${subdefinition.metaId}" label="Add a Related Term"><img alt="Add a Related Term" src="/lex/images/rel-term.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=passage&amp;parentId=${subdefinition.metaId}" label="Add a Passage"><img alt="Add a Passage" src="/lex/images/pass.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=speechRegister&amp;parentId=${subdefinition.metaId}" label="Add a Speech Register"><img alt="Add a Speech Register" src="/lex/images/reg.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Subdefinition:</span>-->
<c:out value="${ subdefinition.subdefinition }" escapeXml="false" />
<br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${subdefinition}" />
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.helper.showTranslations }">
<c:forEach var="translation" items="${ subdefinition.translations }">
<c:set var='href' value='#'/>
<c:if test="${ editMode }">
<c:set var='href' value='/lex/action?cmd=getUpdateForm&amp;comp=subdefinition&amp;metaId=${ translation.metaId }' />
</c:if>
<c:out value='<a class="meta" href="${href} ">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" />
<span class="translation">
<!--<span class="label">Subdefinition:</span>-->
<c:out value="${ translation.subdefinition }" escapeXml="false" /> <br />
</span>
</a>
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
</c:forEach>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

36
src/jsp/jsp/displayTerm.jsf Normal file
View file

@ -0,0 +1,36 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTerm.jsf-->
<!--TERM-->
<h1><c:out value="${ query.entry.term }" /></h1>
<p class="data" >
<c:out value='<a name="${ query.entry.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getUpdateTermForm&amp;comp=term&amp;metaId=${ query.entry.metaId }" label="Edit Term"><img alt="Edit Term" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=term&amp;metaId=${query.entry.metaId}" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=pronunciation&amp;parentId=${query.entry.metaId}" label="Add Pronunciation"><img alt="Add Pronunciation" src="/lex/images/pron.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=etymology&amp;parentId=${query.entry.metaId}" label="Add Etymology"><img alt="Add Etymology" src="/lex/images/etym.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=spelling&amp;parentId=${query.entry.metaId}" label="Add Spelling"><img alt="Add Spelling" src="/lex/images/spell.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=grammaticalFunction&amp;parentId=${query.entry.metaId}" label="Add Grammatical Function"><img alt="Add a Grammatical Function" src="/lex/images/gram.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=encyclopediaArticle&amp;parentId=${query.entry.metaId}" label="Add Encyclopedia Article"><img alt="Add Encyclopedia Article" src="/lex/images/ency.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=definition&amp;parentId=${query.entry.metaId}" label="Add Definition"><img alt="Add Definition" src="/lex/images/def.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${ query.entry }" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>
<!--END TERM-->

34
src/jsp/jsp/displayTransitionalData.jsf Normal file
View file

@ -0,0 +1,34 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTransitionalData.jsf-->
<!--TRANSITIONAL DATA-->
<c:forEach var="transitionalData" items="${ query.entry.transitionalData }">
<p class="data">
<c:out value='<a name="${ transitionalData.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=transitionalData&amp;metaId=${ transitionalData.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=transitionalData&amp;metaId=${ transitionalData.metaId }" label="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<span><c:out value="${ applicationScope.flatData.transitionalDataLabels[ transitionalData.transitionalDataLabel ] }" /></span> <c:out value="${ pronunciation.phonetics }" escapeXml="false"/> <br />
<c:out value="${ transitionalData.transitionalDataText }" escapeXml="false"/> <br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${transitionalData}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach>

32
src/jsp/jsp/displayTranslationEquivalent.jsf Normal file
View file

@ -0,0 +1,32 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<p class="data">
<c:out value='<a name="${ translationEquivalent.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=translationEquivalent&amp;metaId=${ translationEquivalent.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=translationEquivalent&amp;metaId=${ translationEquivalent.metaId }" label="Edit this translationEquivalent"><img alt="Edit this translationEquivalent" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<!--<span class="label">Translation Equivalent: </span> -->
<c:out value="${ translationEquivalent.translationEquivalent }" escapeXml="false" />
<br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${translationEquivalent}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

654
src/jsp/jsp/displayTree.jsf
View file

@ -1,642 +1,152 @@
<%-- <jsp:directive.page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false" />
<jsp:directive.taglib prefix="c" uri="http://java.sun.com/jstl/core" /> --%>
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<%-- This whole edit/update/display should be REWRITTEN! --%>
<c:set var="editMode" value="${ false }" />
<c:set var="updateForm" value="${ false }" />
<c:set var="newForm" value="${ false }" />
<!--displayTreeToc.jsf-->
<c:set var="editMode" value="${ false }" />
<c:if test="${ ! sessionScope.user.guest }">
<c:set var="editMode" value="${ true }" />
</c:if>
<c:if test="${ displayMode == 'addEditForm' }">
<c:set var="updateForm" value="${ true }" />
</c:if>
<c:if test="${ displayMode == 'addNewComponent' && param.cmd != 'annotate' }">
<c:set var="newForm" value="${ true }" />
</c:if>
<c:if test="${ param.comp == 'term' && param.cmd == 'getInsertForm' }">
<p><jsp:include page="termForm.jsf" /></p>
</c:if>
<c:if test="${ ! empty query.entry }">
<c:if test="${ editMode }">
<div>
<script type="text/javascript">
function submitForm( cmd, component, metaId, parentId, componentHex, parentHex )
{
document.forms[2].cmd.value = cmd;
document.forms[2].comp.value = component;
document.forms[2].metaId.value = metaId;
document.forms[2].parentId.value = parentId;
//assert( componentHex != null , "no componentHex");
//document.forms[2].componentHex.value = componentHex;
//assert( parentHex != null , "no parentHex") ;
//document.forms[2].parentHex.value = parentHex;
document.forms[2].submit();
}
</script>
<form action="/lex/action" method="get" id="lexActions">
<p>
<input type="hidden" name="cmd" value="" />
<input type="hidden" name="comp" value="" />
<input type="hidden" name="metaId" value="" />
<input type="hidden" name="parentId" value="" />
<%-- <input type="hidden" name="componentHex" value="" />
<input type="hidden" name="parentHex" value="" /> --%>
</p>
</c:if>
<!--TERM-->
<p class="data" >
<c:out value='<a name="${ query.entry.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'getUpdateTermForm', 'term', '${ query.entry.metaId }', '', '${query.entry}', ''" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'annotate', 'term', '${ query.entry.metaId }', '', '${query.entry}', ''" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'pronunciation', '${ query.entry.metaId }', '${query.entry.metaId}' , '' , '${query.entry}' " />
<c:out value='<input value="note" type="image" src="/lex/images/pron.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'etymology', '${ query.entry.metaId }', '${query.entry.metaId}' , '' , '${query.entry}' " />
<c:out value='<input value="note" type="image" src="/lex/images/etym.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'spelling', '${ query.entry.metaId }', '${query.entry.metaId}' , '' , '${query.entry}' " />
<c:out value='<input value="note" type="image" src="/lex/images/spell.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'grammaticalFunction', '${ query.entry.metaId }', '${query.entry.metaId}' , '' , '${query.entry}' " />
<c:out value='<input value="note" type="image" src="/lex/images/gram.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'encyclopediaArticle', '${ query.entry.metaId }', '${query.entry.metaId}' , '' , '${query.entry}' " />
<c:out value='<input value="note" type="image" src="/lex/images/ency.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'definition', '${ query.entry.metaId }', '${query.entry.metaId}' , '' , '${query.entry}' " />
<c:out value='<input value="note" type="image" src="/lex/images/def.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<span class="label" style="font-size: 1.6em">Term: <c:out value="${ query.entry.term }" escapeXml="false"/></span> <br />
<%-- <a class="meta" href=" "><img src="/lex/images/meta.gif" alt="metadata" /><span class="metadata">
<c:set var="component" value="${query.entry}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a> --%>
<c:forEach var="aNote" items="${ query.entry.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
</p>
</c:if>
<!--END TERM-->
<div id="termChildren">
<jsp:include page="displayTerm.jsf" flush="false"/>
<!--TRANSITIONAL DATA-->
<c:set value="${query.entry.transitionalData}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Special Guests</h1>
<c:forEach var="transitionalData" items="${ query.entry.transitionalData }">
<p class="data">
<c:out value='<a name="${ transitionalData.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'transitionalData', '${ transitionalData.metaId }', '${ query.entry.metaId }', '${ transitionalData }' , '${ query.entry }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'transitionalData', '${ transitionalData.metaId }', '${ query.entry.metaId }', '${ transitionalData }' , '${ query.entry }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
<jsp:include page="displayTransitionalData.jsf" flush="false"/>
</c:forEach>
</c:if>
<span class="label"><c:out value="${ applicationScope.flatData.transitionalDataLabels[ transitionalData.transitionalDataLabel ] }" /></span> <c:out value="${ pronunciation.phonetics }" escapeXml="false"/> <br />
<c:out value="${ transitionalData.transitionalDataText }" escapeXml="false"/> <br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${transitionalData}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="aNote" items="${ transitionalData.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
</p>
</c:forEach>
<!--PRONUNCIATION-->
<c:set value="${query.entry.pronunciations}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Pronunciations</h1>
<c:forEach var="pronunciation" items="${ query.entry.pronunciations }">
<p class="data">
<c:out value='<a name="${ pronunciation.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'pronunciation', '${ pronunciation.metaId }', '${ query.entry.metaId }', '${ pronunciation }' , '${ query.entry }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'pronunciation', '${ pronunciation.metaId }', '${ query.entry.metaId }', '${ pronunciation }' , '${ query.entry }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<span class="label">Phonetic Rendering:</span> <c:out value="${ pronunciation.phonetics }" escapeXml="false"/> <br />
<span class="label">Type of Phonetics:</span> <c:out value="${ applicationScope.flatData.phoneticsTypes[ pronunciation.phoneticsType ] }" escapeXml="false"/> <br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${pronunciation}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="aNote" items="${ pronunciation.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
<jsp:include page="displayPronunciation.jsf" flush="false"/>
</c:forEach>
</p>
</c:forEach><!--END PRONUNCIATION-->
</c:if>
<!--ETYMOLOGY-->
<c:set value="${query.entry.etymologies}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Etymologies</h1>
<c:forEach var="etymology" items="${ query.entry.etymologies }">
<p class="data">
<c:out value='<a name="${ etymology.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'etymology', '${ etymology.metaId }', '${ query.entry.metaId }', '${ etymology }' , '${ query.entry }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'etymology', '${ etymology.metaId }', '${ query.entry.metaId }', '${ etymology }' , '${ query.entry }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getTranslationForm', 'etymology', '${ etymology.metaId }', '${ query.entry.metaId }', '${etymology}', '${ query.entry }'" />
<c:out value='<input value="trans" type="image" src="/lex/images/trans.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
<jsp:include page="displayEtymology.jsf" flush="false"/>
</c:forEach>
</c:if>
<span class="label">Etymology:</span> <c:out value="${ etymology.etymologyDescription }" escapeXml="false" /> <br />
<span class="label">Etymology Type:</span> <c:out value="${ applicationScope.flatData.etymologyTypes[ etymology.etymologyType ] }" escapeXml="false" /> <br />
<span class="label">Loan Language:</span> <c:out value="${ applicationScope.flatData.languages[ etymology.loanLanguage ] }" escapeXml="false" /> <br />
<span class="label">Derivation:</span> <c:out value="${ etymology.derivation }" escapeXml="false" /> <br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${etymology}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="translation" items="${ etymology.translations }" >
<c:set var="jsParams" value="" />
<c:if test="${ editMode }">
<c:set var="jsParams" value="'getUpdateForm', 'etymology', '${ translation.metaId }', '${ query.entry.metaId }', '${ etymology }' , '${ query.entry }'" />
</c:if>
<c:out value='<a class="meta" href="javascript:submitForm( ${jsParams} )">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" />
<span class="translation">
<span class="label">Etymology:</span> <c:out value="${ translation.etymologyDescription }" escapeXml="false" /> <br />
<span class="label">Etymology Type:</span> <c:out value="${ applicationScope.flatData.etymologyTypes[ translation.etymologyType ] }" escapeXml="false" /> <br />
<span class="label">Loan Language:</span> <c:out value="${ applicationScope.flatData.languages[ translation.loanLanguage ] }" escapeXml="false" /> <br />
<span class="label">Derivation:</span> <c:out value="${ translation.derivation }" escapeXml="false" /> <br />
<c:set var="component" value="${ translation }" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
<c:forEach var="aNote" items="${ etymology.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
</p>
</c:forEach>
<!--END ETYMOLOGY-->
<!--SPELLINGS-->
<c:set value="${query.entry.spellings}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Spellings</h1>
<c:forEach var="spelling" items="${ query.entry.spellings }">
<p class="data">
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'spelling', '${ spelling.metaId }', '${ query.entry.metaId }', '${ spelling }' , '${ query.entry }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'spelling', '${ spelling.metaId }', '${ query.entry.metaId }', '${ spelling }' , '${ query.entry }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
<jsp:include page="displaySpelling.jsf" flush="false"/>
</c:forEach>
</c:if>
<c:out value='<a name="${ spelling.label }" ></a>' escapeXml="false" />
<span class="label">Spelling:</span> <c:out value="${ spelling.spelling }" escapeXml="false" /> <br />
<span class="label">Spelling Type:</span> <c:out value="${ applicationScope.flatData.spellingTypes[ spelling.spellingType ] }" escapeXml="false" /> <br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${spelling}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="aNote" items="${ spelling.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
</p>
</c:forEach>
<!--END SPELLINGS-->
<!--FUNCTIONS-->
<c:set value="${query.entry.functions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Functions</h1>
<c:forEach var="function" items="${ query.entry.functions }">
<p class="data">
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'grammaticalFunction', '${ function.metaId }', '${ query.entry.metaId }', '${ function }' , '${ query.entry }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'grammaticalFunction', '${ function.metaId }', '${ query.entry.metaId }', '${ function }' , '${ query.entry }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<c:out value='<a name="${ function.label }" ></a>' escapeXml="false" />
<span class="label">Grammatical Function:</span> <c:out value="${ applicationScope.flatData.functionsGeneral[function.function] }" escapeXml="false" /> <br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${function}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="aNote" items="${ function.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
<jsp:include page="displayFunction.jsf" flush="false"/>
</c:forEach>
</p>
</c:forEach><!--END FUNCTIONS-->
</c:if>
<!--ENCYCLOPEDIA ARTICLES-->
<c:set value="${query.entry.encyclopediaArticles}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Encyclopedia Articles</h1>
<c:forEach var="encyclopediaArticle" items="${ query.entry.encyclopediaArticles }">
<p class="data">
<c:out value='<a name="${ encyclopediaArticle.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'encyclopediaArticle', '${ encyclopediaArticle.metaId }', '${ query.entry.metaId }', '${ encyclopediaArticle }' , '${ query.entry }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'encyclopediaArticle', '${ encyclopediaArticle.metaId }', '${ query.entry.metaId }', '${ encyclopediaArticle }' , '${ query.entry }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<%-- <span class="label">Encyclopedia Article:</span> <c:out value="<a href='/lex/action?cmd=display&amp;comp=encyclopediaArticle&amp;id=${ encyclopediaArticle.metaId }'>${ encyclopediaArticle.articleTitle }</a>" escapeXml="false"/> <br /> --%>
<span class="label">Encyclopedia Article:</span> <c:out value="${ encyclopediaArticle.articleTitle }" escapeXml="false"/> <br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${encyclopediaArticle}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="aNote" items="${ encyclopediaArticle.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
<jsp:include page="displayEncyclopediaArticle.jsf" flush="false"/>
</c:forEach>
</p>
</c:forEach><!--END ENCYCLOPEDIA ARTICLES-->
</div> <!--END TERMCHILDREN -->
</c:if>
<!--DEFINITION LOOP-->
<c:set value="${query.entry.definitions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Definitions</h1>
<c:forEach var="definition" items="${query.entry.definitions}">
<p class="data">
<c:out value='<a name="${ definition.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'definition', '${ definition.metaId }', '${ query.entry.metaId }', '${ definition }' , '${ query.entry }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'definition', '${ definition.metaId }', '${ query.entry.metaId }', '${ definition }' , '${ query.entry }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getTranslationForm', 'definition', '${ definition.metaId }', '${ query.entry.metaId }', '${definition}', '${ query.entry }'" />
<c:out value='<input value="trans" type="image" src="/lex/images/trans.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'subdefinition', '', '${ definition.metaId }', '' , '${ definition }' " />
<c:out value='<input value="subdef" type="image" src="/lex/images/subdef.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<c:set var="definition" scope="request" value="${definition}"/>
<jsp:include page="displayDefinition.jsf" flush="false"/>
<span class="label">Definition <c:out value="${definition.precedence}:</span> ${ definition.definition }" escapeXml="false" />
<br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${definition}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="translation" items="${ definition.translations }" >
<c:set var="jsParams" value="" />
<c:if test="${ editMode }">
<c:set var="jsParams" value="'getUpdateForm', 'definition', '${ translation.metaId }', '${ query.entry.metaId }', '${ definition }' , '${ query.entry }'" />
</c:if>
<c:out value='<a class="meta" href="javascript:submitForm( ${jsParams} )">' escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" /><span class="translation">
<span class="label">Definition
<c:out value="${translation.precedence}:</span> ${ translation.definition }" escapeXml="false" /> <br />
<c:set var="component" value="${ translation }" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
<c:forEach var="aNote" items="${ definition.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
</p>
<div id="defChildren">
<!--SUBDEFINITION-->
<c:set value="${definition.subdefinitions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Subdefinitions</h1>
<c:forEach var="subdefinition" items="${ definition.subdefinitions }">
<p class="data">
<c:out value='<a name="${ subdefinition.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'subdefinition', '${ subdefinition.metaId }', '${ definition.metaId }', '${ subdefinition }' , '${ definition }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'subdefinition', '${ subdefinition.metaId }', '${ definition.metaId }', '${ subdefinition }' , '${ definition }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getTranslationForm', 'subdefinition', '${ subdefinition.metaId }', '${ definition.metaId }', '${subdefinition}', '${ definition }'" />
<c:out value='<input value="trans" type="image" src="/lex/images/trans.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="subdefinition" scope="request" value="${subdefinition}"/>
<jsp:include page="displaySubdefinition.jsf" flush="false"/>
<c:set var="jsParams" value="'getInsertForm', 'keyword', '${ subdefinition.metaId }', '${ subdefinition.metaId }', '' , '${ subdefinition }' " />
<c:out value='<input value="keyword" type="image" src="/lex/images/key.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'modelSentence', '${ subdefinition.metaId }', '${ subdefinition.metaId }', '' , '${ subdefinition }' " />
<c:out value='<input value="model sentence" type="image" src="/lex/images/sent.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'translationEquivalent', '${ subdefinition.metaId }', '${ subdefinition.metaId }', '' , '${ subdefinition }' " />
<c:out value='<input value="trans" type="image" src="/lex/images/trans-eqv.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'relatedTerm', '${ subdefinition.metaId }', '${ subdefinition.metaId }', '' , '${ subdefinition }' " />
<c:out value='<input value="related term" type="image" src="/lex/images/rel-term.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'passage', '${ subdefinition.metaId }', '${ subdefinition.metaId }', '' , '${ subdefinition }' " />
<c:out value='<input value="passage" type="image" src="/lex/images/pass.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getInsertForm', 'register', '${ subdefinition.metaId }', '${ subdefinition.metaId }', '' , '${ subdefinition }' " />
<c:out value='<input value="speech register" type="image" src="/lex/images/reg.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<span class="label">Subdefinition:</span> <c:out value="${ subdefinition.subdefinition }" escapeXml="false" />
<br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${subdefinition}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="translation" items="${ subdefinition.translations }">
<c:set var="jsParams" value="" />
<c:if test="${ editMode }">
<c:set var="jsParams" value="'getUpdateForm', 'subdefinition', '${ translation.metaId }', '${ definition.metaId }', '${ subdefinition }' , '${ definition }'" />
</c:if>
<c:out value='<a class="meta" href="javascript:submitForm( ${jsParams} )">' escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" /><span class="translation">
<span class="label">Subdefinition:</span>
<c:out value="${ translation.subdefinition }" escapeXml="false" /> <br />
<c:set var="component" value="${ translation }" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
<c:forEach var="aNote" items="${ subdefinition.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
</p>
<div id="subdefChildren">
<!--KEYWORD-->
<c:set value="${subdefinition.keywords}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Keywords</h1>
<c:forEach var="keyword" items="${ subdefinition.keywords }">
<p class="data">
<c:out value='<a name="${ keyword.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'keyword', '${ keyword.metaId }', '${ subdefinition.metaId }', '${ keyword }' , '${ subdefinition }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'keyword', '${ keyword.metaId }', '${ subdefinition.metaId }', '${ keyword }' , '${ subdefinition }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
<c:set var="keyword" scope="request" value="${keyword}"/>
<jsp:include page="displayKeyword.jsf" flush="false"/>
</c:forEach>
</c:if>
<span class="label">Keyword:</span> <c:out value="${ keyword.keyword }" escapeXml="false" />
<br /> <a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${keyword}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="aNote" items="${ keyword.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
</p>
</c:forEach>
<!--END KEYWORD LOOP-->
<!--MODEL SENTENCE-->
<c:set value="${subdefinition.modelSentences}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Model Sentences</h1>
<c:forEach var="modelSentence" items="${ subdefinition.modelSentences }">
<p class="data">
<c:out value='<a name="${ modelSentence.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'modelSentence', '${ modelSentence.metaId }', '${ subdefinition.metaId }', '${ modelSentence }' , '${ subdefinition }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'modelSentence', '${ modelSentence.metaId }', '${ subdefinition.metaId }', '${ modelSentence }' , '${ subdefinition }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getTranslationForm', 'modelSentence', '${ modelSentence.metaId }', '${ subdefinition.metaId }', '${modelSentence}', '${ subdefinition }'" />
<c:out value='<input value="trans" type="image" src="/lex/images/trans.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<span class="label">Model Sentence:</span> <c:out value="${ modelSentence.modelSentence }" escapeXml="false" />
<br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${modelSentence}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="translation" items="${ modelSentence.translations }" >
<c:set var="jsParams" value="" />
<c:if test="${ editMode }">
<c:set var="jsParams" value="'getUpdateForm', 'modelSentence', '${ translation.metaId }', '${ subdefinition.metaId }', '${ modelSentence }' , '${ subdefinition }'" />
</c:if>
<c:out value='<a class="meta" href="javascript:submitForm( ${jsParams} )">' escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" /><span class="translation">
<span class="label">Model Sentence:</span> <c:out value="${ translation.modelSentence }" escapeXml="false" /> <br />
<c:set var="component" value="${ translation }" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
<c:set var="modelSentence" scope="request" value="${modelSentence}"/>
<jsp:include page="displayModelSentence.jsf" flush="false"/>
</c:forEach>
<c:forEach var="aNote" items="${ modelSentence.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
</p>
</c:forEach> <!--END MODEL SENTENCE LOOP-->
</c:if>
<!--TRANSLATION EQUIVALENT-->
<c:if test="${ newForm && param.parentHex == subdefinition && param.comp == 'translationEquivalent' }">
<jsp:include page="translationEquivalentForm.jsf" />
</c:if>
<c:set value="${subdefinition.translationEquivalents}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Translation Equivalents</h1>
<c:forEach var="translationEquivalent" items="${ subdefinition.translationEquivalents }">
<p class="data">
<c:out value='<a name="${ translationEquivalent.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'translationEquivalent', '${ translationEquivalent.metaId }', '${ subdefinition.metaId }', '${ translationEquivalent }' , '${ subdefinition }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'translationEquivalent', '${ translationEquivalent.metaId }', '${ subdefinition.metaId }', '${ translationEquivalent }' , '${ subdefinition }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<span class="label">Translation Equivalent: </span> <c:out value="${ translationEquivalent.translationEquivalent }" escapeXml="false" />
<br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${translationEquivalent}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="aNote" items="${ translationEquivalent.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
<c:set var="translationEquivalent" scope="request" value="${translationEquivalent}"/>
<jsp:include page="displayTranslationEquivalent.jsf" flush="false"/>
</c:forEach>
</p>
</c:forEach> <!--END TRANSLATION EQUIVALENT LOOP-->
</c:if>
<!--RELATED TERM-->
<c:set value="${subdefinition.relatedTerms}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>RelatedTerm</h1>
<c:forEach var="relatedTerm" items="${ subdefinition.relatedTerms }">
<p class="data">
<c:out value='<a name="${ relatedTerm.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'relatedTerm', '${ relatedTerm.metaId }', '${ subdefinition.metaId }', '${ relatedTerm }' , '${ subdefinition }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'relatedTerm', '${ relatedTerm.metaId }', '${ subdefinition.metaId }', '${ relatedTerm }' , '${ subdefinition }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<span class="label">Related Term:</span> <c:out value="${ relatedTerm.relatedTerm }" escapeXml="false" /> <br />
<span class="label">Related Term Type:</span> <c:out value="${ applicationScope.flatData.relatedTermTypes[relatedTerm.relatedTermType] }" escapeXml="false" />
<br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${relatedTerm}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="aNote" items="${ relatedTerm.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
<c:set var="relatedTerm" scope="request" value="${relatedTerm}"/>
<jsp:include page="displayRelatedTerm.jsf" flush="false"/>
</c:forEach>
</p>
</c:forEach> <!--END RELATED TERM LOOP-->
</c:if>
<!--PASSAGE-->
<c:set value="${subdefinition.passages}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Passages</h1>
<c:forEach var="passage" items="${ subdefinition.passages }">
<p class="data">
<c:out value='<a name="${ passage.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'passage', '${ passage.metaId }', '${ subdefinition.metaId }', '${ passage }' , '${ subdefinition }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'passage', '${ passage.metaId }', '${ subdefinition.metaId }', '${ passage }' , '${ subdefinition }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getTranslationForm', 'passage', '${ passage.metaId }', '${ subdefinition.metaId }', '${ passage }', '${ subdefinition }'" />
<c:out value='<input value="trans" type="image" src="/lex/images/trans.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<span class="label">Literary Source:</span> <c:out value="${ passage.literarySource }" escapeXml="false" /> <br />
<span class="label">Spelling:</span> <c:out value="${ passage.spelling }" escapeXml="false" /> <br />
<span class="label">Pagination:</span> <c:out value="${ passage.pagination }" escapeXml="false" /> <br />
<span class="label">Passage:</span> <c:out value="${ passage.passage }" escapeXml="false" /> <br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${passage}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="translation" items="${ passage.translations }" >
<c:set var="jsParams" value="" />
<c:if test="${ editMode }">
<c:set var="jsParams" value="'getUpdateForm', 'passage', '${ translation.metaId }', '${ subdefinition.metaId }', '${ passage }' , '${ subdefinition }'" />
</c:if>
<c:out value='<a class="meta" href="javascript:submitForm( ${jsParams} )">' escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" /><span class="translation">
<span class="label">Literary Source:</span> <c:out value="${ translation.literarySource }" escapeXml="false" /> <br />
<span class="label">Spelling:</span> <c:out value="${ translation.spelling }" escapeXml="false" /> <br />
<span class="label">Pagination:</span> <c:out value="${ translation.pagination }" escapeXml="false" /> <br />
<span class="label">Passage:</span> <c:out value="${ translation.passage }" escapeXml="false" /> <br />
<c:set var="component" value="${ translation }" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
<c:set var="passage" scope="request" value="${passage}"/>
<jsp:include page="displayPassage.jsf" flush="false"/>
</c:forEach>
<c:forEach var="aNote" items="${ passage.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
</c:forEach>
</p>
</c:forEach> <!--END PASSAGE LOOP-->
</c:if>
<!--REGISTER-->
<c:set value="${subdefinition.registers}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Registers</h1>
<c:forEach var="register" items="${ subdefinition.registers }">
<p class="data">
<c:out value='<a name="${ register.label }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:set var="jsParams" value="'annotate', 'speechRegister', '${ register.metaId }', '${ subdefinition.metaId }', '${ register }' , '${ subdefinition }'" />
<c:out value='<input value="note" type="image" src="/lex/images/note.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
<c:set var="jsParams" value="'getUpdateForm', 'speechRegister', '${ register.metaId }', '${ subdefinition.metaId }', '${ register }' , '${ subdefinition }'" />
<c:out value='<input value="edit" type="image" src="/lex/images/edit.gif" onclick="submitForm( ${jsParams} )" />' escapeXml="false" />
</span>
</c:if>
<span class="label">Speech Register:</span> <c:out value="${ applicationScope.flatData.registers[register.register] }" escapeXml="false" />
<br />
<a class="meta" href="javascript:smile()"><img src="/lex/images/meta.gif" alt=" view metadata" /><span class="metadata">
<c:set var="component" value="${register}" scope="request" />
<jsp:include page="displayMeta.jsf" />
</span></a>
<c:forEach var="aNote" items="${ register.analyticalNotes }">
<a class="meta" href="javascript:smile()"><img src="/lex/images/note.gif" alt="analysis" /><span class="analysis">
<span class="label">Analysis: </span><c:out value="${ aNote.analyticalNote }" escapeXml="false" /><br />
<c:set var="component" value="${query.entry}" scope="request" />
<span class="metadata"><jsp:include page="displayMeta.jsf" /></span>
</span></a>
<jsp:include page="displayRegister.jsf" flush="false"/>
</c:forEach>
</p>
</c:forEach> <!--END REGISTER LOOP-->
</div> <!-- END SUBDEFCHILDREN -->
</c:forEach> <!--END SUBDEFINITION LOOP-->
</div> <!-- END DEFCHILDREN -->
</c:forEach> <!--END DEFINITION LOOP-->
</c:if>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
</c:forEach>
</c:if>
<c:if test="${ editMode }">
</form>
</div>
</c:forEach>
</c:if>
</c:if>

116
src/jsp/jsp/displayTreeToc.jsf Normal file
View file

@ -0,0 +1,116 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTreeToc.jsf-->
<h2>Term Map</h2>
<h3>
<c:out value="${ query.entry.term }"/>
</h3>
<ol>
<!--TRANSITIONAL DATA-->
<c:set value="${query.entry.transitionalData}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${query.entry.transitionalData}">Special Guests</a></li>' escapeXml='false' />
<c:forEach var="transitionalData" items="${ query.entry.transitionalData }"></c:forEach>
</c:if>
<!--PRONUNCIATION-->
<c:set value="${query.entry.pronunciations}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${query.entry.pronunciations}">Pronunciations</a></li>' escapeXml='false' />
<c:forEach var="pronunciation" items="${ query.entry.pronunciations }"></c:forEach>
</c:if>
<!--ETYMOLOGY-->
<c:set value="${query.entry.etymologies}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${query.entry.etymologies}">Etymologies</a></li>' escapeXml='false' />
<c:forEach var="etymology" items="${ query.entry.etymologies }"></c:forEach>
</c:if>
<!--SPELLINGS-->
<c:set value="${query.entry.spellings}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${query.entry.spellings}">Spellings</a></li>' escapeXml='false' />
<c:forEach var="spelling" items="${ query.entry.spellings }"></c:forEach>
</c:if>
<!--FUNCTIONS-->
<c:set value="${query.entry.functions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${query.entry.functions}">Functions</a></li>' escapeXml='false' />
<c:forEach var="function" items="${ query.entry.functions }"></c:forEach>
</c:if>
<!--ENCYCLOPEDIA ARTICLES-->
<c:set value="${query.entry.encyclopediaArticles}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${query.entry.encyclopediaArticles}">Encyclopedia Articles</a></li>' escapeXml='false' />
<c:forEach var="encyclopediaArticle" items="${ query.entry.encyclopediaArticles }"></c:forEach>
</c:if>
<!--DEFINITION LOOP-->
<c:set value="${query.entry.definitions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${query.entry.definitions}">Definitions</a></li>' escapeXml='false' />
<c:forEach var="definition" items="${query.entry.definitions}">
<!--SUBDEFINITION-->
<c:set value="${definition.subdefinitions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${definition.subdefinitions}">Subdefinitions</a></li>' escapeXml='false' />
<c:forEach var="subdefinition" items="${ definition.subdefinitions }">
<!--KEYWORD-->
<c:set value="${subdefinition.keywords}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${subdefinition.keywords}">Keywords</a></li>' escapeXml='false' />
<c:forEach var="keyword" items="${ subdefinition.keywords }"></c:forEach>
</c:if>
<!--MODEL SENTENCE-->
<c:set value="${subdefinition.modelSentences}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${subdefinition.modelSentences}">Model Sentences</a></li>' escapeXml='false' />
<c:forEach var="modelSentence" items="${ subdefinition.modelSentences }"></c:forEach>
</c:if>
<!--TRANSLATION EQUIVALENT-->
<c:set value="${subdefinition.translationEquivalents}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${subdefinition.translationEquivalents}">Translation Equivalents</a></li>' escapeXml='false' />
<c:forEach var="translationEquivalent" items="${ subdefinition.translationEquivalents }"></c:forEach>
</c:if>
<!--RELATED TERM-->
<c:set value="${subdefinition.relatedTerms}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${subdefinition.relatedTerms}">RelatedTerm</a></li>' escapeXml='false' />
<c:forEach var="relatedTerm" items="${ subdefinition.relatedTerms }"></c:forEach>
</c:if>
<!--PASSAGE-->
<c:set value="${subdefinition.passages}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${subdefinition.passages}">Passages</a></li>' escapeXml='false' />
<c:forEach var="passage" items="${ subdefinition.passages }"></c:forEach>
</c:if>
<!--REGISTER-->
<c:set value="${subdefinition.registers}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${subdefinition.registers}">Registers</a></li>' escapeXml='false' />
<c:forEach var="register" items="${ subdefinition.registers }"></c:forEach>
</c:if>
</c:forEach>
</c:if>
</c:forEach>
</c:if>
</ol>

7
src/jsp/jsp/encyclopediaArticleForm.jsf
View file

@ -11,7 +11,7 @@
<c:set var="article" value="" />
<c:set var="articleTitle" value="" />
<c:set var="metaId" value="" />
<c:set var="note" value="" />
</c:when>
<c:when test="${ ! empty param.formMode && param.formMode == 'update'}">
<c:set var="updateMode" value="${ true }" />
@ -19,7 +19,7 @@
<c:set var="article" value="${ component.article }" />
<c:set var="articleTitle" value="${ component.articleTitle }" />
<c:set var="metaId" value="${ component.metaId }" />
<c:set var="note" value="${ component.note }" />
</c:when>
<c:otherwise>
<c:set var="updateMode" value="${ false }" />
@ -27,7 +27,7 @@
<c:set var="article" value="ERROR" />
<c:set var="articleTitle" value="ERROR" />
<c:set var="metaId" value="ERROR" />
<c:set var="note" value="ERROR" />
</c:otherwise>
</c:choose>
@ -38,7 +38,6 @@
<c:out value='<input type="hidden" name="metaId" value="${metaId}" />' escapeXml="false" />
</c:if>
<c:out value='<input type="hidden" name="cmd" value="${newCmd}" />' escapeXml='false' />
<c:out value='<input type="hidden" name="parentId" value="${ param.parentId }" />' escapeXml='false' />
Article Title: <br />
<textarea name="articleTitle" rows="2" cols="90"><c:out value='${ articleTitle }' escapeXml='false' /></textarea>

6
src/jsp/jsp/etymologyForm.jsf
View file

@ -12,8 +12,8 @@
<c:set var="etymologyType" value="0" />
<c:set var="loanLanguage" value="0" />
<c:set var="metaId" value="" />
<c:set var="note" value="" />
</c:when>
<c:when test="${ ! empty param.formMode && param.formMode == 'update'}">
<c:set var="updateMode" value="${ true }" />
<c:set var="newCmd" value="update" />
@ -22,8 +22,8 @@
<c:set var="metaId" value="${ component.metaId }" />
<c:set var="etymologyType" value="${ component.etymologyType }" />
<c:set var="loanLanguage" value="${ component.loanLanguage }" />
<c:set var="note" value="${ component.note }" />
</c:when>
<c:otherwise>
<c:set var="updateMode" value="${ false }" />
<c:set var="newCmd" value="" />
@ -31,7 +31,6 @@
<c:set var="etymologyDescription" value="ERROR" />
<c:set var="etymologyType" value="ERROR" />
<c:set var="loanLanguage" value="ERROR" />
<c:set var="note" value="ERROR" />
</c:otherwise>
</c:choose>
@ -53,7 +52,6 @@
<c:out value='<input type="hidden" name="metaId" value="${metaId}" />' escapeXml="false" />
</c:if>
<c:out value='<input type="hidden" name="cmd" value="${newCmd}" />' escapeXml='false' />
<c:out value='<input type="hidden" name="parentId" value="${ param.parentId }" />' escapeXml='false' />
<c:out value="${ originalEtymologyDescription } " escapeXml='false' />

Some files were not shown because too many files have changed in this diff Show more