From: n.hoffmann Date: Mon, 7 Mar 2011 15:10:27 +0000 (+0000) Subject: adresses #2257 X-Git-Tag: rcp.ss-first-working-version~183 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/904d57e35411245fb16e5bef48199d7566b7757d adresses #2257 --- diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmEntityWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmEntityWizardPage.java index 78b3f9009..2a67ad470 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmEntityWizardPage.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmEntityWizardPage.java @@ -71,12 +71,11 @@ public abstract class AbstractCdmEntityWizardPage extends WizardPage implemen */ /** {@inheritDoc} */ public void createControl(Composite parent) { - ScrolledForm scrolledForm = formFactory.createScrolledForm(parent); - GridLayout layout = new GridLayout(); - scrolledForm.getBody().setLayout(layout); + ScrolledForm scrolledForm = formFactory.createScrolledForm(parent); + scrolledForm.getBody().setLayout(CdmFormFactory.LAYOUT()); Composite control = formFactory.createComposite(scrolledForm.getBody()); - control.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + control.setLayoutData(CdmFormFactory.FILL()); control.setLayout(CdmFormFactory.LAYOUT(2, false)); WizardPageRootElement rootElement = new WizardPageRootElement(formFactory, control, getConversationHolder()); diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java index be41973f1..ad5379c34 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java @@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.ui.section.agent; import java.util.Arrays; import java.util.Collection; -import org.apache.log4j.Logger; import org.eclipse.swt.SWT; import eu.etaxonomy.cdm.model.agent.Person; @@ -32,10 +31,6 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; */ public class PersonDetailElement extends AbstractCdmDetailElement { - - - private static final Logger logger = Logger - .getLogger(PersonDetailElement.class); private ToggleableTextElement toggleable_cache; private TextWithLabelElement text_nomenclaturalTitle; private TextWithLabelElement text_firstname; @@ -60,7 +55,7 @@ public class PersonDetailElement extends AbstractCdmDetailElement { /** {@inheritDoc} */ @Override protected void createControls(ICdmFormElement formElement, Person entity, int style) { - getLayoutComposite().setLayoutData(CdmFormFactory.LAYOUT(2, false)); +// getLayoutComposite().setLayoutData(CdmFormFactory.LAYOUT(2, false)); toggleable_cache = formFactory.createToggleableTextField(formElement, "Title Cache", entity.getTitleCache(), entity.isProtectedTitleCache(), SWT.NULL); diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java index e3645e648..46bbf8b59 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java @@ -10,14 +10,13 @@ package eu.etaxonomy.taxeditor.ui.section.agent; -import org.apache.log4j.Logger; import org.eclipse.jface.viewers.ISelectionProvider; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -29,9 +28,6 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; */ public class PersonDetailSection extends AbstractCdmDetailSection{ - private static final Logger logger = Logger - .getLogger(PersonDetailSection.class); - /** *

Constructor for PersonDetailSection.

* diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java index f773806c4..c67ac2220 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java @@ -10,15 +10,14 @@ package eu.etaxonomy.taxeditor.ui.section.agent; -import org.apache.log4j.Logger; import org.eclipse.swt.SWT; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; /** @@ -30,9 +29,6 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; */ public class PersonWizardPage extends AbstractCdmEntityWizardPage { - private static final Logger logger = Logger - .getLogger(PersonWizardPage.class); - /** *

Constructor for PersonWizardPage.

* @@ -52,7 +48,7 @@ public class PersonWizardPage extends AbstractCdmEntityWizardPage { */ /** {@inheritDoc} */ @Override - public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { + public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { PersonDetailElement personElement = (PersonDetailElement) formFactory.createCdmDetailElement(DetailType.PERSON, rootElement, SWT.NULL); personElement.setEntity(entity); return personElement; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java index 6d189964c..15bc82380 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java @@ -10,16 +10,15 @@ package eu.etaxonomy.taxeditor.ui.section.agent; -import org.apache.log4j.Logger; import org.eclipse.swt.events.SelectionListener; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.cdm.model.agent.Team; import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory; +import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType; import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent; import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType; import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement; import eu.etaxonomy.taxeditor.ui.selection.PersonSelectionElement; @@ -32,8 +31,6 @@ import eu.etaxonomy.taxeditor.ui.selection.PersonSelectionElement; */ public class TeamMemberElement extends AbstractEntityCollectionElement { - private static final Logger logger = Logger - .getLogger(TeamMemberElement.class); private PersonSelectionElement selection_person; /** diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java index 05c5c00ac..a84304e39 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java @@ -17,7 +17,6 @@ import java.util.List; import org.eclipse.swt.SWT; -import eu.etaxonomy.cdm.model.agent.AgentBase; import eu.etaxonomy.cdm.model.agent.Institution; import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; import eu.etaxonomy.cdm.model.reference.Reference; @@ -25,7 +24,10 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory; import eu.etaxonomy.cdm.model.reference.ReferenceType; import eu.etaxonomy.taxeditor.model.AuthorHelper; import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.ReferenceSelectionDialog; import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory; +import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EnumComboType; +import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType; import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent; import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.forms.IErrorIntolerableElement; @@ -34,10 +36,10 @@ import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement; import eu.etaxonomy.taxeditor.ui.forms.TimePeriodElement; import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement; import eu.etaxonomy.taxeditor.ui.forms.UriWithLabelElement; -import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EnumComboType; -import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement; +import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement; +import eu.etaxonomy.taxeditor.ui.selection.InstitutionSelectionElement; import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement; import eu.etaxonomy.taxeditor.ui.term.ReferenceTypeComboElement; @@ -66,10 +68,10 @@ public class ReferenceDetailElement extends AbstractCdmDetailElement private TextWithLabelElement text_title; private TextWithLabelElement text_volume; private UriWithLabelElement text_uri; - private AbstractSelectionElement selection_authorTeam; + private AgentSelectionElement selection_authorTeam; private TimePeriodElement element_timePeriod; - private AbstractSelectionElement selection_inReference; - private AbstractSelectionElement selection_institution; + private ReferenceSelectionElement selection_inReference; + private InstitutionSelectionElement selection_institution; private ReferenceTypeComboElement combo_referenceType; private ReferenceSelectionElement selection_inSeries; @@ -104,7 +106,7 @@ public class ReferenceDetailElement extends AbstractCdmDetailElement text_title = formFactory.createTextWithLabelElement(formElement, "Title", entity.getTitle(), style); // author team - selection_authorTeam = formFactory.createSelectionElement(SelectionType.TEAM, getConversationHolder(), formElement, "Author", AuthorHelper.getAuthor(entity.getAuthorTeam()), style); + selection_authorTeam = (AgentSelectionElement) formFactory.createSelectionElement(SelectionType.AGENT, getConversationHolder(), formElement, "Author", AuthorHelper.getAuthor(entity.getAuthorTeam()), style); ReferenceType referenceType = entity.getType(); @@ -189,7 +191,7 @@ public class ReferenceDetailElement extends AbstractCdmDetailElement } if(createInReferenceWidget){ - selection_inReference = formFactory.createSelectionElement(SelectionType.REFERENCE, getConversationHolder(), + selection_inReference = (ReferenceSelectionElement) formFactory.createSelectionElement(SelectionType.REFERENCE, getConversationHolder(), element, label, reference.getInReference(), style); } } @@ -241,12 +243,12 @@ public class ReferenceDetailElement extends AbstractCdmDetailElement if(referenceType.equals(ReferenceType.Report)){ // institution - selection_institution = formFactory.createSelectionElement(SelectionType.INSTITUTION, getConversationHolder(), element, "Institution", reference.getInstitution(), style); + selection_institution = (InstitutionSelectionElement) formFactory.createSelectionElement(SelectionType.INSTITUTION, getConversationHolder(), element, "Institution", reference.getInstitution(), style); } if(referenceType.equals(ReferenceType.Thesis)){ // school - selection_institution = formFactory.createSelectionElement(SelectionType.INSTITUTION, getConversationHolder(), element, "School", reference.getSchool(), style); + selection_institution = (InstitutionSelectionElement) formFactory.createSelectionElement(SelectionType.INSTITUTION, getConversationHolder(), element, "School", reference.getSchool(), style); } if(referenceType.equals(ReferenceType.Proceedings)){ diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java index 5beaa06e9..f1423670a 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java @@ -10,7 +10,6 @@ package eu.etaxonomy.taxeditor.view.datasource; -import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -20,9 +19,11 @@ import org.eclipse.core.commands.NotEnabledException; import org.eclipse.core.commands.NotHandledException; import org.eclipse.core.commands.common.NotDefinedException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.StructuredSelection; @@ -91,14 +92,15 @@ public class CdmDataSourceViewPart extends ViewPart{ } } - private class DataSourceRunnable implements IRunnableWithProgress{ + private class DataSourceJob extends Job{ private List dataSources; /** * @param name */ - public DataSourceRunnable(Display display, List dataSources) { + public DataSourceJob(String title, List dataSources) { + super(title); this.dataSources = dataSources; } @@ -106,31 +108,32 @@ public class CdmDataSourceViewPart extends ViewPart{ * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ @Override - public void run(final IProgressMonitor monitor) { + public IStatus run(final IProgressMonitor monitor) { try{ monitor.beginTask("Retrieving datasources", dataSources.size()); List dataSources = CdmDataSourceRepository.getAll(); - List containers = new ArrayList(); + final List containers = new ArrayList(); for(ICdmDataSource dataSource : dataSources){ containers.add(new CdmMetaDataAwareDataSourceContainer(dataSource, CdmDataSourceViewPart.this)); monitor.worked(1); } -// Display.getDefault().asyncExec(new Runnable() { -// -// @Override -// public void run() { -// viewer.setInput(containers); -// } -// }); - viewer.setInput(containers); + Display.getDefault().asyncExec(new Runnable() { + + @Override + public void run() { + viewer.setInput(containers); + } + }); +// viewer.setInput(containers); }finally{ monitor.done(); } + return Status.OK_STATUS; } } @@ -253,14 +256,8 @@ public class CdmDataSourceViewPart extends ViewPart{ /** *

refresh

*/ - public void refresh(){ - try { - StoreUtil.runInUI(new DataSourceRunnable(Display.getCurrent(), CdmDataSourceRepository.getAll()), null); - } catch (InvocationTargetException e) { - StoreUtil.error(this.getClass(), e); - } catch (InterruptedException e) { - StoreUtil.error(this.getClass(), e); - } + public void refresh(){ + getService().schedule(new DataSourceJob("Loading datasources", CdmDataSourceRepository.getAll()), Job.SHORT); } /** {@inheritDoc} */