Project

General

Profile

« Previous | Next » 

Revision 30cf7490

Added by Katja Luther about 8 years ago

fix Ticket #5642

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java
61 61 
		}
62 62 

  		




  63
  63
  
    
		if (getMisappliedName().getSec() == null) {


  		




  64
  
  
    
			setNonEditableInfo("sec. ???", false);


  		




  
  64
  
    
		    if (getMisappliedName().getAppendedPhrase() != null ){


  		




  
  65
  
    
		        setNonEditableInfo(getMisappliedName().getAppendedPhrase(), false);


  		




  
  66
  
    
		    }else{


  		




  
  67
  
    
		        setNonEditableInfo("sec. ???", false);


  		




  
  68
  
    
		    }


  		




  65
  69
  
    
		} else {


  		




  66
  70
  
    
			String title = getMisappliedName().getSec().getTitleCache();


  		




  67
  71
  
    
			title = title.replace("&", "&&");


  		




  68
  
  
    
			setNonEditableInfo("sec. " + title, false);


  		




  
  72
  
    
			String sec = "sec. ";


  		




  
  73
  
    
			if (getMisappliedName().getAppendedPhrase() != null ){


  		




  
  74
  
    
			    sec = getMisappliedName().getAppendedPhrase() + " "+sec;


  		




  
  75
  
    
			}


  		




  
  76
  
    
			setNonEditableInfo(sec + title, false);


  		




  69
  77
  
    
		}


  		




  70
  78
  
    
	}


  		




  71
  79
  
    

  		












  

    
      eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java
    
  





  10
  10
  
    

  		




  11
  11
  
    
package eu.etaxonomy.taxeditor.navigation.navigator;


  		




  12
  12
  
    

  		




  
  13
  
    
import java.util.List;


  		




  
  14
  
    

  		




  13
  15
  
    
import org.apache.log4j.Logger;


  		




  14
  16
  
    
import org.eclipse.jface.viewers.ITreeContentProvider;


  		




  15
  17
  
    
import org.eclipse.jface.viewers.Viewer;


  		




  ......




  38
  40
  
    

  		




  39
  41
  
    
		if(parentElement instanceof ITaxonTreeNode){


  		




  40
  42
  
    
		    ITaxonTreeNode treeNode = (ITaxonTreeNode) HibernateProxyHelper.deproxy(parentElement);


  		




  41
  
  
    
			children = treeNode.getChildNodes().toArray();


  		




  
  43
  
    
			List<TaxonNode> childrenSet = treeNode.getChildNodes();


  		




  
  44
  
    
			while (childrenSet.contains(null)){


  		




  
  45
  
    
			    childrenSet.remove(null);


  		




  
  46
  
    
			}


  		




  
  47
  
    
		    children = childrenSet.toArray();


  		




  
  48
  
    

  		




  42
  49
  
    
		}


  		




  43
  50
  
    

  		




  44
  51
  
    
		return children != null ? children : NO_CHILDREN;


  		












Also available in:  Unified diff