smaller changes in ExportWizard

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/ClassificationContentProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/ClassificationContentProvider.java
index 8ece5799a3c6e47bc1e93e497af3fa3da8028b2a..e145f5f7790b4d50bbf67827dd8404baf2c865e2 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/ClassificationContentProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/ClassificationContentProvider.java
@@ -9,11 +9,16 @@
 
 package eu.etaxonomy.taxeditor.navigation.navigator;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
+import eu.etaxonomy.cdm.model.common.ITreeNode;
 import eu.etaxonomy.cdm.model.taxon.Classification;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 
 /**
  * <p>ClassificationContentProvider class.</p>

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/EmptyRoot.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/EmptyRoot.java
index 40eea2332d56bcd4d5a6f4b2f4b2f8ce71dd2d55..3484244531e5b8c373a6cdd78f05fe864554afce 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/EmptyRoot.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/EmptyRoot.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.navigation.navigator;
 import java.util.ArrayList;
 import java.util.List;
 
+import eu.etaxonomy.cdm.model.common.ITreeNode;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 
 /**
@@ -35,8 +36,8 @@ public class EmptyRoot extends Root {
         *
         * @return a {@link java.util.List} object.
         */
-       public List<Classification> getParentBeans() {
-               return new ArrayList<Classification>();
+       public List<ITreeNode> getParentBeans() {
+               return new ArrayList<ITreeNode>();
        }
        
 }

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index e9d9e4ff086b97ef7b7b6344a6d60800b20b5099..f91e19f70246ba9773cb12a190c1f97529888c2a 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@ -41,6 +41,7 @@ import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
+import eu.etaxonomy.cdm.model.common.ITreeNode;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -111,6 +112,7 @@ public class TaxonNavigator extends CommonNavigator implements
                }
                TaxonNodeNavigatorComparator viewerComparator = new TaxonNodeNavigatorComparator(comparator);
                this.getCommonViewer().setComparator(viewerComparator);
+               //this.getCommonViewer().setAutoExpandLevel(2);
         setLinkingEnabled(true);
 //             this.getCommonViewer().addSelectionChangedListener(new ISelectionChangedListener() {
 //
@@ -135,6 +137,7 @@ public class TaxonNavigator extends CommonNavigator implements
                        // closing the whole application
                        // should be handled by the state manager too
                    root = new Root(conversation);
+                   
                        return root;
                }
                return new EmptyRoot();
@@ -163,6 +166,8 @@ public class TaxonNavigator extends CommonNavigator implements
                    CdmApplicationState.getCurrentDataChangeService().register(this);
                }
                CdmStore.getLoginManager().addObserver(this);
+               
+               
        }
 
        /**
@@ -529,7 +534,7 @@ public class TaxonNavigator extends CommonNavigator implements
      * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getRootEntities()
      */
     @Override
-    public List<Classification> getRootEntities() {
+    public List<ITreeNode> getRootEntities() {
         if(root != null) {
             return root.getParentBeans();
         }

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
index 492f0e45fa11f02ffa2d7a530b861c21805394f8..082a22b2b22735d5bc5e3625c937165cb58788c4 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
@@ -58,7 +58,8 @@ public class TaxonNodeLabelProvider extends ColumnLabelProvider
                        try{
                                Taxon taxon = HibernateProxyHelper.deproxy(taxonNode.getTaxon());
                                if(taxon == null){
-                                       MessagingUtils.error(getClass(), String.format(Messages.TaxonNodeLabelProvider_NODE_WITH_NO_TAXON, element), null);
+                                       return taxonNode.getClassification().getName().getText();
+                                       //MessagingUtils.error(getClass(), String.format(Messages.TaxonNodeLabelProvider_NODE_WITH_NO_TAXON, element), null);
 //                                     throw new RuntimeException("The data your are trying to view is corrupt. Please check your import.");
                                }else{
                                        try{

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java
index 5e6ef66baef75a3be39ed3afe23cecc8579d0435..9487c7874d626d24381bd980bf3ba30fc248de69 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java
@@ -22,10 +22,14 @@ public class TaxonNodeNavigatorComparator extends ViewerComparator{
        
        @Override
        public int compare(Viewer viewer, Object e1, Object e2){
-               if (e1 instanceof Classification && e2 instanceof Classification){
+               if ((e1 instanceof Classification && e2 instanceof Classification) ){
                        return ((Classification)e1).getTitleCache().compareTo(((Classification)e2).getTitleCache());
                } else{
-                       return comparator.compare((TaxonNode)e1, (TaxonNode)e2);
+                       if (((TaxonNode)e1).getTaxon() == null && ((TaxonNode)e2).getTaxon() == null){
+                               return ((TaxonNode)e1).getClassification().getTitleCache().compareTo(((TaxonNode)e2).getClassification().getTitleCache());
+                       }else{
+                               return comparator.compare((TaxonNode)e1, (TaxonNode)e2);
+                       }
                        
                }
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
index ead0452c59f3fdc3cd04953c2ca50c01761f153c..ac8bbb1fd89c8cfe14d7b7444e85eb7bdfd6f51d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
@@ -309,38 +309,14 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                    classificationSelectionCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL,
                                true, false, 2, 1));
                }
-               if (outputModelExport){
-                        Label zipLabel = new Label(composite, SWT.NONE);
-                       zipLabel.setText("Create zip-File");
-                  Button zip = new Button(composite, SWT.CHECK);
-                  zip.addSelectionListener(new SelectionAdapter() {
-                               /*
-                                * (non-Javadoc)
-                                *
-                                * @see
-                                * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
-                                * .swt.events.SelectionEvent)
-                                */
-                               @Override
-                               public void widgetSelected(SelectionEvent e) {
-                                       super.widgetSelected(e);
-                                       ((CdmLightExportConfigurator)configurator).setCreateZipFile(zip.getSelection());
-                               }
-                       });
-               }else {
-                        Label fileLabel = new Label(composite, SWT.NONE);
-                       fileLabel.setText("File");
-                       text_exportFileName = new Text(composite, SWT.BORDER);
-                       text_exportFileName.setText(generateFilename());
-                       text_exportFileName.setLayoutData(new GridData(SWT.FILL, SWT.FILL,
-                                       true, false));
-               }
+               
 
                Label folderLabel = new Label(composite, SWT.NONE);
                folderLabel.setText("Select Folder for exported files");
                folderLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL,
         true, false, 2, 1));
                folderDialog = new DirectoryDialog(parent.getShell());
+               folderDialog.setFilterPath(PreferencesUtil.getPreferenceStore().getString(EXPORT_FOLDER));
 
                text_folder = new Text(composite, SWT.BORDER);
                text_folder.setEditable(false);
@@ -365,6 +341,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                super.widgetSelected(e);
+
                                String path = folderDialog.open();
                                if (path != null) { // a folder was selected
                                        text_folder.setText(path);
@@ -373,7 +350,32 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                                }
                        }
                });
-
+               if (outputModelExport){
+                        Label zipLabel = new Label(composite, SWT.NONE);
+                       zipLabel.setText("Create zip-File");
+                  Button zip = new Button(composite, SWT.CHECK);
+                  zip.addSelectionListener(new SelectionAdapter() {
+                               /*
+                                * (non-Javadoc)
+                                *
+                                * @see
+                                * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
+                                * .swt.events.SelectionEvent)
+                                */
+                               @Override
+                               public void widgetSelected(SelectionEvent e) {
+                                       super.widgetSelected(e);
+                                       ((CdmLightExportConfigurator)configurator).setCreateZipFile(zip.getSelection());
+                               }
+                       });
+               }else {
+                        Label fileLabel = new Label(composite, SWT.NONE);
+                       fileLabel.setText("File");
+                       text_exportFileName = new Text(composite, SWT.BORDER);
+                       text_exportFileName.setText(generateFilename());
+                       text_exportFileName.setLayoutData(new GridData(SWT.FILL, SWT.FILL,
+                                       true, false));
+               }
                // make the composite the wizard pages control
                setControl(composite);
        }