Merge branch 'hotfix/4.12.2' 4.12.2
authorjenkins <jenkins-int@bgbm.org>
Wed, 20 Dec 2017 12:59:35 +0000 (13:59 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 20 Dec 2017 12:59:35 +0000 (13:59 +0100)
41 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/pom.xml
eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtilE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmDataViewerE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/pom.xml
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.webapp/pom.xml
eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.workbench/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 014ce9a6c55953ff5e6623f7e0851c4e8ba69d51..0bebf58ab0a62cd66d2eb19227b132e66a6f300d 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
index 54c7478e1071573b220a4f05e15797af2c8a1503..96da590de940389794a626f9815a37f8f19303ae 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.12.1</version>
+    <version>4.12.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 91aa56433f626e0e285cb9ced59c5865772b6448..f66426ae9023258bd2e3d449d2069ce82bdd2f6d 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index 8854057a436bcf625357af3f54d9bcb84b3c51fe..04845c0d708d454fb0336c351681ef326bd36418 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.12.1</version>
+               <version>4.12.2</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 3ca75037101f2925566e52b8b4cabe9508d878d3..cae74f4a8fdbd241b1e1f1c73219958ea01a2292 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
index 1a7522cd9c22fd294178612bcfc2d824f6642e40..a4f48658de0e99e87a9b86718436505319dc2fae 100644 (file)
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>4.12.1</version>\r
+    <version>4.12.2</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index d2e8e138b1436ba2907d64a72eb62354a5c1bfb3..155a351aa2ff963ca90d52647c75a18a372ddd6d 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
index 238fa5908f7a6cc37d6b82790d472720c2dc61dd..e27ea42e32c71c56a40b8d2c5a22a68617a4fdc1 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>4.12.1</version>
+    <version>4.12.2</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 2483c0c3bb3a4f09091c03edbcdcba05428957b4..23ecc5da20961d66d854d5e185a80deec1f9db97 100644 (file)
@@ -82,15 +82,13 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
     }
 
     private void init(TaxonNode taxonNode) {
-        this.taxonNode = taxonNode;
+       this.taxonNode = taxonNode;
     }
 
 
     private void initForTaxonNode(UUID taxonNodeUuid) {
-
-
+       this.getCdmEntitySession().bind();
         TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(taxonNodeUuid, getTaxonNodePropertyPaths());
-
         if(taxonNode == null){
             MessagingUtils.warningDialog(Messages.TaxonEditorInput_NOT_IMPLEMENTED, TaxonEditorInputE4.class, Messages.TaxonEditorInput_NOT_IMPLEMENTED_MESSAGE);
         }
@@ -100,6 +98,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
     }
 
     private void initForTaxonBase(UUID taxonBaseUuid) {
+       this.getCdmEntitySession().bind();
         TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).load(taxonBaseUuid, getTaxonBasePropertyPaths());
         if (taxonBase != null){
             if(taxonBase.isInstanceOf(Taxon.class)){
@@ -138,8 +137,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
 
 
     private void initForParentTaxonNode(UUID parentNodeUuid){
-
-
+       this.getCdmEntitySession().bind();
         TaxonName name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
         ITaxonTreeNode parentNode = CdmStore.getService(IClassificationService.class).getTreeNodeByUuid(parentNodeUuid);
 
@@ -155,9 +153,11 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
     private void setInputForMultipleNodes(ConversationHolder conversation, Set<TaxonNode> taxonNodes){
         if(taxonNodes.size() == 1){
             TaxonNode taxonNode = taxonNodes.iterator().next();
+            taxonNode = CdmStore.getService(ITaxonNodeService.class).load(taxonNode.getUuid(), getTaxonNodePropertyPaths());
             init(taxonNode);
         }else if(taxonNodes.size() > 1){
             TaxonNode taxonNode = ChooseFromMultipleTaxonNodesDialog.choose(taxonNodes);
+            taxonNode = CdmStore.getService(ITaxonNodeService.class).load(taxonNode.getUuid(), getTaxonNodePropertyPaths());
             if(taxonNode != null){
                 init(taxonNode);
             }
index 5f7f849da5ec230917202ad71bd922a753b59987..6e6d491fd154eb160f3f6bff4c8e6d7f3977c426 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="4.12.1"
+      version="4.12.2"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index 94615ceff2ae8ec8ae4930d386296ebad15bba81..afaf27bece010ed1500dfcd5dddfd8a497896176 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.12.1</version>
+               <version>4.12.2</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index 163363806549067f247ffc49e31a6e4984bcb18b..b2e88f759abc142e5839fa2faaee21c8bd7b7bab 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="4.12.1"
+      version="4.12.2"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 8226e196fe400db9b420c0d7a0b16ad148f1cda3..5761042f52388d12c567f9aaace564a0af0dcbc3 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.12.1</version>
+    <version>4.12.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index cd8c68c66f98a35bbbae5a692c2f7be83da40ca8..90f89be52054cca61468375cd92ff7f796a24091 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 6c8d19997153d13fecdf84bd145b8a28d7db72be..ad84828dff18c262f17ffab5f257367cc5299291 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.12.1</version>
+               <version>4.12.2</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 0f2039a1cc75111d824018771fde4528e67c2029..2a26e6c8206c2e817d015b4c6d8af0e2ce7dd7c2 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Bundle-ClassPath: .,
  lib/owlapi-xmlutils-4.1.4.jar,
  lib/commons-collections4-4.1.jar,
index 207ba0113e8a141950ca55dfe925b04c9d4a55c4..bbf7af4c990e15519d5e2e1b053d47716ba4dcef 100644 (file)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.12.1</version>
+    <version>4.12.2</version>
   </parent>
   
   <name>Molecular Library Dependencies Bundle</name>
index 99b8ce3c6bd093dc0cbfd590c83dfe602888d9ee..fbc763eb4e531c8d682061ddd034e4c04ca52eb8 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Molecular Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
index 0e0485c2f6da093314c7254bd4e2db2841165b2f..9fcaf06447d2039fcb8397a4bab80c455c4d2a3e 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.12.1</version>
+    <version>4.12.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 1a9e4ed916b79886f5968ab3b93d24d0e1a7339c..da802104acfa0187e70a7a0255de3932fd29f61e 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index 0485f7be139370898e06eb145d37423c07a884c3..ef2630b8e9b88f171840813281406c7e5708529d 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.12.1</version>
+               <version>4.12.2</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 7362600836408775473aa6e79010243f0ba07ec3..46203b313120ecd55d003f1af6ecdec2b0a40123 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index 344e0a0451b906a92eb02b0b31b62ba645db8863..b63c18166f24f8c366eda6697e4ceaaade1e204d 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>4.12.1</version>
+               <version>4.12.2</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index e5f071bc83c4c8d9f41b98b430b46e2f1745512a..197f5acd6ce6538ceccfef7ce84d0baabda6080d 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/bundle
index 8d03db66c49ab4d0da76bab7a69048d26462d448..f164c9ef1bc923a09ed78c95f3b6af1c07cef859 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>4.12.1</version>
+       <version>4.12.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 7fdbe866a20f99e79f478d21b7b7ed52121a325f..2c5671eea7c09f305dbc825bc802e8054424cc10 100644 (file)
@@ -55,7 +55,9 @@ public class CdmViewerUtilE4 {
                 TreeNode treeNode = (TreeNode)input;
                 input = treeNode.getValue();
             }
+        }
 
+        if(input!=null){
             IExtensionRegistry reg = Platform.getExtensionRegistry();
             IConfigurationElement[] extensions = reg
                     .getConfigurationElementsFor("eu.etaxonomy.taxeditor.store.cdmViewer"); //$NON-NLS-1$
index 92d84a35d82129c3c906bcb90acd7cc2105636ac..731c9306970834e6061f06d336f1a7e39db174f9 100644 (file)
@@ -13,8 +13,10 @@ import javax.inject.Inject;
 
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.log.Logger;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTException;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -25,6 +27,8 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
@@ -39,6 +43,8 @@ import eu.etaxonomy.taxeditor.view.detail.CdmSectionPart;
  *
  */
 public abstract class AbstractCdmDataViewerE4 extends Viewer implements IConversationEnabled{
+        @Inject
+        private Logger logger;
 
        protected ManagedForm managedForm;
 
@@ -95,7 +101,7 @@ public abstract class AbstractCdmDataViewerE4 extends Viewer implements IConvers
     }
 
     public void showEmptyPage(){
-        destroySections();
+       destroySections();
         createEmptySection(rootElement);
     }
 
@@ -174,9 +180,21 @@ public abstract class AbstractCdmDataViewerE4 extends Viewer implements IConvers
                rootElement = new RootElement(formFactory, body);
 
                for(Control control : body.getChildren()){
-                   if (control != null && !control.isDisposed()){
-                       control.dispose();
-                   }
+                       try{
+                               if (control != null && !control.isDisposed()){
+                                       control.dispose();
+                               }
+                       }catch(SWTException e){
+                               if (PreferencesUtil.isShowUpWidgetIsDisposedMessages() && e.getMessage().equals("Widget is disposed")){
+                    MessagingUtils.errorDialog("Widget is disposed",
+                            null,
+                            MessagingUtils.WIDGET_IS_DISPOSED_MESSAGE,
+                            null,
+                            e,
+                            true);
+
+                }
+                       }
                        control = null;
                }
        }
index 13ae86fd58ef07d0b38e19d9de5ae0ca1cd00e78..67697c1f0f812aca06c96ad4b3a481e5a83ef2b8 100644 (file)
@@ -41,7 +41,9 @@ import eu.etaxonomy.taxeditor.editor.IDistributionEditor;
 import eu.etaxonomy.taxeditor.editor.ITaxonEditor;
 import eu.etaxonomy.taxeditor.event.EventUtility;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.view.e4.details.DetailsViewerE4;
 import eu.etaxonomy.taxeditor.workbench.WorkbenchUtility;
 import eu.etaxonomy.taxeditor.workbench.part.ISelectionElementEditingPart;
@@ -60,6 +62,7 @@ public abstract class AbstractCdmEditorPartE4
      * If it is <code>true</code> then it is currently delaying a selection.
      */
     private boolean isInDelay;
+    private boolean isEnabled;
     private static final Logger logger = Logger.getLogger(AbstractCdmEditorPartE4.class);
 
     /**
@@ -221,9 +224,22 @@ public abstract class AbstractCdmEditorPartE4
     protected void showEmptyPage() {
         if(viewer!=null && viewer.getControl()!=null && !viewer.getControl().isDisposed() ){
             viewer.setInput(null);
-            if (!viewer.getControl().isDisposed()){
-                viewer.getControl().setEnabled(false);
+            try{
+                   if (!viewer.getControl().isDisposed()){
+                       viewer.getControl().setEnabled(false);
+                   }
+            }catch(SWTException e){
+               if (PreferencesUtil.isShowUpWidgetIsDisposedMessages() && e.getMessage().equals("Widget is disposed")){
+                    MessagingUtils.errorDialog("Widget is disposed",
+                            null,
+                            MessagingUtils.WIDGET_IS_DISPOSED_MESSAGE,
+                            null,
+                            e,
+                            true);
+
+                }
             }
+            
         }
         selectionProvidingPart = null;
         if(thisPart!=null){
index d6d3559af7985da350ae93b31434837f245d475d..284496a5768f2821a9871d7b461d53bdbc5b7852 100644 (file)
@@ -14,8 +14,10 @@ import javax.inject.Inject;
 
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.log.Logger;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWTException;
 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
@@ -25,6 +27,8 @@ import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.view.e4.AbstractCdmEditorPartE4;
 import eu.etaxonomy.taxeditor.view.e4.supplementaldata.SupplementalDataPartE4;
 import eu.etaxonomy.taxeditor.workbench.part.ISelectionElementEditingPart;
@@ -35,8 +39,10 @@ import eu.etaxonomy.taxeditor.workbench.part.ISelectionElementEditingPart;
  *
  */
 public class DetailsPartE4 extends AbstractCdmEditorPartE4 implements IPartContentHasSupplementalData {
-
-    @Inject
+       @Inject
+       private Logger logger;
+    
+       @Inject
     public DetailsPartE4() {
     }
 
@@ -108,7 +114,19 @@ public class DetailsPartE4 extends AbstractCdmEditorPartE4 implements IPartConte
     protected void showEmptyPage() {
         super.showEmptyPage();
         if(viewer!=null && viewer.getControl()!=null && !viewer.getControl().isDisposed() ){
-            ((DetailsViewerE4)viewer).destroySections();
+               try{
+                       ((DetailsViewerE4)viewer).destroySections();
+               }catch(SWTException e){
+                       if (PreferencesUtil.isShowUpWidgetIsDisposedMessages() && e.getMessage().equals("Widget is disposed")){
+                    MessagingUtils.errorDialog("Widget is disposed",
+                            null,
+                            MessagingUtils.WIDGET_IS_DISPOSED_MESSAGE,
+                            null,
+                            e,
+                            true);
+
+                }
+               }
         }
     }
 
index aa896d7c465e61659ebb2db420c59e19c4b4883b..8c97abc0270fad7fe0d729a5bed8bfdcfafce658 100755 (executable)
@@ -139,9 +139,8 @@ public class DetailsViewerE4 extends AbstractCdmDataViewerE4 {
         }else{
             detailsEnabled = true;
         }
-
         setInput(input);
-        detailsEnabled = true;
+        
     }
     // START HACK TO MAKE THE DERIVED UNIT FACADE WORK
     // since we are getting implementations of DerivedUnitBase from the bulk
index 8ff3e74ae4100c0183ced85f3d18042783c766d5..20863f98c819afbc00f36df41643e928c7a81e0b 100644 (file)
@@ -16,10 +16,12 @@ import javax.inject.Inject;
 
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.log.Logger;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeNode;
+import org.eclipse.swt.SWTException;
 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
@@ -32,6 +34,8 @@ import eu.etaxonomy.taxeditor.editor.ITaxonEditor;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.view.e4.AbstractCdmEditorPartE4;
 
 
@@ -42,7 +46,9 @@ import eu.etaxonomy.taxeditor.view.e4.AbstractCdmEditorPartE4;
  *
  */
 public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
-
+       @Inject
+       private Logger logger;
+       
        @Inject
     public SupplementalDataPartE4() {
     }
@@ -125,7 +131,19 @@ public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
     protected void showEmptyPage() {
         super.showEmptyPage();
         if(viewer!=null && viewer.getControl()!=null && !viewer.getControl().isDisposed()){
-            ((SupplementalDataViewerE4)viewer).destroySections();
+               try{
+                       ((SupplementalDataViewerE4)viewer).destroySections();
+               }catch (SWTException e){
+                       if (PreferencesUtil.isShowUpWidgetIsDisposedMessages() && e.getMessage().equals("Widget is disposed")){
+                    MessagingUtils.errorDialog("Widget is disposed",
+                            null,
+                            MessagingUtils.WIDGET_IS_DISPOSED_MESSAGE,
+                            null,
+                            e,
+                            true);
+
+                }
+               }
         }
     }
 
index 78193ec00fef7044f29415bd01e12ab06b0d8492..2c6c6c5e107e34b2db1c69deeeb54fa4c66f1990 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.test
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
index 5b4b4e78f03ed59471f1300e9bf30a76d9c757b9..f305ff0324c1d8b7f9d5934ef24bb5d42749d8d8 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.12.1</version>
+    <version>4.12.2</version>
   </parent>
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
index 46172f82bd7cf745fc569b708427b5e9772a7d2c..9e19a183c3db6fb14bacb064e709199f6c54da4e 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webapp
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
index f57377d91b2e8b27b742fe5a6f84f1c8524c1711..11b56943e638536ef12ae0d7eb42c03c8b217bd9 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.12.1</version>
+    <version>4.12.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
index 88c7958ad4fe48388075ff2f0f89c45065e8f9c0..1f84441a41e14da0b7b9046b4c0cf118012512d4 100644 (file)
@@ -4,7 +4,7 @@ Export-Package: eu.etaxonomy.taxeditor.bulkeditor,
  eu.etaxonomy.taxeditor.workbench,
  eu.etaxonomy.taxeditor.workbench.part
 Bundle-Name: Workbench Bundle
-Bundle-Version: 4.12.1
+Bundle-Version: 4.12.2
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.e4.ui.workbench,
index f608b7342014aedc7610e95370fe2236ccbd28a7..c20a616a21b9508d06726402ebf761378b07ce71 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.12.1</version>
+    <version>4.12.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index face8efe87b457487207c506a1ad9c2973530f2a..0fcb277d80f2c766acac8bbe569e1e9e396827c5 100644 (file)
@@ -1,5 +1,5 @@
 <?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.12.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.12.2">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index 5406c8fe44e14b62ab27cba8c4e7ebef10adca3d..7ee9112b0685d91c41135e533a4a87c7383fde15 100644 (file)
@@ -1,7 +1,7 @@
 <?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.12.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.12.2" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
index f5eecfaa03a7afacd46b53053eccdc5ec9349c9d..1235228145a36af8f586589968253feaaefa0f7d 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.12.1</version>
+    <version>4.12.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 657761ee95c3b99d48d863fba97c8a2694616d39..dfb611c5033013972e86f9e57594a2732e611698 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>4.12.1</version>
+  <version>4.12.2</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy