- added property tester to check if CdmStore is connected (#4809, #4856)

diff --git a/.gitattributes b/.gitattributes
index 77114bc1e5f153e621220ce34e56b46d6e1fa851..1844087a168565092fe86e26e6092526df689ea5 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1356,6 +1356,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/IPos
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/MatchStrategyConfigurator.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferences.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/MatchStrategyConfigurator.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferences.java -text

+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmStorePropertyTester.java -text

 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java -text

diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index 2317fff545aff5dbe3fe426150b95c7e81653e71..4558e265001908f6128758943e41e49dc930d4e5 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -681,9 +681,16 @@
          class="eu.etaxonomy.taxeditor.preference.PreferencePropertyTester"
          id="eu.etaxonomy.taxeditor.preferences.propertyTester"
          namespace="eu.etaxonomy.taxeditor.preferences.propertyTester"
          class="eu.etaxonomy.taxeditor.preference.PreferencePropertyTester"
          id="eu.etaxonomy.taxeditor.preferences.propertyTester"
          namespace="eu.etaxonomy.taxeditor.preferences.propertyTester"

-         properties="isCdmStoreConnected, isShowExperimentalFeatures, isChecklistEditorEnabled"
+         properties="isShowExperimentalFeatures, isChecklistEditorEnabled"

          type="org.eclipse.jface.viewers.IStructuredSelection">
    </propertyTester>
          type="org.eclipse.jface.viewers.IStructuredSelection">
    </propertyTester>

+   <propertyTester
+         class="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester"
+         id="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester"
+         namespace="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester"
+         properties="isCdmStoreConnected"
+         type="java.lang.Object">
+   </propertyTester>

    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">


@@ -734,12 +741,9 @@
       </definition>
       <definition
             id="isCdmStoreConnected">
       </definition>
       <definition
             id="isCdmStoreConnected">

-         <with
-               variable="selection">
-            <test
-                  property="eu.etaxonomy.taxeditor.preferences.propertyTester.isCdmStoreConnected">
-            </test>
-         </with>
+         <test
+               property="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester.isCdmStoreConnected">
+         </test>

       </definition>
       <definition
             id="isShowExperimentalFeatures">
       </definition>
       <definition
             id="isShowExperimentalFeatures">

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmStorePropertyTester.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmStorePropertyTester.java
new file mode 100644 (file)
index 0000000..b28e46d
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmStorePropertyTester.java
@@ -0,0 +1,40 @@
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* 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.
+*/
+
+package eu.etaxonomy.taxeditor.preference;
+
+import org.eclipse.core.expressions.PropertyTester;
+
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+/**
+ * @author n.hoffmann
+ * @created Jan 26, 2011
+ * @version 1.0
+ */
+public class CdmStorePropertyTester extends PropertyTester {
+
+       private static final String EDITOR_IS_CONNECTED_TO_DB = "isCdmStoreConnected";
+
+       @Override
+       public boolean test(Object receiver, String property, Object[] args,
+                       Object expectedValue) {
+
+           if(EDITOR_IS_CONNECTED_TO_DB.equals(property)){
+               return isCdmStoreConnected();
+           }
+               return false;
+       }
+
+       private boolean isCdmStoreConnected(){
+           boolean active = CdmStore.isActive();
+           return active;
+       }
+}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java
index 62c31c9195624eb7e7c40e22556024c6f86155d1..5b1a935daa92c9234b6ce410b337b0c9a8946d5a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java
@@ -12,8 +12,6 @@ package eu.etaxonomy.taxeditor.preference;
 
 import org.eclipse.core.expressions.PropertyTester;
 
 
 import org.eclipse.core.expressions.PropertyTester;
 

-import eu.etaxonomy.taxeditor.store.CdmStore;
-

 /**
  * @author n.hoffmann
  * @created Jan 26, 2011
 /**
  * @author n.hoffmann
  * @created Jan 26, 2011


@@ -26,25 +24,15 @@ public class PreferencePropertyTester extends PropertyTester {
 
     private static final String SHOW_CHECKLIST_EDITOR = "isChecklistEditorEnabled";
 
 
     private static final String SHOW_CHECKLIST_EDITOR = "isChecklistEditorEnabled";
 

-       private static final String EDITOR_IS_CONNECTED_TO_DB = "isCdmStoreConnected";
-
-       /* (non-Javadoc)
-        * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
-        */

        @Override
        public boolean test(Object receiver, String property, Object[] args,
                        Object expectedValue) {
        @Override
        public boolean test(Object receiver, String property, Object[] args,
                        Object expectedValue) {

-

                if(SHOW_EXPERIMENTAL_FEATURES.equals(property)){
                        return isShowExperimentalFeatures();
                }
            if(SHOW_CHECKLIST_EDITOR.equals(property)){
                return isChecklistEditorEnabled();
            }
                if(SHOW_EXPERIMENTAL_FEATURES.equals(property)){
                        return isShowExperimentalFeatures();
                }
            if(SHOW_CHECKLIST_EDITOR.equals(property)){
                return isChecklistEditorEnabled();
            }

-           if(EDITOR_IS_CONNECTED_TO_DB.equals(property)){
-               return isCdmStoreConnected();
-           }
-

                return false;
        }
 
                return false;
        }
 


@@ -59,8 +47,4 @@ public class PreferencePropertyTester extends PropertyTester {
         return PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
     }
 
         return PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
     }
 

-       private boolean isCdmStoreConnected(){
-           boolean active = CdmStore.isActive();
-           return active;
-       }

 }
 }