Bundle-ManifestVersion: 2
Bundle-Name: Application
Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
Bundle-Vendor: EDIT
Bundle-Localization: OSGI-INF/l10n/plugin
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Bulkeditor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: CDM Library Dependencies Plugin
Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Eclipse-BundleShape: dir
Export-Package: com.google.api,
com.google.api.detect,
<parent>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>taxeditor-parent</artifactId>\r
- <version>4.8.1</version>\r
+ <version>4.8.2</version>\r
</parent>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
Bundle-ManifestVersion: 2
Bundle-Name: Editor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: OSGI-INF/l10n/plugin
</menuContribution>
<menuContribution
allPopups="false"
- locationURI="popup:bulkeditor.editor?before=taxeditor-bulkeditor.separator1">
+ locationURI="popup:bulkeditor.editor">
<command
commandId="eu.etaxonomy.taxeditor.group.cdmauthorities.edit"
label="%command.label.45"
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
- MPart part = TaxeditorStorePlugin.getDefault().getWorkbench().getService(EPartService.class).showPart(
- AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_DERIVATE_DERIVATEVIEW, PartState.ACTIVATE);
+ EPartService partService = TaxeditorStorePlugin.getDefault().getWorkbench().getService(EPartService.class);
+ MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_DERIVATE_DERIVATEVIEW);
+ partService.showPart(part, PartState.ACTIVATE);
DerivateView derivateView = (DerivateView) part.getObject();
derivateView.init(new DerivateViewEditorInput());
return null;
package eu.etaxonomy.taxeditor.editor.name.container;
-import javax.persistence.GenerationType;
-
import org.apache.commons.lang.StringUtils;
import org.eclipse.swt.graphics.Font;
*
* @author p.ciardelli
* @created 13.01.2009
- * @version 1.0
*/
public class MisapplicationContainer extends AbstractGroupedContainer<Taxon> {
TaxonRelationship misapplication;
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.editor.name.NameComposite#initializeComposite()
- */
/** {@inheritDoc} */
@Override
protected void initializeComposite() {
}
String title = "";
String author = "";
- TaxonName misappliedNameName = HibernateProxyHelper.deproxy(getMisappliedName().getName(), TaxonName.class);
- if (misappliedNameName.getAuthorshipCache() != null && !StringUtils.isBlank(misappliedNameName.getAuthorshipCache())&& getMisappliedName().getAppendedPhrase() == null){
+ TaxonName misappliedNameName = HibernateProxyHelper.deproxy(getMisappliedName().getName());
+ if (StringUtils.isNotBlank(misappliedNameName.getAuthorshipCache())){
author = ", non " + misappliedNameName.getAuthorshipCache();
}
- if (misapplication.getCitation() == null) {
+ if (getMisappliedName().getSec() == null) {
if (getMisappliedName().getAppendedPhrase() != null ){
title = getMisappliedName().getAppendedPhrase();
}else{
- title = "auct."; //$NON-NLS-1$
+ title = "auct.";
}
} else {
- String sec = " sensu "; //$NON-NLS-1$
+ String sec = " sensu ";
if (getMisappliedName().getAppendedPhrase() != null ){
- sec = getMisappliedName().getAppendedPhrase() + " "+sec; //$NON-NLS-1$
+ sec = getMisappliedName().getAppendedPhrase() + " " + sec;
}
title += sec + getMisappliedName().getSec().getTitleCache();
-
-
-
-
}
title += author;
- title = title.replace("&", "&&"); //$NON-NLS-1$ //$NON-NLS-2$
+ title = title.replace("&", "&&");
setNonEditableInfo(title, false);
}
return EditorUtil.getFont(Resources.MISAPPLIEDNAME_FONT);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.editor.name.container.AbstractGroupedContainer#showAnnotations()
- */
@Override
public void showAnnotations() {
if(getData().getSec() == null){
showSec();
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.editor.name.AbstractGroupedContainer#updateIndent()
- */
@Override
protected void updateIndent() {
setIndent(MISAPPLIEDNAME_INDENT);
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
import org.eclipse.e4.ui.services.EMenuService;
import org.eclipse.e4.ui.services.IServiceConstants;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.AbstractTreeViewer;
@Inject
private MDirtyable dirty;
- @Inject
- private EPartService partService;
-
private ISelectionChangedListener selectionChangedListener;
/**
if(cdmEntitySession != null) {
cdmEntitySession.bind();
}
- if(derivateSearchCompositeController!=null) {
- derivateSearchCompositeController.setFocusOnSearchField();
+ if(viewer!=null) {
+ viewer.getControl().setFocus();
+ selService.setSelection(viewer.getSelection());
}
}
<feature
id="eu.etaxonomy.taxeditor.feature.platform"
label="Taxeditor Dependencies"
- version="4.8.1"
+ version="4.8.2"
os="linux,macosx,win32"
ws="cocoa,gtk,win32"
arch="x86,x86_64">
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
<feature
id="eu.etaxonomy.taxeditor.feature"
label="Taxonomic Editor"
- version="4.8.1"
+ version="4.8.2"
provider-name="EDIT"
plugin="eu.etaxonomy.taxeditor.application"
os="linux,macosx,win32"
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
Bundle-ManifestVersion: 2
Bundle-Name: Help
Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
Bundle-Vendor: EDIT
Require-Bundle: org.eclipse.ui,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Bundle-ClassPath: .,
lib/owlapi-xmlutils-4.1.4.jar,
lib/commons-collections4-4.1.jar,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<name>Molecular Library Dependencies Bundle</name>
Bundle-ManifestVersion: 2
Bundle-Name: Molecular Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Navigation Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.cdm,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Printpublisher Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Require-Bundle: org.eclipse.osgi,
org.eclipse.ui,
eu.etaxonomy.taxeditor.cdmlib,
<parent>
<artifactId>taxeditor-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: DataStore Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
Bundle-Vendor: EDIT
Bundle-Localization: OSGI-INF/l10n/bundle
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
secReference = formFactory.createSelectionElement(Reference.class,
- getConversationHolder(), formElement, "Err. Secundum",
+ getConversationHolder(), formElement, "Misappl. Sec.",
entity.getCitation(), EntitySelectionElement.ALL,
style);
entity.getCitationMicroReference(),null,
SWT.WRAP);
checkbox_doubtful = formFactory.createCheckbox(formElement,
- "Misappl. doubtful", entity.isDoubtful(), style);
+ "Misappl. Doubtful", entity.isDoubtful(), style);
}
} else if (eventSource == checkbox_doubtful) {
taxon.setDoubtful(checkbox_doubtful.getSelection());
} else if (eventSource == secReference) {
- taxon.setSec(secReference.getSelection());
+ getEntity().setCitation(secReference.getSelection());
} else if (eventSource == text_appendedPhrase) {
taxon.setAppendedPhrase(text_appendedPhrase.getText());
} else if (eventSource == text_secundum_microreference) {
- taxon.setSecMicroReference(text_secundum_microreference.getText());
+ getEntity().setCitationMicroReference(text_secundum_microreference.getText());
} else if (eventSource == checkbox_published) {
taxon.setPublish(checkbox_published.getSelection());
} else if (eventSource == text_sensu_microreference) {
- getEntity().setCitationMicroReference(text_sensu_microreference.getText());
+ taxon.setSecMicroReference(text_sensu_microreference.getText());
}else if (eventSource == sensuReference) {
- getEntity().setCitation(sensuReference.getSelection());
+ taxon.setSec(sensuReference.getSelection());
}
}
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.test
Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Bundle-ActivationPolicy: lazy
Bundle-Vendor: EDIT
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<artifactId>eu.etaxonomy.taxeditor.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
Bundle-ManifestVersion: 2
Bundle-Name: Webapp
Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Require-Bundle: org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
Bundle-ManifestVersion: 2
Bundle-Name: Workbench Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.workbench;singleton:=true
-Bundle-Version: 4.8.1
+Bundle-Version: 4.8.2
Bundle-Activator: eu.etaxonomy.taxeditor.workbench.Activator
Bundle-Vendor: EDIT
Require-Bundle: org.eclipse.ui,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.e4.core.di.annotations.CanExecute;
import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
}
Map parameterMap = commandParameters.getParameterMap();
String partId = parameterMap.get(AppModelId.COMMANDPARAMETER_EU_ETAXONOMY_TAXEDITOR_WORKBENCH_COMMANDPARAMETER_PARTNAME).toString();
- partService.showPart(partId, PartState.ACTIVATE);
+ MPart part = partService.createPart(partId);
+ partService.showPart(part, PartState.ACTIVATE);
}
@CanExecute
<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="4.8.1">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="4.8.2">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<text>
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="4.8.1" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="4.8.2" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</prerequisites>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
<name>EDIT Taxonomic Editor</name>
<description>The Taxonomic Editor for EDIT's platform for
cybertaxonomy
BGBM BDI Projects / taxeditor.git / commitdiff