From: a.theys <a.theys@localhost>
Date: Tue, 19 Jun 2012 14:05:50 +0000 (+0000)
Subject: AT: committing changes to the TaxEditor Post second round of code review
X-Git-Tag: 3.6.0~1060^2~12
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/2029a457e3ca4ae68d762c7c9241dbedcf3f7e7f

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

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
index a5cbf7d25..6e204c213 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
@@ -8,13 +8,9 @@
  */
 package eu.etaxonomy.taxeditor.editor.view.uses;
 
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.IToolBarManager;
@@ -34,40 +30,24 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.IWorkbenchPart;
 
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.api.service.ITermService;
-import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
-import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.Modifier;
-import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;
 import eu.etaxonomy.taxeditor.editor.key.AbstractGraphKeyEditor;
-import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDragListener;
-import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDropAdapter;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementTransfer;
-import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
-import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree;
-import eu.etaxonomy.taxeditor.model.IContextListener;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
 import eu.etaxonomy.taxeditor.model.ImageResources;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
 
 
@@ -77,7 +57,7 @@ import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
  * @created mar 13, 2012
  * @version 1.0
  */
-public class UsesViewPart extends DescriptiveViewPart implements IPartContentHasDetails, IPartContentHasSupplementalData {
+public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartContentHasDetails, IPartContentHasSupplementalData {
 
 	public static final String ID = "eu.etaxonomy.taxeditor.editor.view.uses";
 	private TreeViewer viewer;
@@ -96,18 +76,15 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas
 				| SWT.V_SCROLL | SWT.FULL_SELECTION));
 		viewer.setContentProvider(new UsesContentProvider(featureNodeContainerCache));
 		viewer.setLabelProvider(new UsesLabelProvider());
-		
-		//viewer.setSorter(new DescriptiveViewerSorter());
-		
 		viewer.setAutoExpandLevel(2);
 		
 		
 		
 		Transfer[] transfers = new Transfer[] { DescriptionElementTransfer.getInstance() };
-		viewer.addDragSupport(dndOperations, transfers, new DescriptionElementDragListener(
+		/*viewer.addDragSupport(dndOperations, transfers, new DescriptionElementDragListener(
 				this));
 		viewer.addDropSupport(dndOperations, transfers,
-				new DescriptionElementDropAdapter(viewer));
+				new DescriptionElementDropAdapter(viewer));*/
 						
 		// Propagate selection from viewer
 		getSite().setSelectionProvider(viewer);
@@ -119,7 +96,7 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas
 		createMenu();
 		
 		createToolbar();
-		
+
 	}
 	
 
@@ -185,8 +162,10 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas
 		
 		if(part instanceof MultiPageTaxonEditor){
 			if(! part.equals(this.part)){
+				//TaxonEditorInput input = (TaxonEditorInput)((IEditorPart) part).getEditorInput();
 				IEditorInput input = ((IEditorPart) part).getEditorInput();
 				featureNodeContainerCache.clear();
+				//showViewer(part, new StructuredSelection(CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(input.getTaxonNode().getTaxon(), null, null, null, null, null, null)));
 				showViewer(part, new StructuredSelection(input));
 			}
 			showViewer();
@@ -194,20 +173,6 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas
 		
 	}
 
-
-
-	/*@Override
-	public void showViewer(IWorkbenchPart part, IStructuredSelection selection) {
-		this.part = part;		
-    	
-		Object element = selection.getFirstElement();
-		
-		getViewer().setInput(descService.listTaxonDescriptions((Taxon) element, null, null, null, null, null, null));
-		
-		showViewer();	
-	}*/
-	
-	
 	
 	private class ToggleDescriptionAction extends Action{
 		private boolean expanded;
@@ -282,5 +247,15 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas
 	public Viewer getViewer() {
 		return viewer;
 	}
+	
+	/**
+	 * <p>onComplete</p>
+	 *
+	 * @return a boolean.
+	 */
+	@Override
+	public boolean onComplete() {
+		return false;
+	}
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
index b51cf74e3..874393258 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
@@ -1,3 +1,11 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
 package eu.etaxonomy.taxeditor.ui.section.userecords;
 
 import java.util.ArrayList;