Project

General

Profile

« Previous | Next » 

Revision 56b2c5b8

Added by Katja Luther about 9 years ago

show media information for taxa in bulk editor

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
49 49
import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
50 50
import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
51 51
import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData;
52
import eu.etaxonomy.taxeditor.model.IPartContentHasMedia;
53

  
52 54

  
53 55
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
54 56
import eu.etaxonomy.taxeditor.store.CdmStore;
......
63 65
 * @version 1.0
64 66
 */
65 67
public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDetails,
66
        IDirtyMarkable, IDerivedUnitFacadePart, IPartContentHasFactualData {
68
        IDirtyMarkable, IDerivedUnitFacadePart, IPartContentHasFactualData, IPartContentHasMedia {
67 69

  
68 70
	/** Constant <code>ID="bulkeditor.editor"</code> */
69 71
	public static final String ID = "bulkeditor.editor";
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
21 21

  
22 22
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
23 23
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
24
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
24 25
import eu.etaxonomy.cdm.model.description.DescriptionBase;
25 26
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
26 27
import eu.etaxonomy.cdm.model.description.SpecimenDescription;
......
29 30
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
30 31
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
31 32
import eu.etaxonomy.cdm.model.taxon.Taxon;
33
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
32 34
import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
33 35
import eu.etaxonomy.taxeditor.model.MessagingUtils;
34 36

  
......
47 49
	@Override
48 50
    public Object[] getChildren(Object parentElement) {
49 51

  
50
		if (parentElement instanceof TaxonEditorInput) {
51
			Taxon taxon = ((TaxonEditorInput) parentElement).getTaxon();
52
		if (parentElement instanceof TaxonEditorInput || parentElement instanceof Taxon) {
53
			
54
			Taxon taxon = null;
55
			if (parentElement instanceof TaxonEditorInput){
56
				taxon = ((TaxonEditorInput) parentElement).getTaxon(); 
57
			} else{
58
				taxon = HibernateProxyHelper.deproxy(parentElement, Taxon.class);
59
			}
60
			 
52 61
			if(taxon == null){
53 62
				MessagingUtils.error(getClass(), "Taxon is null", null);
54 63
				return NO_CHILDREN;
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java
10 10

  
11 11
package eu.etaxonomy.taxeditor.editor.view.media;
12 12

  
13
import java.util.HashMap;
14
import java.util.Map;
15

  
13 16
import org.eclipse.jface.action.GroupMarker;
14 17
import org.eclipse.jface.action.MenuManager;
15 18
import org.eclipse.jface.viewers.ISelection;
16 19
import org.eclipse.jface.viewers.IStructuredSelection;
20
import org.eclipse.jface.viewers.ITreeContentProvider;
17 21
import org.eclipse.jface.viewers.StructuredSelection;
18 22
import org.eclipse.jface.viewers.TreeNode;
19 23
import org.eclipse.jface.viewers.TreeViewer;
......
28 32
import org.eclipse.ui.IWorkbenchActionConstants;
29 33
import org.eclipse.ui.IWorkbenchPart;
30 34

  
35
import eu.etaxonomy.cdm.model.description.DescriptionBase;
36
import eu.etaxonomy.cdm.model.description.IDescribable;
37
import eu.etaxonomy.cdm.model.media.IMediaDocumented;
31 38
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
32 39
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
33 40
import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
41
import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveContentProvider;
42
import eu.etaxonomy.cdm.model.description.TaxonDescription;
34 43
import eu.etaxonomy.taxeditor.model.AbstractUtility;
44
import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree;
35 45
import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
46
import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData;
36 47
import eu.etaxonomy.taxeditor.model.IPartContentHasMedia;
37 48
import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
38 49
import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
......
51 62
	/** Constant <code>ID="eu.etaxonomy.taxeditor.editor.view.medi"{trunked}</code> */
52 63
	public static final String ID = "eu.etaxonomy.taxeditor.editor.view.media";
53 64

  
54
	private TreeViewer viewer;
55 65

  
66
	private TreeViewer viewer;
67
	
56 68
	/*
57 69
	 * (non-Javadoc)
58 70
	 * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#createViewer(org.eclipse.swt.widgets.Composite)
......
63 75

  
64 76
		viewer = new TreeViewer(new Tree(parent, SWT.MULTI | SWT.H_SCROLL
65 77
				| SWT.V_SCROLL | SWT.FULL_SELECTION));
66

  
78
		
67 79
		viewer.setContentProvider(new MediaContentProvider());
68 80
		viewer.setLabelProvider(new MediaLabelProvider());
69 81
		viewer.setAutoExpandLevel(2);
......
116 128
		        IEditorInput input = ((IEditorPart) part).getEditorInput();
117 129
		        showViewer(part, new StructuredSelection(input));
118 130
		    }
119
		    else if(selection instanceof IStructuredSelection){
120
		        Object firstElement = ((IStructuredSelection) selection).getFirstElement();
131
		    else if(selection instanceof IStructuredSelection
132
			        && ((IStructuredSelection) selection).getFirstElement() instanceof IDescribable<?>
133
			        && part instanceof IPartContentHasFactualData  && !(((IStructuredSelection) selection).getFirstElement() instanceof SpecimenOrObservationBase && part instanceof BulkEditor)){
134
		    	Object firstElement = ((IStructuredSelection) selection).getFirstElement();
121 135
		        if(firstElement instanceof TreeNode){
122 136
		            showViewer(part, new StructuredSelection(((TreeNode) firstElement).getValue()));
123 137
		        }
124 138
		        else{
125 139
		            showViewer(part, (IStructuredSelection) selection);
126 140
		        }
141
		    }else{
142
		    	showEmptyPage();
127 143
		    }
128 144
		}
129 145
		else{

Also available in: Unified diff