Project

General

Profile

« Previous | Next » 

Revision a510c562

Added by Andreas Kohlbecker almost 7 years ago

fix #6758 removing registration type icon

  • replacing TypeStatusLabel by the new class RegistrationStateLabel

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkflowViewBean.java
42 42 
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItem;
43 43 
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItemEditButtonGroup;
44 44 
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItemEditButtonGroup.IdButton;
45 
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationStateLabel;
45 46 
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationStyles;
46 
import eu.etaxonomy.cdm.vaadin.component.registration.TypeStateLabel;
47 47 
import eu.etaxonomy.cdm.vaadin.component.registration.WorkflowSteps;
48 48 
import eu.etaxonomy.cdm.vaadin.event.AbstractEditorAction;
49 49 
import eu.etaxonomy.cdm.vaadin.event.AbstractEditorAction.Action;
......
247 247 
        messageButton.setCaptionAsHtml(true);
248 248 
        buttonGroup.addComponent(messageButton);
249 249 

  		




  250
  
  
    
        TypeStateLabel typeStateLabel = new TypeStateLabel().update(dto.getRegistrationType(), dto.getStatus());


  		




  
  250
  
    
        RegistrationStateLabel stateLabel = new RegistrationStateLabel().update(dto.getStatus());


  		




  251
  251
  
    

  		




  252
  252
  
    

  		




  253
  253
  
    
        if(UserHelper.fromSession().userIsRegistrationCurator() || UserHelper.fromSession().userIsAdmin()) {


  		




  ......




  338
  338
  
    
            regItem = new Label(dto.getSummary());


  		




  339
  339
  
    
        }


  		




  340
  340
  
    

  		




  341
  
  
    
        namesTypesList.addComponent(typeStateLabel, 0, row);


  		




  342
  
  
    
        namesTypesList.setComponentAlignment(typeStateLabel, Alignment.TOP_LEFT);


  		




  
  341
  
    
        namesTypesList.addComponent(stateLabel, 0, row);


  		




  
  342
  
    
        namesTypesList.setComponentAlignment(stateLabel, Alignment.TOP_LEFT);


  		




  343
  343
  
    
        namesTypesList.addComponent(regItem, 1, row);


  		




  344
  344
  
    
        namesTypesList.addComponent(buttonGroup, 2, row);


  		




  345
  345
  
    
        namesTypesList.setComponentAlignment(buttonGroup, Alignment.TOP_LEFT);


  		












Also available in:  Unified diff