Project

General

Profile

« Previous | Next » 

Revision 62dbf348

Added by Patrick Plitzner over 6 years ago

ref #7086 Fix merge issues

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/handler/OpenWorkingSetEditorHandler.java
19 19 

  		




  20
  20
  
    
	@Execute


  		




  21
  21
  
    
	public void execute(Shell shell, EPartService partService, MApplication application, EModelService modelService) {


  		




  22
  
  
    
	    WorkingSet workingSet = WorkingSetSelectionDialog.select(shell, null, null);


  		




  
  22
  
    
	    WorkingSet workingSet = WorkingSetSelectionDialog.select(shell, null);


  		




  23
  23
  
    
	    MPart part = partService.createPart("eu.etaxonomy.taxeditor.editor.view.workingSet.WorkingSetEditor");


  		




  24
  24
  
    

  		




  25
  25
  
    
        MPartStack editorAreaPartStack = WorkbenchUtility.getEditorAreaPartStack(application, modelService);


  		












  

    
      eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
    
  





  26
  26
  
    
    public static String ChangeAcceptedTaxonToSynonymOperation_CREATE_FAIL;


  		




  27
  27
  
    
    public static String ChangeAcceptedTaxonToSynonymOperation_CREATE_SUCCESS;


  		




  28
  28
  
    
    public static String ChangeAcceptedTaxonToSynonymOperation_OP_FAIL;


  		




  
  29
  
    
    public static String ClassificationLabelProvider_UNNAMED_TREE;


  		




  29
  30
  
    
    public static String CloneClassificationHandler_CLONE_CLASSIFICATION;


  		




  30
  31
  
    
    public static String CreateClassificationHierarchyHandler_CREATE_HIERARCHY;


  		




  31
  32
  
    
    public static String CreateClassificationHierarchyHandler_FAILED;


  		












  

    
      eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
    
  





  7
  7
  
    
ChangeAcceptedTaxonToSynonymOperation_CREATE_FAIL=Synonym creation not possible


  		




  8
  8
  
    
ChangeAcceptedTaxonToSynonymOperation_CREATE_SUCCESS=Synonym created but taxon deletion not possible.


  		




  9
  9
  
    
ChangeAcceptedTaxonToSynonymOperation_OP_FAIL=Operation failed


  		




  
  10
  
    
ClassificationLabelProvider_UNNAMED_TREE=Unnamed Taxonomic Tree


  		




  10
  11
  
    
CloneClassificationHandler_CLONE_CLASSIFICATION=Clone classification


  		




  11
  12
  
    
CreateClassificationHierarchyHandler_CREATE_HIERARCHY=Create Taxon Hierarchy


  		




  12
  13
  
    
CreateClassificationHierarchyHandler_FAILED=Failed to open Editor


  		












  

    
      eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
    
  





  7
  7
  
    
ChangeAcceptedTaxonToSynonymOperation_CREATE_FAIL=Synonymerstellung nicht m?glich


  		




  8
  8
  
    
ChangeAcceptedTaxonToSynonymOperation_CREATE_SUCCESS=Synonym erstellt, aber das L?schen des Taxons ist nicht m?glich.


  		




  9
  9
  
    
ChangeAcceptedTaxonToSynonymOperation_OP_FAIL=Vorgang fehlgeschlagen


  		




  
  10
  
    
ClassificationLabelProvider_UNNAMED_TREE=Unbenannter taxonomischer BaumTree


  		




  10
  11
  
    
CloneClassificationHandler_CLONE_CLASSIFICATION=Klassifikation duplizieren


  		




  11
  12
  
    
CreateClassificationHierarchyHandler_CREATE_HIERARCHY=Taxonhierarchie erstellen


  		




  12
  13
  
    
CreateClassificationHierarchyHandler_FAILED=?ffnen des Editors fehlgeschlagen


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java
    
  





  20
  20
  
    
import org.eclipse.swt.widgets.Shell;


  		




  21
  21
  
    
import org.eclipse.swt.widgets.Text;


  		




  22
  22
  
    

  		




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


  		




  24
  23
  
    
import eu.etaxonomy.cdm.api.service.IWorkingSetService;


  		




  25
  24
  
    
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;


  		




  26
  25
  
    
import eu.etaxonomy.cdm.model.description.WorkingSet;


  		




  ......




  36
  35
  
    
public class WorkingSetSelectionDialog extends


  		




  37
  36
  
    
AbstractFilteredCdmResourceSelectionDialog<WorkingSet> {


  		




  38
  37
  
    

  		




  39
  
  
    
    public static WorkingSet select(Shell shell, ConversationHolder conversation, WorkingSet workingSet){


  		




  40
  
  
    
        WorkingSetSelectionDialog dialog = new WorkingSetSelectionDialog(shell, conversation,


  		




  
  38
  
    
    public static WorkingSet select(Shell shell, WorkingSet workingSet){


  		




  
  39
  
    
        WorkingSetSelectionDialog dialog = new WorkingSetSelectionDialog(shell,


  		




  41
  40
  
    
                "Choose working set", false, WorkingSetSelectionDialog.class.getCanonicalName(), workingSet);


  		




  42
  41
  
    
        return getSelectionFromDialog(dialog);


  		




  43
  42
  
    
    }


  		




  ......




  45
  44
  
    
    /**


  		




  46
  45
  
    
     * <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>


  		




  47
  46
  
    
     */


  		




  48
  
  
    
    protected WorkingSetSelectionDialog(Shell shell, ConversationHolder conversation, String title,


  		




  
  47
  
    
    protected WorkingSetSelectionDialog(Shell shell, String title,


  		




  49
  48
  
    
            boolean multi, String settings, WorkingSet cdmObject) {


  		




  50
  
  
    
        super(shell, conversation, title, multi, settings, cdmObject);


  		




  
  49
  
    
        super(shell, title, multi, settings, cdmObject);


  		




  51
  50
  
    
    }


  		




  52
  51
  
    

  		




  53
  52
  
    
    /** {@inheritDoc} */


  		












Also available in:  Unified diff