From 2602a12b98e4b5c9037c0af74c97495324208523 Mon Sep 17 00:00:00 2001
From: "p.ciardelli" <p.ciardelli@localhost>
Date: Fri, 12 Jun 2009 11:56:28 +0000
Subject: [PATCH] .

---
 .../taxeditor/editor/TaxonEditorInputFactory.java     |  3 +++
 .../eu/etaxonomy/taxeditor/model/AbstractUtility.java |  8 +-------
 .../eu/etaxonomy/taxeditor/model/DescriptionUtil.java |  1 +
 .../java/eu/etaxonomy/taxeditor/store/StoreUtil.java  | 11 ++++++++++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java
index f8bd22a3f..48e92ffa1 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java
@@ -17,7 +17,9 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.ui.IElementFactory;
 import org.eclipse.ui.IMemento;
 
+import eu.etaxonomy.taxeditor.model.TaxonUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 
 /**
@@ -49,6 +51,7 @@ public class TaxonEditorInputFactory implements IElementFactory {
         if (uuid == null) {
 			return null;
 		}
+//        StoreUtil.checktaxonExists(UUID.fromString(uuid));
         if (CdmStore.getTaxonService().getTaxonByUuid(UUID.fromString(uuid)) == null) {
         	logger.warn("Couldn't find taxon with UUID " + uuid);
         	return null;
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
index d0ed8ab37..9ecd389b6 100644
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.model;
 import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.themes.ITheme;
 import org.eclipse.ui.themes.IThemeManager;
@@ -41,12 +40,7 @@ public abstract class AbstractUtility {
 	}
 	
 	public static boolean closeAll() {
-		for (IEditorReference reference : getActivePage().getEditorReferences()) {
-			if (!getActivePage().closeEditor(reference.getEditor(false), true)) {
-				return false;
-			}
-		}
-		return true;
+		return getActivePage().closeAllEditors(true);
 	}
 
 	public static ITheme getCurrentTheme(){
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionUtil.java
index 389f167ca..79b8fb69e 100644
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionUtil.java
@@ -78,6 +78,7 @@ public class DescriptionUtil {
 		}
 		if(element instanceof Distribution){
 			logger.warn("trying to set cache on distribution, don't know what to do at the moment.");
+			return;
 		}
 		logger.warn("No matching subclass found for DescriptionElementBase object, 'cache' not set.");
 	}
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
index 30653cda9..4cc13b0ad 100644
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
@@ -10,6 +10,8 @@
 
 package eu.etaxonomy.taxeditor.store;
 
+import java.util.UUID;
+
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 
 /**
@@ -17,4 +19,11 @@ import eu.etaxonomy.taxeditor.model.AbstractUtility;
  * @created 11.05.2009
  * @version 1.0
  */
-public class StoreUtil extends AbstractUtility {}
+public class StoreUtil extends AbstractUtility {
+
+	public static void checktaxonExists(UUID fromString) {
+//        if (CdmStore.getTaxonService().getTaxonByUuid(UUID.fromString(uuid)) == null) {
+//        	logger.warn("Couldn't find taxon with UUID " + uuid);
+//        	return null;
+//        }
+	}}
-- 
2.34.1