From: a.theys Date: Thu, 21 Jun 2012 11:20:12 +0000 (+0000) Subject: AT: committing changes to the TaxEditor Post third round of code review X-Git-Tag: 3.6.0~1060^2~9 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/88c2fdda037723d16c83c0d39bd6464c38bec413 AT: committing changes to the TaxEditor Post third round of code review --- diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java index 23d3665d9..30db42aed 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java @@ -71,7 +71,7 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP protected ToggleDescriptionAction hideAllElementsAction; - private int dndOperations = DND.DROP_COPY | DND.DROP_MOVE; + protected int dndOperations = DND.DROP_COPY | DND.DROP_MOVE; /** {@inheritDoc} */ @Override diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java index 33c4e91f1..9542fb5cd 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java @@ -1,6 +1,6 @@ // $Id$ /** -* Copyright (C) 2007 EDIT +* Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * 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 feea06199..10033d118 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,5 +1,5 @@ /** -* Copyright (C) 2007 EDIT +* Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * @@ -52,7 +52,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements if (!((CategoricalData) element).getStates().isEmpty()) { boolean isUseCategoryAbsent = true; 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")) { + if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) { text = text + statedata.getState().getTitleCache() + ";"; isUseCategoryAbsent = false; } @@ -63,7 +63,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements boolean isUseSubCategoryAbsent = true; for (StateData statedata : ((CategoricalData) element).getStates()) { - if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals("Use SubCategory")) { + if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useSubCategoryVocabularyLabel)) { text = text + statedata.getState().getTitleCache() + ";"; isUseSubCategoryAbsent = false; } 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 9fb185656..f0cc2942b 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 @@ -15,6 +15,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Tree; import eu.etaxonomy.cdm.model.common.CdmBase; +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.IPartContentHasDetails; @@ -44,10 +46,10 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas 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); 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 dedfdf510..f208906a8 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 @@ -1,5 +1,5 @@ /** -* Copyright (C) 2007 EDIT +* Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * @@ -22,9 +22,8 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; * @version 1.0 */ public class CreateUseHandler extends CreateDescriptionHandler { - /* (non-Javadoc) - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ + + /** {@inheritDoc} */ @Override protected AbstractPostOperation createOperationInstance(String eventLabel, Taxon taxon, IPostOperationEnabled postOperationEnabled) { 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 f596f1240..8124bd3cf 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,5 +1,5 @@ /** - * Copyright (C) 2007 EDIT + * Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * @@ -9,8 +9,6 @@ package eu.etaxonomy.taxeditor.editor.view.uses.handler; -import java.util.UUID; - import org.eclipse.core.commands.ExecutionEvent; import eu.etaxonomy.cdm.api.service.ITermService; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseSummaryHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseSummaryHandler.java index b31d30650..ebc3e2884 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseSummaryHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseSummaryHandler.java @@ -1,5 +1,5 @@ /** -* Copyright (C) 2007 EDIT +* Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * @@ -9,8 +9,6 @@ package eu.etaxonomy.taxeditor.editor.view.uses.handler; -import java.util.UUID; - import org.eclipse.core.commands.ExecutionEvent; import eu.etaxonomy.cdm.api.service.ITermService; 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 c3d73a28e..f312a1a42 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 @@ -1,5 +1,5 @@ /** -* Copyright (C) 2007 EDIT +* Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * 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 68f6862d0..ea45ffb28 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 @@ -1,5 +1,5 @@ /** -* Copyright (C) 2007 EDIT +* Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * @@ -32,8 +32,8 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; */ public class CreateUseRecordOperation extends AbstractPostOperation { + /** Constant ID="eu.etaxonomy.taxeditor.editor.view.use."{trunked} */ public static final String ID = "eu.etaxonomy.taxeditor.editor.use.createUseRecord"; - private TaxonDescription description; private Feature feature; private DescriptionElementBase element; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java index 758d0dec7..2a86f90fd 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java @@ -1,5 +1,5 @@ /** -* Copyright (C) 2007 EDIT +* Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * 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 874393258..bd90ae371 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,5 +1,5 @@ /** -* Copyright (C) 2007 EDIT +* Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * @@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - + /** * The context manager mediates context start/stop and workbench shutdowns to all registered listeners. * @@ -111,6 +111,11 @@ public class UseRecordDetailElement extends } + /** + * Returns the select modifier + * @param comboCategory + * @return + */ private Modifier modifierSelection(String comboCategory) { if(!getEntity().getModifiers().isEmpty()) { for (Modifier modifier : getEntity().getModifiers()) { @@ -125,6 +130,11 @@ public class UseRecordDetailElement extends } + /** + * Returns the selected state + * @param comboCategory + * @return + */ private State stateSelection(String comboCategory) { if (!getEntity().getStates().isEmpty()) { for (StateData statedata : getEntity().getStates()) { @@ -145,6 +155,12 @@ public class UseRecordDetailElement extends } + /** + * This function sets the combo terms (Besides EthnicGroup + * @param listOfTerms + * @param modType + * @return + */ private List setModifierComboTerms(List listOfTerms, String modType) { List termsToAdd = new ArrayList(); for (Modifier term : listOfTerms) { @@ -161,7 +177,11 @@ public class UseRecordDetailElement extends } - + /** + * This function sets the Use Category combo term + * @param listOfTerms + * @return + */ private List setUseCategoryComboTerms(List listOfTerms) { List termsToAdd = new ArrayList(); for (State term : listOfTerms) { @@ -177,6 +197,12 @@ public class UseRecordDetailElement extends } + /** + * This function sets the Use SubCategory combo term + * @param listOfTerms + * @param selectedUseCategory + * @return + */ private List setUseCategoryComboTerms(List listOfTerms, State selectedUseCategory) { List termsToAdd = new ArrayList(); @@ -217,6 +243,13 @@ public class UseRecordDetailElement extends return termsToAdd; } + + /** + * This function sets the EthnicGroup combo term + * @param listOfTerms + * @param selectedHumangroup + * @return + */ private List setEthnicGroupComboTerms(List listOfTerms, Modifier selectedHumangroup) { List termsToAdd = new ArrayList(); @@ -255,6 +288,7 @@ public class UseRecordDetailElement extends return termsToAdd; } + /** {@inheritDoc} */ @Override public void handleEvent(Object eventSource) { @@ -496,6 +530,12 @@ public class UseRecordDetailElement extends + /** + * This function Checks the vocabulary type + * @param term + * @param vocabularyExpected + * @return + */ private boolean GetVocabularyType(Modifier term, String vocabularyExpected) { if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(vocabularyExpected))) { return true; @@ -517,6 +557,7 @@ public class UseRecordDetailElement extends super.setEntity(entity); } + /** {@inheritDoc} */ @Override public void widgetSelected(SelectionEvent e) { Object eventSource = e.getSource(); @@ -562,6 +603,7 @@ public class UseRecordDetailElement extends } } + /** {@inheritDoc} */ @Override public void widgetDefaultSelected(SelectionEvent e) { // TODO Auto-generated method stub 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 e47e516d3..953928966 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 @@ -1,5 +1,5 @@ /** -* Copyright (C) 2007 EDIT +* Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java index 8231d4d2a..f4c2c5805 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java @@ -1,6 +1,6 @@ // $Id$ /** - * Copyright (C) 2007 EDIT + * Copyright (C) 2011 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * @@ -310,6 +310,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { fireSelectionChanged(selectionChangedEvent); } + /** + * createTaxonSections(RootElement parent) + * @param parent + */ private void createTaxonSections(RootElement parent) { destroySections(); @@ -371,6 +375,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(parsingMessagesSection); } + /** + * createNameSections + * @param parent + */ private void createNameSections(RootElement parent) { destroySections(); NonViralNameDetailSection nonViralNameSection = (NonViralNameDetailSection) formFactory @@ -419,6 +427,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(nameRelationshipSection); } + /** + * createReferenceSections + * @param parent + */ private void createReferenceSections(RootElement parent) { destroySections(); @@ -430,6 +442,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(referenceDetailSection); } + /** + * createTeamOrPersonBaseDetailSection + * @param parent + */ private void createTeamOrPersonBaseDetailSection(RootElement parent) { destroySections(); TeamOrPersonBaseDetailSection teamOrPersonBaseDetailSection = (TeamOrPersonBaseDetailSection) formFactory @@ -440,6 +456,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(teamOrPersonBaseDetailSection); } + /** + * createTeamDetailSection + * @param parent + */ private void createTeamDetailSection(RootElement parent) { destroySections(); TeamDetailSection teamDetailSection = (TeamDetailSection) formFactory @@ -449,7 +469,11 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(teamDetailSection); } - + + /** + * createPersonDetailSection + * @param parent + */ private void createPersonDetailSection(RootElement parent) { destroySections(); PersonDetailSection personDetailSection = (PersonDetailSection) formFactory @@ -459,6 +483,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(personDetailSection); } + /** + * createDescriptionElementSection + * @param parent + */ private void createDescriptionElementSection(RootElement parent) { destroySections(); @@ -488,6 +516,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(descriptionElementMediaSection); } + /** + * createDescriptionSection + * @param parent + */ private void createDescriptionSection(RootElement parent) { destroySections(); DescriptionDetailSection descriptionDetailSection = (DescriptionDetailSection) formFactory @@ -567,6 +599,11 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(descriptionDetailSection); } + + /** + * createMediaElementSection + * @param parent + */ private void createMediaElementSection(RootElement parent) { destroySections(); @@ -578,6 +615,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(mediaDetailSection); } + /** + * createDerivedUnitBaseElementSection + * @param parent + */ private void createDerivedUnitBaseElementSection(RootElement parent) { destroySections(); @@ -664,6 +705,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(taxonomicScopeSection); } + /** + * createPolytomousKeyNodeSection + * @param parent + */ private void createPolytomousKeyNodeSection(RootElement parent) { destroySections(); @@ -694,6 +739,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { } + /** + * createUserSection + * @param parent + */ private void createUserSection(RootElement parent) { destroySections(); @@ -711,6 +760,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(groupByUserDetailSection); } + /** + * createTaxonRelationshipSection + * @param parent + */ private void createTaxonRelationshipSection(RootElement parent) { destroySections(); @@ -740,6 +793,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(termVocabularyDetailSection); } + /** + * createDefinedTermSection + * @param parent + */ private void createDefinedTermSection(RootElement parent) { destroySections();