Author: lemovice
Date: Thu Sep 12 21:32:51 2013
New Revision: 4543
Log:
Update percentage computation method
Modified:
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ResourceFile.java
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ZipArchive.java
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ZipDirectory.java
Modified:
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ResourceFile.java
==============================================================================
---
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ResourceFile.java
(original)
+++
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ResourceFile.java
Thu Sep 12 21:32:51 2013
@@ -262,6 +262,10 @@
}
}
+ public int getTranslatedLineCount () {
+ return getLineCount() - not_translated;
+ }
+
public String getLine(int i) {
ResourceItem.ResourceLine line = null;
String value = null;
Modified:
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ZipArchive.java
==============================================================================
---
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ZipArchive.java
(original)
+++
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ZipArchive.java
Thu Sep 12 21:32:51 2013
@@ -84,7 +84,7 @@
ZipOutputStream translationOutputStream = new
ZipOutputStream(new BufferedOutputStream(new FileOutputStream(outputFile)));
int nbTransaltedFiles =
root.saveTranslation(translationOutputStream, "");
translationOutputStream.close();
-
+
/*
* directory structure has change and need to be saved.
* modified.xx file has been removed during translation saving
@@ -132,8 +132,12 @@
change = true;
}
- public int getTranslatePercent() {
- return root.getTranslatedPercent();
+ public int getTranslatedLineCount() {
+ return root.getTranslatedLineCount();
+ }
+
+ public int getLineCount() {
+ return root.getLineCount();
}
/**
Modified:
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ZipDirectory.java
==============================================================================
---
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ZipDirectory.java
(original)
+++
trunk/Tools/trancestris/Resources/src/org/ancestris/trancestris/resources/ZipDirectory.java
Thu Sep 12 21:32:51 2013
@@ -166,28 +166,37 @@
return directoryNamesArray;
}
- public int getTranslatedPercent() {
- int translatedPercent = 0;
+ public int getTranslatedLineCount() {
+
+ int translatedLineCount;
+
+ if (resourceFile != null) {
+ translatedLineCount = resourceFile.getTranslatedLineCount();
+ } else {
+ translatedLineCount = 0;
+ }
+
+ for (ZipDirectory zipDirectory : dirs.values()) {
+ translatedLineCount += zipDirectory.getTranslatedLineCount();
+ }
+
+ return translatedLineCount;
+ }
+
+ public int getLineCount() {
+ int lineCount;
+
if (resourceFile != null) {
- translatedPercent = resourceFile.getTranslatedPercent();
+ lineCount = resourceFile.getLineCount();
} else {
- translatedPercent = -1;
+ lineCount = 0;
}
for (ZipDirectory zipDirectory : dirs.values()) {
- int Percentage = zipDirectory.getTranslatedPercent();
- if (translatedPercent == -1) {
- if (Percentage >= 0) {
- translatedPercent = Percentage;
- }
- } else {
- if (Percentage >= 0) {
- translatedPercent = (int) ((float) (translatedPercent +
Percentage) / (float) 2);
- }
- }
+ lineCount += zipDirectory.getLineCount();
}
- return translatedPercent;
+ return lineCount;
}
public void addPropertyChangeListener(PropertyChangeListener pcl) {
---------------------------------------------------------------------
Site Web Ancestris : http://www.ancestris.org
<*> Pour vous desinscrire de cette liste, envoyez un mail a :
[email protected]
<*> Pour obtenir de l'aide sur les commandes de la liste :
[email protected]
Pour obtenir tous les messages lies a ce fil de discussion, cliquez sur le
lien ci-dessous, cela ouvrira votre logiciel de messagerie. Il vous suffira
d'envoyer le message :
[email protected]
