From 9e59c2ac642776a4419fd80e11675c7895519ab6 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Mon, 23 Sep 2013 11:11:32 +0000 Subject: [PATCH] - @Override annotation - fixed some more warnings --- .../bulkeditor/BulkEditorLineDisplay.java | 77 ++++++----- .../OpenBulkEditorContributionItem.java | 120 +++++++++--------- .../input/AbstractBulkEditorInput.java | 95 +++++++------- .../input/OccurrenceEditorInput.java | 34 ++--- 4 files changed, 174 insertions(+), 152 deletions(-) diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java index cd53d16cb..a6ae0fd77 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* 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. */ @@ -42,7 +42,7 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil; * @version 1.0 */ public class BulkEditorLineDisplay implements ILineDisplayStrategy { - + private BulkEditor editor; /** @@ -58,7 +58,8 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#getIcon(java.lang.Object) */ /** {@inheritDoc} */ - public Image getIcon(Object entity) { + @Override + public Image getIcon(Object entity) { return null; } @@ -66,7 +67,8 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#getIndent(java.lang.Object) */ /** {@inheritDoc} */ - public int getIndent(Object entity) { + @Override + public int getIndent(Object entity) { return 0; } @@ -74,7 +76,8 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#getText(java.lang.Object) */ /** {@inheritDoc} */ - public String getText(Object entity) { + @Override + public String getText(Object entity) { return editor.getEditorInput().getText((ICdmBase) entity); } @@ -83,20 +86,21 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getSupplementalText(java.lang.Object) */ /** {@inheritDoc} */ - public String getSupplementalText(Object entity) { - + @Override + public String getSupplementalText(Object entity) { + String supplementalText = ""; - + AbstractBulkEditorInput input = editor.getEditorInput(); String typeText = input.getTypeText(entity); - + supplementalText += StringUtils.isBlank(typeText) ? "" : String.format(" [%s]", typeText); - + if (entity instanceof IAnnotatableEntity) { IAnnotatableEntity annotatableEntity = (IAnnotatableEntity) HibernateProxyHelper.deproxy(entity); Map editMarkerTypePreferences = PreferencesUtil.getEditMarkerTypePreferences(); - + String markerText = ""; List markers = new ArrayList(); for (Marker marker : annotatableEntity.getMarkers()) { @@ -106,20 +110,21 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { if (! markers.isEmpty()) { markerText = StringUtils.join(markers, ", "); } - + supplementalText += StringUtils.isBlank(markerText) ? "" : String.format(" [%s]", markerText); } - + return supplementalText; } - + /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#setText(java.lang.String, java.lang.Object) */ /** {@inheritDoc} */ - public void setText(String text, Object entity) { + @Override + public void setText(String text, Object entity) { if (entity instanceof Reference) { - ((Reference) entity).setTitleCache(text); + ((Reference) entity).setTitleCache(text); } } @@ -127,7 +132,8 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#getHoverText(java.lang.Object) */ /** {@inheritDoc} */ - public String getHoverText(Object entity) { + @Override + public String getHoverText(Object entity) { return null; } @@ -135,15 +141,18 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#setStatusMessage(java.lang.String, java.lang.Object) */ /** {@inheritDoc} */ - public void setStatusMessage(final String text, Object entity) { - + @Override + public void setStatusMessage(final String text, Object entity) { + // Calling from the synchronized method ListEditorReconcilingStrategy#doReconcile // without its own thread causes an invalid thread access exception // see http://wiki.eclipse.org/FAQ_Why_do_I_get_an_invalid_thread_access_exception%3F new Thread(new Runnable() { - public void run() { + @Override + public void run() { Display.getDefault().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { IStatusLineManager statusLineManager = editor.getEditorSite().getActionBars().getStatusLineManager(); statusLineManager.setMessage(text); } @@ -156,7 +165,8 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getEmptyText(java.lang.Object) */ /** {@inheritDoc} */ - public String getEmptyCacheMessage(Object entity) { + @Override + public String getEmptyCacheMessage(Object entity) { if (entity instanceof Reference) { return "No reference title cache"; } @@ -173,17 +183,18 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#isEntityCacheEmpty(java.lang.Object) */ /** {@inheritDoc} */ - public boolean isEntityCacheEmpty(Object entity) { + @Override + public boolean isEntityCacheEmpty(Object entity) { if (entity instanceof Reference) { String text = ((Reference) entity).getTitleCache(); return (text == null || text.equals("")); } if (entity instanceof TaxonNameBase) { - String text = ((TaxonNameBase) entity).getTitleCache(); + String text = ((TaxonNameBase) entity).getTitleCache(); return (text == null || text.equals("")); } if (entity instanceof AgentBase) { - String text = ((AgentBase) entity).getTitleCache(); + String text = ((AgentBase) entity).getTitleCache(); return (text == null || text.equals("")); } return false; @@ -193,16 +204,17 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#addDisplayListener(java.lang.Object) */ /** {@inheritDoc} */ - public void addDisplayListener(Object entity, EntityListener listener) { - /* Note: all non-field specific listeners require that corresponding property sheets + @Override + public void addDisplayListener(Object entity, EntityListener listener) { + /* Note: all non-field specific listeners require that corresponding property sheets * contain the following: - * - * + * + * * public void setPropertyValue(Object id, Object value) { * ... * reference.firePropertyChange(new PropertyChangeEvent(reference, "", null, null)); * } - * + * */ if (entity instanceof CdmBase) { ((CdmBase) entity).addPropertyChangeListener(listener); @@ -213,7 +225,8 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy { * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getFont(java.lang.Object) */ /** {@inheritDoc} */ - public Font getFont(Object entity) { + @Override + public Font getFont(Object entity) { return null; } } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java index 8150e39ae..303373ac0 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT - * European Distributed Institute of Taxonomy + * 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. */ @@ -25,82 +25,82 @@ import org.eclipse.ui.menus.CommandContributionItemParameter; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants; import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputType; +import eu.etaxonomy.taxeditor.dataimport.DataImportEditor; /** *

* OpenBulkEditorContributionItem class. *

- * + * * @author p.ciardelli * @created 19.08.2009 * @version 1.0 */ public class OpenBulkEditorContributionItem extends CompoundContributionItem { - /** - *

- * Constructor for OpenBulkEditorContributionItem. - *

- */ - public OpenBulkEditorContributionItem() { - } + /** + *

+ * Constructor for OpenBulkEditorContributionItem. + *

+ */ + public OpenBulkEditorContributionItem() { + } - /** - *

- * Constructor for OpenBulkEditorContributionItem. - *

- * - * @param id - * a {@link java.lang.String} object. - */ - public OpenBulkEditorContributionItem(String id) { - super(id); - } + /** + *

+ * Constructor for OpenBulkEditorContributionItem. + *

+ * + * @param id + * a {@link java.lang.String} object. + */ + public OpenBulkEditorContributionItem(String id) { + super(id); + } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.actions.CompoundContributionItem#getContributionItems() - */ - /** {@inheritDoc} */ - @Override - protected IContributionItem[] getContributionItems() { + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ui.actions.CompoundContributionItem#getContributionItems() + */ + /** {@inheritDoc} */ + @Override + protected IContributionItem[] getContributionItems() { - List contributionItems = new ArrayList(); + List contributionItems = new ArrayList(); - contributionItems.add(BulkEditorInputType.AGENT.createContributionItem()); - contributionItems.add(BulkEditorInputType.REFERENCE.createContributionItem()); - contributionItems.add(new Separator("test")); - contributionItems.add(BulkEditorInputType.NAME.createContributionItem()); - contributionItems.add(BulkEditorInputType.NAME_RELATIONSHIP.createContributionItem()); - contributionItems.add(new Separator("test")); - contributionItems.add(BulkEditorInputType.OCCURRENCE.createContributionItem()); - contributionItems.add(new Separator("test")); - contributionItems.add(BulkEditorInputType.USER.createContributionItem()); - contributionItems.add(BulkEditorInputType.GROUP.createContributionItem()); + contributionItems.add(BulkEditorInputType.AGENT.createContributionItem()); + contributionItems.add(BulkEditorInputType.REFERENCE.createContributionItem()); + String groupName = "test"; + contributionItems.add(new Separator(groupName)); + contributionItems.add(BulkEditorInputType.NAME.createContributionItem()); + contributionItems.add(BulkEditorInputType.NAME_RELATIONSHIP.createContributionItem()); + contributionItems.add(new Separator(groupName)); + contributionItems.add(BulkEditorInputType.OCCURRENCE.createContributionItem()); + contributionItems.add(new Separator(groupName)); + contributionItems.add(BulkEditorInputType.USER.createContributionItem()); + contributionItems.add(BulkEditorInputType.GROUP.createContributionItem()); + contributionItems.add(new Separator(groupName)); + contributionItems.add(createContributionItem("Search Specimen", DataImportEditor.ID)); - return contributionItems - .toArray(new IContributionItem[contributionItems.size()]); - } + return contributionItems.toArray(new IContributionItem[contributionItems.size()]); + } - /** - * @param key - * @param object - * @return - */ - private IContributionItem createContributionItem(String label, - String inputType) { - CommandContributionItemParameter parameter = new CommandContributionItemParameter( - PlatformUI.getWorkbench().getActiveWorkbenchWindow(), null, - IBulkEditorConstants.DYNAMIC_OPEN_MENU_ID, SWT.NONE); + /** + * @param key + * @param object + * @return + */ + private IContributionItem createContributionItem(String label, String inputType) { + CommandContributionItemParameter parameter = new CommandContributionItemParameter(PlatformUI.getWorkbench().getActiveWorkbenchWindow(), null, IBulkEditorConstants.DYNAMIC_OPEN_MENU_ID, SWT.NONE); - parameter.label = label; + parameter.label = label; - Map parameters = new HashMap(); - parameters.put(IBulkEditorConstants.INPUT_TYPE_PARAMETER_ID, inputType); - parameter.parameters = parameters; + Map parameters = new HashMap(); + parameters.put(IBulkEditorConstants.INPUT_TYPE_PARAMETER_ID, inputType); + parameter.parameters = parameters; - return new CommandContributionItem(parameter); - } + return new CommandContributionItem(parameter); + } } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java index c92942567..1126b550f 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* 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. */ @@ -30,10 +30,10 @@ import eu.etaxonomy.cdm.strategy.merge.MergeException; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorQuery; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.CdmBaseSortProvider; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.TitleCacheComparator; +import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -47,16 +47,16 @@ import eu.etaxonomy.taxeditor.store.CdmStore; public abstract class AbstractBulkEditorInput implements IEditorInput, IEntityPersistenceService { /** - * + * */ private static final long serialVersionUID = 416414530232743735L; private UUID entityUuid; private List model; - + private IEntityCreator entityCreator; - + /** *

NewInstance

* @@ -66,7 +66,7 @@ public abstract class AbstractBulkEditorInput implements IEd static public AbstractBulkEditorInput NewInstance(BulkEditorInputType inputType) { return BulkEditorInputType.getInput(inputType); } - + /** *

NewInstance

* @@ -74,17 +74,17 @@ public abstract class AbstractBulkEditorInput implements IEd * @return a {@link eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput} object. */ public static AbstractBulkEditorInput NewInstance(IdentifiableEntity entity) { - - + + BulkEditorInputType inputType = BulkEditorInputType.getByType(entity.getClass()); - + AbstractBulkEditorInput editorInput = NewInstance(inputType); - + editorInput.setEntityUuid(entity.getUuid()); - + return editorInput; } - + /** *

listEntities

* @@ -92,7 +92,7 @@ public abstract class AbstractBulkEditorInput implements IEd * @return a {@link java.util.List} object. */ protected abstract List listEntities(IIdentifiableEntityServiceConfigurator configurator); - + /** *

loadEntity

* @@ -104,7 +104,7 @@ public abstract class AbstractBulkEditorInput implements IEd private void setEntityUuid(UUID entityUuid){ this.entityUuid = entityUuid; } - + /** *

Getter for the field entityUuid.

* @@ -114,7 +114,7 @@ public abstract class AbstractBulkEditorInput implements IEd return entityUuid; } - + /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#exists() */ @@ -123,7 +123,8 @@ public abstract class AbstractBulkEditorInput implements IEd * * @return a boolean. */ - public boolean exists() { + @Override + public boolean exists() { // TODO Auto-generated method stub return false; } @@ -136,7 +137,8 @@ public abstract class AbstractBulkEditorInput implements IEd * * @return a {@link org.eclipse.jface.resource.ImageDescriptor} object. */ - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { // TODO Auto-generated method stub return null; } @@ -149,7 +151,8 @@ public abstract class AbstractBulkEditorInput implements IEd * * @return a {@link org.eclipse.ui.IPersistableElement} object. */ - public IPersistableElement getPersistable() { + @Override + public IPersistableElement getPersistable() { return null; } @@ -157,7 +160,8 @@ public abstract class AbstractBulkEditorInput implements IEd * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ /** {@inheritDoc} */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public Object getAdapter(Class adapter) { return null; } @@ -168,30 +172,29 @@ public abstract class AbstractBulkEditorInput implements IEd * @param bulkEditorQuery a {@link eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorQuery} object. */ public void performSearch(final BulkEditorQuery bulkEditorQuery) { - + List entityList = new ArrayList(); - + if(getEntityUuid() != null){ - + T entity = loadEntity(getEntityUuid()); entityList.add(entity); model = entityList; } else if(bulkEditorQuery != null){ - - String queryString = bulkEditorQuery.getSearchString(); + IIdentifiableEntityServiceConfigurator configurator = bulkEditorQuery.getSearchConfigurator(); Comparator queryComparator = (bulkEditorQuery.getComparator() != null) ? bulkEditorQuery.getComparator() : new TitleCacheComparator(); - + entityList = listEntities(configurator); - - Collections.sort(entityList, queryComparator); - + + Collections.sort(entityList, queryComparator); + } - + model = entityList; } - + /** *

isMergingEnabled

* @@ -210,32 +213,34 @@ public abstract class AbstractBulkEditorInput implements IEd public boolean isMarkerTypeEditingEnabled(MarkerType markerType) { return false; } - + /* * (non-Javadoc) * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService#merge(eu.etaxonomy.cdm.model.common.IdentifiableEntity, eu.etaxonomy.cdm.model.common.IdentifiableEntity) */ /** {@inheritDoc} */ - public boolean merge(T entity, T mergeTarget) { + @Override + public boolean merge(T entity, T mergeTarget) { if (entity instanceof IMergable) { try { CdmStore.getService(ICommonService.class).merge((IMergable)mergeTarget, (IMergable)entity, null); } catch (MergeException e) { - BulkEditorUtil.error(getClass(), e); + AbstractUtility.error(getClass(), e); } } return true; - }; - + } + /* * (non-Javadoc) * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService#create(eu.etaxonomy.cdm.model.common.IdentifiableEntity) */ /** {@inheritDoc} */ - public boolean create(T entity) { - return save(entity); - }; - + @Override + public boolean create(T entity) { + return save(entity); + } + public IEntityCreator getEntityCreator(){ if(entityCreator == null){ entityCreator = createEntityCreator(); @@ -254,9 +259,9 @@ public abstract class AbstractBulkEditorInput implements IEd */ public List> getSortProviders(){ List> sortProviders = new ArrayList>(); - + sortProviders.add(new CdmBaseSortProvider()); - + return sortProviders; } @@ -275,13 +280,13 @@ public abstract class AbstractBulkEditorInput implements IEd public String getText(T entity) { if(entity instanceof IdentifiableEntity){ IdentifiableEntity identifiableEntity = (IdentifiableEntity) HibernateProxyHelper.deproxy(entity); - + return identifiableEntity.getTitleCache(); } - + return "No text. Implement in subclass"; } - + /** * @return */ diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java index 6c7fc05d2..296a07090 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* 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. */ @@ -31,9 +31,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore; * @version 1.0 */ public class OccurrenceEditorInput extends AbstractBulkEditorInput { - + /** - * + * */ private static final long serialVersionUID = 1014860873939989973L; @@ -41,7 +41,7 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInputGetter for the field instance.

* @@ -53,7 +53,7 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput propertyPaths = Arrays.asList(new String[]{}); + List propertyPaths = Arrays.asList(new String[]{}); return CdmStore.getService(IOccurrenceService.class).load(entityUuid, propertyPaths); } @@ -82,7 +82,8 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInputgetId

* @@ -111,7 +113,8 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput> getSortProviders() { List> sortProviders = super.getSortProviders(); - + sortProviders.add(0, new IdentifiableEntitySortProvider()); - + return sortProviders; } } -- 2.34.1