Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor a bit (no behavior change)

Browse source
This commit is contained in:
Eric House 2018-05-23 22:03:16 -07:00
parent 1821d197b9
commit 39a5ce92ee
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java
View file

@ -151,14 +151,16 @@ public class DictUtils {
// changes?
}
private static void addLogDup( Map<String, DictAndLoc> map, String path,
DictLoc loc )
private static void addLogDupIf( Context context, Map<String, DictAndLoc> map,
String path, File dir, DictLoc loc )
{
String name = removeDictExtn( new File(path).getName() );
if ( map.containsKey( name ) ) {
Log.d( TAG, "replacing info for %s with from %s", name, loc );
if ( isDict( context, path, dir ) ) {
String name = removeDictExtn( new File(path).getName() );
if ( map.containsKey( name ) ) {
Log.d( TAG, "replacing info for %s with from %s", name, loc );
}
map.put( name, new DictAndLoc( name, loc ) );
}
map.put( name, new DictAndLoc( name, loc ) );
}
private static void tryDir( Context context, File dir, boolean strict,
@ -168,9 +170,7 @@ public class DictUtils {
String[] list = dir.list();
if ( null != list ) {
for ( String file : list ) {
if ( isDict( context, file, strict? dir : null ) ) {
addLogDup( map, file, loc );
}
addLogDupIf( context, map, file, strict? dir : null, loc );
}
}
}
@ -190,15 +190,11 @@ public class DictUtils {
Map<String, DictAndLoc> map = new HashMap<>();
for ( String file : getAssets( context ) ) {
if ( isDict( context, file, null ) ) {
addLogDup( map, file, DictLoc.BUILT_IN );
}
addLogDupIf( context, map, file, null, DictLoc.BUILT_IN );
}
for ( String file : context.fileList() ) {
if ( isDict( context, file, null ) ) {
addLogDup( map, file, DictLoc.INTERNAL );
}
addLogDupIf( context, map, file, null, DictLoc.INTERNAL );
}
tryDir( context, getSDDir( context ), false, DictLoc.EXTERNAL, map );