From fd0e1d976d37141df38e2db7470eaa56bb1d9474 Mon Sep 17 00:00:00 2001
From: Matthieu Casanova <kpouer@java.net>
Date: Wed, 14 Apr 2010 19:23:51 +0000
Subject: [PATCH] forbid creation of of contact group with empty name

---
 resources/languages/resources.properties              |  1 +
 resources/languages/resources_fr.properties           |  1 +
 .../main/contactlist/addgroup/CreateGroupDialog.java  | 11 ++++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 3dcaec036..041d716c9 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -45,6 +45,7 @@ service.gui.ADD_GROUP_LOCAL_ERROR=Failed to add group with name: {0}. The proble
 service.gui.ADD_GROUP_EXIST_ERROR=The group {0} already exists in your contact list. Please choose another name.
 service.gui.ADD_GROUP_NET_ERROR=Failed to add group with name: {0}. The problem occured due to a network failure. Please check your network connection and try again.
 service.gui.ADD_GROUP_ERROR=Failed to add group with name: {0}.
+service.gui.ADD_GROUP_EMPTY_NAME=The group name must not be empty.
 service.gui.ADD_GROUP=Create group
 service.gui.ADD_SUBCONTACT=&Add subcontact
 service.gui.ADMINISTRATOR=administrator
diff --git a/resources/languages/resources_fr.properties b/resources/languages/resources_fr.properties
index 1a57a2451..e08010505 100644
--- a/resources/languages/resources_fr.properties
+++ b/resources/languages/resources_fr.properties
@@ -45,6 +45,7 @@ service.gui.ADD_GROUP_LOCAL_ERROR=Échec lors de l''ajout du groupe : {0}. Le pr
 service.gui.ADD_GROUP_EXIST_ERROR=Le groupe {0} existe déjà dans votre liste de contact. Veuillez choisir un nom différent.
 service.gui.ADD_GROUP_NET_ERROR=Échec lors de l''ajout du groupe : {0}. Le problème est dû à une erreur réseau. Veuillez vérifier votre connexion au réseau et réessayez.
 service.gui.ADD_GROUP_ERROR=Échec lors de l''ajout du groupe : {0}.
+service.gui.ADD_GROUP_EMPTY_NAME=Le nom du groupe ne doit pas etre vide.
 service.gui.ADD_GROUP=Créer un groupe
 service.gui.ADD_SUBCONTACT=&Ajouter un sous-contact
 service.gui.ADMINISTRATOR=administrateur
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
index 382cf7021..a111bb1de 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
@@ -149,7 +149,16 @@ public void actionPerformed(ActionEvent e)
 
         if (name.equals("create"))
         {
-            new CreateGroup(clist, groupPanel.getGroupName()).start();
+            String groupName = groupPanel.getGroupName().trim();
+            if (groupName.length() == 0)
+            {
+                     groupPanel.showErrorMessage(
+                        GuiActivator.getResources().getI18NString(
+                                "service.gui.ADD_GROUP_EMPTY_NAME",
+                                new String[]{groupName}));
+            }
+            else
+                new CreateGroup(clist, groupName).start();
         }
         else if(name.equals("cancel"))
         {