From ffa56d68fbd2b9e24934599f182c6a1c18f62a33 Mon Sep 17 00:00:00 2001 From: Patric Plitzner
* TaxonNameEditor class. *
- * + * * @author p.ciardelli * @author n.hoffmann * @created 15.05.2008 * @version 1.0 */ public class TaxonNameEditor extends EditorPart implements - IMultiPageTaxonEditorPage, IAdaptable, IConversationEnabled, - IPostOperationEnabled, IPartContentHasDetails, IPartChangeListener, + IMultiPageTaxonEditorPage, IConversationEnabled, + IPartContentHasDetails, IPartChangeListener, ISelectionListener, IDropTargetable, ISecuredEditor { /** ConstantID="eu.etaxonomy.taxeditor.editor.taxon.name"
*/
@@ -124,7 +124,7 @@ public class TaxonNameEditor extends EditorPart implements
* * Constructor for TaxonNameEditor. *
- * + * * @param editor * a {@link eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor} * object. @@ -138,7 +138,7 @@ public class TaxonNameEditor extends EditorPart implements ** getUndoContext *
- * + * * @return a {@link org.eclipse.core.commands.operations.IUndoContext} * object. */ @@ -148,7 +148,7 @@ public class TaxonNameEditor extends EditorPart implements /* * (non-Javadoc) - * + * * @see * org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets * .Composite) @@ -169,7 +169,7 @@ public class TaxonNameEditor extends EditorPart implements ** createManagedForm *
- * + * * @param composite * a {@link org.eclipse.swt.widgets.Composite} object. */ @@ -191,8 +191,8 @@ public class TaxonNameEditor extends EditorPart implements selection = null; getSite().getSelectionProvider().setSelection(new StructuredSelection()); } - - + + return super.setInput(input); } }; @@ -218,7 +218,7 @@ public class TaxonNameEditor extends EditorPart implements layout.horizontalSpacing = 0; parent.setLayout(layout); - parent.setBackground(EditorUtil + parent.setBackground(AbstractUtility .getColor(Resources.COLOR_COMPOSITE_BACKGROUND)); createOrUpdateNameComposites(); @@ -247,7 +247,7 @@ public class TaxonNameEditor extends EditorPart implements *
* Getter for the field taxon
.
*
* getConversationHolder *
- * + * * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} * object. */ - public ConversationHolder getConversationHolder() { + @Override + public ConversationHolder getConversationHolder() { return conversation; } /* * (non-Javadoc) - * + * * @see * eu.etaxonomy.cdm.persistence.hibernate.ICdmPostCrudObserver#update(eu * .etaxonomy.cdm.persistence.hibernate.CdmCrudEvent) */ /** {@inheritDoc} */ - public void update(CdmDataChangeMap events) { + @Override + public void update(CdmDataChangeMap events) { // redraw(); } /** * Redraws this editor return true on success - * + * * @return a boolean. */ - public boolean redraw() { + @Override + public boolean redraw() { return redraw(true); } /** * {@inheritDoc} - * + * * Redraws the editor controls */ - public boolean redraw(boolean focus) { + @Override + public boolean redraw(boolean focus) { createOrUpdateNameComposites(); @@ -358,7 +363,7 @@ public class TaxonNameEditor extends EditorPart implements ** getMultiPageTaxonEditor *
- * + * * @return a {@link eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor} * object. */ @@ -368,16 +373,17 @@ public class TaxonNameEditor extends EditorPart implements /* * (non-Javadoc) - * + * * @see * eu.etaxonomy.taxeditor.store.operations.IPostOperationEnabled#postOperation * () */ /** {@inheritDoc} */ - public boolean postOperation(CdmBase objectAffectedByOperation) { + @Override + public boolean postOperation(CdmBase objectAffectedByOperation) { editor.changed(objectAffectedByOperation); - + redraw(false); if (objectAffectedByOperation instanceof TaxonBase) { @@ -391,7 +397,7 @@ public class TaxonNameEditor extends EditorPart implements *
* Getter for the field managedForm
.
*
* getControl *
- * + * * @return a {@link org.eclipse.swt.widgets.Composite} object. */ - public Composite getControl() { + @Override + public Composite getControl() { return this.getManagedForm().getForm().getBody(); } @@ -413,7 +420,7 @@ public class TaxonNameEditor extends EditorPart implements *
* Getter for the field menu
.
*
* checkForEmptyNames *
- * + * * @return true if there are empty names */ public boolean checkForEmptyNames() { @@ -495,8 +502,9 @@ public class TaxonNameEditor extends EditorPart implements public void init(IEditorSite site, IEditorInput input) throws PartInitException { - if (!(input instanceof IEditorInput)) - throw new PartInitException("Invalid Input: Must be IEditorInput"); + if (!(input != null)) { + throw new PartInitException("Invalid Input: Must be IEditorInput"); + } if (input.getAdapter(Taxon.class) != null) { taxon = (Taxon) input.getAdapter(Taxon.class); @@ -513,7 +521,7 @@ public class TaxonNameEditor extends EditorPart implements /** - * + * */ private void createDragSupport() { // Listen for names being dragged outside of existing homotypic groups - @@ -531,7 +539,7 @@ public class TaxonNameEditor extends EditorPart implements *
* Getter for the field acceptedNameContainer
.
*
* getSynonymGroup *
- * + * * @param homotypicalGroup * a {@link eu.etaxonomy.cdm.model.name.HomotypicalGroup} object. * @return a @@ -566,7 +574,7 @@ public class TaxonNameEditor extends EditorPart implements ** getDirtyNames *
- * + * * @return a Set containing all composites that have been edited */ public Set* getGroupedContainers *
- * + * * @return a {@link java.util.List} object. */ public List* getAllGroups *
- * + * * @return a {@link java.util.List} object. */ public List* getNameEditor *
- * + * * @return a {@link eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor} * object. */ - public TaxonNameEditor getEditor() { + @Override + public TaxonNameEditor getEditor() { return this; } @@ -685,7 +695,7 @@ public class TaxonNameEditor extends EditorPart implements *
* Getter for the field selectedObject
.
*
* setMisapplicationsGroup *
- * + * * @param misappliedGroup * a * {@link eu.etaxonomy.taxeditor.editor.name.container.MisappliedGroup} @@ -745,7 +757,7 @@ public class TaxonNameEditor extends EditorPart implements /* * (non-Javadoc) - * + * * @see * eu.etaxonomy.taxeditor.editor.IMultiPageTaxonEditorPage#isRedrawing() */ @@ -753,10 +765,11 @@ public class TaxonNameEditor extends EditorPart implements ** isRedrawing *
- * + * * @return a boolean. */ - public boolean isRedrawing() { + @Override + public boolean isRedrawing() { return false; } @@ -764,7 +777,7 @@ public class TaxonNameEditor extends EditorPart implements ** getToolkit *
- * + * * @return a {@link org.eclipse.ui.forms.widgets.FormToolkit} object. */ public FormToolkit getToolkit() { @@ -775,7 +788,7 @@ public class TaxonNameEditor extends EditorPart implements ** getHeterotypicSynonymGroups *
- * + * * @return a {@link java.util.List} object. */ public List* addHeterotypicSynonymGroup *
- * + * * @param group * a * {@link eu.etaxonomy.taxeditor.editor.name.container.HomotypicalSynonymGroup} @@ -800,7 +813,7 @@ public class TaxonNameEditor extends EditorPart implements ** getHomotypicSynonymGroup *
- * + * * @return a * {@link eu.etaxonomy.taxeditor.editor.name.container.HomotypicalSynonymGroup} * object. @@ -810,7 +823,7 @@ public class TaxonNameEditor extends EditorPart implements } /** - * + * * @param acceptedGroup */ public void setAcceptedGroup(AcceptedGroup acceptedGroup) { @@ -821,7 +834,7 @@ public class TaxonNameEditor extends EditorPart implements *
* Getter for the field misappliedGroup
.
*
* isActive *
- * + * * @return a boolean. */ public boolean isActive() { - IWorkbenchPart activePart = EditorUtil.getActivePart(); + IWorkbenchPart activePart = AbstractUtility.getActivePart(); return editor.equals(activePart); } @@ -847,16 +860,18 @@ public class TaxonNameEditor extends EditorPart implements ** onComplete *
- * + * * @return a boolean. */ - public boolean onComplete() { + @Override + public boolean onComplete() { getContainer(objectAffectedByLastOperation).setSelected(); return true; } /** {@inheritDoc} */ - public void partChanged(Integer eventType, IWorkbenchPartReference partRef) { + @Override + public void partChanged(Integer eventType, IWorkbenchPartReference partRef) { if (!partRef.getPart(false).equals(editor)) { // getSelectedObject().colorSelected(AbstractGroupedContainer.SELECTED_NO_FOCUS); } @@ -868,7 +883,7 @@ public class TaxonNameEditor extends EditorPart implements public void removeGroup(AbstractGroup group) { if (group != null) { group.dispose(); - + //if (heterotypicSynonymGroups != null) { heterotypicSynonymGroups.remove(group); //} @@ -889,12 +904,13 @@ public class TaxonNameEditor extends EditorPart implements } return getAcceptedNameContainer(); } - + /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.editor.IMultiPageTaxonEditorPage#setOnError() */ - public void setOnError() { - Color disabledColor = StoreUtil.getColor(Resources.COLOR_EDITOR_ERROR); + @Override + public void setOnError() { + Color disabledColor = AbstractUtility.getColor(Resources.COLOR_EDITOR_ERROR); setEnabled(false, disabledColor); } @@ -903,16 +919,16 @@ public class TaxonNameEditor extends EditorPart implements */ @Override public void setDisabled(){ - Color disabledColor = StoreUtil.getColor(Resources.COLOR_TEXT_DISABLED_BACKGROUND); + Color disabledColor = AbstractUtility.getColor(Resources.COLOR_TEXT_DISABLED_BACKGROUND); setEnabled(false); } - + protected void setEnabled(boolean enabled, Color background) { - + for(AbstractGroupedContainer groupedContainer : getGroupedContainers()){ groupedContainer.setEnabled(enabled); } - + // send an empty selection to the current provider - TODO only on error ??? if (!enabled) { getManagedForm().setInput(null); @@ -923,10 +939,10 @@ public class TaxonNameEditor extends EditorPart implements } getControl().setBackground(background); } - + @Override public void setEnabled(boolean enabled) { - Color background = StoreUtil.getColor(enabled ? Resources.COLOR_COMPOSITE_BACKGROUND : Resources.COLOR_TEXT_DISABLED_BACKGROUND); + Color background = AbstractUtility.getColor(enabled ? Resources.COLOR_COMPOSITE_BACKGROUND : Resources.COLOR_TEXT_DISABLED_BACKGROUND); setEnabled(enabled, background); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditor.java index 6e460a719..9cf41e4d9 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditor.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditor.java @@ -82,6 +82,7 @@ IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, I */ @Override public void setFocus() { + tableViewer.getControl().setFocus(); //make sure to bind again if maybe in another view the conversation was unbound if(!conversation.isBound()){ conversation.bind(); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java index bab27cfed..90fc97eeb 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java @@ -195,6 +195,7 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa */ @Override public void setFocus() { + viewer.getControl().setFocus(); //make sure to bind again if maybe in another view the conversation was unbound if(!conversation.isBound()){ conversation.bind(); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java index 2600f0477..5fc4322ef 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2009 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. */ @@ -52,7 +52,7 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable public static final String ID = "eu.etaxonomy.taxeditor.editor.definedTerm"; public static final String OPEN_COMMAND_ID = "eu.etaxonomy.taxeditor.store.openDefinedTermEditor"; - + protected TreeViewer viewer; protected ConversationHolder conversation; private ISelectionService selectionService; @@ -60,9 +60,9 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable - private int dndOperations = DND.DROP_COPY | DND.DROP_MOVE; + private final int dndOperations = DND.DROP_COPY | DND.DROP_MOVE; /** - * + * */ public DefinedTermEditor() { super(); @@ -71,42 +71,42 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable @Override public void createPartControl(Composite parent) { - + // parent.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLUE)); - + FillLayout layout = new FillLayout(); layout.marginHeight = 0; layout.marginWidth = 0; layout.type = SWT.VERTICAL; - + parent.setLayout(layout); viewer = new TreeViewer(parent); viewer.getControl().setLayoutData(LayoutConstants.FILL()); viewer.setContentProvider(new TermContentProvider()); viewer.setLabelProvider(new TermLabelProvider()); viewer.setSorter(new ViewerSorter()); - + Transfer[] transfers = new Transfer[] { TermTransfer.getInstance() }; viewer.addDragSupport(dndOperations, transfers, new DefinedTermDragListener(viewer)); viewer.addDropSupport(dndOperations, transfers, new DefinedTermDropAdapter(this)); - + getDefinedTermEditorInput().initialiseVocabularies(); viewer.setInput(getDefinedTermEditorInput().getVocabularies()); - + getSite().setSelectionProvider(viewer); - + selectionService = getSite().getWorkbenchWindow().getSelectionService(); selectionService.addSelectionListener(this); - + setPartName(getEditorInput().getName()); createMenu(); } - - - + + + /** - * + * */ public TermEditorInput getDefinedTermEditorInput() { return (TermEditorInput) getEditorInput(); @@ -117,17 +117,17 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable */ @Override public boolean postOperation(CdmBase objectAffectedByOperation) { - - - viewer.refresh(); - + + + viewer.refresh(); + if(objectAffectedByOperation != null){ viewer.setSelection(new StructuredSelection(objectAffectedByOperation)); } setDirty(true); return true; - } + } private void createMenu() { // register context menu @@ -135,14 +135,14 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable menuManager .add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS)); getSite().registerContextMenu(ID, menuManager, viewer); - + Control control = viewer.getControl(); Menu menu = menuManager.createContextMenu(control); control.setMenu(menu); } - - + + @Override public void doSave(IProgressMonitor monitor) { @@ -150,7 +150,7 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable setDirty(false); getDefinedTermEditorInput().initialiseVocabularies(); } - + @Override public void doSaveAs() {} @@ -159,7 +159,7 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable public void init(IEditorSite site, IEditorInput input) throws PartInitException { setSite(site); setInput(input); - + } @Override @@ -174,13 +174,14 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable @Override public void setFocus() { + viewer.getControl().setFocus(); getConversationHolder().bind(); } @Override public void update(CdmDataChangeMap changeEvents) { // TODO Auto-generated method stub - + } @Override @@ -191,7 +192,7 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { // TODO Auto-generated method stub - + } @Override @@ -216,7 +217,7 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable } /** - * + * */ public TreeViewer getViewer() { return viewer; -- 2.34.1