[Jrisk-cvs] SF.net SVN: jrisk:[441] TranslationTool/src/net/yura/translation

[<yu...@us...>]

Revision: 441
          http://jrisk.svn.sourceforge.net/jrisk/?rev=441&view=rev
Author:   yuranet
Date:     2010-09-14 15:53:51 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
fix to leafs being set to no work needed even if they had children that needed work

Modified Paths:
--------------
    TranslationTool/src/net/yura/translation/MessageTool.java
    TranslationTool/src/net/yura/translation/MyNode.java

Modified: TranslationTool/src/net/yura/translation/MessageTool.java
===================================================================
--- TranslationTool/src/net/yura/translation/MessageTool.java	2010-09-03 18:44:04 UTC (rev 440)
+++ TranslationTool/src/net/yura/translation/MessageTool.java	2010-09-14 15:53:51 UTC (rev 441)
@@ -77,7 +77,7 @@
     private PartnerNode currentpartner;
     private JComboBox filter1;
     private JToolBar toolbar;
-    public static final String version = "2.0";
+    public static final String version = "2.1";
     private Map partmap;
     public static final Comparator CASE_POSTERIORITY_ORDER = new Comparator() {
         public int compare(Object o1, Object o2) {
@@ -95,7 +95,7 @@
             System.err.println("TCPopupEventQueue error: " + th.toString());
         }
 
-        setName("Translation Tool");
+        setName("yura.net Translation Tool "+version);
 
         setOpaque(false);
 
@@ -1293,7 +1293,7 @@
 
         MessageTool mt = new MessageTool();
 
-        JFrame frame = new JFrame("yura.net Translation Tool");
+        JFrame frame = new JFrame( mt.getName() );
 
         frame.getContentPane().add(mt.getToolBar(), BorderLayout.NORTH);
         frame.getContentPane().add(mt);

Modified: TranslationTool/src/net/yura/translation/MyNode.java
===================================================================
--- TranslationTool/src/net/yura/translation/MyNode.java	2010-09-03 18:44:04 UTC (rev 440)
+++ TranslationTool/src/net/yura/translation/MyNode.java	2010-09-14 15:53:51 UTC (rev 441)
@@ -153,45 +153,36 @@
 
 		// adding bottom or removing top
 		if (((m!=null && l!=null) || (m==null && l==null)) && workneeded) {
-			workneeded = false;
-			checkBackWorkNeeded(mycomm,currentlocale);
+                    checkBackWorkNeeded(mycomm,currentlocale);
 		}
 		// adding top or removing bottom
 		else if (((m!=null && l==null) || (l!=null && m==null)) && !workneeded) {
-
-			checkBackWorkNeededSetTrue();
+                    checkBackWorkNeededSetTrue();
 		}
 	}
 
-	public void checkBackWorkNeededSetTrue() {
-
+	private void checkBackWorkNeededSetTrue() {
 		workneeded = true;
-
 		MyNode parent = (MyNode)getParent();
-
 		if (parent!=null && !parent.workNeeded()) {
-
 			parent.checkBackWorkNeededSetTrue();
-
 		}
-
 	}
 
-	public void checkBackWorkNeeded(Mtcomm mycomm,Locale currentlocale) throws Exception {
+	private void checkBackWorkNeeded(Mtcomm mycomm,Locale currentlocale) throws Exception {
+                if (haschildren) {
+                    mycomm.setupMissingTranslation( this, currentlocale );
+                }
+                else {
+                    workneeded = false;
+                }
 
-		MyNode parent = (MyNode)getParent();
-
-		if (parent!=null) {
-
-			mycomm.setupMissingTranslation( parent, currentlocale );
-
-			if (!parent.workNeeded()) {
-
-				parent.checkBackWorkNeeded(mycomm,currentlocale);
-
-			}
+                if (!workneeded) {
+                    MyNode parent = (MyNode)getParent();
+                    if (parent!=null) {
+                            parent.checkBackWorkNeeded(mycomm,currentlocale);
+                    }
 		}
-
 	}
 
 	public void loadChildren(Mtcomm mycomm,Locale currentlocale) throws Exception {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.