tabbed_properties branch merged into trunk completely

diff --git a/.gitignore b/.gitignore
index 71abc16156da353abe9170bdd79cf3d8e8afefca..583ca808e7e0dbd331ebbca89c648b26710fcfe4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ taxeditor-annotatedlineeditor/.settings
 taxeditor-application/.classpath
 taxeditor-application/.project
 taxeditor-application/.settings
 taxeditor-application/.classpath
 taxeditor-application/.project
 taxeditor-application/.settings

+taxeditor-application/bin

 taxeditor-application/target
 taxeditor-bulkeditor/.classpath
 taxeditor-bulkeditor/.project
 taxeditor-application/target
 taxeditor-bulkeditor/.classpath
 taxeditor-bulkeditor/.project

diff --git a/taxeditor-application/META-INF/MANIFEST.MF b/taxeditor-application/META-INF/MANIFEST.MF
index 675f3d4f58cffd0209f1554937043406ebad7595..5b1330d3c3ff7740e49611af44eb912a5e614e26 100644 (file)
--- a/taxeditor-application/META-INF/MANIFEST.MF
+++ b/taxeditor-application/META-INF/MANIFEST.MF
@@ -2,24 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true

-Bundle-Version: 2.1.1.qualifier
+Bundle-Version: 2.1.0.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
 Export-Package: eu.etaxonomy.taxeditor
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
 Export-Package: eu.etaxonomy.taxeditor

-Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",
- org.eclipse.equinox.p2.core,
- org.eclipse.equinox.p2.ui;bundle-version="1.0.101",
- org.eclipse.equinox.p2.ui.sdk;bundle-version="1.0.100",
- org.eclipse.equinox.p2.ui.sdk.scheduler;bundle-version="1.0.0",
- org.eclipse.equinox.p2.updatechecker;bundle-version="1.1.0",
- eu.etaxonomy.cdmlib;bundle-version="2.3.0",
- eu.etaxonomy.taxeditor.store;bundle-version="2.1.0",
- eu.etaxonomy.taxeditor.editor;bundle-version="2.1.0",
- eu.etaxonomy.taxeditor.navigation;bundle-version="2.1.0",
- eu.etaxonomy.taxeditor.bulkeditor;bundle-version="2.1.0"

 Bundle-ActivationPolicy: lazy
 Bundle-ActivationPolicy: lazy

-Import-Package: org.eclipse.equinox.app,
+Import-Package: org.apache.log4j,
+ org.eclipse.equinox.app,

  org.eclipse.equinox.internal.p2.core.helpers,
  org.eclipse.equinox.internal.provisional.p2.artifact.repository,
  org.eclipse.equinox.internal.provisional.p2.director,
  org.eclipse.equinox.internal.p2.core.helpers,
  org.eclipse.equinox.internal.provisional.p2.artifact.repository,
  org.eclipse.equinox.internal.provisional.p2.director,


@@ -30,3 +20,9 @@ Import-Package: org.eclipse.equinox.app,
  org.eclipse.equinox.internal.provisional.p2.repository,
  org.osgi.framework,
  org.osgi.service.packageadmin
  org.eclipse.equinox.internal.provisional.p2.repository,
  org.osgi.framework,
  org.osgi.service.packageadmin

+Require-Bundle: org.eclipse.ui;bundle-version="3.5.2",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ eu.etaxonomy.taxeditor.navigation;bundle-version="2.1.0",
+ eu.etaxonomy.taxeditor.bulkeditor;bundle-version="2.1.0",
+ eu.etaxonomy.taxeditor.editor;bundle-version="2.1.0",
+ eu.etaxonomy.taxeditor.store;bundle-version="2.1.0"

diff --git a/taxeditor-application/plugin.properties b/taxeditor-application/plugin.properties
index 361e0e82be9e0973f7058ae606764b5c0367d9f2..0a0e9835143eddfa9bf00be1d01a15ce320f473d 100644 (file)
--- a/taxeditor-application/plugin.properties
+++ b/taxeditor-application/plugin.properties
@@ -1,2 +1,2 @@
 productName=EDIT Taxonomic Editor\r
 productName=EDIT Taxonomic Editor\r

-productBlurb=EDIT Taxonomic Editor\n\Version: 2.1.1\n\n\Copyright (C) 2009 EDIT\n\European Distributed Institute of Taxonomy\n\http://www.e-taxonomy.eu\r
+productBlurb=EDIT Taxonomic Editor\n\Version: 2.1.0\n\n\Copyright (C) 2009 EDIT\n\European Distributed Institute of Taxonomy\n\http://www.e-taxonomy.eu\r

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
index 81b5e8cae90e70824881655f3083d9df014c67a3..15c2798bd0045a6d94b4f3ba46e4709be939dd77 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
@@ -1,21 +1,16 @@
 package eu.etaxonomy.taxeditor;
 
 import org.apache.log4j.Logger;
 package eu.etaxonomy.taxeditor;
 
 import org.apache.log4j.Logger;

-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;

-import org.springframework.security.BadCredentialsException;

 
 

-import eu.etaxonomy.cdm.model.name.NomenclaturalCode;

 import eu.etaxonomy.taxeditor.dialogs.LoginDialog;
 import eu.etaxonomy.taxeditor.dialogs.LoginDialog;

-import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper;
-import eu.etaxonomy.taxeditor.preference.InitNomenclaturalCodePrefDialog;

 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;

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

 
 public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
        private static final Logger logger = Logger.getLogger(ApplicationWorkbenchWindowAdvisor.class);
 
 public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
        private static final Logger logger = Logger.getLogger(ApplicationWorkbenchWindowAdvisor.class);


@@ -40,35 +35,10 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
        }
        
        public void postWindowOpen() { 
        }
        
        public void postWindowOpen() { 

-               try{
-                       authenticate();
-               }catch(BadCredentialsException e){
-                       logger.error("Bad credentials", e);
-               }
-               
-               checkNomenclaturalCode();
-       }
-
-       private void checkNomenclaturalCode() {
-               
-               // First time Editor is opened, no nomenclatural code has been set
-               if (PreferencesUtil.getPreferredNomenclaturalCode() == null) {
+               PreferencesUtil.checkNomenclaturalCode();

 
 

-                       logger.info("No nomencatural code set.");
-                       
-                       Shell shell = TaxonomicEditorPlugin.getDefault().getWorkbench()
-                                       .getActiveWorkbenchWindow().getShell();
-                       
-                       // Query user re: preferred nom. code
-                       Dialog dialog = new InitNomenclaturalCodePrefDialog(shell);
-                       dialog.open();
-                       
-                       // Short message confirming user's choice
-                       NomenclaturalCode code = PreferencesUtil.getPreferredNomenclaturalCode();
-                       MessageDialog.openInformation(shell, "Nomenclatural code set", 
-                                       "The following has been set as your preferred nomenclatural code:\n\n\t" + 
-                                       NomenclaturalCodeHelper.getDescription(code) + "\n\nYou can change the nomenclatural code at any time in the \"Preferences\" menu.");
-               }               
+               if(PreferencesUtil.shouldConnectAtStartUp())
+                       CdmStore.initialize();

        }
        
        private int authenticate(){
        }
        
        private int authenticate(){