merge trunk to branch

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index db8f5d25e7ed8d749ae9e218dda12fd281acb68d..b846a1be86c6d270e9045a20d25fd6b4d5ca1282 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -8,7 +8,7 @@
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.11-SNAPSHOT.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.11-SNAPSHOT.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.11-SNAPSHOT.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.11-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.11-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.0.11-SNAPSHOT-sources.jar"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
index c07f8650f46a90cf4f978b6f3d0a15fe6f5e5773..e7ca0952d6d2ae176796b4f057b1df08bdc8bade 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
@@ -38,7 +38,7 @@ public class TermBasePropertyTester extends PropertyTester {
                \r
                IStructuredSelection selection = (IStructuredSelection) receiver;\r
                CdmBase selectedElement = (CdmBase)selection.getFirstElement();\r
-               if (selectedElement.isInstanceOf(TermBase.class)){\r
+               if (selectedElement != null && selectedElement.isInstanceOf(TermBase.class)){\r
                        TermBase term = CdmBase.deproxy(selectedElement, TermBase.class);\r
 \r
                        if(IS_MODIFIABLE.equals(property)){\r