Revision 41416 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/rendering/symbols/impl/DefaultSymbolManager.java
DefaultSymbolManager.java | ||
---|---|---|
495 | 495 |
} |
496 | 496 |
|
497 | 497 |
public ISymbol getSymbol(String libraryName, String symbolID) throws SymbolException { |
498 |
File rootfolder = new File(this.getSymbolPreferences().getSymbolLibraryPath()); |
|
499 |
Collection symbols = FileUtils.listFiles(rootfolder, |
|
500 |
FileFilterUtils.nameFileFilter(symbolID + getSymbolPreferences().getSymbolFileExtension()), |
|
501 |
FileFilterUtils.trueFileFilter() |
|
502 |
); |
|
498 |
Collection symbols = null; |
|
499 |
File rootfolder = null; |
|
500 |
try { |
|
501 |
rootfolder = new File(this.getSymbolPreferences().getSymbolLibraryPath()); |
|
502 |
symbols = FileUtils.listFiles(rootfolder, |
|
503 |
FileFilterUtils.nameFileFilter(symbolID + getSymbolPreferences().getSymbolFileExtension()), |
|
504 |
FileFilterUtils.trueFileFilter() |
|
505 |
); |
|
506 |
} catch(Exception ex) { |
|
507 |
logger.warn("Can't get symbol from symbol library (library:'"+libraryName+"', symbol:'"+symbolID+"', symbolLibraryPath'"+rootfolder+"')", ex); |
|
508 |
} |
|
503 | 509 |
if (symbols == null) { |
504 | 510 |
return null; |
505 | 511 |
} |
... | ... | |
507 | 513 |
return null; |
508 | 514 |
} |
509 | 515 |
|
510 |
File f = (File) symbols.iterator().next(); |
|
511 |
ISymbol symbol = loadSymbol(f); |
|
512 |
return symbol; |
|
516 |
File f = null; |
|
517 |
try { |
|
518 |
f = (File) symbols.iterator().next(); |
|
519 |
ISymbol symbol = loadSymbol(f); |
|
520 |
return symbol; |
|
521 |
} catch(Exception ex) { |
|
522 |
String fname = ((f==null)?"Null":f.getAbsolutePath()); |
|
523 |
logger.warn("Can't load symbol from symbol library (library:'"+libraryName+"', symbol:'"+symbolID+"', symbolLibraryPath'"+rootfolder+"', symbolFile:'"+fname+"')", ex); |
|
524 |
} |
|
525 |
return null; |
|
513 | 526 |
} |
514 | 527 |
|
515 | 528 |
/** |
Also available in: Unified diff