Project

General

Profile

« Previous | Next » 

Revision 6cf98995

Added by Cherian Mathew almost 9 years ago

Correct issues from last merge

View differences:

eu.etaxonomy.taxeditor.application/.classpath
4 4 
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5 
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6 6 
	<classpathentry kind="src" path="src/test/java"/>
7 
	<classpathentry kind="src" path="src/main/resources/"/>
8 7 
	<classpathentry kind="output" path="target/classes"/>
9 8 
</classpath>
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
20 20 
import org.eclipse.ui.handlers.HandlerUtil;
21 21 
import org.eclipse.ui.texteditor.IDocumentProvider;
22 22 

  		




  
  23
  
    
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;


  		




  
  24
  
    
import eu.etaxonomy.cdm.api.service.DeleteResult;


  		




  
  25
  
    
import eu.etaxonomy.cdm.api.service.IAgentService;


  		




  
  26
  
    
import eu.etaxonomy.cdm.api.service.IGroupService;


  		




  
  27
  
    
import eu.etaxonomy.cdm.api.service.INameService;


  		




  
  28
  
    
import eu.etaxonomy.cdm.api.service.IOccurrenceService;


  		




  
  29
  
    
import eu.etaxonomy.cdm.api.service.IReferenceService;


  		




  
  30
  
    
import eu.etaxonomy.cdm.api.service.ITaxonService;


  		




  
  31
  
    
import eu.etaxonomy.cdm.api.service.IUserService;


  		




  
  32
  
    
import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;


  		




  
  33
  
    
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;


  		




  
  34
  
    
import eu.etaxonomy.cdm.model.common.Group;


  		




  
  35
  
    
import eu.etaxonomy.cdm.model.common.User;


  		




  
  36
  
    
import eu.etaxonomy.cdm.model.name.TaxonNameBase;


  		




  
  37
  
    
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;


  		




  
  38
  
    
import eu.etaxonomy.cdm.model.reference.Reference;


  		




  
  39
  
    
import eu.etaxonomy.cdm.model.taxon.Synonym;


  		




  
  40
  
    
import eu.etaxonomy.cdm.model.taxon.Taxon;


  		




  
  41
  
    
import eu.etaxonomy.cdm.model.taxon.TaxonBase;


  		




  23
  42
  
    
import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService;


  		




  24
  43
  
    
import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;


  		




  25
  44
  
    
import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;


  		












  

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





  31
  31
  
    
import org.eclipse.ui.PartInitException;


  		




  32
  32
  
    
import org.eclipse.ui.navigator.CommonNavigator;


  		




  33
  33
  
    

  		




  
  34
  
    
import eu.etaxonomy.cdm.api.application.CdmApplicationState;


  		




  
  35
  
    
import eu.etaxonomy.cdm.api.application.CdmChangeEvent;


  		




  
  36
  
    
import eu.etaxonomy.cdm.api.application.ICdmChangeListener;


  		




  
  37
  
    
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;


  		




  
  38
  
    
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;


  		




  
  39
  
    
import eu.etaxonomy.cdm.api.service.IClassificationService;


  		




  
  40
  
    
import eu.etaxonomy.cdm.model.common.CdmBase;


  		




  
  41
  
    
import eu.etaxonomy.cdm.model.taxon.Classification;


  		




  
  42
  
    
import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;


  		




  
  43
  
    
import eu.etaxonomy.cdm.model.taxon.TaxonNode;


  		




  
  44
  
    
import eu.etaxonomy.cdm.model.taxon.TaxonNodeByRankAndNameComparator;


  		




  
  45
  
    
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;


  		




  34
  46
  
    
import eu.etaxonomy.taxeditor.model.DataChangeBridge;


  		




  35
  47
  
    
import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;


  		




  36
  48
  
    
import eu.etaxonomy.taxeditor.model.MessagingUtils;


  		




  37
  49
  
    
import eu.etaxonomy.taxeditor.navigation.NavigationUtil;


  		




  38
  50
  
    
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;


  		




  39
  51
  
    
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;


  		




  
  52
  
    
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;


  		




  
  53
  
    
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;


  		




  40
  54
  
    
import eu.etaxonomy.taxeditor.store.CdmStore;


  		




  41
  55
  
    
import eu.etaxonomy.taxeditor.store.LoginManager;


  		




  42
  56
  
    

  		












  

    
      eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/operations/RemotingTestUpdateOperation.java
    
  





  70
  70
  
    
            return testService.returnResult(result);


  		




  71
  71
  
    
        } else if(exception != null) {


  		




  72
  72
  
    
            return testService.throwException(exception);


  		




  73
  
  
    
        } else if(cei != null) {


  		




  74
  
  
    
            return testService.addChild(cei);


  		




  75
  73
  
    
        }


  		




  76
  74
  
    
        return null;


  		




  77
  75
  
    
    }


  		












Also available in:  Unified diff