# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1376340261 -7200
# Node ID b87ea854d9201ee65091af16913bc9e44543b05c
# Parent  8503a20726d276b5b4c711a562e04a39db0bc64d
data: sieve improved | generator: little Java improvements

diff -r 8503a20726d2 -r b87ea854d920 data/dictionary.xml
--- a/data/dictionary.xml	Mon Aug 12 22:40:38 2013 +0200
+++ b/data/dictionary.xml	Mon Aug 12 22:44:21 2013 +0200
@@ -274,10 +274,10 @@
 			<text>
 				a standardized language for describing e-mail filters;
 				the MDA can apply system-wide or user-defined filters on incoming messages;
-				a filter has conditions (connected logical operators: AND, OR…) like „message header contains value X“
-				and actions that will be done with the message like „file into folder X“ or „add flag/label 1“ or „redirect message to some.address@example.com“ or „discard message“;
+				a filter has conditions (connected by logical operators: AND, OR…) like „message header contains value X“
+				and actions that will be done with the message like „file into folder X“ or „add flag/label X“ or „redirect message to some.address@example.com“ or „discard message“;
 				filters are executed on the server where MDA resides,
-				so they are independent on the MUA currently used by the user
+				so they are independent of the MUA currently used by the user
 				and works even if the user is offline (useful for OOTO messages when the user is on vacation)
 			</text>
 		</explanation>
diff -r 8503a20726d2 -r b87ea854d920 java/dictionary-generator/src/cz/frantovo/telco/dictionary/Functions.java
--- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/Functions.java	Mon Aug 12 22:40:38 2013 +0200
+++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/Functions.java	Mon Aug 12 22:44:21 2013 +0200
@@ -18,7 +18,6 @@
 package cz.frantovo.telco.dictionary;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
diff -r 8503a20726d2 -r b87ea854d920 java/dictionary-generator/src/cz/frantovo/telco/dictionary/MappedNamespaceContext.java
--- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/MappedNamespaceContext.java	Mon Aug 12 22:40:38 2013 +0200
+++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/MappedNamespaceContext.java	Mon Aug 12 22:44:21 2013 +0200
@@ -54,7 +54,7 @@
 	}
 
 	@Override
-	public Iterator getPrefixes(String xmlns) {
+	public Iterator<String> getPrefixes(String xmlns) {
 		return getKeysForValue(prefixMap, xmlns).iterator();
 	}
 }
\ No newline at end of file