[Debian-islamic-commits] [zekr] 08/08: Added string_cast.diff patch to fix FTBFS caused by incompatible type conversion from List<Object> to List<String>

[أحمد المحمودي (Ahmed El-Mahmoudy)]

This is an automated email from the git hooks/post-receive script.

aelmahmoudy-guest pushed a commit to branch master
in repository zekr.

commit ca82f549608c61aff3e0a673ab52b6b26a01f0ea
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Thu Jul 30 18:03:47 2015 +0200

    Added string_cast.diff patch to fix FTBFS caused by incompatible type conversion from List<Object> to List<String>
    
    Closes: #722201
---
 debian/patches/series           |  1 +
 debian/patches/string_cast.diff | 91 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 1c8d09b..69ebd96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 02_build_xml.patch
 build_manifest.diff
 no_jintellitype.diff
+string_cast.diff
diff --git a/debian/patches/string_cast.diff b/debian/patches/string_cast.diff
new file mode 100644
index 0000000..7b4d6f6
--- /dev/null
+++ b/debian/patches/string_cast.diff
@@ -0,0 +1,91 @@
+Description: cast List<Object> to List<String>
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+Bug-Debian: https://bugs.debian.org/722201
+--- a/src/net/sf/zekr/common/config/ApplicationConfig.java
++++ b/src/net/sf/zekr/common/config/ApplicationConfig.java
+@@ -253,9 +253,9 @@
+ 
+          searchInfo = new SearchInfo();
+          Configuration stopWordConf = searchProps.subset("search.stopword");
+-         List<String> defaultStopWord = searchProps.getList("search.stopword");
++         List<String> defaultStopWord = (List<String>)(List<?>) searchProps.getList("search.stopword");
+          Configuration replacePatternConf = searchProps.subset("search.pattern.replace");
+-         List<String> defaultReplacePattern = searchProps.getList("search.pattern.replace");
++         List<String> defaultReplacePattern = (List<String>)(List<?>) searchProps.getList("search.pattern.replace");
+          Configuration punctuationConf = searchProps.subset("search.pattern.punct");
+          String defaultPunctuation = searchProps.getString("search.pattern.punct");
+          Configuration diacriticsConf = searchProps.subset("search.pattern.diacr");
+@@ -269,7 +269,7 @@
+                continue;
+             }
+             logger.debug("\tAdd stop words for: " + langCode);
+-            searchInfo.addStopWord(langCode, stopWordConf.getList(langCode));
++            searchInfo.addStopWord(langCode, (List<String>)(List<?>) stopWordConf.getList(langCode));
+          }
+ 
+          searchInfo.setDefaultReplacePattern(defaultReplacePattern);
+@@ -279,7 +279,7 @@
+                continue;
+             }
+             logger.debug("\tAdd replace patterns for: " + langCode);
+-            searchInfo.addReplacePattern(langCode, replacePatternConf.getList(langCode));
++            searchInfo.addReplacePattern(langCode, (List<String>)(List<?>) replacePatternConf.getList(langCode));
+          }
+ 
+          if (defaultPunctuation != null) {
+@@ -725,7 +725,7 @@
+          // load custom translation list
+          logger.info("Load custom translation list.");
+          List<TranslationData> customList = translation.getCustomGroup();
+-         List<String> customs = props.getList("trans.custom");
++         List<String> customs = (List<String>)(List<?>) props.getList("trans.custom");
+          for (int i = 0; i < customs.size(); i++) {
+             String tid = customs.get(i);
+             if (tid == null || "".equals(tid.trim())) {
+@@ -891,7 +891,7 @@
+    @SuppressWarnings("unchecked")
+    private void extractAudioProps() {
+       String def = props.getString("audio.default");
+-      List<String> selectedList = props.getList("audio.default");
++      List<String> selectedList = (List<String>)(List<?>) props.getList("audio.default");
+       if (org.apache.commons.collections.CollectionUtils.isNotEmpty(selectedList) && selectedList.size() > 1) {
+          def = selectedList.get(0);
+       }
+--- a/src/net/sf/zekr/ui/QuranForm.java
++++ b/src/net/sf/zekr/ui/QuranForm.java
+@@ -590,7 +590,7 @@
+ 
+       if (isSashed) {
+          if (config.getProps().getProperty("view.quranForm.paneSashWeight") != null) {
+-            List<String> weights = config.getProps().getList("view.quranForm.paneSashWeight");
++            List<String> weights = (List<String>)(List<?>) config.getProps().getList("view.quranForm.paneSashWeight");
+             navSashForm.setWeights(new int[] { Integer.parseInt(weights.get(0).toString()),
+                   Integer.parseInt(weights.get(1).toString()) });
+          } else {
+@@ -1971,7 +1971,7 @@
+             sashForm.setWeights(new int[] { 1, 1 });
+          }
+          if (viewLayout == 0) { // Application just started up
+-            List<String> weights = config.getProps().getList("view.quranForm.layoutSashWeight");
++            List<String> weights = (List<String>)(List<?>) config.getProps().getList("view.quranForm.layoutSashWeight");
+             if (weights.size() != 0) {
+                sashForm.setWeights(new int[] { Integer.parseInt(weights.get(0).toString()),
+                      Integer.parseInt(weights.get(1).toString()) });
+@@ -2182,7 +2182,7 @@
+       Set<SearchScope> searchScopeSet = new LinkedHashSet<SearchScope>();
+       while (keys.hasNext()) {
+          String key = keys.next();
+-         SearchScope ss = SearchScope.parse(config.getProps().getList(key));
++         SearchScope ss = SearchScope.parse((List<String>)(List<?>) config.getProps().getList(key));
+          if (ss != null) {
+             searchScopeSet.add(ss);
+          }
+@@ -2191,7 +2191,7 @@
+ 
+       String v = config.getProps().getString("view.search.scope", null);
+       if (StringUtils.isNotEmpty(v)) {
+-         List<String> scope = config.getProps().getList("view.search.scope");
++         List<String> scope = (List<String>)(List<?>) config.getProps().getList("view.search.scope");
+          if (CollectionUtils.isNotEmpty(scope)) {
+             setSearchScope(SearchScope.parse(scope));
+          }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/zekr.git