Author: jerome
Date: 2008-12-14 11:32:39 +0100 (Sun, 14 Dec 2008)
New Revision: 3104

Modified:
   
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcInterface.java
   
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
   
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/JLogWindow.java
Log:
Fixed : #176 ?\226?\128?\148 Attitunes play behaviors.

Modified: 
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcInterface.java
===================================================================
--- 
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcInterface.java
        2008-12-13 23:50:51 UTC (rev 3103)
+++ 
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcInterface.java
        2008-12-14 10:32:39 UTC (rev 3104)
@@ -2398,6 +2398,7 @@
                                                playflag = !playflag;
                                                String path = 
remotePlaylist.getPath();
                                                
fileBrowser.playAttituneFromPath(path);
+                                               System.out.println("Attitune 
path= " + path);
                                        }
                                        else{
                                                playB.setIcon(new 
ImageIcon(CcCommons.targetClass.getResource("images/buttons/play.png")));

Modified: 
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
===================================================================
--- 
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
   2008-12-13 23:50:51 UTC (rev 3103)
+++ 
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
   2008-12-14 10:32:39 UTC (rev 3104)
@@ -231,16 +231,42 @@
        
        
        private int getIndexWithPath(String path){
-               for(int i=0 ; i < this.values.length; i++){
-                       if(this.values[i][7].toString().equals(path)){
-                               return i; 
+               Hashtable<String, Object> targetHash = null;
+               for(Hashtable<String, Object> hash : 
AttitunesFunctions.attitunes.values())
+               {
+                       if(hash.get("path").toString().equals(path))
+                       {
+                               targetHash = hash;
+                               break;
                        }
                }
+               
+               String key = null;
+               
+               Enumeration<String> enu = AttitunesFunctions.attitunes.keys();
+               while(enu.hasMoreElements())
+               {
+                       key = enu.nextElement();
+                       
if(AttitunesFunctions.attitunes.get(key).equals(targetHash))
+                       {
+                               break;
+                       }
+               }
+               
+               for(int i = 0; i < jTable.getRowCount(); i++)
+               {
+                       if(jTable.getValueAt(i, 0).toString().equals(key))
+                       {
+                               return i;
+                       }
+               }
+               
                return -1;
        }
        
        public boolean playAttituneFromPath(String path){
                int index = this.getIndexWithPath(path);
+               
                if(index != -1){
                        return this.play(index) == 0;
                }
@@ -266,15 +292,17 @@
                        String paneTitle = 
CcCommons.language.messages.getMessageBoxTitle();
                        Integer duration = Integer.valueOf(0);
                        String data = jTable.getValueAt(index, 0).toString();
-                       String lang = "";
-                       for(Object[] dat : values){
-                               if(dat[0] == data){
+                       String lang = "";
+                       
+                       for(Object[] dat : values){
+                               
+                               if(dat[0].toString().equals(data)){
                                        attPath = dat[7].toString();
                                        duration = Integer.valueOf((String) 
dat[2]);
                                        lang = dat[4].toString();
                                }
                        }
-                       
+               
                        if(!(attPath == null)){
                                CcCommons.logger.append("Trying to play 
attitune", true);
                                CcCommons.isFrameworkBusy = true;

Modified: 
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/JLogWindow.java
===================================================================
--- 
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/JLogWindow.java
   2008-12-13 23:50:51 UTC (rev 3103)
+++ 
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/JLogWindow.java
   2008-12-14 10:32:39 UTC (rev 3104)
@@ -83,7 +83,6 @@
                if(!logFile.exists() || (this.area == null))
                {
                        //Log file doesn't exists, then quit read log funtion.
-                       System.out.println("File doesn't exists.");
                        return;
                }
                //Reading log file.
@@ -93,14 +92,13 @@
                        BufferedReader br=new BufferedReader(ipsr);
                        String ligne;
                        while ((ligne=br.readLine())!=null){
-                               System.out.println(ligne);
                                this.area.append(ligne+"\n");
                        }
                        br.close(); 
                }               
                catch (Exception e){
                        CcCommons.logger.appendError(e.getStackTrace());
-                       System.out.println(e.toString());
+                       e.printStackTrace();
                }
        }
 }


------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn

Reply via email to