Author: jerome
Date: 2009-01-21 08:47:56 +0100 (Wed, 21 Jan 2009)
New Revision: 3504
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
Log:
* Changed the method to get a single name in alerts/favorites.
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-01-20 19:48:10 UTC (rev 3503)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-01-21 07:47:56 UTC (rev 3504)
@@ -2446,41 +2446,54 @@
* @param datas
* @return
*/
- //FIXME
private Object[] rename(Object[] newDatas, Object[][] datas)
{
if((datas == null) || (datas.length <= 0)){
return newDatas;
}
- boolean have = true;
- while(have)
+ Vector<String> names = new Vector<String>();
+ String name = newDatas[0].toString();
+ //Changing object[][] to a vector.
+ for(Object[] obj : datas)
{
- int i = 0;
- for(Object[] obj : datas)
+ names.add(obj[0].toString());
+ }
+
+ if(!names.contains(name))
+ {
+ return newDatas;
+ }
+
+ // Generate a single name
+ String absoluteItemName;
+ if (name.toLowerCase().contains("(copy"))
+ {
+ absoluteItemName = name.substring(0,
name.indexOf("(copy") - 1);
+ }
+ else
+ {
+ absoluteItemName = name;
+ }
+
+ int i = 0;
+ String proposedItemName;
+ while (true)
+ {
+ if (i == 0)
{
-
if(newDatas[0].toString().equals(obj[0].toString())){
- if(i == 0)
- {
- newDatas[0] =
newDatas[0].toString() + " (copy)";
- }
- else
- {
- try
- {
- newDatas[0] =
String.format(newDatas[0].toString().substring(0,
-
newDatas[0].toString().indexOf(" (copy")) + " (copy %d)", i);
- }
-
catch(StringIndexOutOfBoundsException e)
- {
- newDatas[0] =
String.format(newDatas[0].toString() + " (copy %d)", i);
- }
- }
- }
-
- else have = false;
- i++;
+ proposedItemName = String.format("%s (copy)",
absoluteItemName);
}
+ else
+ {
+ proposedItemName = String.format("%s (copy
%d)", absoluteItemName, i);
+ }
+ if (!names.contains(proposedItemName))
+ {
+ newDatas[0] = proposedItemName;
+ break;
+ }
+ i++;
}
return newDatas;
}
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
