diff --git a/src/java/log4j.properties b/src/java/log4j.properties
index 8a8ea14..4e40354 100644
--- a/src/java/log4j.properties
+++ b/src/java/log4j.properties
@@ -22,7 +22,7 @@ log4j.rootLogger=warn, stdout
log4j.logger.net.sf.hibernate=info, file
-log4j.logger.org.thdl.lex=info, lex-out
+log4j.logger.org.thdl.lex=debug, lex-out
### enable the following line if you want to track down connection ###
### leakages when using DriverManagerConnectionProvider ###
diff --git a/src/java/org/thdl/lex/commands/RemoveCommand.java b/src/java/org/thdl/lex/commands/RemoveCommand.java
index 3789b62..c56ffde 100644
--- a/src/java/org/thdl/lex/commands/RemoveCommand.java
+++ b/src/java/org/thdl/lex/commands/RemoveCommand.java
@@ -93,6 +93,9 @@ public class RemoveCommand extends LexCommand implements Command
else if ( component instanceof Translatable && null != ( (Translatable) component ).getTranslationOf() )
{
Translatable translation = (Translatable) component;
+ LexLogger.debug( "Checking translation state before looking for its source" );
+ LexLogger.debugComponent( translation );
+
Translatable source = null;
try
{
@@ -105,6 +108,9 @@ public class RemoveCommand extends LexCommand implements Command
source.setMetaId( translation.getTranslationOf() );
source.setParentId( translation.getParentId() );
source = (Translatable) term.findChild( source );
+ LexLogger.debug( "Checking source state before looking for its translation list" );
+ LexLogger.debugComponent( source );
+
List translationList = source.getTranslations();
ILexComponent doomedComponent = (ILexComponent) translationList.get( translationList.indexOf( translation ) );
doomedComponent.setDeleted( Boolean.TRUE );
diff --git a/src/java/org/thdl/lex/component/BaseSubdefinition.java b/src/java/org/thdl/lex/component/BaseSubdefinition.java
index 778863d..e193ea2 100644
--- a/src/java/org/thdl/lex/component/BaseSubdefinition.java
+++ b/src/java/org/thdl/lex/component/BaseSubdefinition.java
@@ -192,15 +192,6 @@ public abstract class BaseSubdefinition extends LexComponent implements org.thdl
*/
public void setPrecedence( java.lang.Integer precedence )
{
- if ( null == precedence )
- {
- int i = getGlosses().size();
- }
- if ( ( new Integer( -1 ) ).equals( precedence ) )
- {
- Object o = new String();
- Integer i = (Integer) o;
- }
this.precedence = precedence;
}
diff --git a/src/java/org/thdl/lex/component/LexComponent.java b/src/java/org/thdl/lex/component/LexComponent.java
index e6bf0c6..a3e2fb7 100644
--- a/src/java/org/thdl/lex/component/LexComponent.java
+++ b/src/java/org/thdl/lex/component/LexComponent.java
@@ -227,6 +227,14 @@ public abstract class LexComponent extends BaseLexComponent implements Serializa
{
label = "transitionalData";
}
+ else if ( label.equals( "grammaticalFunction" ) )
+ {
+ label = "functions";
+ }
+ else if ( label.equals( "speechRegister" ) )
+ {
+ label = "registers";
+ }
else
{
label = label + "s";
diff --git a/src/jsp/jsp/displayDefinition.jsf b/src/jsp/jsp/displayDefinition.jsf
index 55f547c..748be15 100644
--- a/src/jsp/jsp/displayDefinition.jsf
+++ b/src/jsp/jsp/displayDefinition.jsf
@@ -14,7 +14,7 @@
-
+
diff --git a/src/jsp/jsp/displayEncyclopediaArticle.jsf b/src/jsp/jsp/displayEncyclopediaArticle.jsf
index 0c5a78b..f17dffb 100644
--- a/src/jsp/jsp/displayEncyclopediaArticle.jsf
+++ b/src/jsp/jsp/displayEncyclopediaArticle.jsf
@@ -9,7 +9,7 @@
-
+
diff --git a/src/jsp/jsp/displayForm.jsp b/src/jsp/jsp/displayForm.jsp
index dde0264..ca8a2df 100644
--- a/src/jsp/jsp/displayForm.jsp
+++ b/src/jsp/jsp/displayForm.jsp
@@ -48,7 +48,9 @@ Back to:
+
+
Warning!! This is your last chance. Are you sure you want to remove this component and all of its sub-components?
diff --git a/src/jsp/jsp/displayFunction.jsf b/src/jsp/jsp/displayFunction.jsf
index a291d50..60ba8ae 100644
--- a/src/jsp/jsp/displayFunction.jsf
+++ b/src/jsp/jsp/displayFunction.jsf
@@ -7,7 +7,7 @@
-
+
diff --git a/src/jsp/jsp/displayKeyword.jsf b/src/jsp/jsp/displayKeyword.jsf
index 5d44fb3..b15ffdc 100644
--- a/src/jsp/jsp/displayKeyword.jsf
+++ b/src/jsp/jsp/displayKeyword.jsf
@@ -11,7 +11,7 @@
-
+
diff --git a/src/jsp/jsp/displayModelSentence.jsf b/src/jsp/jsp/displayModelSentence.jsf
index f2cb5c2..90223ac 100644
--- a/src/jsp/jsp/displayModelSentence.jsf
+++ b/src/jsp/jsp/displayModelSentence.jsf
@@ -12,7 +12,7 @@
-
+
diff --git a/src/jsp/jsp/displayPassage.jsf b/src/jsp/jsp/displayPassage.jsf
index ffd9658..70d7d57 100644
--- a/src/jsp/jsp/displayPassage.jsf
+++ b/src/jsp/jsp/displayPassage.jsf
@@ -12,7 +12,7 @@
-
+
diff --git a/src/jsp/jsp/displayPronunciation.jsf b/src/jsp/jsp/displayPronunciation.jsf
index 48cdebf..a08e680 100644
--- a/src/jsp/jsp/displayPronunciation.jsf
+++ b/src/jsp/jsp/displayPronunciation.jsf
@@ -12,7 +12,7 @@
-
+
diff --git a/src/jsp/jsp/displayRegister.jsf b/src/jsp/jsp/displayRegister.jsf
index 08cb5f7..305985e 100644
--- a/src/jsp/jsp/displayRegister.jsf
+++ b/src/jsp/jsp/displayRegister.jsf
@@ -11,7 +11,7 @@
-
+
diff --git a/src/jsp/jsp/displayRelatedTerm.jsf b/src/jsp/jsp/displayRelatedTerm.jsf
index c6f8c49..bdfd4d6 100644
--- a/src/jsp/jsp/displayRelatedTerm.jsf
+++ b/src/jsp/jsp/displayRelatedTerm.jsf
@@ -10,7 +10,7 @@
-
+
diff --git a/src/jsp/jsp/displaySpelling.jsf b/src/jsp/jsp/displaySpelling.jsf
index 10bf1cb..8a3ef43 100644
--- a/src/jsp/jsp/displaySpelling.jsf
+++ b/src/jsp/jsp/displaySpelling.jsf
@@ -7,7 +7,7 @@
-
+
diff --git a/src/jsp/jsp/displaySubdefinition.jsf b/src/jsp/jsp/displaySubdefinition.jsf
index 68113e1..842fa41 100644
--- a/src/jsp/jsp/displaySubdefinition.jsf
+++ b/src/jsp/jsp/displaySubdefinition.jsf
@@ -20,7 +20,7 @@
-
+
diff --git a/src/jsp/jsp/displayTransitionalData.jsf b/src/jsp/jsp/displayTransitionalData.jsf
index 7a0cf72..3ae7612 100644
--- a/src/jsp/jsp/displayTransitionalData.jsf
+++ b/src/jsp/jsp/displayTransitionalData.jsf
@@ -13,7 +13,7 @@
-
+
diff --git a/src/jsp/jsp/displayTranslationEquivalent.jsf b/src/jsp/jsp/displayTranslationEquivalent.jsf
index a6b32d4..4fcfe21 100644
--- a/src/jsp/jsp/displayTranslationEquivalent.jsf
+++ b/src/jsp/jsp/displayTranslationEquivalent.jsf
@@ -11,7 +11,7 @@
-
+