From 324d38f7d844cbbfdccacf46f74063a250667bd6 Mon Sep 17 00:00:00 2001 From: "a.theys" Date: Wed, 14 Mar 2012 14:22:11 +0000 Subject: [PATCH] AT: committing latest changes to the Tax Editor after a first round of Code review --- .../taxeditor/perspective/PalmUses.java | 7 +- .../editor/view/uses/UsesContentProvider.java | 25 ++-- .../editor/view/uses/UsesLabelProvider.java | 31 ++--- .../editor/view/uses/UsesViewPart.java | 31 +---- .../view/uses/handler/CreateUseHandler.java | 8 +- .../uses/handler/CreateUseRecordHandler.java | 20 +-- .../view/uses/handler/DeleteUseHandler.java | 29 ++-- .../operation/CreateTaxonUseOperation.java | 8 +- .../operation/CreateUseRecordOperation.java | 18 +-- .../operation/DeleteTaxonUseOperation.java | 8 ++ .../operation/DeleteUseRecordOperation.java | 8 ++ .../userecords/UseRecordDetailElement.java | 15 ++- .../userecords/UseRecordDetailSection.java | 7 + .../view/userecords/UseRecordsViewPart.java | 126 +++++++++--------- .../view/userecords/UseRecordsViewer.java | 17 +-- 15 files changed, 175 insertions(+), 183 deletions(-) diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PalmUses.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PalmUses.java index 735c403d5..9d77f7f40 100644 --- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PalmUses.java +++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PalmUses.java @@ -12,8 +12,11 @@ import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator; import eu.etaxonomy.taxeditor.view.userecords.UseRecordsViewPart; /** - * @author a.theys + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 */ public class PalmUses extends Default { @@ -26,8 +29,6 @@ public class PalmUses extends Default { layout.addView(UseRecordsViewPart.ID, IPageLayout.RIGHT, 0.25f, layout.getEditorArea()); layout.addView(UsesViewPart.ID, IPageLayout.BOTTOM, 0.25f, layout.getEditorArea()); - // layout.addView(SupplementalDataViewPart.ID, IPageLayout.BOTTOM, 0.25f, DetailsViewPart.ID); - createAdditionalFolder(layout, layout.getEditorArea()); } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java index b1052f61c..98cb3a683 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java @@ -10,7 +10,7 @@ import java.util.UUID; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import eu.etaxonomy.cdm.api.service.IDescriptionService; +import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.model.common.Marker; import eu.etaxonomy.cdm.model.common.MarkerType; import eu.etaxonomy.cdm.model.description.DescriptionBase; @@ -25,6 +25,13 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.store.TermStore; +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class UsesContentProvider implements ITreeContentProvider { private static final Object[] NO_CHILDREN = new Object[0]; @@ -124,29 +131,19 @@ public class UsesContentProvider implements ITreeContentProvider { * @param parentElement * @return */ - //CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(input.getTaxonNode().getTaxon(), null, null, null, null, null, null) private List getDescriptions(TaxonEditorInput parentElement) { - //this.markerTypes.addAll(CdmStore.getTermManager().getPreferredMarkerTypes()); this.markerTypes.addAll(CdmStore.getTermManager().getPreferredTerms(MarkerType.class)); Taxon taxon = parentElement.getTaxon(); - Set typesToDisdplay = new HashSet(); List descriptions = new ArrayList(); - List usesDescriptions = new ArrayList(); - /*for (MarkerType markerType : markerTypes) { - if (markerType.toString().equals("complete")) { - typesToDisdplay.add(markerType); - } - }*/ - //usesDescriptions = CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(taxon, null, null, typesToDisdplay, null, null, null); - //for(DescriptionBase description : CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(taxon, null, null, typesToDisdplay, null, null, null)){ - for(DescriptionBase description : taxon.getDescriptions()){ + for(DescriptionBase description : taxon.getDescriptions()){ if(! description.isImageGallery()){ + MarkerType useMarkertype = (MarkerType) CdmStore.getService(ITermService.class).find(UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f039")); Set descriptionMarkers = description.getMarkers(); if(descriptionMarkers != null) { for (Marker marker: descriptionMarkers) { //TODO Use the GetbyUUID method - if(marker.getMarkerType().getTitleCache().equals("use")) { + if(marker.getMarkerType().equals(useMarkertype)) { descriptions.add(description); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java index 85601542a..8b41d9dfb 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java @@ -1,10 +1,6 @@ package eu.etaxonomy.taxeditor.editor.view.uses; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.swing.text.html.HTMLDocument.HTMLReader.IsindexAction; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; @@ -12,30 +8,25 @@ import org.eclipse.jface.viewers.StyledString; import eu.etaxonomy.cdm.api.service.DefaultCategoricalDescriptionBuilder; import eu.etaxonomy.cdm.api.service.DescriptionBuilder; -import eu.etaxonomy.cdm.model.common.Language; -import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.description.CategoricalData; import eu.etaxonomy.cdm.model.description.DescriptionBase; -import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.cdm.model.description.Modifier; -import eu.etaxonomy.cdm.model.description.State; import eu.etaxonomy.cdm.model.description.StateData; -import eu.etaxonomy.cdm.model.description.TextData; import eu.etaxonomy.taxeditor.store.CdmStore; +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class UsesLabelProvider extends ColumnLabelProvider implements IStyledLabelProvider { - private static DescriptionBuilder categoricalDescriptionBuilder = new DefaultCategoricalDescriptionBuilder(); public String getText(Object element) { String text = ""; - /* - * return DescriptionHelper.getLabel(element); - * - * for (Marker marker : element.getMarkers()) { if - * (marker.getMarkerType().getTitleCache().equals("use")) { return - * "Use: " + text; } } - */ + if (element instanceof DescriptionBase) { text = ((DescriptionBase) element).getTitleCache(); if (text == null || text.length() == 0) { @@ -46,8 +37,6 @@ public class UsesLabelProvider extends ColumnLabelProvider implements } } else if (element instanceof CategoricalData) { - //String text = ""; - //TextData textData = categoricalDescriptionBuilder.build((CategoricalData) element, getLanguageList()); if (!((CategoricalData) element).getStates().isEmpty()) { for (StateData statedata : ((CategoricalData) element).getStates()) { if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals("Use Category")) { @@ -126,8 +115,6 @@ public class UsesLabelProvider extends ColumnLabelProvider implements StyledString.QUALIFIER_STYLER); } - private static List getLanguageList(){ - return Arrays.asList(new Language[]{CdmStore.getDefaultLanguage()}); - } + } 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 1f9cf8653..94ffa1c1a 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 @@ -75,7 +75,13 @@ import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart; - +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartContentHasDetails, IPartContentHasSupplementalData { @@ -110,23 +116,12 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont TermVocabulary humanGroupVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UUID.fromString("ca46cea5-bdf7-438d-9cd8-e2793d2178dc")); ConversationHolder conversation = CdmStore.createConversation(); if (existingMarkertype == null) { - //existingMarkertype.set("use") - //existingMarkertype.setLabel("use"); - //MarkerType useMarkerType = MarkerType.NewInstance("use", "use", null); - //ConversationHolder conversation = CdmStore.createConversation(); existingMarkertype = MarkerType.NewInstance("use", "use", null); existingMarkertype.setUuid( UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f039")); - //CdmStore.getService(ITermService.class).save(existingMarkertype); - //saveOrUpdate(existingMarkertype); - //TermVocabulary markerTypeVocabulary = (TermVocabulary)CdmStore.getService(IVocabularyService.class).getVocabulary(VocabularyEnum.MarkerType); TermVocabulary markerTypeVocabulary = (TermVocabulary)CdmStore.getService(IVocabularyService.class).find((UUID.fromString("19dffff7-e142-429c-a420-5d28e4ebe305"))); - //(UUID.fromString("19dffff7-e142-429c-a420-5d28e4ebe305")); - //CdmStore. - markerTypeVocabulary.addTerm(existingMarkertype); CdmStore.getService(IVocabularyService.class).saveOrUpdate(markerTypeVocabulary); conversation.commit(true); - //conversation.close(); } if (stateVocabulary == null) { monitor.subTask("stateVocabulary empty"); @@ -134,7 +129,6 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont try { termSourceUri = new URI("eu.etaxonomy.cdm.model.description.State"); } catch (URISyntaxException e) { - // TODO Auto-generated catch block e.printStackTrace(); } stateVocabulary = TermVocabulary.NewInstance("Use Category", "Use Category", null, termSourceUri); @@ -152,7 +146,6 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont try { termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier"); } catch (URISyntaxException e) { - // TODO Auto-generated catch block e.printStackTrace(); } countryVocabulary = TermVocabulary.NewInstance("Country", "Country", null, termSourceUri); @@ -169,7 +162,6 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont try { termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier"); } catch (URISyntaxException e) { - // TODO Auto-generated catch block e.printStackTrace(); } plantPartVocabulary = TermVocabulary.NewInstance("Plant Part", "Plant Part", null, termSourceUri); @@ -185,7 +177,6 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont try { termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier"); } catch (URISyntaxException e) { - // TODO Auto-generated catch block e.printStackTrace(); } humanGroupVocabulary = TermVocabulary.NewInstance("Human Group", "Human Group", null, termSourceUri); @@ -198,13 +189,9 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont conversation.commit(true); } if(featureUseRecord == null) { - //Feature usesFeature = (Feature) CdmStore.getService(ITermService.class).find(UUID.fromString("e5374d39-b210-47c7-bec1-bee05b5f1cb6")); featureUseRecord = Feature.NewInstance("Use Record", "Use Record", null); featureUseRecord.setUuid(UUID.fromString("8125a59d-b4d5-4485-89ea-67306297b599")); featureUseRecord.setSupportsCategoricalData(true); - //featureUseRecord - //featureUseRecord.setLabel("Use Record"); - //featureUseRecord. TermVocabulary featureVocabulary = (TermVocabulary)CdmStore.getService(IVocabularyService.class).find((UUID.fromString("b187d555-f06f-4d65-9e53-da7c93f8eaa8"))); featureVocabulary.addTerm(featureUseRecord); CdmStore.getService(IVocabularyService.class).saveOrUpdate(featureVocabulary); @@ -215,10 +202,6 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont conversation.close(); } - /*public void contextStop(IMemento memento, IProgressMonitor monitor) { - monitor.subTask("Getting rid of search results"); - NavigationUtil.hideView(SearchResultView.this); - }*/ } public static final String ID = "eu.etaxonomy.taxeditor.editor.view.uses"; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseHandler.java index e9a71d539..42b965072 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseHandler.java @@ -17,6 +17,13 @@ import eu.etaxonomy.taxeditor.editor.view.uses.operation.CreateTaxonUseOperation import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class CreateUseHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) @@ -36,7 +43,6 @@ public class CreateUseHandler extends AbstractHandler { Taxon taxon = ((TaxonEditorInput) input).getTaxon(); AbstractPostOperation operation; try { - // TODO use undo context specific to editor operation = new CreateTaxonUseOperation(event.getCommand().getName(), EditorUtil.getUndoContext(), taxon, postOperationEnabled); EditorUtil.executeOperation(operation); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseRecordHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseRecordHandler.java index cc679a5cc..5f4c39538 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseRecordHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseRecordHandler.java @@ -1,7 +1,6 @@ package eu.etaxonomy.taxeditor.editor.view.uses.handler; -import java.util.List; -import java.util.Set; + import java.util.UUID; import org.eclipse.core.commands.AbstractHandler; @@ -12,7 +11,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeSelection; import org.eclipse.jface.viewers.TreePath; -import org.eclipse.swt.widgets.Event; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; @@ -20,12 +18,8 @@ import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.api.service.ITermService; -import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; -import eu.etaxonomy.cdm.model.description.CategoricalData; -import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.TaxonDescription; -import eu.etaxonomy.cdm.model.description.TextData; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; @@ -34,6 +28,13 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class CreateUseRecordHandler extends AbstractHandler { public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchPart part = HandlerUtil.getActivePart(event); @@ -69,10 +70,9 @@ public class CreateUseRecordHandler extends AbstractHandler { AbstractPostOperation operation = null; try { //Use Record Feature retrieval below - //Feature feature = (Feature) CdmStore.getService(ITermService.class).find(UUID.fromString("8125a59d-b4d5-4485-89ea-67306297b599")); - //Feature feature = (Feature) CdmStore.getService(ITermService.class).find(UUID.fromString("247606f2-5f24-421f-92ca-dad2351b171e")); + Feature feature = (Feature) CdmStore.getService(ITermService.class).find(UUID.fromString("8125a59d-b4d5-4485-89ea-67306297b599")); //The code below retrieves the feature "Uses" as a work around - Feature feature = (Feature) CdmStore.getService(ITermService.class).find(UUID.fromString("e5374d39-b210-47c7-bec1-bee05b5f1cb6")); + //Feature feature = (Feature) CdmStore.getService(ITermService.class).find(UUID.fromString("e5374d39-b210-47c7-bec1-bee05b5f1cb6")); feature.setSupportsCategoricalData(true); operation = new CreateUseRecordOperation(event .getCommand().getName(), diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/DeleteUseHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/DeleteUseHandler.java index 0028fc3a1..43a39ce55 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/DeleteUseHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/DeleteUseHandler.java @@ -9,23 +9,25 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.common.NotDefinedException; import org.eclipse.core.commands.operations.IUndoContext; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.TreePath; -import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.cdm.model.description.TaxonDescription; -import eu.etaxonomy.cdm.model.media.Media; import eu.etaxonomy.taxeditor.editor.EditorUtil; -import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteDescriptionElementOperation; -import eu.etaxonomy.taxeditor.editor.view.media.operation.DeleteMediaOperation; import eu.etaxonomy.taxeditor.editor.view.uses.operation.DeleteTaxonUseOperation; import eu.etaxonomy.taxeditor.editor.view.uses.operation.DeleteUseRecordOperation; import eu.etaxonomy.taxeditor.model.FeatureNodeContainer; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class DeleteUseHandler extends AbstractHandler { /* @@ -53,8 +55,6 @@ public class DeleteUseHandler extends AbstractHandler { for (Object object : selection.toArray()) { - AbstractPostOperation operation = null; - // TaxonDescription if (object instanceof TaxonDescription) { operations.add(new DeleteTaxonUseOperation(label, @@ -76,20 +76,7 @@ public class DeleteUseHandler extends AbstractHandler { postOperationEnabled)); } } - // Media - else if (object instanceof Media) { - TreeSelection treeSelection = (TreeSelection) selection; - - TreePath[] path = treeSelection.getPathsFor(object); - - TaxonDescription imageGallery = (TaxonDescription) path[0] - .getFirstSegment(); - - operations - .add(new DeleteMediaOperation(label, undoContext, - imageGallery, (Media) object, - postOperationEnabled)); - } else { + else { EditorUtil.error(getClass(), "Selection is not valid for this delete handler", null); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java index b8ca26e8e..d133d6a89 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java @@ -20,6 +20,13 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class CreateTaxonUseOperation extends AbstractPostOperation { private TaxonDescription description; private boolean isImageGallery; @@ -66,7 +73,6 @@ public class CreateTaxonUseOperation extends AbstractPostOperation { monitor.worked(20); //this.markerTypes.addAll(CdmStore.getTermManager().getPreferredMarkerTypes()); this.markerTypes.addAll(CdmStore.getTermManager().getPreferredTerms(MarkerType.class)); - Set typesToDisdplay = new HashSet(); for (MarkerType markerType : markerTypes) { if (markerType.getTitleCache().equals("use")) { marker = Marker.NewInstance(markerType, true); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java index 90fd7e604..e001a28aa 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java @@ -20,6 +20,14 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; + +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class CreateUseRecordOperation extends AbstractPostOperation { public static final String ID = "eu.etaxonomy.taxeditor.editor.use.createUseRecord"; @@ -29,8 +37,6 @@ public class CreateUseRecordOperation extends AbstractPostOperation { private DescriptionElementBase element; - /*public CreateUseRecordOperation(String label, IUndoContext undoContext, - Taxon taxon, TaxonDescription description, Feature feature, IPostOperationEnabled postOperationEnabled) {*/ public CreateUseRecordOperation(String label, IUndoContext undoContext, Taxon taxon, TaxonDescription description, Feature feature, IPostOperationEnabled postOperationEnabled) { super(label, undoContext, taxon, postOperationEnabled); @@ -43,14 +49,8 @@ public class CreateUseRecordOperation extends AbstractPostOperation { IUndoContext undoContext, Taxon taxon, TaxonDescription description, Feature feature, DescriptionElementBase element, IPostOperationEnabled postOperationEnabled) { - /*public CreateUseRecordOperation(String label, - IUndoContext undoContext, Taxon taxon, - TaxonDescription description, Feature feature, - DescriptionElementBase element, IPostOperationEnabled postOperationEnabled) {*/ + this(label, undoContext, taxon, description, feature, postOperationEnabled); - this(label, undoContext, taxon, description, feature, postOperationEnabled); - //this(label, undoContext, taxon, description, (CategoricalData) element, postOperationEnabled); - this.element = element; } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteTaxonUseOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteTaxonUseOperation.java index 66a5073f2..a98b9347a 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteTaxonUseOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteTaxonUseOperation.java @@ -10,6 +10,14 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; + +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class DeleteTaxonUseOperation extends AbstractPostOperation { private TaxonDescription description; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteUseRecordOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteUseRecordOperation.java index b50e4bd65..8b27e6bd9 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteUseRecordOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteUseRecordOperation.java @@ -1,5 +1,6 @@ package eu.etaxonomy.taxeditor.editor.view.uses.operation; + import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; import org.eclipse.core.runtime.IAdaptable; @@ -12,6 +13,13 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.StoreUtil; +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class DeleteUseRecordOperation extends AbstractPostOperation { private DescriptionElementBase element; private DescriptionBase description = null; 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 56a66d864..d858d2840 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 @@ -22,8 +22,15 @@ import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementDetailElement; + +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class UseRecordDetailElement extends AbstractCdmDetailElement implements SelectionListener { @@ -242,11 +249,6 @@ public class UseRecordDetailElement extends /** {@inheritDoc} */ @Override public void handleEvent(Object eventSource) { - /* - * if(eventSource == checkbox_orderRelevant){ - * getEntity().setOrderRelevant(checkbox_orderRelevant.getSelection()); - * } - */ if (eventSource == combo_UseCategory) { if (combo_UseCategory.getSelection() != null) { boolean isChanged = false; @@ -512,7 +514,6 @@ public class UseRecordDetailElement extends for (Object object: combo_UseCategory.getControls()) { if (object == eventSource) { State selectedUseCategory = combo_UseCategory.getSelection(); - //List newSubCategories = setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false),selectedUseCategory); if (selectedUseCategory != null) { combo_UseSubCategory.setTerms(setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false),selectedUseCategory)); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailSection.java index 31891b7e7..2af0297fc 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailSection.java @@ -10,6 +10,13 @@ import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class UseRecordDetailSection extends AbstractCdmDetailSection { public UseRecordDetailSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewPart.java index c87beb8f7..d8f3ca946 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewPart.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewPart.java @@ -14,85 +14,89 @@ import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart; import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart; - - public class UseRecordsViewPart extends AbstractCdmEditorViewPart implements IPartContentHasSupplementalData{ +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ +public class UseRecordsViewPart extends AbstractCdmEditorViewPart implements IPartContentHasSupplementalData{ - public static String ID = "eu.etaxonomy.taxeditor.view.userecords"; - private UseRecordsViewer viewer; + public static String ID = "eu.etaxonomy.taxeditor.view.userecords"; + private UseRecordsViewer viewer; + + @Override + public void createViewer(Composite parent) { + viewer = new UseRecordsViewer(parent, this); + getSite().setSelectionProvider(viewer); - @Override - public void createViewer(Composite parent) { - //selectionService.addPostSelectionListener(this); - - viewer = new UseRecordsViewer(parent, this); - getSite().setSelectionProvider(viewer); - + } + + @Override + public void selectionChanged(IWorkbenchPart part, ISelection selection) { + if(StoreUtil.getActiveEditor() == null){ + showEmptyPage(); + return; + } + + if(part == this){ + return; } - @Override - public void selectionChanged(IWorkbenchPart part, ISelection selection) { - if(StoreUtil.getActiveEditor() == null){ + if(!(selection instanceof IStructuredSelection)){ + return; + } + + IStructuredSelection structuredSelection = (IStructuredSelection) selection; + + if((part instanceof IEditorPart) || (part instanceof AbstractCdmViewPart)) { + if(structuredSelection.size() != 1){ showEmptyPage(); return; } - if(part == this){ - return; - } - - if(!(selection instanceof IStructuredSelection)){ - return; - } - - IStructuredSelection structuredSelection = (IStructuredSelection) selection; - - if((part instanceof IEditorPart) || (part instanceof AbstractCdmViewPart)) { - if(structuredSelection.size() != 1){ + // do not show details for feature nodes TODO really? + if(structuredSelection.getFirstElement() instanceof FeatureNodeContainer){ + // do show the map for distributions + Feature feature = ((FeatureNodeContainer) ((IStructuredSelection) selection).getFirstElement()).getFeature(); + if(!feature.equals(Feature.DISTRIBUTION())){ showEmptyPage(); return; } - - // do not show details for feature nodes TODO really? - if(structuredSelection.getFirstElement() instanceof FeatureNodeContainer){ - // do show the map for distributions - Feature feature = ((FeatureNodeContainer) ((IStructuredSelection) selection).getFirstElement()).getFeature(); - if(!feature.equals(Feature.DISTRIBUTION())){ - showEmptyPage(); - return; - } - } - - showViewer(part, structuredSelection); - }else{ - showEmptyPage(); - } + } - } + showViewer(part, structuredSelection); + }else{ + showEmptyPage(); + } - @Override - public Viewer getViewer() { - return viewer; - } + } + + @Override + public Viewer getViewer() { + return viewer; + } - /** {@inheritDoc} */ - @Override - public void dispose() { - super.dispose(); - selectionService.removePostSelectionListener(this); - } + /** {@inheritDoc} */ + @Override + public void dispose() { + super.dispose(); + selectionService.removePostSelectionListener(this); + } - /** - *

onComplete

- * - * @return a boolean. - */ - public boolean onComplete() { - return true; - } + /** + *

onComplete

+ * + * @return a boolean. + */ + public boolean onComplete() { + return true; + } - } +} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewer.java index 47be20f44..38e294d5d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewer.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewer.java @@ -12,21 +12,14 @@ 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.occurrence.DerivedUnitBase; -import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.element.RootElement; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType; -import eu.etaxonomy.taxeditor.ui.section.description.DescribedSpecimenSection; import eu.etaxonomy.taxeditor.ui.section.description.DescriptionDetailSection; -import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementDetailSection; -import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementMediaSection; -import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementSourceSection; import eu.etaxonomy.taxeditor.ui.section.description.DescriptionSourceSection; -import eu.etaxonomy.taxeditor.ui.section.description.NaturalLanguageSection; -import eu.etaxonomy.taxeditor.ui.section.description.ScopeSection; import eu.etaxonomy.taxeditor.ui.section.name.NameRelationshipDetailSection; import eu.etaxonomy.taxeditor.ui.section.name.NomenclaturalStatusSection; import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameDetailSection; @@ -42,9 +35,13 @@ import eu.etaxonomy.taxeditor.view.AbstractCdmDataViewer; import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart; - - - +/** + * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. + * + * @author a.theys + * @created mar 13, 2012 + * @version 1.0 + */ public class UseRecordsViewer extends AbstractCdmDataViewer { private ISelection selection; -- 2.34.1