Revision 47784 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/DefaultProject.java
DefaultProject.java | ||
---|---|---|
562 | 562 |
if (type == null) { |
563 | 563 |
for (int i = 0; i < documents.size(); i++) { |
564 | 564 |
Document document = documents.get(i); |
565 |
if ( name.equalsIgnoreCase(document.getName())) { |
|
565 |
if( document == null ) { |
|
566 |
continue; |
|
567 |
} |
|
568 |
if( StringUtils.equalsIgnoreCase(name, document.getName()) ) { |
|
566 | 569 |
return document; |
567 | 570 |
} |
568 | 571 |
} |
569 | 572 |
} else { |
570 | 573 |
for (int i = 0; i < documents.size(); i++) { |
571 | 574 |
Document document = documents.get(i); |
572 |
if (type.equalsIgnoreCase(document.getTypeName()) |
|
573 |
&& name.equalsIgnoreCase(document.getName())) { |
|
575 |
if( document == null ) { |
|
576 |
continue; |
|
577 |
} |
|
578 |
if( StringUtils.equalsIgnoreCase(type, document.getTypeName()) |
|
579 |
&& StringUtils.equalsIgnoreCase(name, document.getName()) ) { |
|
574 | 580 |
return document; |
575 | 581 |
} |
576 | 582 |
} |
... | ... | |
580 | 586 |
|
581 | 587 |
public Document getDocument(Predicate<Document>condition) { |
582 | 588 |
for (Document document : documents) { |
589 |
if( document == null ) { |
|
590 |
continue; |
|
591 |
} |
|
583 | 592 |
if( condition.test(document) ) { |
584 | 593 |
return document; |
585 | 594 |
} |
Also available in: Unified diff