Project

General

Profile

« Previous | Next » 

Revision 2029a457

Added by Alex Theys almost 12 years ago

AT: committing changes to the TaxEditor Post second round of code review

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
8 8
 */
9 9
package eu.etaxonomy.taxeditor.editor.view.uses;
10 10

  
11
import java.net.URI;
12
import java.net.URISyntaxException;
13 11
import java.util.HashMap;
14 12
import java.util.Map;
15
import java.util.UUID;
16 13

  
17
import org.eclipse.core.runtime.IProgressMonitor;
18 14
import org.eclipse.jface.action.Action;
19 15
import org.eclipse.jface.action.GroupMarker;
20 16
import org.eclipse.jface.action.IToolBarManager;
......
34 30
import org.eclipse.swt.widgets.Tree;
35 31
import org.eclipse.ui.IEditorInput;
36 32
import org.eclipse.ui.IEditorPart;
37
import org.eclipse.ui.IMemento;
38 33
import org.eclipse.ui.IWorkbenchActionConstants;
39 34
import org.eclipse.ui.IWorkbenchPart;
40 35

  
41
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
42
import eu.etaxonomy.cdm.api.service.ITermService;
43
import eu.etaxonomy.cdm.api.service.IVocabularyService;
44 36
import eu.etaxonomy.cdm.model.common.CdmBase;
45
import eu.etaxonomy.cdm.model.common.MarkerType;
46
import eu.etaxonomy.cdm.model.common.TermVocabulary;
47 37
import eu.etaxonomy.cdm.model.description.DescriptionBase;
48 38
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
49
import eu.etaxonomy.cdm.model.description.Feature;
50
import eu.etaxonomy.cdm.model.description.Modifier;
51
import eu.etaxonomy.cdm.model.description.State;
52 39
import eu.etaxonomy.cdm.model.description.TaxonDescription;
53 40
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
54 41
import eu.etaxonomy.taxeditor.editor.EditorUtil;
55 42
import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
56 43
import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;
57 44
import eu.etaxonomy.taxeditor.editor.key.AbstractGraphKeyEditor;
58
import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDragListener;
59
import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDropAdapter;
60 45
import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementTransfer;
61
import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
62
import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
63 46
import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
64 47
import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree;
65
import eu.etaxonomy.taxeditor.model.IContextListener;
66 48
import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
67 49
import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
68 50
import eu.etaxonomy.taxeditor.model.ImageResources;
69
import eu.etaxonomy.taxeditor.store.CdmStore;
70
import eu.etaxonomy.taxeditor.store.StoreUtil;
71 51
import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
72 52

  
73 53

  
......
77 57
 * @created mar 13, 2012
78 58
 * @version 1.0
79 59
 */
80
public class UsesViewPart extends DescriptiveViewPart implements IPartContentHasDetails, IPartContentHasSupplementalData {
60
public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartContentHasDetails, IPartContentHasSupplementalData {
81 61

  
82 62
	public static final String ID = "eu.etaxonomy.taxeditor.editor.view.uses";
83 63
	private TreeViewer viewer;
......
96 76
				| SWT.V_SCROLL | SWT.FULL_SELECTION));
97 77
		viewer.setContentProvider(new UsesContentProvider(featureNodeContainerCache));
98 78
		viewer.setLabelProvider(new UsesLabelProvider());
99
		
100
		//viewer.setSorter(new DescriptiveViewerSorter());
101
		
102 79
		viewer.setAutoExpandLevel(2);
103 80
		
104 81
		
105 82
		
106 83
		Transfer[] transfers = new Transfer[] { DescriptionElementTransfer.getInstance() };
107
		viewer.addDragSupport(dndOperations, transfers, new DescriptionElementDragListener(
84
		/*viewer.addDragSupport(dndOperations, transfers, new DescriptionElementDragListener(
108 85
				this));
109 86
		viewer.addDropSupport(dndOperations, transfers,
110
				new DescriptionElementDropAdapter(viewer));
87
				new DescriptionElementDropAdapter(viewer));*/
111 88
						
112 89
		// Propagate selection from viewer
113 90
		getSite().setSelectionProvider(viewer);
......
119 96
		createMenu();
120 97
		
121 98
		createToolbar();
122
		
99

  
123 100
	}
124 101
	
125 102

  
......
185 162
		
186 163
		if(part instanceof MultiPageTaxonEditor){
187 164
			if(! part.equals(this.part)){
165
				//TaxonEditorInput input = (TaxonEditorInput)((IEditorPart) part).getEditorInput();
188 166
				IEditorInput input = ((IEditorPart) part).getEditorInput();
189 167
				featureNodeContainerCache.clear();
168
				//showViewer(part, new StructuredSelection(CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(input.getTaxonNode().getTaxon(), null, null, null, null, null, null)));
190 169
				showViewer(part, new StructuredSelection(input));
191 170
			}
192 171
			showViewer();
......
194 173
		
195 174
	}
196 175

  
197

  
198

  
199
	/*@Override
200
	public void showViewer(IWorkbenchPart part, IStructuredSelection selection) {
201
		this.part = part;		
202
    	
203
		Object element = selection.getFirstElement();
204
		
205
		getViewer().setInput(descService.listTaxonDescriptions((Taxon) element, null, null, null, null, null, null));
206
		
207
		showViewer();	
208
	}*/
209
	
210
	
211 176
	
212 177
	private class ToggleDescriptionAction extends Action{
213 178
		private boolean expanded;
......
282 247
	public Viewer getViewer() {
283 248
		return viewer;
284 249
	}
250
	
251
	/**
252
	 * <p>onComplete</p>
253
	 *
254
	 * @return a boolean.
255
	 */
256
	@Override
257
	public boolean onComplete() {
258
		return false;
259
	}
285 260

  
286 261
}

Also available in: Unified diff