some changes for the admin preferences

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
index 26a7cdf4ab1013ae6868c6b56eeb59294c7077f5..0cf7499ed6e25352a04004490e0a3a135e60309b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
@@ -191,4 +191,5 @@ page.name.44 = Name Details
 extension-point.name = Cdm Viewer\r
 extension-point.name.0 = Preference Page\r
 extension-point.name.1 = Admin Preference Page\r
-page.name.45 = Specimen Preferences
\ No newline at end of file
+page.name.45 = Specimen Preferences\r
+page.name.46 = Publish Flag Preferences
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
index 013d377101d6d47f5958fbb766c305e7cb996655..1b092ebffbe1a589add8cf43038dd450d94879c6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -191,4 +191,6 @@ page.name.44 = Detailsview f
 extension-point.name = Cdm Viewer
 extension-point.name.0 = Präferenzen
 extension-point.name.1 = Admin Präferenzen
-page.name.45 = Specimen Präferenzen
\ No newline at end of file
+page.name.45 = Specimen Präferenzen
+page.name.46 = Publish Flag Präferenzen
+1
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index e693d7d3bc4d7b658ee7d6e5c7a7c4ac542b17c8..25d191d62d3ee99561312e71951a0c47e23d24ea 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -598,11 +598,16 @@
    </page>
    <page
         
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.PublishFlagPreference"
+         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.GeneralAdminPreferencePage"
          id="eu.etaxonomy.taxeditor.preferences.general"
          name="%page.name.42">
    </page>
-   
+    <page
+        category="eu.etaxonomy.taxeditor.preferences.general"
+         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.PublishFlagPreference"
+         id="eu.etaxonomy.taxeditor.preferences.publishFlagPreference"
+         name="%page.name.46">
+   </page>
    <page
          category="eu.etaxonomy.taxeditor.preferences.general"
          class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NomenclaturalCodePreferences"

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
new file mode 100755 (executable)
index 0000000..7659c2e
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
@@ -0,0 +1,43 @@
+/**
+* Copyright (C) 2018 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.databaseAdmin.preferencePage;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
+
+/**
+ * @author k.luther
+ * @since 29.05.2018
+ *
+ */
+public class GeneralAdminPreferencePage extends CdmPreferencePage implements IE4AdminPreferencePage {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Control createContents(Composite parent) {
+        final Composite composite = new Composite(parent, SWT.NULL);
+
+        GridLayout gridLayout = new GridLayout();
+        composite.setLayout(gridLayout);
+        return composite;
+    }
+
+    @Override
+    public void createControl(Composite parent){
+        super.createControl(parent);
+        getControl().setVisible(false);
+    }
+
+}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
index 03fb98770d65da895f844b9d9e4132d07d7dfd85..4257f1c18f1e1c416fe496d8a9864d9432eda28c 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
@@ -12,6 +12,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -45,7 +46,8 @@ public class SpecimenAdminPreferences extends CdmPreferencePage implements IE4Ad
     @Override
     protected Control createContents(Composite parent) {
         Composite composite = new Composite(parent, SWT.NULL);
-
+        GridLayout gridLayout = new GridLayout();
+        composite.setLayout(gridLayout);
         final Button showCollectingAreaInGeneralSectionButton = new Button(composite, SWT.CHECK);
 
         showCollectingAreaInGeneralSectionButton.setText(Messages.DatabasePreferncesPage_Show_Collecting_Areas_in_general_section);