Author: jerome
Date: 2009-01-20 16:01:55 +0100 (Tue, 20 Jan 2009)
New Revision: 3502
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/Object/Playlist/RemotePlaylist.java
Log:
Fixed: #47 ?\226?\128?\148 Remplacement de (favorites copy) (favorites copy) by
(favorite copy 2)
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 12:47:03 UTC (rev 3501)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-01-20 15:01:55 UTC (rev 3502)
@@ -2446,20 +2446,41 @@
* @param datas
* @return
*/
- private Object[] rename(Object[] newDatas, Object[][] datas){
+ //FIXME
+ private Object[] rename(Object[] newDatas, Object[][] datas)
+ {
if((datas == null) || (datas.length <= 0)){
return newDatas;
}
boolean have = true;
- while(have){
- for(Object[] obj : datas){
+ while(have)
+ {
+ int i = 0;
+ for(Object[] obj : datas)
+ {
if(newDatas[0].toString().equals(obj[0].toString())){
- newDatas[0] = newDatas[0].toString() +
" (copy)";
+ 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++;
}
-
}
return newDatas;
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
2009-01-20 12:47:03 UTC (rev 3501)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
2009-01-20 15:01:55 UTC (rev 3502)
@@ -79,7 +79,8 @@
}
- public void refresh(){ //FIXME
+ public void refresh()
+ {
if(this.playlist.getSelectedRow() != -1)
RemotePlaylist.selected =
this.playlist.getSelectedRow();
this.setDatas(CcCommons.settings.getRemoteListDatas());
------------------------------------------------------------------------------
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
