- removed remaining occurences of "campanula"

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index d5995fd3a8609fa06658fc4bcdc4019a50a88042..fabd67f94775814786730a5878c7a9125e135479 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -230,7 +230,7 @@
   <view
         class="eu.etaxonomy.taxeditor.view.derivateSearch.DerivateSearchView"
         icon="icons/derivate_search_view-16x16-32.png"
-        id="eu.etaxonomy.taxeditor.ui.campanula.derivatesearch.DerivateSearchView"
+        id="eu.etaxonomy.taxeditor.view.derivateSearch.DerivateSearchView"
         name="Derivate Search"
         restorable="true">
   </view>
@@ -257,14 +257,8 @@
                   style="push">
                <parameter
                      name="org.eclipse.ui.views.showView.viewId"
-                     value="eu.etaxonomy.taxeditor.ui.campanula.derivatesearch.DerivateSearchView">
+                     value="eu.etaxonomy.taxeditor.view.derivateSearch.DerivateSearchView">
                </parameter>
-               <visibleWhen
-                     checkEnabled="false">
-                  <reference
-                        definitionId="isShowExperimentalFeatures">
-                  </reference>
-               </visibleWhen>
             </command>
             <separator
                   name="eu.etaxonomy.taxeditor.store.showViewMenu.details"

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/EmptyElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/EmptyElement.java
index c729861e8248b1a63c4e7c1f127ca9433f794ee5..c36aa92a3cb5dff80f0a964d778ead9c268e0527 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/EmptyElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/EmptyElement.java
@@ -39,13 +39,14 @@ public class EmptyElement extends AbstractCdmDetailElement{
                addControl(new Label(getLayoutComposite(), SWT.HORIZONTAL));
        }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement, java.lang.Object, int)
-     */
-    @Override
-    protected void createControls(ICdmFormElement formElement, Object entity, int style) {
-        //empty
-    }
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.ui.element.ICdmFormElement, java.lang.Object, int)
+        */
+       @Override
+       protected void createControls(ICdmFormElement formElement, Object entity, int style) {
+           // TODO Auto-generated method stub
+
+       }
 
     /* (non-Javadoc)
      * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#handleEvent(java.lang.Object)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
index fb26f2d74a36be91f7bf4bd5d10304c4431646ef..b5c9b4bf1a46af84925c131455f1cca364758180 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
@@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
  */
 public class DerivateSearchView extends ViewPart {
 
-    public static final String ID = "eu.etaxonomy.taxeditor.ui.campanula.derivatesearch.DerivateSearchView";
+    public static final String ID = "eu.etaxonomy.taxeditor.view.derivateSearch.DerivateSearchView";
     private DerivateSearchCompositeController derivateSearchCompositeController;
 
     public DerivateSearchView() {