Here are many changes to the object model including two new interfaces, LexComponentNode and Translatable. Also translation collections have been moved from generic LexComponent to specific components that allow translation. RETRY FROM CORRECT DIRECTORY

build.xml

@@ -146,11 +146,12 @@
 	
 	<target name="move-log" description="move old log file">
 		<mkdir dir="logs"/>
+		<mkdir dir="logs/old"/>
 		<tstamp prefix="now"/>
 		<touch file="${basedir}/logs/hibernate.log"/>
-		<move file="${basedir}/logs/hibernate.log" tofile="${basedir}/logs/${now.DSTAMP}_${now.TSTAMP}_hibernate.log" overwrite="true"/>
+		<move file="${basedir}/logs/hibernate.log" tofile="${basedir}/logs/old/${now.DSTAMP}_${now.TSTAMP}_hibernate.log" overwrite="true"/>
 		<touch file="${basedir}/logs/lex.log"/>
-		<move file="${basedir}/logs/lex.log" tofile="${basedir}/logs/${now.DSTAMP}_${now.TSTAMP}_lex.log" overwrite="true"/>
+		<move file="${basedir}/logs/lex.log" tofile="${basedir}/logs/old/${now.DSTAMP}_${now.TSTAMP}_lex.log" overwrite="true"/>
 	</target>
 	
 	<target name="reinstall" description="Remove and Re-install web application" depends="remove">

src/java/org/thdl/lex/AuthenticationFilter.java

@@ -27,17 +27,17 @@ public class AuthenticationFilter implements Filter
 	public String getLoginPage() {
 		return loginPage;
 	}
-	public void setSessionMgr() {
+	public void setSessionManager() {
 		this.sessionMgr = UserSessionManager.getInstance();
 	}
-	public UserSessionManager getSessionMgr() {
+	public UserSessionManager getSessionManager() {
 		return sessionMgr;
 	}
 
 //contract methods
 	public void init(FilterConfig config) throws ServletException
 	{
-		setSessionMgr();
+		setSessionManager();
 		setLoginPage( config.getInitParameter("loginPage") );
 		if ( null == getLoginPage() )
 			throw new ServletException("The loginPage parameter must be specified");

src/java/org/thdl/lex/GuestFilter.java

@@ -1,19 +1,26 @@
 package org.thdl.lex;
-
+import java.io.IOException;
-import org.thdl.users.*;
+import java.util.Enumeration;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import javax.servlet.ServletException;
-import java.io.IOException;
-import java.util.Enumeration;
 
+import org.thdl.users.*;
+
+
+/**
+ *  Description of the Class
+ *
+ * @author     travis
+ * @created    October 9, 2003
+ */
 public class GuestFilter implements Filter
 {
 //attributes
@@ -21,32 +28,77 @@ public class GuestFilter implements Filter
 	private UserSessionManager sessionMgr;
 
 //accessors
-	public void setLoginPage(String loginPage) {
+	/**
+	 *  Sets the loginPage attribute of the GuestFilter object
+	 *
+	 * @param  loginPage  The new loginPage value
+	 */
+	public void setLoginPage( String loginPage )
+	{
 		this.loginPage = loginPage;
 	}
-	public String getLoginPage() {
+
+
+	/**
+	 *  Gets the loginPage attribute of the GuestFilter object
+	 *
+	 * @return    The loginPage value
+	 */
+	public String getLoginPage()
+	{
 		return loginPage;
 	}
-	public void setSessionMgr() {
+
+
+	/**
+	 *  Sets the sessionManager attribute of the GuestFilter object
+	 */
+	public void setSessionManager()
+	{
 		this.sessionMgr = UserSessionManager.getInstance();
 	}
-	public UserSessionManager getSessionMgr() {
+
+
+	/**
+	 *  Gets the sessionManager attribute of the GuestFilter object
+	 *
+	 * @return    The sessionManager value
+	 */
+	public UserSessionManager getSessionManager()
+	{
 		return sessionMgr;
 	}
 
 //contract methods
-	public void init(FilterConfig config) throws ServletException
+	/**
+	 *  Description of the Method
+	 *
+	 * @param  config                Description of the Parameter
+	 * @exception  ServletException  Description of the Exception
+	 */
+	public void init( FilterConfig config ) throws ServletException
 	{
-		setSessionMgr();
+		setSessionManager();
 	}
-	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
+
+
+	/**
+	 *  Description of the Method
+	 *
+	 * @param  request               Description of the Parameter
+	 * @param  response              Description of the Parameter
+	 * @param  chain                 Description of the Parameter
+	 * @exception  IOException       Description of the Exception
+	 * @exception  ServletException  Description of the Exception
+	 */
+	public void doFilter( ServletRequest request, ServletResponse response, FilterChain chain ) throws IOException, ServletException
 	{
-		if ( request instanceof HttpServletRequest && response instanceof HttpServletResponse)
+		if ( request instanceof HttpServletRequest && response instanceof HttpServletResponse )
 		{
 			HttpServletRequest req = (HttpServletRequest) request;
-			HttpSession session = req.getSession(true);
+			HttpSession session = req.getSession( true );
-			ThdlUser user = getSessionMgr().getSessionUser(session);
+			ThdlUser user = getSessionManager().getSessionUser( session );
-			if (null == user )
+			if ( null == user )
 			{
 				try
 				{
@@ -57,16 +109,22 @@ public class GuestFilter implements Filter
 					throw new ServletException( e );
 				}
 				user.setRoles( "guest" );
-				getSessionMgr().setSessionUser( session, user );
+				getSessionManager().setSessionUser( session, user );
-				getSessionMgr().setDisplayMode( session, "full" );
+				getSessionManager().setDisplayMode( session, "full" );
 			}
-			chain.doFilter(request, response);
+			chain.doFilter( request, response );
 		}
 		else
 		{
-			throw new ServletException("Filter only applicable to HTTP and HTTPS requests");
+			throw new ServletException( "Filter only applicable to HTTP and HTTPS requests" );
 		}
 	}
-	public void destroy() {}
+
+
+	/**
+	 *  Description of the Method
+	 */
+	public void destroy() { }
 //helper methods
 }
+

src/java/org/thdl/lex/HibernateSession.java

@@ -7,22 +7,25 @@ import net.sf.hibernate.cfg.*;
 /**
  *  Description of the Class
  *
- *@author     Hibernate WIKI
+ * @author     Hibernate WIKI
- *@created    October 1, 2003
+ * @created    October 1, 2003
  */
 public class HibernateSession
 {
 
 	private static SessionFactory sessionFactory;
+	/**
+	 *  Description of the Field
+	 */
 	public final static ThreadLocal session = new ThreadLocal();
 
 
 	/**
 	 *  Description of the Method
 	 *
-	 *@return                         Description of the Returned Value
+	 * @return                         Description of the Returned Value
-	 *@exception  HibernateException  Description of Exception
+	 * @exception  HibernateException  Description of Exception
-	 *@since
+	 * @since
 	 */
 	public static Session currentSession()
 			 throws HibernateException
@@ -51,8 +54,8 @@ public class HibernateSession
 	/**
 	 *  Description of the Method
 	 *
-	 *@exception  HibernateException  Description of Exception
+	 * @exception  HibernateException  Description of Exception
-	 *@since
+	 * @since
 	 */
 	public static void closeSession()
 			 throws HibernateException

src/java/org/thdl/lex/LexActionServlet.java

@@ -106,11 +106,13 @@ 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
 		{
-			logRequestState( req );
-			logSessionState( req.getSession( true ) );
 			setCmd( req.getParameter( LexConstants.COMMAND_REQ_PARAM ) );
 			Command command = lookupCommand( getCmd() );
 			LexComponent component = (LexComponent) req.getAttribute( LexConstants.COMPONENT_REQ_ATTR );
@@ -148,6 +150,10 @@ public class LexActionServlet extends HttpServlet
 		RequestDispatcher rd;
 		rd = getServletContext().getRequestDispatcher( LexConstants.JSP_DIR + next );
 		rd.forward( req, res );
+		LexLogger.debug( "Checking Request state at end of LexActionServlet.service()" );
+		LexLogger.logRequestState( req );
+		LexLogger.logSessionState( req );
+
 	}
 
 
@@ -176,57 +182,6 @@ public class LexActionServlet extends HttpServlet
 	}
 
 
-	/**
-	 *  Description of the Method
-	 *
-	 * @param  req  Description of the Parameter
-	 */
-	public void logRequestState( HttpServletRequest req )
-	{
-		Logger logger = Logger.getLogger( "org.thdl.lex" );
-		Iterator it;
-		Enumeration enum = req.getParameterNames();
-		while ( enum.hasMoreElements() )
-		{
-			String parm = (String) enum.nextElement();
-			logger.debug( "Request Parameter " + parm + " = " + req.getParameter( parm ) );
-		}
-		enum = req.getAttributeNames();
-		while ( enum.hasMoreElements() )
-		{
-			String att = (String) enum.nextElement();
-			logger.debug( "Request Attribute " + att + " = " + req.getAttribute( att ) );
-		}
-	}
-
-
-	/**
-	 *  Description of the Method
-	 *
-	 * @param  ses  Description of the Parameter
-	 */
-	public void logSessionState( HttpSession ses )
-	{
-		Logger logger = Logger.getLogger( "org.thdl.lex" );
-		Enumeration enum = ses.getAttributeNames();
-		while ( enum.hasMoreElements() )
-		{
-			String att = (String) enum.nextElement();
-			logger.debug( "Request Attribute " + att + " = " + ses.getAttribute( att ) );
-		}
-		LexQuery query = (LexQuery) ses.getAttribute( "query" );
-		if ( null == query )
-		{
-			return;
-		}
-		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() );
-		logger.debug( "Query Duration: " + query.getEntry() );
-
-	}
-
 
 	/**
 	 *  Description of the Method
@@ -236,27 +191,29 @@ public class LexActionServlet extends HttpServlet
 	private void initCommands()
 	{
 		HashMap commands = new HashMap();
+
 		commands.put( "menu", new NullCommand( "menu.jsp" ) );
-		commands.put( "abort", new AbortCommand( "menu.jsp" ) );
-		commands.put( "testing", new TestingCommand( "displayEntry.jsp" ) );
-		// commands.put( "login", new NullCommand( "login.jsp" ) );
 		commands.put( "logout", new NullCommand( "logout.jsp" ) );
-		commands.put( "new", new NewComponentCommand() );
+		commands.put( "getMetaPrefsForm", new NullCommand( "metaPrefsForm.jsp" ) );
+		commands.put( "getMetaDefaultsForm", new NullCommand( "metaDefaultsForm.jsp" ) );
 		commands.put( "find", new FindCommand() );
-		commands.put( "getInsertForm", new GetInsertFormCommand( "displayForm.jsp?formMode=insert" ) );
+		commands.put( "getInsertForm", new GetFormCommand( "displayForm.jsp?formMode=insert", Boolean.TRUE ) );
-		commands.put( "getUpdateForm", new GetUpdateFormCommand( "displayForm.jsp?formMode=update" ) );
+		commands.put( "getUpdateForm", new GetFormCommand( "displayForm.jsp?formMode=update", Boolean.FALSE ) );
-		commands.put( "getTranslationForm", new GetTranslationFormCommand( "displayForm.jsp?formMode=insert" ) );
+		commands.put( "getInsertTermForm", new GetFormCommand( "displayForm.jsp?formMode=insert", Boolean.TRUE, Boolean.TRUE ) );
-		commands.put( "annotate", new GetInsertFormCommand( "displayForm.jsp?formMode=insert" ) );
+		commands.put( "getUpdateTermForm", new GetFormCommand( "displayForm.jsp?formMode=update", Boolean.FALSE, Boolean.TRUE ) );
-		commands.put( "insert", new InsertCommand( "displayEntry.jsp" ) );
+		commands.put( "getTranslationForm", new GetFormCommand( "displayForm.jsp?formMode=insert", Boolean.TRUE ) );
-		commands.put( "update", new UpdateCommand( "displayEntry.jsp" ) );
+		commands.put( "annotate", new GetFormCommand( "displayForm.jsp?formMode=insert", Boolean.FALSE ) );
+		commands.put( "insert", new UpdateCommand( "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( "getMetaPrefsForm", new NullCommand( "metaPrefsForm.jsp" ) );
-		commands.put( "getMetaDefaultsForm", new NullCommand( "metaDefaultsForm.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 );
 	}
 }

src/java/org/thdl/lex/LexComponentFilter.java

@@ -11,6 +11,7 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import org.apache.log4j.*;
 
 import org.thdl.lex.component.*;
 
@@ -47,7 +48,7 @@ public class LexComponentFilter implements Filter
 	 * @param  sessionMgr  The new sessionMgr value
 	 * @since
 	 */
-	public void setSessionMgr( UserSessionManager sessionMgr )
+	public void setSessionManager( UserSessionManager sessionMgr )
 	{
 		this.sessionMgr = sessionMgr;
 	}
@@ -71,11 +72,11 @@ public class LexComponentFilter implements Filter
 	 * @return    The sessionMgr value
 	 * @since
 	 */
-	public UserSessionManager getSessionMgr()
+	public UserSessionManager getSessionManager()
 	{
 		if ( null == sessionMgr )
 		{
-			setSessionMgr( UserSessionManager.getInstance() );
+			setSessionManager( UserSessionManager.getInstance() );
 		}
 		return sessionMgr;
 	}
@@ -133,6 +134,7 @@ public class LexComponentFilter implements Filter
 	 */
 	public void doFilter( ServletRequest request, ServletResponse response, FilterChain chain ) throws IOException, ServletException
 	{
+		long start = System.currentTimeMillis();
 		if ( request instanceof HttpServletRequest && response instanceof HttpServletResponse )
 		{
 			HttpServletRequest req = (HttpServletRequest) request;
@@ -177,6 +179,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" );
 		}
 		else
 		{

src/java/org/thdl/lex/LexComponentRepository.java

@@ -16,6 +16,18 @@ import org.thdl.lex.component.*;
  */
 public class LexComponentRepository
 {
+	/**
+	 *  Description of the Field
+	 */
+	public final static String EXACT = "exact";
+	/**
+	 *  Description of the Field
+	 */
+	public final static String STARTS_WITH = "startsWith";
+	/**
+	 *  Description of the Field
+	 */
+	public final static String ANYWHERE = "anywhere";
 	private static long start;
 
 
@@ -81,6 +93,45 @@ public class LexComponentRepository
 	}
 
 
+	/**
+	 *  Description of the Method
+	 *
+	 * @exception  LexRepositoryException  Description of the Exception
+	 */
+	private static void beginTransaction() throws LexRepositoryException
+	{
+		try
+		{
+			HibernateTransaction.beginTransaction();
+		}
+		catch ( HibernateException he )
+		{
+			throw new LexRepositoryException( he );
+		}
+
+	}
+
+
+	/**
+	 *  Description of the Method
+	 *
+	 * @param  commit                      Description of Parameter
+	 * @exception  LexRepositoryException  Description of the Exception
+	 * @since
+	 */
+	private static void endTransaction( boolean commit ) throws LexRepositoryException
+	{
+		try
+		{
+			HibernateTransaction.endTransaction( commit );
+		}
+		catch ( HibernateException he )
+		{
+			throw new LexRepositoryException( he );
+		}
+	}
+
+
 	/**
 	 *  Description of the Method
 	 *
@@ -127,6 +178,7 @@ public class LexComponentRepository
 	public static void findTermsByTerm( LexQuery lexQuery ) throws LexRepositoryException
 	{
 		setStart( now() );
+		beginTransaction();
 		ITerm term = assertTerm( lexQuery.getQueryComponent() );
 		if ( null == term.getTerm() )
 		{
@@ -135,7 +187,20 @@ public class LexComponentRepository
 
 		Query query = null;
 		Iterator it = null;
-		String queryString = " FROM org.thdl.lex.component.Term as term WHERE term.term like '" + term.getTerm() + "%' AND term.deleted=0 ORDER BY term.term";
+		String termForQuery = null;
+		if ( lexQuery.getFindMode().equals( LexComponentRepository.EXACT ) )
+		{
+			termForQuery = "'" + term.getTerm() + "'";
+		}
+		else if ( lexQuery.getFindMode().equals( LexComponentRepository.STARTS_WITH ) )
+		{
+			termForQuery = "'" + term.getTerm() + "%'";
+		}
+		else if ( lexQuery.getFindMode().equals( LexComponentRepository.ANYWHERE ) )
+		{
+			termForQuery = "'%" + term.getTerm() + "%'";
+		}
+		String queryString = " FROM org.thdl.lex.component.ITerm as term WHERE term.term like '" + term.getTerm() + "%' AND term.deleted=0 ORDER BY term.term";
 		try
 		{
 			query = getSession().createQuery( queryString );
@@ -145,16 +210,6 @@ public class LexComponentRepository
 			throw new LexRepositoryException( he );
 		}
 
-		/*
-		    try
-		    {
-		    query.setProperties( lexQuery.getQueryComponent() );
-		    }
-		    catch ( HibernateException he )
-		    {
-		    throw new LexRepositoryException( he );
-		    }
-		  */
 		try
 		{
 			it = query.iterate();
@@ -176,6 +231,7 @@ public class LexComponentRepository
 			term = (ITerm) it.next();
 			lexQuery.getResults().put( term.getMetaId(), term.getTerm() );
 		}
+		endTransaction( false );
 		lexQuery.setDuration( getDuration() );
 	}
 
@@ -191,7 +247,9 @@ public class LexComponentRepository
 	{
 		try
 		{
+			beginTransaction();
 			getSession().load( term, term.getMetaId() );
+			endTransaction( false );
 		}
 		catch ( HibernateException he )
 		{
@@ -208,6 +266,7 @@ public class LexComponentRepository
 	 */
 	public static void loadTermByPk( LexQuery lexQuery ) throws LexRepositoryException
 	{
+		beginTransaction();
 		ITerm term = assertTerm( lexQuery.getQueryComponent() );
 		loadTermByPk( term );
 		lexQuery.setEntry( term );
@@ -215,6 +274,7 @@ public class LexComponentRepository
 		{
 			lexQuery.getResults().put( term.getMetaId(), term.getTerm() );
 		}
+		endTransaction( false );
 	}
 
 
@@ -229,7 +289,9 @@ public class LexComponentRepository
 
 		try
 		{
+			beginTransaction();
 			getSession().load( component, component.getMetaId() );
+			endTransaction( false );
 		}
 		catch ( HibernateException he )
 		{
@@ -244,12 +306,14 @@ public class LexComponentRepository
 	 * @param  component                   Description of the Parameter
 	 * @exception  LexRepositoryException  Description of the Exception
 	 */
-	public static void update( ILexComponent component ) throws LexRepositoryException
+	public static void saveOrUpdate( ILexComponent component ) throws LexRepositoryException
 	{
 
 		try
 		{
-			getSession().update( component );
+			beginTransaction();
+			getSession().saveOrUpdate( component );
+			endTransaction( true );
 		}
 		catch ( HibernateException he )
 		{

src/java/org/thdl/lex/LexQuery.java

@@ -20,7 +20,7 @@ public class LexQuery
 	private ILexComponent updateComponent;
 	private ITerm entry;
 	private Map results;
-	private Enumeration mode;
+	private String findMode;
 	private long duration;
 
 
@@ -72,14 +72,14 @@ public class LexQuery
 
 
 	/**
-	 *  Sets the mode attribute of the LexQuery object
+	 *  Sets the findMode attribute of the LexQuery object
 	 *
-	 * @param  mode  The new mode value
+	 * @param  findMode  The new findMode value
 	 * @since
 	 */
-	public void setMode( Enumeration mode )
+	public void setFindMode( String findMode )
 	{
-		this.mode = mode;
+		this.findMode = findMode;
 	}
 
 
@@ -114,7 +114,7 @@ public class LexQuery
 	 */
 	public long getDuration()
 	{
-		return duration;
+		return duration / 1000;
 	}
 
 
@@ -143,14 +143,14 @@ public class LexQuery
 
 
 	/**
-	 *  Gets the mode attribute of the LexQuery object
+	 *  Gets the findMode attribute of the LexQuery object
 	 *
-	 * @return    The mode value
+	 * @return    The findMode value
 	 * @since
 	 */
-	public Enumeration getMode()
+	public String getFindMode()
 	{
-		return mode;
+		return findMode;
 	}
 
 
@@ -200,17 +200,49 @@ public class LexQuery
 	/**
 	 *  Constructor for the LexQuery object
 	 *
+	 * @param  findMode  Description of the Parameter
 	 * @since
 	 */
-	public LexQuery() { }
+	public LexQuery( String findMode )
-
-//inner classes
-
-	/*
-	    class LexQueryMode extends Enumeration
 	{
+		setFindMode( findMode );
 	}
+
+
+	/**
+	 *Constructor for the LexQuery object
 	 */
+	public LexQuery()
+	{
+		this( LexComponentRepository.STARTS_WITH );
+	}
+
+
+	/**
+	 *Constructor for the LexQuery object
+	 *
+	 * @param  component  Description of the Parameter
+	 */
+	public LexQuery( ILexComponent component )
+	{
+		this();
+		setQueryComponent( component );
+	}
+
+
+	/**
+	 *Constructor for the LexQuery object
+	 *
+	 * @param  component  Description of the Parameter
+	 * @param  findMode   Description of the Parameter
+	 */
+	public LexQuery( ILexComponent component, String findMode )
+	{
+		this( findMode );
+		setQueryComponent( component );
+	}
+
+
 }
 
 

src/java/org/thdl/lex/component/BaseAnalyticalNote.java

@@ -2,7 +2,6 @@ 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 */
@@ -21,8 +20,8 @@ abstract public class BaseAnalyticalNote extends LexComponent implements Seriali
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BaseAnalyticalNote(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.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.Short precedence, java.lang.String analyticalNote, org.thdl.lex.component.ILexComponent parent) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.analyticalNote = analyticalNote;
@@ -34,8 +33,8 @@ abstract public class BaseAnalyticalNote extends LexComponent implements Seriali
     }
 
     /** minimal constructor */
-    public BaseAnalyticalNote(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta) {
+    public BaseAnalyticalNote(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
     }
 
     public java.lang.Integer getParentId() {

src/java/org/thdl/lex/component/BaseDefinition.java

@@ -6,7 +6,7 @@ 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 {
+abstract public class BaseDefinition extends LexComponent implements org.thdl.lex.component.IDefinition,Serializable,org.thdl.lex.component.Translatable {
 
     /** nullable persistent field */
     private java.lang.Integer parentId;
@@ -17,6 +17,9 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le
     /** nullable persistent field */
     private java.lang.String definition;
 
+    /** nullable persistent field */
+    private java.lang.Integer translationOf;
+
     /** nullable persistent field */
     private org.thdl.lex.component.ILexComponent parent;
 
@@ -44,12 +47,16 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le
     /** persistent field */
     private List registers;
 
+    /** persistent field */
+    private Set translations;
+
     /** full constructor */
-    public BaseDefinition(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.String definition, org.thdl.lex.component.ILexComponent parent, List subdefinitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) {
+    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) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.definition = definition;
+        this.translationOf = translationOf;
         this.parent = parent;
         this.subdefinitions = subdefinitions;
         this.glosses = glosses;
@@ -59,6 +66,7 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le
         this.relatedTerms = relatedTerms;
         this.passages = passages;
         this.registers = registers;
+        this.translations = translations;
     }
 
     /** default constructor */
@@ -66,8 +74,8 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le
     }
 
     /** minimal constructor */
-    public BaseDefinition(java.lang.Boolean deleted, List analyticalNotes, Set translations, 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) {
+    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) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.precedence = precedence;
         this.subdefinitions = subdefinitions;
         this.glosses = glosses;
@@ -77,6 +85,7 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le
         this.relatedTerms = relatedTerms;
         this.passages = passages;
         this.registers = registers;
+        this.translations = translations;
     }
 
     public java.lang.Integer getParentId() {
@@ -103,6 +112,14 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le
         this.definition = definition;
     }
 
+    public java.lang.Integer getTranslationOf() {
+        return this.translationOf;
+    }
+
+    public void setTranslationOf(java.lang.Integer translationOf) {
+        this.translationOf = translationOf;
+    }
+
     public org.thdl.lex.component.ILexComponent getParent() {
         return this.parent;
     }
@@ -175,6 +192,14 @@ abstract public class BaseDefinition extends LexComponent implements org.thdl.le
         this.registers = registers;
     }
 
+    public java.util.Set getTranslations() {
+        return this.translations;
+    }
+
+    public void setTranslations(java.util.Set translations) {
+        this.translations = translations;
+    }
+
     public String toString() {
         return new ToStringBuilder(this)
             .append("metaId", getMetaId())

src/java/org/thdl/lex/component/BaseEncyclopediaArticle.java

@@ -2,7 +2,6 @@ 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 */
@@ -24,8 +23,8 @@ abstract public class BaseEncyclopediaArticle extends LexComponent implements or
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BaseEncyclopediaArticle(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.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.Short precedence, java.lang.String article, java.lang.String articleTitle, org.thdl.lex.component.ILexComponent parent) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.article = article;
@@ -38,8 +37,8 @@ abstract public class BaseEncyclopediaArticle extends LexComponent implements or
     }
 
     /** minimal constructor */
-    public BaseEncyclopediaArticle(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, java.lang.String article, java.lang.String articleTitle) {
+    public BaseEncyclopediaArticle(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String article, java.lang.String articleTitle) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.article = article;
         this.articleTitle = articleTitle;
     }

src/java/org/thdl/lex/component/BaseEtymology.java

@@ -6,7 +6,7 @@ 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 {
+abstract public class BaseEtymology extends LexComponent implements Serializable,org.thdl.lex.component.IEtymology,org.thdl.lex.component.Translatable {
 
     /** nullable persistent field */
     private java.lang.Integer parentId;
@@ -26,19 +26,27 @@ abstract public class BaseEtymology extends LexComponent implements Serializable
     /** persistent field */
     private java.lang.String etymologyDescription;
 
+    /** nullable persistent field */
+    private java.lang.Integer translationOf;
+
     /** nullable persistent field */
     private org.thdl.lex.component.ILexComponent parent;
 
+    /** persistent field */
+    private Set translations;
+
     /** full constructor */
-    public BaseEtymology(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 loanLanguage, java.lang.Short etymologyType, java.lang.String derivation, java.lang.String etymologyDescription, org.thdl.lex.component.ILexComponent parent) {
+    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) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.loanLanguage = loanLanguage;
         this.etymologyType = etymologyType;
         this.derivation = derivation;
         this.etymologyDescription = etymologyDescription;
+        this.translationOf = translationOf;
         this.parent = parent;
+        this.translations = translations;
     }
 
     /** default constructor */
@@ -46,11 +54,12 @@ abstract public class BaseEtymology extends LexComponent implements Serializable
     }
 
     /** minimal constructor */
-    public BaseEtymology(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, java.lang.Short etymologyType, java.lang.String derivation, java.lang.String etymologyDescription) {
+    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) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.etymologyType = etymologyType;
         this.derivation = derivation;
         this.etymologyDescription = etymologyDescription;
+        this.translations = translations;
     }
 
     public java.lang.Integer getParentId() {
@@ -101,6 +110,14 @@ abstract public class BaseEtymology extends LexComponent implements Serializable
         this.etymologyDescription = etymologyDescription;
     }
 
+    public java.lang.Integer getTranslationOf() {
+        return this.translationOf;
+    }
+
+    public void setTranslationOf(java.lang.Integer translationOf) {
+        this.translationOf = translationOf;
+    }
+
     public org.thdl.lex.component.ILexComponent getParent() {
         return this.parent;
     }
@@ -109,6 +126,14 @@ abstract public class BaseEtymology extends LexComponent implements Serializable
         this.parent = parent;
     }
 
+    public java.util.Set getTranslations() {
+        return this.translations;
+    }
+
+    public void setTranslations(java.util.Set translations) {
+        this.translations = translations;
+    }
+
     public String toString() {
         return new ToStringBuilder(this)
             .append("metaId", getMetaId())

src/java/org/thdl/lex/component/BaseGloss.java

@@ -2,7 +2,6 @@ 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 */
@@ -24,8 +23,8 @@ abstract public class BaseGloss extends LexComponent implements org.thdl.lex.com
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BaseGloss(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.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.Short precedence, java.lang.String gloss, java.lang.String translation, org.thdl.lex.component.ILexComponent parent) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.gloss = gloss;
@@ -38,8 +37,8 @@ abstract public class BaseGloss extends LexComponent implements org.thdl.lex.com
     }
 
     /** minimal constructor */
-    public BaseGloss(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta) {
+    public BaseGloss(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
     }
 
     public java.lang.Integer getParentId() {

src/java/org/thdl/lex/component/BaseGrammaticalFunction.java

@@ -2,7 +2,6 @@ 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 */
@@ -21,8 +20,8 @@ abstract public class BaseGrammaticalFunction extends LexComponent implements or
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BaseGrammaticalFunction(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) {
+    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) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.function = function;
@@ -34,8 +33,8 @@ abstract public class BaseGrammaticalFunction extends LexComponent implements or
     }
 
     /** minimal constructor */
-    public BaseGrammaticalFunction(java.lang.Boolean deleted, List analyticalNotes, Set translations, 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.Short function) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.function = function;
     }
 

src/java/org/thdl/lex/component/BaseKeyword.java

@@ -2,7 +2,6 @@ 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 */
@@ -21,8 +20,8 @@ abstract public class BaseKeyword extends LexComponent implements org.thdl.lex.c
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BaseKeyword(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.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.Short precedence, java.lang.String keyword, org.thdl.lex.component.ILexComponent parent) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.keyword = keyword;
@@ -34,8 +33,8 @@ abstract public class BaseKeyword extends LexComponent implements org.thdl.lex.c
     }
 
     /** minimal constructor */
-    public BaseKeyword(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta) {
+    public BaseKeyword(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
     }
 
     public java.lang.Integer getParentId() {

src/java/org/thdl/lex/component/BaseLexComponent.java

@@ -2,267 +2,86 @@ package org.thdl.lex.component;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Set;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
+/** @author Hibernate CodeGenerator */
+abstract public class BaseLexComponent implements org.thdl.lex.component.ILexComponent,Serializable {
 
-/**
+    /** identifier field */
- * @author     Hibernate CodeGenerator
- * @created    October 7, 2003
- */
-public abstract class BaseLexComponent implements org.thdl.lex.component.ILexComponent, Serializable
-{
-
-	/**
-	 * identifier field
-	 */
     private java.lang.Integer metaId;
 
-	/**
+    /** persistent field */
-	 * nullable persistent field
-	 */
-	private java.lang.Integer translationOf;
-
-	/**
-	 * persistent field
-	 */
     private java.lang.Boolean deleted;
 
-	/**
+    /** persistent field */
-	 * persistent field
-	 */
     private List analyticalNotes;
 
-	/**
+    /** persistent field */
-	 * persistent field
-	 */
-	private Set translations;
-
-	/**
-	 * persistent field
-	 */
     private org.thdl.lex.component.Meta meta;
 
-
+    /** full constructor */
-	/**
+    public BaseLexComponent(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) {
-	 *  Sets the metaId attribute of the BaseLexComponent object
-	 *
-	 * @param  metaId  The new metaId value
-	 */
-	public void setMetaId( java.lang.Integer metaId )
-	{
-		this.metaId = metaId;
-	}
-
-
-	/**
-	 *  Sets the translationOf attribute of the BaseLexComponent object
-	 *
-	 * @param  translationOf  The new translationOf value
-	 */
-	public void setTranslationOf( java.lang.Integer translationOf )
-	{
-		this.translationOf = translationOf;
-	}
-
-
-	/**
-	 *  Sets the deleted attribute of the BaseLexComponent object
-	 *
-	 * @param  deleted  The new deleted value
-	 */
-	public void setDeleted( java.lang.Boolean deleted )
-	{
         this.deleted = deleted;
-	}
-
-
-	/**
-	 *  Sets the analyticalNotes attribute of the BaseLexComponent object
-	 *
-	 * @param  analyticalNotes  The new analyticalNotes value
-	 */
-	public void setAnalyticalNotes( java.util.List analyticalNotes )
-	{
         this.analyticalNotes = analyticalNotes;
-	}
-
-
-	/**
-	 *  Sets the translations attribute of the BaseLexComponent object
-	 *
-	 * @param  translations  The new translations value
-	 */
-	public void setTranslations( java.util.Set translations )
-	{
-		this.translations = translations;
-	}
-
-
-	/**
-	 *  Sets the meta attribute of the BaseLexComponent object
-	 *
-	 * @param  meta  The new meta value
-	 */
-	public void setMeta( org.thdl.lex.component.Meta meta )
-	{
         this.meta = meta;
     }
 
+    /** default constructor */
+    public BaseLexComponent() {
+    }
 
-	/**
+    public java.lang.Integer getMetaId() {
-	 *  Gets the metaId attribute of the BaseLexComponent object
-	 *
-	 * @return    The metaId value
-	 */
-	public java.lang.Integer getMetaId()
-	{
         return this.metaId;
     }
 
-
+    public void setMetaId(java.lang.Integer metaId) {
-	/**
+        this.metaId = metaId;
-	 *  Gets the translationOf attribute of the BaseLexComponent object
-	 *
-	 * @return    The translationOf value
-	 */
-	public java.lang.Integer getTranslationOf()
-	{
-		return this.translationOf;
     }
 
-
+    public java.lang.Boolean getDeleted() {
-	/**
-	 *  Gets the deleted attribute of the BaseLexComponent object
-	 *
-	 * @return    The deleted value
-	 */
-	public java.lang.Boolean getDeleted()
-	{
         return this.deleted;
     }
 
+    public void setDeleted(java.lang.Boolean deleted) {
+        this.deleted = deleted;
+    }
 
-	/**
+    public java.util.List getAnalyticalNotes() {
-	 *  Gets the analyticalNotes attribute of the BaseLexComponent object
-	 *
-	 * @return    The analyticalNotes value
-	 */
-	public java.util.List getAnalyticalNotes()
-	{
         return this.analyticalNotes;
     }
 
-
+    public void setAnalyticalNotes(java.util.List analyticalNotes) {
-	/**
+        this.analyticalNotes = analyticalNotes;
-	 *  Gets the translations attribute of the BaseLexComponent object
-	 *
-	 * @return    The translations value
-	 */
-	public java.util.Set getTranslations()
-	{
-		return this.translations;
     }
 
-
+    public org.thdl.lex.component.Meta getMeta() {
-	/**
-	 *  Gets the meta attribute of the BaseLexComponent object
-	 *
-	 * @return    The meta value
-	 */
-	public org.thdl.lex.component.Meta getMeta()
-	{
         return this.meta;
     }
 
+    public void setMeta(org.thdl.lex.component.Meta meta) {
+        this.meta = meta;
+    }
 
-	/**
+    public String toString() {
-	 *  Description of the Method
+        return new ToStringBuilder(this)
-	 *
+            .append("metaId", getMetaId())
-	 * @return    Description of the Return Value
-	 */
-	public String toString()
-	{
-		return new ToStringBuilder( this )
-				.append( "metaId", getMetaId() )
             .toString();
     }
 
-
+    public boolean equals(Object other) {
-	/**
+        if ( !(other instanceof BaseLexComponent) ) return false;
-	 *  Description of the Method
-	 *
-	 * @param  other  Description of the Parameter
-	 * @return        Description of the Return Value
-	 */
-	public boolean equals( Object other )
-	{
-		if ( !( other instanceof BaseLexComponent ) )
-		{
-			return false;
-		}
         BaseLexComponent castOther = (BaseLexComponent) other;
         return new EqualsBuilder()
-				.append( this.getMetaId(), castOther.getMetaId() )
+            .append(this.getMetaId(), castOther.getMetaId())
             .isEquals();
     }
 
-
+    public int hashCode() {
-	/**
-	 *  Description of the Method
-	 *
-	 * @return    Description of the Return Value
-	 */
-	public int hashCode()
-	{
         return new HashCodeBuilder()
-				.append( getMetaId() )
+            .append(getMetaId())
             .toHashCode();
     }
 
-
-	/**
-	 * full constructor
-	 *
-	 * @param  translationOf    Description of the Parameter
-	 * @param  deleted          Description of the Parameter
-	 * @param  analyticalNotes  Description of the Parameter
-	 * @param  translations     Description of the Parameter
-	 * @param  meta             Description of the Parameter
-	 */
-	public BaseLexComponent( java.lang.Integer translationOf, java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta )
-	{
-		this.translationOf = translationOf;
-		this.deleted = deleted;
-		this.analyticalNotes = analyticalNotes;
-		this.translations = translations;
-		this.meta = meta;
-	}
-
-
-	/**
-	 * default constructor
-	 */
-	public BaseLexComponent() { }
-
-
-	/**
-	 * minimal constructor
-	 *
-	 * @param  deleted          Description of the Parameter
-	 * @param  analyticalNotes  Description of the Parameter
-	 * @param  translations     Description of the Parameter
-	 * @param  meta             Description of the Parameter
-	 */
-	public BaseLexComponent( java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta )
-	{
-		this.deleted = deleted;
-		this.analyticalNotes = analyticalNotes;
-		this.translations = translations;
-		this.meta = meta;
-	}
-
 }
-

src/java/org/thdl/lex/component/BaseModelSentence.java

@@ -6,7 +6,7 @@ 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.IModelSentence,Serializable {
+abstract public class BaseModelSentence extends LexComponent implements org.thdl.lex.component.Translatable,org.thdl.lex.component.IModelSentence,Serializable {
 
     /** nullable persistent field */
     private java.lang.Integer parentId;
@@ -20,17 +20,25 @@ abstract public class BaseModelSentence extends LexComponent implements org.thdl
     /** nullable persistent field */
     private java.lang.String modelSentence;
 
+    /** nullable persistent field */
+    private java.lang.Integer translationOf;
+
     /** nullable persistent field */
     private org.thdl.lex.component.ILexComponent parent;
 
+    /** persistent field */
+    private Set translations;
+
     /** full constructor */
-    public BaseModelSentence(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.Integer subdefinitionId, java.lang.String modelSentence, org.thdl.lex.component.ILexComponent parent) {
+    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) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.subdefinitionId = subdefinitionId;
         this.modelSentence = modelSentence;
+        this.translationOf = translationOf;
         this.parent = parent;
+        this.translations = translations;
     }
 
     /** default constructor */
@@ -38,9 +46,10 @@ abstract public class BaseModelSentence extends LexComponent implements org.thdl
     }
 
     /** minimal constructor */
-    public BaseModelSentence(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, java.lang.Integer subdefinitionId) {
+    public BaseModelSentence(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.Integer subdefinitionId, Set translations) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.subdefinitionId = subdefinitionId;
+        this.translations = translations;
     }
 
     public java.lang.Integer getParentId() {
@@ -75,6 +84,14 @@ abstract public class BaseModelSentence extends LexComponent implements org.thdl
         this.modelSentence = modelSentence;
     }
 
+    public java.lang.Integer getTranslationOf() {
+        return this.translationOf;
+    }
+
+    public void setTranslationOf(java.lang.Integer translationOf) {
+        this.translationOf = translationOf;
+    }
+
     public org.thdl.lex.component.ILexComponent getParent() {
         return this.parent;
     }
@@ -83,6 +100,14 @@ abstract public class BaseModelSentence extends LexComponent implements org.thdl
         this.parent = parent;
     }
 
+    public java.util.Set getTranslations() {
+        return this.translations;
+    }
+
+    public void setTranslations(java.util.Set translations) {
+        this.translations = translations;
+    }
+
     public String toString() {
         return new ToStringBuilder(this)
             .append("metaId", getMetaId())

src/java/org/thdl/lex/component/BasePassage.java

@@ -6,7 +6,7 @@ import java.util.Set;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 /** @author Hibernate CodeGenerator */
-abstract public class BasePassage extends LexComponent implements org.thdl.lex.component.IPassage,Serializable {
+abstract public class BasePassage extends LexComponent implements org.thdl.lex.component.IPassage,Serializable,org.thdl.lex.component.Translatable {
 
     /** nullable persistent field */
     private java.lang.Integer parentId;
@@ -26,19 +26,27 @@ abstract public class BasePassage extends LexComponent implements org.thdl.lex.c
     /** nullable persistent field */
     private java.lang.String passage;
 
+    /** nullable persistent field */
+    private java.lang.Integer translationOf;
+
     /** nullable persistent field */
     private org.thdl.lex.component.ILexComponent parent;
 
+    /** persistent field */
+    private Set translations;
+
     /** full constructor */
-    public BasePassage(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.String literarySource, java.lang.String spelling, java.lang.String pagination, java.lang.String passage, org.thdl.lex.component.ILexComponent parent) {
+    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) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.literarySource = literarySource;
         this.spelling = spelling;
         this.pagination = pagination;
         this.passage = passage;
+        this.translationOf = translationOf;
         this.parent = parent;
+        this.translations = translations;
     }
 
     /** default constructor */
@@ -46,8 +54,9 @@ abstract public class BasePassage extends LexComponent implements org.thdl.lex.c
     }
 
     /** minimal constructor */
-    public BasePassage(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta) {
+    public BasePassage(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, Set translations) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
+        this.translations = translations;
     }
 
     public java.lang.Integer getParentId() {
@@ -98,6 +107,14 @@ abstract public class BasePassage extends LexComponent implements org.thdl.lex.c
         this.passage = passage;
     }
 
+    public java.lang.Integer getTranslationOf() {
+        return this.translationOf;
+    }
+
+    public void setTranslationOf(java.lang.Integer translationOf) {
+        this.translationOf = translationOf;
+    }
+
     public org.thdl.lex.component.ILexComponent getParent() {
         return this.parent;
     }
@@ -106,6 +123,14 @@ abstract public class BasePassage extends LexComponent implements org.thdl.lex.c
         this.parent = parent;
     }
 
+    public java.util.Set getTranslations() {
+        return this.translations;
+    }
+
+    public void setTranslations(java.util.Set translations) {
+        this.translations = translations;
+    }
+
     public String toString() {
         return new ToStringBuilder(this)
             .append("metaId", getMetaId())

src/java/org/thdl/lex/component/BasePronunciation.java

@@ -2,7 +2,6 @@ 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 */
@@ -24,8 +23,8 @@ abstract public class BasePronunciation extends LexComponent implements org.thdl
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BasePronunciation(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.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.Short precedence, java.lang.String phonetics, java.lang.Short phoneticsType, org.thdl.lex.component.ILexComponent parent) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.phonetics = phonetics;
@@ -38,8 +37,8 @@ abstract public class BasePronunciation extends LexComponent implements org.thdl
     }
 
     /** minimal constructor */
-    public BasePronunciation(java.lang.Boolean deleted, List analyticalNotes, Set translations, 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.Short phoneticsType) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.phonetics = phonetics;
         this.phoneticsType = phoneticsType;
     }

src/java/org/thdl/lex/component/BaseRelatedTerm.java

@@ -2,7 +2,6 @@ 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 */
@@ -24,8 +23,8 @@ abstract public class BaseRelatedTerm extends LexComponent implements Serializab
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BaseRelatedTerm(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.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.Short precedence, java.lang.String relatedTerm, java.lang.Short relatedTermType, org.thdl.lex.component.ILexComponent parent) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.relatedTerm = relatedTerm;
@@ -38,8 +37,8 @@ abstract public class BaseRelatedTerm extends LexComponent implements Serializab
     }
 
     /** minimal constructor */
-    public BaseRelatedTerm(java.lang.Boolean deleted, List analyticalNotes, Set translations, 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.Short relatedTermType) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.relatedTermType = relatedTermType;
     }
 

src/java/org/thdl/lex/component/BaseSpeechRegister.java

@@ -2,7 +2,6 @@ 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 */
@@ -21,8 +20,8 @@ abstract public class BaseSpeechRegister extends LexComponent implements org.thd
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BaseSpeechRegister(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) {
+    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) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.register = register;
@@ -34,8 +33,8 @@ abstract public class BaseSpeechRegister extends LexComponent implements org.thd
     }
 
     /** minimal constructor */
-    public BaseSpeechRegister(java.lang.Boolean deleted, List analyticalNotes, Set translations, 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.Short register) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.register = register;
     }
 

src/java/org/thdl/lex/component/BaseSpelling.java

@@ -2,7 +2,6 @@ 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 */
@@ -24,8 +23,8 @@ abstract public class BaseSpelling extends LexComponent implements Serializable,
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BaseSpelling(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.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.Short precedence, java.lang.String spelling, java.lang.Short spellingType, org.thdl.lex.component.ILexComponent parent) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.spelling = spelling;
@@ -38,8 +37,8 @@ abstract public class BaseSpelling extends LexComponent implements Serializable,
     }
 
     /** minimal constructor */
-    public BaseSpelling(java.lang.Boolean deleted, List analyticalNotes, Set translations, 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.Short spellingType) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.spelling = spelling;
         this.spellingType = spellingType;
     }

src/java/org/thdl/lex/component/BaseSubdefinition.java

@@ -6,7 +6,7 @@ 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 {
+abstract public class BaseSubdefinition extends LexComponent implements org.thdl.lex.component.ISubdefinition,Serializable,org.thdl.lex.component.Translatable {
 
     /** nullable persistent field */
     private java.lang.Integer parentId;
@@ -17,6 +17,9 @@ abstract public class BaseSubdefinition extends LexComponent implements org.thdl
     /** nullable persistent field */
     private java.lang.String subdefinition;
 
+    /** nullable persistent field */
+    private java.lang.Integer translationOf;
+
     /** nullable persistent field */
     private org.thdl.lex.component.ILexComponent parent;
 
@@ -41,12 +44,16 @@ abstract public class BaseSubdefinition extends LexComponent implements org.thdl
     /** persistent field */
     private List registers;
 
+    /** persistent field */
+    private Set translations;
+
     /** full constructor */
-    public BaseSubdefinition(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.String subdefinition, org.thdl.lex.component.ILexComponent parent, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) {
+    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) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.subdefinition = subdefinition;
+        this.translationOf = translationOf;
         this.parent = parent;
         this.glosses = glosses;
         this.keywords = keywords;
@@ -55,6 +62,7 @@ abstract public class BaseSubdefinition extends LexComponent implements org.thdl
         this.relatedTerms = relatedTerms;
         this.passages = passages;
         this.registers = registers;
+        this.translations = translations;
     }
 
     /** default constructor */
@@ -62,8 +70,8 @@ abstract public class BaseSubdefinition extends LexComponent implements org.thdl
     }
 
     /** minimal constructor */
-    public BaseSubdefinition(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) {
+    public BaseSubdefinition(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers, Set translations) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.glosses = glosses;
         this.keywords = keywords;
         this.modelSentences = modelSentences;
@@ -71,6 +79,7 @@ abstract public class BaseSubdefinition extends LexComponent implements org.thdl
         this.relatedTerms = relatedTerms;
         this.passages = passages;
         this.registers = registers;
+        this.translations = translations;
     }
 
     public java.lang.Integer getParentId() {
@@ -97,6 +106,14 @@ abstract public class BaseSubdefinition extends LexComponent implements org.thdl
         this.subdefinition = subdefinition;
     }
 
+    public java.lang.Integer getTranslationOf() {
+        return this.translationOf;
+    }
+
+    public void setTranslationOf(java.lang.Integer translationOf) {
+        this.translationOf = translationOf;
+    }
+
     public org.thdl.lex.component.ILexComponent getParent() {
         return this.parent;
     }
@@ -161,6 +178,14 @@ abstract public class BaseSubdefinition extends LexComponent implements org.thdl
         this.registers = registers;
     }
 
+    public java.util.Set getTranslations() {
+        return this.translations;
+    }
+
+    public void setTranslations(java.util.Set translations) {
+        this.translations = translations;
+    }
+
     public String toString() {
         return new ToStringBuilder(this)
             .append("metaId", getMetaId())

src/java/org/thdl/lex/component/BaseTerm.java

@@ -2,7 +2,6 @@ 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 */
@@ -57,8 +56,8 @@ abstract public class BaseTerm extends LexComponent implements org.thdl.lex.comp
     private List registers;
 
     /** full constructor */
-    public BaseTerm(java.lang.Integer translationOf, java.lang.Boolean deleted, List analyticalNotes, Set translations, 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.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) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.term = term;
         this.precedence = precedence;
         this.pronunciations = pronunciations;
@@ -82,8 +81,8 @@ abstract public class BaseTerm extends LexComponent implements org.thdl.lex.comp
     }
 
     /** minimal constructor */
-    public BaseTerm(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, java.lang.String term, List pronunciations, List etymologies, List spellings, List functions, List encyclopediaArticles, List transitionalData, List definitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) {
+    public BaseTerm(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String term, List pronunciations, List etymologies, List spellings, List functions, List encyclopediaArticles, List transitionalData, List definitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.term = term;
         this.pronunciations = pronunciations;
         this.etymologies = etymologies;

src/java/org/thdl/lex/component/BaseTransitionalData.java

@@ -2,7 +2,6 @@ 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 */
@@ -27,8 +26,8 @@ abstract public class BaseTransitionalData extends LexComponent implements org.t
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BaseTransitionalData(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 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.Short precedence, java.lang.Short transitionalDataLabel, java.lang.String forPublicConsumption, java.lang.String transitionalDataText, org.thdl.lex.component.ILexComponent parent) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.transitionalDataLabel = transitionalDataLabel;
@@ -42,8 +41,8 @@ abstract public class BaseTransitionalData extends LexComponent implements org.t
     }
 
     /** minimal constructor */
-    public BaseTransitionalData(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, java.lang.String forPublicConsumption) {
+    public BaseTransitionalData(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta, java.lang.String forPublicConsumption) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
         this.forPublicConsumption = forPublicConsumption;
     }
 

src/java/org/thdl/lex/component/BaseTranslationEquivalent.java

@@ -2,7 +2,6 @@ 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 */
@@ -21,8 +20,8 @@ abstract public class BaseTranslationEquivalent extends LexComponent implements
     private org.thdl.lex.component.ILexComponent parent;
 
     /** full constructor */
-    public BaseTranslationEquivalent(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.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.Short precedence, java.lang.String translationEquivalent, org.thdl.lex.component.ILexComponent parent) {
-        super(translationOf, deleted, analyticalNotes, translations, meta);
+        super(deleted, analyticalNotes, meta);
         this.parentId = parentId;
         this.precedence = precedence;
         this.translationEquivalent = translationEquivalent;
@@ -34,8 +33,8 @@ abstract public class BaseTranslationEquivalent extends LexComponent implements
     }
 
     /** minimal constructor */
-    public BaseTranslationEquivalent(java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta) {
+    public BaseTranslationEquivalent(java.lang.Boolean deleted, List analyticalNotes, org.thdl.lex.component.Meta meta) {
-      super(deleted, analyticalNotes, translations, meta);
+      super(deleted, analyticalNotes, meta);
     }
 
     public java.lang.Integer getParentId() {

src/java/org/thdl/lex/component/Definition.java

@@ -1,8 +1,62 @@
 package org.thdl.lex.component;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import org.thdl.lex.LexConstants;
 
-public class Definition extends BaseDefinition implements Serializable
+/**
+ *  Description of the Class
+ *
+ * @author     travis
+ * @created    October 13, 2003
+ */
+public class Definition extends BaseDefinition implements Serializable, Translatable, LexComponentNode
 {
+	private HashMap childMap;
+
+
+	/**
+	 *  Sets the childMap attribute of the Term object
+	 *
+	 * @param  childMap  The new childMap value
+	 */
+	public void setChildMap( HashMap childMap )
+	{
+		this.childMap = childMap;
+	}
+
+
+	/**
+	 *  Gets the childMap attribute of the Term object
+	 *
+	 * @return    The childMap value
+	 */
+	public HashMap getChildMap()
+	{
+		if ( null == childMap )
+		{
+			initChildMap();
+		}
+		return childMap;
+	}
+
+
+	/**
+	 *  Description of the Method
+	 */
+	private void initChildMap()
+	{
+		setChildMap( new HashMap() );
+		getChildMap().put( LexConstants.SUBDEFINITIONLABEL_VALUE, getSubdefinitions() );
+		getChildMap().put( LexConstants.MODELSENTENCELABEL_VALUE, getModelSentences() );
+		getChildMap().put( LexConstants.PASSAGELABEL_VALUE, getPassages() );
+		getChildMap().put( LexConstants.TRANSLATIONLABEL_VALUE, getTranslations() );
+		getChildMap().put( LexConstants.RELATEDTERMLABEL_VALUE, getRelatedTerms() );
+		getChildMap().put( LexConstants.REGISTERLABEL_VALUE, getRegisters() );
+		getChildMap().put( LexConstants.KEYWORDLABEL_VALUE, getKeywords() );
+		getChildMap().put( LexConstants.ANALYTICALNOTELABEL_VALUE, getAnalyticalNotes() );
+		getChildMap().put( LexConstants.TRANSLATIONLABEL_VALUE, getTranslationEquivalents() );
+	}
 
 }
+

src/java/org/thdl/lex/component/Etymology.java

@@ -2,7 +2,7 @@ package org.thdl.lex.component;
 
 import java.io.Serializable;
 
-public class Etymology extends BaseEtymology implements Serializable
+public class Etymology extends BaseEtymology implements Serializable, Translatable
 {
 
 }

src/java/org/thdl/lex/component/IDefinition.java

@@ -4,19 +4,48 @@ package org.thdl.lex.component;
 /**
  *  Description of the Interface
  *
- *@author     travis
+ * @author     travis
- *@created    October 1, 2003
+ * @created    October 1, 2003
+ */
+public interface IDefinition extends Translatable
+{
+	/**
+	 *  Gets the parent attribute of the IDefinition object
+	 *
+	 * @return    The parent value
+	 */
+	public ILexComponent getParent();
+
+
+	/**
+	 *  Sets the parent attribute of the IDefinition object
+	 *
+	 * @param  comp  The new parent value
 	 */
-public interface IDefinition extends ILexComponent
-{	public ILexComponent getParent();
 	public void setParent( ILexComponent comp );
+
+
+	/**
+	 *  Gets the parentId attribute of the IDefinition object
+	 *
+	 * @return    The parentId value
+	 */
 	public java.lang.Integer getParentId();
+
+
+	/**
+	 *  Sets the parentId attribute of the IDefinition object
+	 *
+	 * @param  parentId  The new parentId value
+	 */
 	public void setParentId( java.lang.Integer parentId );
+
+
 	/**
 	 *  Gets the definition attribute of the IDefinition object
 	 *
-	 *@return    The definition value
+	 * @return    The definition value
-	 *@since
+	 * @since
 	 */
 	public java.lang.String getDefinition();
 
@@ -24,8 +53,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Sets the definition attribute of the IDefinition object
 	 *
-	 *@param  definition  The new definition value
+	 * @param  definition  The new definition value
-	 *@since
+	 * @since
 	 */
 	public void setDefinition( java.lang.String definition );
 
@@ -33,8 +62,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Gets the precedence attribute of the IDefinition object
 	 *
-	 *@return    The precedence value
+	 * @return    The precedence value
-	 *@since
+	 * @since
 	 */
 	public java.lang.Short getPrecedence();
 
@@ -42,8 +71,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Sets the precedence attribute of the IDefinition object
 	 *
-	 *@param  precedence  The new precedence value
+	 * @param  precedence  The new precedence value
-	 *@since
+	 * @since
 	 */
 	public void setPrecedence( java.lang.Short precedence );
 
@@ -51,8 +80,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Gets the subdefinitions attribute of the IDefinition object
 	 *
-	 *@return    The subdefinitions value
+	 * @return    The subdefinitions value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getSubdefinitions();
 
@@ -60,8 +89,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Sets the subdefinitions attribute of the IDefinition object
 	 *
-	 *@param  subdefinitions  The new subdefinitions value
+	 * @param  subdefinitions  The new subdefinitions value
-	 *@since
+	 * @since
 	 */
 	public void setSubdefinitions( java.util.List subdefinitions );
 
@@ -69,8 +98,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Gets the glosses attribute of the IDefinition object
 	 *
-	 *@return    The glosses value
+	 * @return    The glosses value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getGlosses();
 
@@ -78,8 +107,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Sets the glosses attribute of the IDefinition object
 	 *
-	 *@param  glosses  The new glosses value
+	 * @param  glosses  The new glosses value
-	 *@since
+	 * @since
 	 */
 	public void setGlosses( java.util.List glosses );
 
@@ -87,8 +116,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Gets the keywords attribute of the IDefinition object
 	 *
-	 *@return    The keywords value
+	 * @return    The keywords value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getKeywords();
 
@@ -96,8 +125,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Sets the keywords attribute of the IDefinition object
 	 *
-	 *@param  keywords  The new keywords value
+	 * @param  keywords  The new keywords value
-	 *@since
+	 * @since
 	 */
 	public void setKeywords( java.util.List keywords );
 
@@ -105,8 +134,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Gets the modelSentences attribute of the IDefinition object
 	 *
-	 *@return    The modelSentences value
+	 * @return    The modelSentences value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getModelSentences();
 
@@ -114,8 +143,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Sets the modelSentences attribute of the IDefinition object
 	 *
-	 *@param  modelSentences  The new modelSentences value
+	 * @param  modelSentences  The new modelSentences value
-	 *@since
+	 * @since
 	 */
 	public void setModelSentences( java.util.List modelSentences );
 
@@ -123,8 +152,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Gets the translationEquivalents attribute of the IDefinition object
 	 *
-	 *@return    The translationEquivalents value
+	 * @return    The translationEquivalents value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getTranslationEquivalents();
 
@@ -132,8 +161,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Sets the translationEquivalents attribute of the IDefinition object
 	 *
-	 *@param  translationEquivalents  The new translationEquivalents value
+	 * @param  translationEquivalents  The new translationEquivalents value
-	 *@since
+	 * @since
 	 */
 	public void setTranslationEquivalents( java.util.List translationEquivalents );
 
@@ -141,8 +170,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Gets the relatedTerms attribute of the IDefinition object
 	 *
-	 *@return    The relatedTerms value
+	 * @return    The relatedTerms value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getRelatedTerms();
 
@@ -150,8 +179,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Sets the relatedTerms attribute of the IDefinition object
 	 *
-	 *@param  relatedTerms  The new relatedTerms value
+	 * @param  relatedTerms  The new relatedTerms value
-	 *@since
+	 * @since
 	 */
 	public void setRelatedTerms( java.util.List relatedTerms );
 
@@ -159,8 +188,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Gets the passages attribute of the IDefinition object
 	 *
-	 *@return    The passages value
+	 * @return    The passages value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getPassages();
 
@@ -168,8 +197,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Sets the passages attribute of the IDefinition object
 	 *
-	 *@param  passages  The new passages value
+	 * @param  passages  The new passages value
-	 *@since
+	 * @since
 	 */
 	public void setPassages( java.util.List passages );
 
@@ -177,8 +206,8 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Gets the registers attribute of the IDefinition object
 	 *
-	 *@return    The registers value
+	 * @return    The registers value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getRegisters();
 
@@ -186,9 +215,10 @@ public interface IDefinition extends ILexComponent
 	/**
 	 *  Sets the registers attribute of the IDefinition object
 	 *
-	 *@param  registers  The new registers value
+	 * @param  registers  The new registers value
-	 *@since
+	 * @since
 	 */
 	public void setRegisters( java.util.List registers );
+
 }
 

src/java/org/thdl/lex/component/IEtymology.java

@@ -1,6 +1,6 @@
 package org.thdl.lex.component;
 
-public interface IEtymology  extends ILexComponent
+public interface IEtymology  extends Translatable
 {	public ILexComponent getParent();
 	public void setParent( ILexComponent comp );
 	public java.lang.Integer getParentId();

src/java/org/thdl/lex/component/ILexComponent.java

@@ -109,16 +109,16 @@ public interface ILexComponent
 	 * @return    The translations value
 	 * @since
 	 */
-	public java.util.Set getTranslations();
+	// public java.util.Set getTranslations();
 
 
 	/**
 	 *  Sets the translations attribute of the ILexComponent object
 	 *
-	 * @param  translations  The new translations value
+	 * @return               The deleted value
 	 * @since
 	 */
-	public void setTranslations( java.util.Set translations );
+	//public void setTranslations( java.util.Set translations );
 
 
 	/**

src/java/org/thdl/lex/component/IModelSentence.java

@@ -1,6 +1,6 @@
 package org.thdl.lex.component;
 
-public interface IModelSentence  extends ILexComponent
+public interface IModelSentence  extends Translatable
 {	public ILexComponent getParent();
 	public void setParent( ILexComponent comp );
 	public java.lang.Integer getParentId();

src/java/org/thdl/lex/component/IPassage.java

@@ -1,17 +1,107 @@
 package org.thdl.lex.component;
 
-public interface IPassage  extends ILexComponent
+
-{	public ILexComponent getParent();
+/**
+ *  Description of the Interface
+ *
+ * @author     travis
+ * @created    October 13, 2003
+ */
+public interface IPassage extends Translatable
+{
+	/**
+	 *  Gets the parent attribute of the IPassage object
+	 *
+	 * @return    The parent value
+	 */
+	public ILexComponent getParent();
+
+
+	/**
+	 *  Sets the parent attribute of the IPassage object
+	 *
+	 * @param  comp  The new parent value
+	 */
 	public void setParent( ILexComponent comp );
+
+
+	/**
+	 *  Gets the parentId attribute of the IPassage object
+	 *
+	 * @return    The parentId value
+	 */
 	public java.lang.Integer getParentId();
+
+
+	/**
+	 *  Sets the parentId attribute of the IPassage object
+	 *
+	 * @param  parentId  The new parentId value
+	 */
 	public void setParentId( java.lang.Integer parentId );
+
+
+	/**
+	 *  Gets the literarySource attribute of the IPassage object
+	 *
+	 * @return    The literarySource value
+	 */
 	public java.lang.String getLiterarySource();
-	public void setLiterarySource(java.lang.String literarySource);
+
+
+	/**
+	 *  Sets the literarySource attribute of the IPassage object
+	 *
+	 * @param  literarySource  The new literarySource value
+	 */
+	public void setLiterarySource( java.lang.String literarySource );
+
+
+	/**
+	 *  Gets the spelling attribute of the IPassage object
+	 *
+	 * @return    The spelling value
+	 */
 	public java.lang.String getSpelling();
-	public void setSpelling(java.lang.String spelling);
+
+
+	/**
+	 *  Sets the spelling attribute of the IPassage object
+	 *
+	 * @param  spelling  The new spelling value
+	 */
+	public void setSpelling( java.lang.String spelling );
+
+
+	/**
+	 *  Gets the pagination attribute of the IPassage object
+	 *
+	 * @return    The pagination value
+	 */
 	public java.lang.String getPagination();
-	public void setPagination(java.lang.String pagination);
+
+
+	/**
+	 *  Sets the pagination attribute of the IPassage object
+	 *
+	 * @param  pagination  The new pagination value
+	 */
+	public void setPagination( java.lang.String pagination );
+
+
+	/**
+	 *  Gets the passage attribute of the IPassage object
+	 *
+	 * @return    The passage value
+	 */
 	public java.lang.String getPassage();
-	public void setPassage(java.lang.String passage);
+
+
+	/**
+	 *  Sets the passage attribute of the IPassage object
+	 *
+	 * @param  passage  The new passage value
+	 */
+	public void setPassage( java.lang.String passage );
 }
 

src/java/org/thdl/lex/component/ISubdefinition.java

@@ -1,25 +1,174 @@
 package org.thdl.lex.component;
 
-public interface ISubdefinition  extends ILexComponent
+
-{	public ILexComponent getParent();
+/**
+ *  Description of the Interface
+ *
+ * @author     travis
+ * @created    October 13, 2003
+ */
+public interface ISubdefinition extends Translatable
+{
+	/**
+	 *  Gets the parent attribute of the ISubdefinition object
+	 *
+	 * @return    The parent value
+	 */
+	public ILexComponent getParent();
+
+
+	/**
+	 *  Sets the parent attribute of the ISubdefinition object
+	 *
+	 * @param  comp  The new parent value
+	 */
 	public void setParent( ILexComponent comp );
+
+
+	/**
+	 *  Gets the parentId attribute of the ISubdefinition object
+	 *
+	 * @return    The parentId value
+	 */
 	public java.lang.Integer getParentId();
+
+
+	/**
+	 *  Sets the parentId attribute of the ISubdefinition object
+	 *
+	 * @param  parentId  The new parentId value
+	 */
 	public void setParentId( java.lang.Integer parentId );
+
+
+
+	/**
+	 *  Gets the subdefinition attribute of the ISubdefinition object
+	 *
+	 * @return    The subdefinition value
+	 */
 	public java.lang.String getSubdefinition();
-	public void setSubdefinition(java.lang.String subdefinition);
+
+
+	/**
+	 *  Sets the subdefinition attribute of the ISubdefinition object
+	 *
+	 * @param  subdefinition  The new subdefinition value
+	 */
+	public void setSubdefinition( java.lang.String subdefinition );
+
+
+	/**
+	 *  Gets the glosses attribute of the ISubdefinition object
+	 *
+	 * @return    The glosses value
+	 */
 	public java.util.List getGlosses();
-	public void setGlosses(java.util.List glosses);
+
+
+	/**
+	 *  Sets the glosses attribute of the ISubdefinition object
+	 *
+	 * @param  glosses  The new glosses value
+	 */
+	public void setGlosses( java.util.List glosses );
+
+
+	/**
+	 *  Gets the keywords attribute of the ISubdefinition object
+	 *
+	 * @return    The keywords value
+	 */
 	public java.util.List getKeywords();
-	public void setKeywords(java.util.List keywords);
+
+
+	/**
+	 *  Sets the keywords attribute of the ISubdefinition object
+	 *
+	 * @param  keywords  The new keywords value
+	 */
+	public void setKeywords( java.util.List keywords );
+
+
+	/**
+	 *  Gets the modelSentences attribute of the ISubdefinition object
+	 *
+	 * @return    The modelSentences value
+	 */
 	public java.util.List getModelSentences();
-	public void setModelSentences(java.util.List modelSentences);
+
+
+	/**
+	 *  Sets the modelSentences attribute of the ISubdefinition object
+	 *
+	 * @param  modelSentences  The new modelSentences value
+	 */
+	public void setModelSentences( java.util.List modelSentences );
+
+
+	/**
+	 *  Gets the translationEquivalents attribute of the ISubdefinition object
+	 *
+	 * @return    The translationEquivalents value
+	 */
 	public java.util.List getTranslationEquivalents();
-	public void setTranslationEquivalents(java.util.List translationEquivalents);
+
+
+	/**
+	 *  Sets the translationEquivalents attribute of the ISubdefinition object
+	 *
+	 * @param  translationEquivalents  The new translationEquivalents value
+	 */
+	public void setTranslationEquivalents( java.util.List translationEquivalents );
+
+
+	/**
+	 *  Gets the relatedTerms attribute of the ISubdefinition object
+	 *
+	 * @return    The relatedTerms value
+	 */
 	public java.util.List getRelatedTerms();
-	public void setRelatedTerms(java.util.List relatedTerms);
+
+
+	/**
+	 *  Sets the relatedTerms attribute of the ISubdefinition object
+	 *
+	 * @param  relatedTerms  The new relatedTerms value
+	 */
+	public void setRelatedTerms( java.util.List relatedTerms );
+
+
+	/**
+	 *  Gets the passages attribute of the ISubdefinition object
+	 *
+	 * @return    The passages value
+	 */
 	public java.util.List getPassages();
-	public void setPassages(java.util.List passages);
+
+
+	/**
+	 *  Sets the passages attribute of the ISubdefinition object
+	 *
+	 * @param  passages  The new passages value
+	 */
+	public void setPassages( java.util.List passages );
+
+
+	/**
+	 *  Gets the registers attribute of the ISubdefinition object
+	 *
+	 * @return    The registers value
+	 */
 	public java.util.List getRegisters();
-	public void setRegisters(java.util.List registers);
+
+
+	/**
+	 *  Sets the registers attribute of the ISubdefinition object
+	 *
+	 * @param  registers  The new registers value
+	 */
+	public void setRegisters( java.util.List registers );
+
+
 }
 

src/java/org/thdl/lex/component/ITerm.java

@@ -4,16 +4,16 @@ package org.thdl.lex.component;
 /**
  *  Description of the Interface
  *
- *@author     travis
+ * @author     travis
- *@created    October 1, 2003
+ * @created    October 1, 2003
  */
 public interface ITerm extends ILexComponent
 {
 	/**
 	 *  Gets the term attribute of the ITerm object
 	 *
-	 *@return    The term value
+	 * @return    The term value
-	 *@since
+	 * @since
 	 */
 	public java.lang.String getTerm();
 
@@ -21,8 +21,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the term attribute of the ITerm object
 	 *
-	 *@param  term  The new term value
+	 * @param  term  The new term value
-	 *@since
+	 * @since
 	 */
 	public void setTerm( java.lang.String term );
 
@@ -30,8 +30,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the precedence attribute of the ITerm object
 	 *
-	 *@return    The precedence value
+	 * @return    The precedence value
-	 *@since
+	 * @since
 	 */
 	public java.lang.Short getPrecedence();
 
@@ -39,8 +39,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the precedence attribute of the ITerm object
 	 *
-	 *@param  precedence  The new precedence value
+	 * @param  precedence  The new precedence value
-	 *@since
+	 * @since
 	 */
 	public void setPrecedence( java.lang.Short precedence );
 
@@ -48,8 +48,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the pronunciations attribute of the ITerm object
 	 *
-	 *@return    The pronunciations value
+	 * @return    The pronunciations value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getPronunciations();
 
@@ -57,8 +57,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the pronunciations attribute of the ITerm object
 	 *
-	 *@param  pronunciations  The new pronunciations value
+	 * @param  pronunciations  The new pronunciations value
-	 *@since
+	 * @since
 	 */
 	public void setPronunciations( java.util.List pronunciations );
 
@@ -66,8 +66,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the etymologies attribute of the ITerm object
 	 *
-	 *@return    The etymologies value
+	 * @return    The etymologies value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getEtymologies();
 
@@ -75,8 +75,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the etymologies attribute of the ITerm object
 	 *
-	 *@param  etymologies  The new etymologies value
+	 * @param  etymologies  The new etymologies value
-	 *@since
+	 * @since
 	 */
 	public void setEtymologies( java.util.List etymologies );
 
@@ -84,8 +84,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the spellings attribute of the ITerm object
 	 *
-	 *@return    The spellings value
+	 * @return    The spellings value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getSpellings();
 
@@ -93,8 +93,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the spellings attribute of the ITerm object
 	 *
-	 *@param  spellings  The new spellings value
+	 * @param  spellings  The new spellings value
-	 *@since
+	 * @since
 	 */
 	public void setSpellings( java.util.List spellings );
 
@@ -102,8 +102,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the functions attribute of the ITerm object
 	 *
-	 *@return    The functions value
+	 * @return    The functions value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getFunctions();
 
@@ -111,8 +111,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the functions attribute of the ITerm object
 	 *
-	 *@param  functions  The new functions value
+	 * @param  functions  The new functions value
-	 *@since
+	 * @since
 	 */
 	public void setFunctions( java.util.List functions );
 
@@ -120,8 +120,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the encyclopediaArticles attribute of the ITerm object
 	 *
-	 *@return    The encyclopediaArticles value
+	 * @return    The encyclopediaArticles value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getEncyclopediaArticles();
 
@@ -129,8 +129,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the encyclopediaArticles attribute of the ITerm object
 	 *
-	 *@param  encyclopediaArticles  The new encyclopediaArticles value
+	 * @param  encyclopediaArticles  The new encyclopediaArticles value
-	 *@since
+	 * @since
 	 */
 	public void setEncyclopediaArticles( java.util.List encyclopediaArticles );
 
@@ -138,8 +138,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the transitionalData attribute of the ITerm object
 	 *
-	 *@return    The transitionalData value
+	 * @return    The transitionalData value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getTransitionalData();
 
@@ -147,8 +147,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the transitionalData attribute of the ITerm object
 	 *
-	 *@param  transitionalData  The new transitionalData value
+	 * @param  transitionalData  The new transitionalData value
-	 *@since
+	 * @since
 	 */
 	public void setTransitionalData( java.util.List transitionalData );
 
@@ -156,8 +156,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the definitions attribute of the ITerm object
 	 *
-	 *@return    The definitions value
+	 * @return    The definitions value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getDefinitions();
 
@@ -165,8 +165,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the definitions attribute of the ITerm object
 	 *
-	 *@param  definitions  The new definitions value
+	 * @param  definitions  The new definitions value
-	 *@since
+	 * @since
 	 */
 	public void setDefinitions( java.util.List definitions );
 
@@ -174,8 +174,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the glosses attribute of the ITerm object
 	 *
-	 *@return    The glosses value
+	 * @return    The glosses value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getGlosses();
 
@@ -183,8 +183,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the glosses attribute of the ITerm object
 	 *
-	 *@param  glosses  The new glosses value
+	 * @param  glosses  The new glosses value
-	 *@since
+	 * @since
 	 */
 	public void setGlosses( java.util.List glosses );
 
@@ -192,8 +192,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the keywords attribute of the ITerm object
 	 *
-	 *@return    The keywords value
+	 * @return    The keywords value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getKeywords();
 
@@ -201,8 +201,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the keywords attribute of the ITerm object
 	 *
-	 *@param  keywords  The new keywords value
+	 * @param  keywords  The new keywords value
-	 *@since
+	 * @since
 	 */
 	public void setKeywords( java.util.List keywords );
 
@@ -210,8 +210,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the modelSentences attribute of the ITerm object
 	 *
-	 *@return    The modelSentences value
+	 * @return    The modelSentences value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getModelSentences();
 
@@ -219,8 +219,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the modelSentences attribute of the ITerm object
 	 *
-	 *@param  modelSentences  The new modelSentences value
+	 * @param  modelSentences  The new modelSentences value
-	 *@since
+	 * @since
 	 */
 	public void setModelSentences( java.util.List modelSentences );
 
@@ -228,8 +228,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the translationEquivalents attribute of the ITerm object
 	 *
-	 *@return    The translationEquivalents value
+	 * @return    The translationEquivalents value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getTranslationEquivalents();
 
@@ -237,8 +237,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the translationEquivalents attribute of the ITerm object
 	 *
-	 *@param  translationEquivalents  The new translationEquivalents value
+	 * @param  translationEquivalents  The new translationEquivalents value
-	 *@since
+	 * @since
 	 */
 	public void setTranslationEquivalents( java.util.List translationEquivalents );
 
@@ -246,8 +246,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the relatedTerms attribute of the ITerm object
 	 *
-	 *@return    The relatedTerms value
+	 * @return    The relatedTerms value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getRelatedTerms();
 
@@ -255,8 +255,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the relatedTerms attribute of the ITerm object
 	 *
-	 *@param  relatedTerms  The new relatedTerms value
+	 * @param  relatedTerms  The new relatedTerms value
-	 *@since
+	 * @since
 	 */
 	public void setRelatedTerms( java.util.List relatedTerms );
 
@@ -264,8 +264,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the passages attribute of the ITerm object
 	 *
-	 *@return    The passages value
+	 * @return    The passages value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getPassages();
 
@@ -273,8 +273,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the passages attribute of the ITerm object
 	 *
-	 *@param  passages  The new passages value
+	 * @param  passages  The new passages value
-	 *@since
+	 * @since
 	 */
 	public void setPassages( java.util.List passages );
 
@@ -282,8 +282,8 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Gets the registers attribute of the ITerm object
 	 *
-	 *@return    The registers value
+	 * @return    The registers value
-	 *@since
+	 * @since
 	 */
 	public java.util.List getRegisters();
 
@@ -291,9 +291,10 @@ public interface ITerm extends ILexComponent
 	/**
 	 *  Sets the registers attribute of the ITerm object
 	 *
-	 *@param  registers  The new registers value
+	 * @param  registers  The new registers value
-	 *@since
+	 * @since
 	 */
 	public void setRegisters( java.util.List registers );
+
 }
 

src/java/org/thdl/lex/component/LexComponent.hbm.xml

@@ -11,19 +11,17 @@
 			<generator class="native"/>
 		</id>
 
-		<property name="translationOf" type="java.lang.Integer" column="translationOf" length="11"/>
+<!-- 		<property name="translationOf" type="java.lang.Integer" column="translationOf" length="11"/> -->
-		<set name="translations" table="Meta" lazy="true" where="translationOf = 1">
+		
-			<key column="translationOf"/>
-			<one-to-many class="org.thdl.lex.component.LexComponent"/>
-		</set>
 		<property name="deleted" type="java.lang.Boolean" column="deleted" not-null="true" length="5"/>
-		<list name="analyticalNotes" table="AnalyticalNotes" lazy="true">
+		<list name="analyticalNotes" table="AnalyticalNotes" lazy="true" cascade="all">
 			<key column="parentId"/>
 			<index column="precedence"/>
 			<one-to-many class="org.thdl.lex.component.AnalyticalNote"/>
 		</list>
 		
 		<component name="meta" class="org.thdl.lex.component.Meta">
+			<meta attribute="generated-class">org.thdl.lex.component.BaseMeta</meta>
 			<property name="createdBy" type="java.lang.Integer" column="createdBy" not-null="true" length="11"/>
 			<property name="modifiedBy" type="java.lang.Integer" column="modifiedBy" not-null="true" length="11"/>
 			<property name="createdByProjSub" type="java.lang.Integer" column="createdByProjSub" not-null="true" length="11"/>
@@ -52,72 +50,72 @@
 			<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">
+			<list name="pronunciations" table="Pronunciations" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Pronunciation"/>
 			</list>
-			<list name="etymologies" table="Etymologies" lazy="true">
+			<list name="etymologies" table="Etymologies" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Etymology"/>
 			</list>
-			<list name="spellings" table="Spellings" lazy="true">
+			<list name="spellings" table="Spellings" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Spelling"/>
 			</list>
-			<list name="functions" table="GrammaticalFunctions" lazy="true">
+			<list name="functions" table="GrammaticalFunctions" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.GrammaticalFunction"/>
 			</list>
-			<list name="encyclopediaArticles" table="EncyclopediaArticles" lazy="true">
+			<list name="encyclopediaArticles" table="EncyclopediaArticles" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.EncyclopediaArticle"/>
 			</list>
-			<list name="transitionalData" table="TransitionalData" lazy="true">
+			<list name="transitionalData" table="TransitionalData" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.TransitionalData"/>
 			</list>
-			<list name="definitions" table="Definitions" lazy="true">
+			<list name="definitions" table="Definitions" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Definition"/>
 			</list>
-			<list name="glosses" table="Glosses" lazy="true">
+			<list name="glosses" table="Glosses" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Gloss"/>
 			</list>
-			<list name="keywords" table="Keywords" lazy="true">
+			<list name="keywords" table="Keywords" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Keyword"/>
 			</list>
-			<list name="modelSentences" table="ModelSentences" lazy="true">
+			<list name="modelSentences" table="ModelSentences" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.ModelSentence"/>
 			</list>
-			<list name="translationEquivalents" table="TranslationEquivalents" lazy="true">
+			<list name="translationEquivalents" table="TranslationEquivalents" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.TranslationEquivalent"/>
 			</list>
-			<list name="relatedTerms" table="RelatedTerms" lazy="true">
+			<list name="relatedTerms" table="RelatedTerms" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.RelatedTerm"/>
 			</list>
-			<list name="passages" table="Passages" lazy="true">
+			<list name="passages" table="Passages" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Passage"/>
 			</list>
-			<list name="registers" table="SpeechRegisters" lazy="true">
+			<list name="registers" table="SpeechRegisters" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.SpeechRegister"/>
@@ -126,47 +124,53 @@
 		
 		<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"/>
 			<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="definition" type="java.lang.String" column="definition" length="65535"/>
-			<list name="subdefinitions" table="Subdefinitions" lazy="true">
+			<property name="translationOf" type="java.lang.Integer" column="translationOf" length="11"/>
+			<set name="translations" table="Definitions" lazy="true" cascade="all" where="translationOf = 1">
+				<key column="translationOf"/>
+				<one-to-many class="org.thdl.lex.component.Definition"/>
+			</set>
+			<list name="subdefinitions" table="Subdefinitions" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Subdefinition"/>
 			</list>
-			<list name="glosses" table="Glosses" lazy="true">
+			<list name="glosses" table="Glosses" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Gloss"/>
 			</list>
-			<list name="keywords" table="Keywords" lazy="true">
+			<list name="keywords" table="Keywords" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Keyword"/>
 			</list>
-			<list name="modelSentences" table="ModelSentences" lazy="true">
+			<list name="modelSentences" table="ModelSentences" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.ModelSentence"/>
 			</list>
-			<list name="translationEquivalents" table="TranslationEquivalents" lazy="true">
+			<list name="translationEquivalents" table="TranslationEquivalents" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.TranslationEquivalent"/>
 			</list>
-			<list name="relatedTerms" table="RelatedTerms" lazy="true">
+			<list name="relatedTerms" table="RelatedTerms" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.RelatedTerm"/>
 			</list>
-			<list name="passages" table="Passages" lazy="true">
+			<list name="passages" table="Passages" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Passage"/>
 			</list>
-			<list name="registers" table="SpeechRegisters" lazy="true">
+			<list name="registers" table="SpeechRegisters" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.SpeechRegister"/>
@@ -175,42 +179,48 @@
 		
 		<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"/>
 			<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="subdefinition" type="java.lang.String" column="subdefinition" length="65535"/>
-			<list name="glosses" table="Glosses" lazy="true">
+			<property name="translationOf" type="java.lang.Integer" column="translationOf" length="11"/>
+			<set name="translations" table="Subdefinitions" lazy="true" cascade="all" where="translationOf = 1">
+				<key column="translationOf"/>
+				<one-to-many class="org.thdl.lex.component.Subdefinition"/>
+			</set>
+			<list name="glosses" table="Glosses" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Gloss"/>
 			</list>
-			<list name="keywords" table="Keywords" lazy="true">
+			<list name="keywords" table="Keywords" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Keyword"/>
 			</list>
-			<list name="modelSentences" table="ModelSentences" lazy="true">
+			<list name="modelSentences" table="ModelSentences" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.ModelSentence"/>
 			</list>
-			<list name="translationEquivalents" table="TranslationEquivalents" lazy="true">
+			<list name="translationEquivalents" table="TranslationEquivalents" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.TranslationEquivalent"/>
 			</list>
-			<list name="relatedTerms" table="RelatedTerms" lazy="true">
+			<list name="relatedTerms" table="RelatedTerms" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.RelatedTerm"/>
 			</list>
-			<list name="passages" table="Passages" lazy="true">
+			<list name="passages" table="Passages" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.Passage"/>
 			</list>
-			<list name="registers" table="SpeechRegisters" lazy="true">
+			<list name="registers" table="SpeechRegisters" lazy="true" cascade="all">
 				<key column="parentId"/>
 				<index column="precedence"/>
 				<one-to-many class="org.thdl.lex.component.SpeechRegister"/>
@@ -229,6 +239,7 @@
 		
 		<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"/>
 			<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
@@ -237,6 +248,11 @@
 			<property name="etymologyType" type="java.lang.Short" 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">
+				<key column="translationOf"/>
+				<one-to-many class="org.thdl.lex.component.Etymology"/>
+			</set>
 		</joined-subclass>
 		
 		<joined-subclass name="org.thdl.lex.component.Spelling" proxy="org.thdl.lex.component.ISpelling" table="Spellings">
@@ -289,12 +305,18 @@
 		
 		<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"/>
 			<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="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">
+				<key column="translationOf"/>
+				<one-to-many class="org.thdl.lex.component.ModelSentence"/>
+			</set>
 		</joined-subclass>
 		
 		<joined-subclass name="org.thdl.lex.component.TranslationEquivalent" proxy="org.thdl.lex.component.ITranslationEquivalent" table="TranslationEquivalents">
@@ -318,6 +340,7 @@
 		
 		<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"/>
 			<many-to-one name="parent" class="org.thdl.lex.component.LexComponent" column="parentId" insert="false" update="false"/>
@@ -326,6 +349,11 @@
 			<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">
+				<key column="translationOf"/>
+				<one-to-many class="org.thdl.lex.component.Passage"/>
+			</set>
 		</joined-subclass>
 		
 		<joined-subclass name="org.thdl.lex.component.SpeechRegister" proxy="org.thdl.lex.component.IRegister" table="SpeechRegisters">

src/java/org/thdl/lex/component/LexComponent.java

@@ -14,6 +14,41 @@ import org.apache.commons.beanutils.BeanUtils;
 // public abstract class LexComponent extends BaseLexComponent implements Serializable
 public abstract class LexComponent extends BaseLexComponent implements Serializable
 {
+	private Meta meta;
+
+
+	/*
+	    public List getTranslations()
+	    {
+	    List nullNullNullNull = null;
+	    return nullNullNullNull;
+	    }
+	  */
+	/**
+	 *  Gets the meta attribute of the LexComponent object
+	 *
+	 * @return    The meta value
+	 */
+	public Meta getMeta()
+	{
+		if ( null == this.meta )
+		{
+			setMeta( new Meta() );
+		}
+		return this.meta;
+	}
+
+
+	/**
+	 *  Sets the meta attribute of the LexComponent object
+	 *
+	 * @param  meta  The new meta value
+	 */
+	public void setMeta( Meta meta )
+	{
+		this.meta = meta;
+	}
+
 
 	/**
 	 *  Gets the precedence attribute of the LexComponent object
@@ -109,42 +144,46 @@ public abstract class LexComponent extends BaseLexComponent implements Serializa
 	}
 
 
+	/**
+	 *  Description of the Method
+	 *
+	 * @param  component                  Description of the Parameter
+	 * @exception  LexComponentException  Description of the Exception
+	 */
+	public void populate( ILexComponent component ) throws LexComponentException
+	{
+		try
+		{
+			BeanUtils.copyProperties( this, component );
+		}
+		catch ( IllegalAccessException iae )
+		{
+			throw new LexComponentException( iae );
+		}
+		catch ( java.lang.reflect.InvocationTargetException ite )
+		{
+			throw new LexComponentException( ite );
+		}
+
+	}
+
 //constructors
+
 	/**
-	 *  Constructor for the LexComponent object
+	 *Constructor for the LexComponent object
 	 *
-	 * @param  translationOf    Description of Parameter
+	 * @param  deleted          Description of the Parameter
-	 * @param  deleted          Description of Parameter
+	 * @param  analyticalNotes  Description of the Parameter
-	 * @param  analyticalNotes  Description of Parameter
+	 * @param  meta             Description of the Parameter
-	 * @param  meta             Description of Parameter
-	 * @param  translations     Description of Parameter
-	 * @since
 	 */
-	public LexComponent( Integer translationOf, Boolean deleted, List analyticalNotes, Set translations, Meta meta )
+	public LexComponent( java.lang.Boolean deleted, java.util.List analyticalNotes, org.thdl.lex.component.Meta meta )
 	{
-		super( translationOf, deleted, analyticalNotes, translations, meta );
+		super( deleted, analyticalNotes, meta );
 	}
 
 
 	/**
-	 *  Constructor for the LexComponent object
+	 *Constructor for the LexComponent object
-	 *
-	 * @param  deleted          Description of Parameter
-	 * @param  analyticalNotes  Description of Parameter
-	 * @param  meta             Description of Parameter
-	 * @param  translations     Description of Parameter
-	 * @since
-	 */
-	public LexComponent( Boolean deleted, List analyticalNotes, Set translations, Meta meta )
-	{
-		super( deleted, analyticalNotes, translations, meta );
-	}
-
-
-	/**
-	 *  Constructor for the LexComponent object
-	 *
-	 * @since
 	 */
 	public LexComponent()
 	{

src/java/org/thdl/lex/component/Meta.java

@@ -1,166 +1,59 @@
 package org.thdl.lex.component;
 
 import java.io.Serializable;
+import java.util.Map;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
-/** @author Hibernate CodeGenerator */
-public class Meta implements Serializable {
 
-    /** persistent field */
+/**
-    private java.lang.Integer createdBy;
+ * @author     Hibernate CodeGenerator
+ * @created    October 10, 2003
+ */
+public class Meta extends BaseMeta implements Serializable
+{
 
-    /** persistent field */
+	/**
-    private java.lang.Integer modifiedBy;
+	 *  Description of the Method
-
+	 *
-    /** persistent field */
+	 * @param  properties                 Description of the Parameter
-    private java.lang.Integer createdByProjSub;
+	 * @exception  LexComponentException  Description of the Exception
-
+	 */
-    /** persistent field */
+	public void populate( Map properties ) throws LexComponentException
-    private java.lang.Integer modifiedByProjSub;
+	{
-
+		try
-    /** nullable persistent field */
+		{
-    private java.util.Date createdOn;
+			BeanUtils.populate( this, properties );
-
+		}
-    /** nullable persistent field */
+		catch ( IllegalAccessException iae )
-    private java.util.Date modifiedOn;
+		{
-
+			throw new LexComponentException( iae );
-    /** persistent field */
+		}
-    private java.lang.Integer source;
+		catch ( java.lang.reflect.InvocationTargetException ite )
-
+		{
-    /** persistent field */
+			throw new LexComponentException( ite );
-    private java.lang.Short language;
-
-    /** persistent field */
-    private java.lang.Short script;
-
-    /** persistent field */
-    private java.lang.Short dialect;
-
-    /** nullable persistent field */
-    private java.lang.String note;
-
-    /** full constructor */
-    public Meta(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) {
-        this.createdBy = createdBy;
-        this.modifiedBy = modifiedBy;
-        this.createdByProjSub = createdByProjSub;
-        this.modifiedByProjSub = modifiedByProjSub;
-        this.createdOn = createdOn;
-        this.modifiedOn = modifiedOn;
-        this.source = source;
-        this.language = language;
-        this.script = script;
-        this.dialect = dialect;
-        this.note = note;
 		}
 
-    /** default constructor */
-    public Meta() {
 	}
 
-    /** minimal constructor */
-    public Meta(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) {
-        this.createdBy = createdBy;
-        this.modifiedBy = modifiedBy;
-        this.createdByProjSub = createdByProjSub;
-        this.modifiedByProjSub = modifiedByProjSub;
-        this.source = source;
-        this.language = language;
-        this.script = script;
-        this.dialect = dialect;
-    }
 
-    public java.lang.Integer getCreatedBy() {
+	/**
-        return this.createdBy;
+	 *  Description of the Method
-    }
+	 *
-
+	 * @return    Description of the Return Value
-    public void setCreatedBy(java.lang.Integer createdBy) {
+	 */
-        this.createdBy = createdBy;
+	public String toString()
-    }
+	{
-
+		return new ToStringBuilder( this )
-    public java.lang.Integer getModifiedBy() {
-        return this.modifiedBy;
-    }
-
-    public void setModifiedBy(java.lang.Integer modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public java.lang.Integer getCreatedByProjSub() {
-        return this.createdByProjSub;
-    }
-
-    public void setCreatedByProjSub(java.lang.Integer createdByProjSub) {
-        this.createdByProjSub = createdByProjSub;
-    }
-
-    public java.lang.Integer getModifiedByProjSub() {
-        return this.modifiedByProjSub;
-    }
-
-    public void setModifiedByProjSub(java.lang.Integer modifiedByProjSub) {
-        this.modifiedByProjSub = modifiedByProjSub;
-    }
-
-    public java.util.Date getCreatedOn() {
-        return this.createdOn;
-    }
-
-    public void setCreatedOn(java.util.Date createdOn) {
-        this.createdOn = createdOn;
-    }
-
-    public java.util.Date getModifiedOn() {
-        return this.modifiedOn;
-    }
-
-    public void setModifiedOn(java.util.Date modifiedOn) {
-        this.modifiedOn = modifiedOn;
-    }
-
-    public java.lang.Integer getSource() {
-        return this.source;
-    }
-
-    public void setSource(java.lang.Integer source) {
-        this.source = source;
-    }
-
-    public java.lang.Short getLanguage() {
-        return this.language;
-    }
-
-    public void setLanguage(java.lang.Short language) {
-        this.language = language;
-    }
-
-    public java.lang.Short getScript() {
-        return this.script;
-    }
-
-    public void setScript(java.lang.Short script) {
-        this.script = script;
-    }
-
-    public java.lang.Short getDialect() {
-        return this.dialect;
-    }
-
-    public void setDialect(java.lang.Short dialect) {
-        this.dialect = dialect;
-    }
-
-    public java.lang.String getNote() {
-        return this.note;
-    }
-
-    public void setNote(java.lang.String note) {
-        this.note = note;
-    }
-
-    public String toString() {
-        return new ToStringBuilder(this)
 				.toString();
 	}
 
+
+
+	/**
+	 * default constructor
+	 */
+	public Meta() { }
+
 }
+

src/java/org/thdl/lex/component/ModelSentence.java

@@ -2,7 +2,7 @@ package org.thdl.lex.component;
 
 import java.io.Serializable;
 
-public class ModelSentence extends BaseModelSentence implements Serializable
+public class ModelSentence extends BaseModelSentence implements Serializable, Translatable
 {
 
 }

src/java/org/thdl/lex/component/Passage.java

@@ -2,7 +2,7 @@ package org.thdl.lex.component;
 
 import java.io.Serializable;
 
-public class Passage extends BasePassage implements Serializable
+public class Passage extends BasePassage implements Serializable, Translatable
 {
 
 }

src/java/org/thdl/lex/component/Subdefinition.java

@@ -1,8 +1,62 @@
 package org.thdl.lex.component;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import org.thdl.lex.LexConstants;
 
-public class Subdefinition extends BaseSubdefinition implements Serializable
+
+/**
+ *  Description of the Class
+ *
+ * @author     travis
+ * @created    October 13, 2003
+ */
+public class Subdefinition extends BaseSubdefinition implements Serializable, Translatable, LexComponentNode
 {
+	private HashMap childMap;
+
+
+	/**
+	 *  Sets the childMap attribute of the Term object
+	 *
+	 * @param  childMap  The new childMap value
+	 */
+	public void setChildMap( HashMap childMap )
+	{
+		this.childMap = childMap;
+	}
+
+
+	/**
+	 *  Gets the childMap attribute of the Term object
+	 *
+	 * @return    The childMap value
+	 */
+	public HashMap getChildMap()
+	{
+		if ( null == childMap )
+		{
+			initChildMap();
+		}
+		return childMap;
+	}
+
+
+	/**
+	 *  Description of the Method
+	 */
+	private void initChildMap()
+	{
+		setChildMap( new HashMap() );
+		getChildMap().put( LexConstants.MODELSENTENCELABEL_VALUE, getModelSentences() );
+		getChildMap().put( LexConstants.PASSAGELABEL_VALUE, getPassages() );
+		getChildMap().put( LexConstants.TRANSLATIONLABEL_VALUE, getTranslations() );
+		getChildMap().put( LexConstants.RELATEDTERMLABEL_VALUE, getRelatedTerms() );
+		getChildMap().put( LexConstants.REGISTERLABEL_VALUE, getRegisters() );
+		getChildMap().put( LexConstants.KEYWORDLABEL_VALUE, getKeywords() );
+		getChildMap().put( LexConstants.ANALYTICALNOTELABEL_VALUE, getAnalyticalNotes() );
+		getChildMap().put( LexConstants.TRANSLATIONLABEL_VALUE, getTranslationEquivalents() );
+	}
 
 }
+

src/java/org/thdl/lex/component/Term.java

@@ -3,6 +3,7 @@ package org.thdl.lex.component;
 import java.io.Serializable;
 import java.util.*;
 import org.thdl.lex.LexConstants;
+import org.thdl.lex.LexLogger;
 
 
 /**
@@ -11,10 +12,10 @@ import org.thdl.lex.LexConstants;
  * @author     travis
  * @created    October 3, 2003
  */
-public class Term extends BaseTerm implements Serializable
+public class Term extends BaseTerm implements Serializable, LexComponentNode
 {
 	private HashMap childMap;
-	//helper methods
+
 
 	/**
 	 *  Gets the parentId attribute of the Term object
@@ -78,53 +79,55 @@ public class Term extends BaseTerm implements Serializable
 	 */
 	public HashMap getChildMap()
 	{
+		if ( null == childMap )
+		{
+			initChildMap();
+		}
 		return childMap;
 	}
 
 
 	/**
-	 *  Gets the childList attribute of the Term object
+	 *  Description of the Method
 	 *
 	 * @param  component                  Description of the Parameter
-	 * @return            The childList value
+	 * @return                            Description of the Return Value
+	 * @exception  LexComponentException  Description of the Exception
 	 */
-	/*
+	public List findSiblings( ILexComponent component ) throws LexComponentException
-	    public List getChildList( String label )
 	{
 		List list = null;
-	    Iterator it = getChildMap().keySet().iterator();
+		if ( null != component.getParent() )
-	    while ( it.hasNext() )
 		{
-	    String key = (String) it.next();
+			LexComponentNode node = (LexComponentNode) component.getParent();
-	    if ( key.equals( label ) )
+			list = (List) node.getChildMap().get( component.getLabel() );
-	    {
+			LexLogger.debug( "List derived from " + node + ": " + list );
-	    list = (List) getChildMap().get( key );
 		}
+		else
+		{
+			throw new LexComponentException( "Failed to locate a set of siblings in the Term object graph for: " + component );
 		}
 		return list;
 	}
-	  */
+
+
 	/**
 	 *  Gets the persistentChild attribute of the Term object
 	 *
-	 * @param  component  Description of the Parameter
+	 * @param  child                      Description of the Parameter
 	 * @return                            The persistentChild value
+	 * @exception  LexComponentException  Description of the Exception
 	 */
-	public ILexComponent findChild( ILexComponent component )
+	public ILexComponent findChild( ILexComponent child ) throws LexComponentException
 	{
 		ILexComponent persistentChild = null;
-		if ( component.getParent() instanceof Term )
+		List list = findSiblings( child );
-		{
-			//String label =
-			//List list = getChildList( label );
-			List list = (List) getChildMap().get( component.getLabel() );
 		for ( Iterator it = list.iterator(); it.hasNext();  )
 		{
-				ILexComponent termChild = (ILexComponent) it.next();
+			ILexComponent lc = (ILexComponent) it.next();
-				if ( termChild.getMetaId().equals( component.getMetaId() ) )
+			if ( lc.getMetaId().equals( child.getMetaId() ) )
 			{
-					persistentChild = termChild;
+				persistentChild = lc;
-				}
 			}
 		}
 		return persistentChild;
@@ -135,11 +138,12 @@ public class Term extends BaseTerm implements Serializable
 	 *  Adds a feature to the Child attribute of the Term object
 	 *
 	 * @param  component                  The feature to be added to the Child attribute
-	 * @return            Description of the Return Value
+	 * @exception  LexComponentException  Description of the Exception
 	 */
-	public ILexComponent addChild( ILexComponent component )
+	public void addChild( ILexComponent component ) throws LexComponentException
 	{
-		return null;
+		List list = findSiblings( component );
+		list.add( component );
 	}
 
 
@@ -178,7 +182,7 @@ public class Term extends BaseTerm implements Serializable
 	/**
 	 *  Description of the Method
 	 */
-	private void initChild()
+	private void initChildMap()
 	{
 		setChildMap( new HashMap() );
 		getChildMap().put( LexConstants.PRONUNCIATIONLABEL_VALUE, getPronunciations() );
@@ -187,15 +191,14 @@ public class Term extends BaseTerm implements Serializable
 		getChildMap().put( LexConstants.FUNCTIONLABEL_VALUE, getFunctions() );
 		getChildMap().put( LexConstants.ENCYCLOPEDIA_ARTICLE_LABEL_VALUE, getEncyclopediaArticles() );
 		getChildMap().put( LexConstants.DEFINITIONLABEL_VALUE, getDefinitions() );
-		// getChildMap().put( LexConstants.SUBDEFINITIONLABEL_VALUE, getSubdefinitions() );
 		getChildMap().put( LexConstants.MODELSENTENCELABEL_VALUE, getModelSentences() );
 		getChildMap().put( LexConstants.PASSAGELABEL_VALUE, getPassages() );
-		getChildMap().put( LexConstants.TRANSLATIONLABEL_VALUE, getTranslations() );
 		getChildMap().put( LexConstants.RELATEDTERMLABEL_VALUE, getRelatedTerms() );
 		getChildMap().put( LexConstants.REGISTERLABEL_VALUE, getRegisters() );
 		getChildMap().put( LexConstants.KEYWORDLABEL_VALUE, getKeywords() );
 		getChildMap().put( LexConstants.ANALYTICALNOTELABEL_VALUE, getAnalyticalNotes() );
-		getChildMap().put( LexConstants.TRANSLATIONLABEL_VALUE, getTranslations() );
+		getChildMap().put( LexConstants.TRANSLATIONLABEL_VALUE, getTranslationEquivalents() );
+		getChildMap().put( LexConstants.TRANSITIONALDATALABEL_VALUE, getTransitionalData() );
 	}
 
 
@@ -205,69 +208,8 @@ public class Term extends BaseTerm implements Serializable
 	 */
 	public Term()
 	{
-		initChild();
+		super();
 	}
 
-
-	/**
-	 *Constructor for the Term object
-	 *
-	 * @param  translationOf           Description of the Parameter
-	 * @param  deleted                 Description of the Parameter
-	 * @param  analyticalNotes         Description of the Parameter
-	 * @param  translations            Description of the Parameter
-	 * @param  meta                    Description of the Parameter
-	 * @param  term                    Description of the Parameter
-	 * @param  precedence              Description of the Parameter
-	 * @param  pronunciations          Description of the Parameter
-	 * @param  etymologies             Description of the Parameter
-	 * @param  spellings               Description of the Parameter
-	 * @param  functions               Description of the Parameter
-	 * @param  encyclopediaArticles    Description of the Parameter
-	 * @param  transitionalData        Description of the Parameter
-	 * @param  definitions             Description of the Parameter
-	 * @param  glosses                 Description of the Parameter
-	 * @param  keywords                Description of the Parameter
-	 * @param  modelSentences          Description of the Parameter
-	 * @param  translationEquivalents  Description of the Parameter
-	 * @param  relatedTerms            Description of the Parameter
-	 * @param  passages                Description of the Parameter
-	 * @param  registers               Description of the Parameter
-	 */
-	public Term( java.lang.Integer translationOf, java.lang.Boolean deleted, List analyticalNotes, Set translations, 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 )
-	{
-		super( translationOf, deleted, analyticalNotes, translations, meta, term, precedence, pronunciations, etymologies, spellings, functions, encyclopediaArticles, transitionalData, definitions, glosses, keywords, modelSentences, translationEquivalents, relatedTerms, passages, registers );
-		initChild();
-	}
-
-
-	/**
-	 *Constructor for the Term object
-	 *
-	 * @param  deleted                 Description of the Parameter
-	 * @param  analyticalNotes         Description of the Parameter
-	 * @param  translations            Description of the Parameter
-	 * @param  meta                    Description of the Parameter
-	 * @param  term                    Description of the Parameter
-	 * @param  pronunciations          Description of the Parameter
-	 * @param  etymologies             Description of the Parameter
-	 * @param  spellings               Description of the Parameter
-	 * @param  functions               Description of the Parameter
-	 * @param  encyclopediaArticles    Description of the Parameter
-	 * @param  transitionalData        Description of the Parameter
-	 * @param  definitions             Description of the Parameter
-	 * @param  glosses                 Description of the Parameter
-	 * @param  keywords                Description of the Parameter
-	 * @param  modelSentences          Description of the Parameter
-	 * @param  translationEquivalents  Description of the Parameter
-	 * @param  relatedTerms            Description of the Parameter
-	 * @param  passages                Description of the Parameter
-	 * @param  registers               Description of the Parameter
-	 */
-	public Term( java.lang.Boolean deleted, List analyticalNotes, Set translations, org.thdl.lex.component.Meta meta, java.lang.String term, List pronunciations, List etymologies, List spellings, List functions, List encyclopediaArticles, List transitionalData, List definitions, List glosses, List keywords, List modelSentences, List translationEquivalents, List relatedTerms, List passages, List registers )
-	{
-		super( deleted, analyticalNotes, translations, meta, term, pronunciations, etymologies, spellings, functions, encyclopediaArticles, transitionalData, definitions, glosses, keywords, modelSentences, translationEquivalents, relatedTerms, passages, registers );
-		initChild();
-	}
 }
 

src/java/org/thdl/lex/component/Translatable.java

@@ -1,6 +1,44 @@
 package org.thdl.lex.component;
 
-public interface Translatable
+
+/**
+ *  Description of the Interface
+ *
+ * @author     travis
+ * @created    October 13, 2003
+ */
+public interface Translatable extends ILexComponent
 {
-	//public java.util.Enumeration getTranslatableFields();
+	/**
+	 *  Gets the translationOf attribute of the Translatable object
+	 *
+	 * @return    The translationOf value
+	 */
+	public Integer getTranslationOf();
+
+
+	/**
+	 *  Sets the translationOf attribute of the Translatable object
+	 *
+	 * @param  pkReference  The new translationOf value
+	 */
+	public void setTranslationOf( Integer pkReference );
+
+
+	/**
+	 *  Gets the translations attribute of the Translatable object
+	 *
+	 * @return    The translations value
+	 */
+	public java.util.Set getTranslations();
+
+
+	/**
+	 *  Sets the translations attribute of the Translatable object
+	 *
+	 * @param  translations  The new translations value
+	 */
+	public void setTranslations( java.util.Set translations );
+
 }
+

src/jsp/jsp/displayEntry.jsp

@@ -33,17 +33,7 @@
 	<input type="hidden" name="cmd" value="" />
 	<input type="hidden" name="comp" value="term" />
 	<c:set var="multiple" value="multiple='multiple'" />
-<%-- 	<c:set var="jsFunction" value="MM_jumpMenu('parent',this,0)" />
+
-	<c:out value='<select name="id" ${multiple} onchange="${jsFunction}" onclick="${jsFunction}">' escapeXml='false' /> 
-		<c:forEach var="resultsMapItem" items="${query.results}">
-			<c:set var="sel" value="" />
-				<c:out value="<!--resultsMapItem='${resultsMapItem.key}' component='${component.metaId }'-->" escapeXml="false" />
-				<c:if test="${ resultsMapItem.key == termEntry.metaId }">
-					<c:set var="sel" value="selected='selected'" />
-				</c:if>
-				<c:out value='<option value="${resultsMapItem.key}" ${sel}>${ resultsMapItem.value}</option>' escapeXml="false" />
-		</c:forEach>
-	</select>--%>
 	
 	<c:forEach var="resultsMapItem" items="${query.results}">
 				<c:set var="cls" value="" />
@@ -53,32 +43,20 @@
 		<c:out value='<a ${cls} href="/lex/action?cmd=displayFull&comp=term&metaId=${resultsMapItem.key}">${ resultsMapItem.value}</a>' escapeXml='false' /><br />		
 	</c:forEach>
 
-	<%-- Click term to display entry<br /> 
+
-	<c:if test="${ param.mode == 'newTerm'}">
+	Query took: <c:out value="${ session.query.duration }"/> seconds.
-		<c:out value='<input type="hidden" id="term" name="term" value="${ term }" />' escapeXml="false" />
-		<input type="submit" value="New Entry" onclick="setCmd('getInsertForm',0)" /><br />
-	</c:if>	
-	<c:if test="${ editMode }">
-		<input type="submit" value="Remove Term" onclick="setCmd('remove',0)" /><br />
-	</c:if>--%>
-	Query took: <c:out value="${ session.query.duration/1000 }"/> seconds.
 </p>
 </form>
 </div><!--END MENU-->
 </c:if>
-<%-- <c:if test="${ ! empty results }">  --%>
 <c:choose>
 	<c:when test="${ param.comp == 'encyclopediaArticle' && param.cmd == 'display' }">
 	<jsp:include page="encyclopedia.jsf" flush="false"/>
 	</c:when>
-	<c:when test="${ param.cmd == 'testing' }">
-	<jsp:include page="testing.jsf" flush="false"/>
-	</c:when>
 	<c:otherwise>
 	<jsp:include page="displayTree.jsf" flush="false"/>
 	</c:otherwise>
 </c:choose>
-<%-- </c:if> --%>
 </div><!--END columnSingle-->
 
 <jsp:include page="footer.jsf" flush="false" />

src/jsp/jsp/displayMeta.jsf

@@ -22,14 +22,14 @@
 <span class="label">Dialect:	</span><c:out value="${ applicationScope.flatData.majorDialectFamilies[ component.meta.dialect ] }"  default="unknown"  escapeXml="false"/>
 <br />
 <span class="label">Translation: </span>
-<c:choose>
+<%-- <c:choose>
 <c:when test="${ component.translationOf > 0 }">
 Yes (of <c:out value="${ component.translationOf }"  default="unknown"  escapeXml="false"/>)
 </c:when>
 <c:otherwise>
 No
 </c:otherwise>
-</c:choose>
+</c:choose> --%>
 <br />
 <span class="label">Note:	</span><c:out value="${ component.meta.note }"  default="unknown"  escapeXml="false"/>	<br />
 </c:if>

src/jsp/jsp/displayTree.jsf

@@ -33,10 +33,10 @@ function submitForm( cmd, component, metaId, parentId, componentHex, parentHex )
 	document.forms[2].comp.value = component;
 	document.forms[2].metaId.value = metaId;
 	document.forms[2].parentId.value = parentId;
-	assert( componentHex != null , "no componentHex");
+	//assert( componentHex != null , "no componentHex");
-		document.forms[2].componentHex.value = componentHex;
+		//document.forms[2].componentHex.value = componentHex;
-	assert( parentHex != null , "no parentHex") ;
+	//assert( parentHex != null , "no parentHex") ;
-		document.forms[2].parentHex.value = parentHex;
+		//document.forms[2].parentHex.value = parentHex;
 	document.forms[2].submit();
 }
 </script>
@@ -47,8 +47,8 @@ function submitForm( cmd, component, metaId, parentId, componentHex, parentHex )
 	<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="componentHex" value="" />
-	<input type="hidden" name="parentHex" value="" />
+	<input type="hidden" name="parentHex" value="" /> --%>
 </p>
 </c:if>
 
@@ -57,7 +57,7 @@ function submitForm( cmd, component, metaId, parentId, componentHex, parentHex )
 <c:out value='<a name="${ query.entry.label }" ></a>' escapeXml="false" />
 		<c:if test="${ editMode }">
 		<span class="compEditOptions">
-			<c:set var="jsParams" value="'getUpdateForm', 'term', '${ query.entry.metaId }', '', '${query.entry}', ''" />
+			<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" />
@@ -99,9 +99,7 @@ function submitForm( cmd, component, metaId, parentId, componentHex, parentHex )
 <c:forEach var="transitionalData" items="${ query.entry.transitionalData }">
 <p class="data">
 <c:out value='<a name="${ transitionalData.label }" ></a>' escapeXml="false" />
-<c:out value='${ transitionalData }' escapeXml="false" /><br/>
+
-<c:out value='${ transitionalData.parent }' escapeXml="false" /><br/>
-<c:out value='${ query.entry }' escapeXml="false" /><br/>
 		<c:if test="${ editMode }">
 		<span class="compEditOptions">
 		<c:set var="jsParams" value="'annotate', 'transitionalData', '${ transitionalData.metaId }', '${ query.entry.metaId }', '${ transitionalData }' , '${ query.entry }'" />

src/jsp/jsp/error.jsp

@@ -61,7 +61,7 @@ The message appears below.<br />
 </p>
 </div>
 
-<jsp:include page="debug.jsf" />
+<%-- <jsp:include page="debug.jsf" /> --%>
 
 </body>
 </html>

src/jsp/jsp/footer.jsf

@@ -2,7 +2,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <%@ taglib prefix = "req" uri = "http://jakarta.apache.org/taglibs/request-1.0" %>
 
-<c:if test="${ ! empty sessionScope.user }">
+<%-- <c:if test="${ ! empty sessionScope.user }">
 	<c:if test="${ sessionScope.user.developer }">
 	<jsp:include page="debug.jsf" flush="false" />
 	</c:if>
@@ -19,7 +19,7 @@
 		scrollIt('<c:out value="${ jumpToLocation }"/>');
 	</script>
 
-</c:if>
+</c:if> --%>
 
 </div><!--END Main-->
 

src/jsp/jsp/menu.jsp

@@ -29,7 +29,7 @@ Message:
 	Step 2: Choose an action <br />
 	<input type="submit" value="Find Term" onclick="setCmd('find','menu')" /> <br />
 	<c:if test="${ editMode }">
-	<input type="submit" value="New Entry" onclick="setCmd('new', 'menu')" /> <br />
+	<input type="submit" value="New Entry" onclick="setCmd('getInsertTermForm', 'menu')" /> <br />
 	Metadata Preferences <br />
 	<input type="submit" value="Defaults" onclick="setCmd('getMetaDefaultsForm','menu')"/> <br />
 	<input type="submit" value="Preferences" onclick="setCmd('getMetaPrefsForm','menu')"/> <br />

src/jsp/jsp/metaForm.jsf

@@ -36,11 +36,11 @@
 		<c:set var="note" value="ERROR" />
 	</c:otherwise>
 </c:choose>
-<c:if test="${ component.translationOf > 0 }">
+<%-- <c:if test="${ component.translationOf > 0 }">
 	<c:set var="translateMode" value="${ true }" />
 	<c:set var="originalNote" value="Original Metadata Note: ${ note } <br /> Translation " />
 	<c:set var="note" value="" />
-</c:if>
+</c:if> --%>
 
 <c:if test="${ translateMode }">
 <c:out value='<input type="hidden" name="translationOf" value="${ component.translationOf }" />'escapeXml="false" />

src/jsp/jsp/transitionalDataForm.jsf

@@ -23,11 +23,10 @@
 </c:choose>
 
 <c:set var="translateMode" value="${ false }" />
-<c:if test="${ component.translationOf > 0 }">
+<%-- <c:if test="${ component.translationOf > 0 }">
 	<c:set var="translateMode" value="${ true }" />
-	<c:set var="originalTransitionalDataText" 
+	<c:set var="originalTransitionalDataText" value="Original Text: ${ original.transitionalDataText } <br /> Translation " />
-			 value="Original Text: ${ original.transitionalDataText } <br /> Translation " />
+</c:if> --%>
-</c:if>
 
 <form id="newCompForm" action="/lex/action" method="post">
 <p>