Project

General

Profile

« Previous | Next » 

Revision ef8972ee

Added by Katja Luther almost 5 years ago

smaller changes for abcd imports in tax editor

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
35 35 
import org.eclipse.jface.viewers.TreeNode;
36 36 
import org.eclipse.jface.viewers.TreeSelection;
37 37 
import org.eclipse.jface.viewers.TreeViewer;
38 
import org.eclipse.jface.viewers.Viewer;
39 
import org.eclipse.jface.viewers.ViewerComparator;
38 40 
import org.eclipse.swt.SWT;
39 41 
import org.eclipse.swt.dnd.DND;
40 42 
import org.eclipse.swt.dnd.Transfer;
......
49 51 
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
50 52 
import eu.etaxonomy.cdm.api.service.ITaxonService;
51 53 
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
54 
import eu.etaxonomy.cdm.model.molecular.Sequence;
52 55 
import eu.etaxonomy.cdm.model.molecular.SingleRead;
53 56 
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
54 57 
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
......
299 302 
        }
300 303 
        labelProvider.updateLabelCache(rootElements);
301 304 
        viewer.setInput(rootElements);
305 
        viewer.setComparator(new ViewerComparator() {
306 
    		@Override
307 
    		@SuppressWarnings("unchecked")
308 
               public int compare(Viewer testViewer, Object e1, Object e2) {
309 
    			if (((TreeNode)e1).getValue() instanceof SpecimenOrObservationBase){
310 
    				return ((SpecimenOrObservationBase)((TreeNode)e1).getValue()).getTitleCache().compareTo(((SpecimenOrObservationBase)((TreeNode)e2).getValue()).getTitleCache());
311 
    			}else{
312 
    				return e1.toString().compareTo(e2.toString());
313 
    			}
314 
    			//return (((SpecimenOrObservationBase) e1).getTitleCache()).compareTo(((SpecimenOrObservationBase) e2).getTitleCache());
315 
    		}
316 
    	});
302 317 

  		




  303
  318
  
    
        //TODO e4


  		




  304
  319
  
    
        //            getEditorSite().getActionBars().getStatusLineManager().setMessage(String.format(Messages.DerivateView_CNT_DERIVATIVES_FOUND, rootElements.size()));


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
    
  





  244
  244
  
    
        textDNAProviderString = new Text(composite, SWT.NONE);


  		




  245
  245
  
    
        textDNAProviderString.setEnabled(true);


  		




  246
  246
  
    
        textDNAProviderString.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true, 1, 1));


  		




  247
  
  
    
        textDNAProviderString.setText(abcdImportConfigurator.getDnaSoure().toString());


  		




  
  247
  
    
        if (abcdImportConfigurator.getDnaSoure() != null){


  		




  
  248
  
    
        	textDNAProviderString.setText(abcdImportConfigurator.getDnaSoure().toString());


  		




  
  249
  
    
        }


  		




  248
  250
  
    

  		




  249
  251
  
    
        GridData gridData = new GridData();


  		




  250
  252
  
    
        gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false);


  		












Also available in:  Unified diff