Project

General

Profile

« Previous | Next » 

Revision 9021b90c

Added by Katja Luther over 4 years ago

ref #8410: fix NPE

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
482 482 
            }else{
483 483 
                nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(false);
484 484 
            }
485 
            if (nameDetailsConfig == null){
486 
                nameDetailsConfig = new NameDetailsConfigurator();
487 
            }
485 488 
        }
486 489 
    }
487 490 

  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java
    
  





  63
  63
  
    
	    NameDetailsConfigurator config = PreferencesUtil.getPreferredNameDetailsConfiguration();


  		




  64
  64
  
    
		label = formFactory.createLabel(element, null);


  		




  65
  65
  
    

  		




  66
  
  
    
		if (config.isNameRelationsRuleConsideredActivated()){


  		




  67
  
  
    
		    ruleConsidered = formFactory.createRuleConsideredElement(element, "Rule Considered", config.isNameRelationsRuleConsideredCodeEditionActivated(), style);


  		




  
  66
  
    
		if (config == null || config.isNameRelationsRuleConsideredActivated()){


  		




  
  67
  
    
		    ruleConsidered = formFactory.createRuleConsideredElement(element, "Rule Considered", config == null || config.isNameRelationsRuleConsideredCodeEditionActivated(), style);


  		




  68
  68
  
    
		}


  		




  69
  69
  
    

  		




  70
  70
  
    
		super.createControls(element, style);


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
    
  





  81
  81
  
    

  		




  82
  82
  
    
		nomenclaturalStatusTypeCombo = formFactory.createDefinedTermComboElement(TermType.NomenclaturalStatusType, this, "Status", null,true, style, true);


  		




  83
  83
  
    
		nomenclaturalStatusTypeCombo.setTermComparator(termComparator);


  		




  84
  
  
    
		if (config.isNomenclaturalStatusRuleConsideredActivated()){


  		




  85
  
  
    
		    ruleConsidered = formFactory.createRuleConsideredElement(this, "Rule Considered", config.isNomenclaturalStatusRuleConsideredCodeEditionActivated(), style);


  		




  
  84
  
    
		if (config == null || config.isNomenclaturalStatusRuleConsideredActivated()){


  		




  
  85
  
    
		    ruleConsidered = formFactory.createRuleConsideredElement(this, "Rule Considered", config == null || config.isNomenclaturalStatusRuleConsideredCodeEditionActivated(), style);


  		




  86
  86
  
    
		}


  		




  87
  87
  
    

  		




  88
  88
  
    
		super.createControls(element, style);


  		












Also available in:  Unified diff