From 4f9cd4feab0c6bf36e22b208865f3fc155ae03f6 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 19 Jul 2011 09:42:39 +0000
Subject: [PATCH] [LMS-2336] updated constraint violation messages

SVN: 22200
---
 .../business/bo/DataAccessExceptionTranslator.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataAccessExceptionTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataAccessExceptionTranslator.java
index 02f63f13a9a..035eff2b4e8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataAccessExceptionTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataAccessExceptionTranslator.java
@@ -51,10 +51,9 @@ public final class DataAccessExceptionTranslator
     public final static String FOREIGN_KEY_VIOLATION_FORMAT =
             "%s is being used. Delete all connected data %s first.";
 
-    public final static String DETAILED_FOREIGN_KEY_VIOLATION_FORMAT =
-            FOREIGN_KEY_VIOLATION_FORMAT
-                    + " To find out which exactly objects are connected to this object "
-                    + "go to its Detail view or use Search.";
+    public final static String DETAILED_FOREIGN_KEY_VIOLATION_FORMAT = FOREIGN_KEY_VIOLATION_FORMAT
+            + " To find out which exactly objects are connected to this object "
+            + "go to its Detail view or use Search.";
 
     private DataAccessExceptionTranslator()
     {
@@ -137,13 +136,13 @@ public final class DataAccessExceptionTranslator
         switch (entityKindOrNull)
         {
             case DATA_SET:
-                return "(child data sets)";
+                return "";
             case EXPERIMENT:
-                return "(attachments, data sets, samples)";
+                return "(data sets, samples)";
             case MATERIAL:
                 return "";
             case SAMPLE:
-                return "(attachments, data sets, contained and generated samples)";
+                return "(data sets, contained and generated samples)";
         }
         return "";
     }
-- 
GitLab