[Fudaa-svn-commit] SF.net SVN: fudaa:[8266] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque

[<de...@us...>]

Revision: 8266
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8266&view=rev
Author:   deniger
Date:     2013-02-14 12:07:15 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
cas ?\195?\160 g?\195?\169rer si titre du calque est null.

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BGroupeCalque.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java	2013-02-13 15:38:28 UTC (rev 8265)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java	2013-02-14 12:07:15 UTC (rev 8266)
@@ -34,6 +34,7 @@
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
+import org.apache.commons.lang.StringUtils;
 import org.fudaa.ctulu.CtuluLib;
 import org.fudaa.ctulu.CtuluLibArray;
 import org.fudaa.ctulu.CtuluResource;
@@ -278,7 +279,13 @@
   }
 
   protected void renameLayer(final BCalque _calque) {
-    final String title = _calque.getTitle();
+    String title = _calque.getTitle();
+    if(title==null){
+      title=_calque.getName();
+    }
+    if(title==null){
+      title=StringUtils.EMPTY;
+    }
     final BuTextField ft = new BuTextField(title);
     ft.setColumns(title.length() + 2);
     final CtuluDialogPanel pn = new CtuluDialogPanel();

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BGroupeCalque.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BGroupeCalque.java	2013-02-13 15:38:28 UTC (rev 8265)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BGroupeCalque.java	2013-02-14 12:07:15 UTC (rev 8266)
@@ -269,10 +269,10 @@
   private static String findUniqueName(final String _pref, final BCalque _parent, final int _idx) {
     final BCalque[] cqs = _parent.getCalques();
     final String defaultName=buildName(_pref, _idx);
+    if (cqs == null || cqs.length == 0) { return defaultName; }
 //    final String defaultName = _pref + '_' + CtuluLibString.getString(_idx);
 
     // Aucun calque trouv\xE9 avec ce nom.
-    if (cqs == null || cqs.length == 0) { return defaultName; }
     final String[] cqNames = new String[cqs.length];
     final int nb = cqNames.length;
     boolean found = false;

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