(no commit message)

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewTaxonNodeWizard.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewTaxonNodeWizard.java
index e19760249ed882ec790efbd48812ec3c697b760a..089fe27089b2eec974f879d3e69ce4bb9ef1a10d 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewTaxonNodeWizard.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewTaxonNodeWizard.java
@@ -3,16 +3,10 @@
  */
 package eu.etaxonomy.taxeditor.newWizards;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
@@ -39,8 +33,6 @@ public class NewTaxonNodeWizard extends Wizard implements INewWizard, IPostOpera
 
        private IStructuredSelection selection;
 
-       private IWorkbench workbench;
-
        private TaxonNode generatedTaxonNode;
 
        private boolean openEmptyEditor = false;
@@ -96,7 +88,7 @@ public class NewTaxonNodeWizard extends Wizard implements INewWizard, IPostOpera
        }
 
        public void init(IWorkbench workbench, IStructuredSelection selection) {
-               this.workbench = workbench;
+               // workbench is not used at the moment
                this.selection = selection;
        }
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java
index b386c3c1a4800ea8cccf54f2bd026bbb53137e38..a822dbf897ca45f63781381fbbe0f102f6fbf9a6 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java
@@ -219,16 +219,7 @@ public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity>
                        // set combos to their default values
                        for(String fieldName : matchModeCombos.keySet()){
                                Combo combo = matchModeCombos.get(fieldName);
-                               MatchMode matchMode;
-                               if(matchStrategy.getMatchMode(fieldName) == null){
-                                       
-                                       matchMode = IMatchStrategy.defaultMatchMode;
-                                       
-                                       // TODO set default match modes for collections and other objects 
-                               }else{
-                                       matchMode = matchStrategy.getMatchMode(fieldName);
-                               }
-                               
+                               MatchMode matchMode = matchStrategy.getMatchMode(fieldName);
                                combo.select(matchModeList.indexOf(matchMode));
                        }