[Comsuite-svn] SF.net SVN: comsuite: [189] trunk/code

[<sku...@us...>]

Revision: 189
          http://svn.sourceforge.net/comsuite/?rev=189&view=rev
Author:   skuzniak
Date:     2006-10-02 15:39:51 -0700 (Mon, 02 Oct 2006)

Log Message:
-----------
error message while deleting server with assigned messages provided

Modified Paths:
--------------
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/BeansUtils.java
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties
    trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/BeansUtils.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/BeansUtils.java	2006-10-02 22:11:31 UTC (rev 188)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/BeansUtils.java	2006-10-02 22:39:51 UTC (rev 189)
@@ -190,4 +190,6 @@
 
 	public static final String SERVER_TEST_FAIL = "SERVER_TEST_FAIL";
 
+	public static final String MESSAGE_ERROR_SERVER_MESSAGES = "MESSAGE_SERVER_ERROR_MESSAGES";
+
 }

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java	2006-10-02 22:11:31 UTC (rev 188)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java	2006-10-02 22:39:51 UTC (rev 189)
@@ -349,7 +349,15 @@
     	try {
     		ws.deleteServer(this.serverId);
     	} catch(WebServiceException wse) {
-    		
+    		logger.fatal("Cannot delete server", wse);
+    		if (wse.getMessage().equals("error in deleteServer method")) {
+	    		LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_SERVER_MESSAGES,
+	            		BeansUtils.SEARCH_SERVER_NAVIGATION);
+    		} else {
+    			LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_DATABASE,
+	            		BeansUtils.SEARCH_SERVER_NAVIGATION);
+    		}
+    		this.serverId = null;
     	}
     	return BeansUtils.SEARCH_SERVER_NAVIGATION;
     }

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties	2006-10-02 22:11:31 UTC (rev 188)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties	2006-10-02 22:39:51 UTC (rev 189)
@@ -247,6 +247,7 @@
 MESSAGE_SERVER_ERROR_IOOBE=Could not found given server
 MESSAGE_SERVER_ERROR_PASSWORD=Passwords must be equal
 MESSAGE_SERVER_ERROR_VALIDATE=Mandatory fileds not set according to present 'Load balancing' field configuration
+MESSAGE_SERVER_ERROR_MESSAGES=This server has assigned messages. To delete it, delete the messages first.
 
 MESSAGE_MESSAGE_ERROR_FETCH= while fetching messages list
 

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties	2006-10-02 22:11:31 UTC (rev 188)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties	2006-10-02 22:39:51 UTC (rev 189)
@@ -248,6 +248,7 @@
 MESSAGE_SERVER_ERROR_IOOBE=Podany serwer nie zosta\u0142 odnaleziony.
 MESSAGE_SERVER_ERROR_PASSWORD=Has\u0142a musz\u0105 byc takie same.
 MESSAGE_SERVER_ERROR_VALIDATE=Nie zosta\u0142y wype\u0142nione pola konieczne, przy zaznaczeniu/odznaczeniu opcji 'R\u00f3wnowa\u017cenie obci\u0105\u017ce\u0144'
+MESSAGE_SERVER_ERROR_MESSAGES=Do tego serwera przypisane s\u0105 wiadomo\u015bci. Aby usun\u0105c serwer, usu\u0144 najpierw wiadomo\u015bci z bazy.
 
 MESSAGE_MESSAGE_ERROR_FETCH= podczas pobierania listy wiadomo\u015bci.
 

Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java	2006-10-02 22:11:31 UTC (rev 188)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java	2006-10-02 22:39:51 UTC (rev 189)
@@ -255,7 +255,7 @@
             service.deletServer(id);
         } catch (Throwable t) {
             logger.fatal("error in deleteServer method", t);
-            throw new WebServiceException(t);
+            throw new WebServiceException("error in deleteServer method", t);
         }
     }
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.