Project

General

Profile

« Previous | Next » 

Revision 895e21ca

Added by Katja Luther about 4 years ago

code cleaning and fix potential null pointer

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/GenericConfiguratorWizardPageE4.java
234 234
            if (method.getName().startsWith("set")) {
235 235

  
236 236
                Class<?>[] typeList = method.getParameterTypes();
237

  
238
                if (typeList.length > 1) {
239
                    new IllegalStateException(
237
                //this is irrelevant for methods without boolean parameters
238
                if (typeList.length > 1 && typeList[0].getName().equals("boolean")) {
239
                    throw new IllegalStateException(
240 240
                            "Found a setter with parameter count > 1");
241 241
                }
242 242

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWithReferenceWizardPage.java
27 27

  
28 28
	private Text textReferenceString;
29 29

  
30
    protected Text text_source;
31

  
32 30
    @Inject
33 31
	public ImportFromFileDataSourceWithReferenceWizardPage() {
34 32
        super();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
18 18
import java.util.ArrayList;
19 19
import java.util.Calendar;
20 20
import java.util.Collection;
21
import java.util.HashSet;
21 22
import java.util.LinkedHashMap;
22 23
import java.util.List;
23 24
import java.util.Map;
......
624 625
                public IStatus run(IProgressMonitor monitor) {
625 626
                    // run the monitor until the operation is finished
626 627
                    SubMonitor subMonitor = SubMonitor.convert(monitor, 100);
627
                   // subMonitor.beginTask("Start", 100);
628

  
628 629

  
629 630
                    IRemotingProgressMonitor remotingMonitor;
630 631
                    try {
......
642 643
                    // collect reports
643 644
//	                    for(String report : remotingMonitor.getResult()) {
644 645
                    createResult(label, showResult, remotingMonitor);
645
                    updateNameEditors(remotingMonitor);
646
                    refreshNavigator();
646
                    Set<Taxon> taxaToUpdate = getTaxaToUpdate(remotingMonitor);
647
                    updateNameEditors(taxaToUpdate);
648
                    if (!taxaToUpdate.isEmpty()){
649
                        refreshNavigator();
650
                    }
647 651
                    return Status.OK_STATUS;
648 652
                }
649 653

  
650 654

  
651 655

  
656
                private Set<Taxon> getTaxaToUpdate(IRemotingProgressMonitor remotingMonitor) {
657
                    Set<Taxon> taxaToUpdate = new HashSet<>();
658
                    if (remotingMonitor.getResult() instanceof UpdateResult){
659
                        for (CdmBase object: ((UpdateResult)remotingMonitor.getResult()).getUpdatedObjects()){
660
                            Taxon taxon = null;
661

  
662
                            if (object instanceof Taxon){
663
                                taxon = HibernateProxyHelper.deproxy(object, Taxon.class);
664

  
665

  
666
                            }else if (object instanceof Synonym){
667
                                Synonym syn = HibernateProxyHelper.deproxy(object, Synonym.class);
668
                                taxon = syn.getAcceptedTaxon();
669
                            }
670

  
671
                            taxaToUpdate.add(taxon);
672
                        }
673
                    }else if (remotingMonitor.getResult() instanceof ImportResult){
674
                        Map<String, Integer> result = ((ImportResult)remotingMonitor.getResult()).getUpdatedRecords();
675
                        for (Map.Entry<String, Integer> object: result.entrySet()){
676
                            Taxon taxon = null;
677
                            if (object instanceof Taxon){
678
                                taxon = HibernateProxyHelper.deproxy(object, Taxon.class);
679
                            }else if (object instanceof Synonym){
680
                                Synonym syn = HibernateProxyHelper.deproxy(object, Synonym.class);
681
                                taxon = syn.getAcceptedTaxon();
682
                            }
683
                            taxaToUpdate.add(taxon);
684
                       }
685

  
686
                    }
687
                    return taxaToUpdate;
688
                }
689

  
690

  
691

  
652 692
                private void refreshNavigator() {
653 693
                    EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAVIGATOR, true);
654 694

  
......
810 850
            }
811 851
        }
812 852
    }
813
    public static void updateNameEditors(IRemotingProgressMonitor remotingMonitor){
814
        List<Taxon> taxaToUpdate = new ArrayList();
815
        if (remotingMonitor.getResult() instanceof UpdateResult){
816
            for (CdmBase object: ((UpdateResult)remotingMonitor.getResult()).getUpdatedObjects()){
817
                Taxon taxon = null;
818

  
819
                if (object instanceof Taxon){
820
                    taxon = HibernateProxyHelper.deproxy(object, Taxon.class);
821

  
822

  
823
                }else if (object instanceof Synonym){
824
                    Synonym syn = HibernateProxyHelper.deproxy(object, Synonym.class);
825
                    taxon = syn.getAcceptedTaxon();
826
                }
827
                taxaToUpdate.add(taxon);
828
            }
829
        }else if (remotingMonitor.getResult() instanceof ImportResult){
830
            Map<String, Integer> result = ((ImportResult)remotingMonitor.getResult()).getUpdatedRecords();
831
            for (Map.Entry<String, Integer> object: result.entrySet()){
832
                //TODO
833
            }
834
        }
835

  
836

  
853
    public static void updateNameEditors(Set<Taxon> taxaToUpdate){
837 854
        EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAME_EDITOR, taxaToUpdate);
838 855
    }
839 856

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
88 88
    */
89 89
   public List<TermDto> getPreferredTerms(TermVocabularyDto termVocabularyDto){
90 90
       List terms = cachedTermMap.get(termVocabularyDto.getUuid());
91
       if(terms==null){
91
       if(terms==null || terms.isEmpty()){
92 92
           terms = getFilteredTermDtos(new ArrayList<>(termVocabularyDto.getTerms()));
93 93
           cachedTermMap.put(termVocabularyDto.getUuid(), terms);
94 94
       }

Also available in: Unified diff