yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

Deleted defaultIds()

Browse source
This commit is contained in:
Dmitry Yuranov 2013-08-25 13:17:37 +04:00
parent 28cea8d352
commit 60e1d7bb7f
1 changed files with 1 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/org/geometerplus/fbreader/network/NetworkLibrary.java
View file

@ -167,12 +167,6 @@ public class NetworkLibrary {
return firstLaunchOption; return firstLaunchOption;
} }
private List<String> defaultIds() {
final TreeSet<String> set = new TreeSet<String>();
set.add("http://data.fbreader.org/catalogs/litres2/index.php5");
return new ArrayList<String>(set);
}
private ZLStringListOption myActiveIdsOption; private ZLStringListOption myActiveIdsOption;
private ZLStringListOption activeIdsOption() { private ZLStringListOption activeIdsOption() {
if (myActiveIdsOption == null) { if (myActiveIdsOption == null) {
@ -180,7 +174,7 @@ public class NetworkLibrary {
new ZLStringListOption( new ZLStringListOption(
"Options", "Options",
"ActiveIds", "ActiveIds",
ZLibrary.Instance().defaultIds(), "",
"," ","
); );
} }
@ -203,21 +197,6 @@ public class NetworkLibrary {
public void setActiveIds(Collection<String> ids) { public void setActiveIds(Collection<String> ids) {
final TreeSet<String> allCodes = new TreeSet<String>(); final TreeSet<String> allCodes = new TreeSet<String>();
//add default catalog ids which are matched to link ids
boolean found = false;
for(String did : ZLibrary.Instance().defaultIds()){
for(String id : linkIds()){
if(did.equals(id)){
found = true;
break;
}
}
if(found){
allCodes.add(did);
}
found = false;
}
allCodes.removeAll(linkIds());
allCodes.addAll(ids); allCodes.addAll(ids);
final ArrayList<String> codesList = new ArrayList<String>(allCodes.size()); final ArrayList<String> codesList = new ArrayList<String>(allCodes.size());