You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/03/24 14:01:17 UTC
svn commit: r757770 - in
/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n:
ContextMatrix.java LocaleHolder.java
Author: simoneg
Date: Tue Mar 24 13:01:16 2009
New Revision: 757770
URL: http://svn.apache.org/viewvc?rev=757770&view=rev
Log:
LABS-319 : refined the case for single solution
Modified:
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java?rev=757770&r1=757769&r2=757770&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java Tue Mar 24 13:01:16 2009
@@ -57,9 +57,9 @@
public int getScore(Stack<ContextElement> mc) {
//int maxscore = (mc.size() * (mc.size() + 1)) / 2;
if (parts.length == 1) return 0;
- int total = 0;
+ int total = -1;
int upto = 0;
- int pos = 0;
+ int pos = 1;
for (ContextElement ele : mc) {
if (ele instanceof I18nContextElement) {
if (ele instanceof I18nSingleSegmentContextElement) {
@@ -93,4 +93,11 @@
return value;
}
+ /**
+ * @return The "parts" of this message, that is the context informations plus the main discriminator.
+ */
+ public String[] getParts() {
+ return parts;
+ }
+
}
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java?rev=757770&r1=757769&r2=757770&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java Tue Mar 24 13:01:16 2009
@@ -120,7 +120,9 @@
List<ContextMatrix> list = firstLookup.get(deh);
if (list == null || list.size() == 0) return original;
if (list.size() == 1) {
- return list.get(0).getValue();
+ if (list.get(0).getParts().length == 1) {
+ return list.get(0).getValue();
+ }
}
//ct.push(deh);
int topscore = -1;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org