Author: jerome
Date: 2009-01-27 11:24:28 +0100 (Tue, 27 Jan 2009)
New Revision: 3534
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/Utils/ServicesLauncher.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/alerts/AlertRestoreThread.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/alerts/FiFo.java
Log:
Fixed: #120 ?\226?\128?\148 Alert gadget is launched instead of favorite gadget.
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-27 09:33:12 UTC (rev 3533)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-01-27 10:24:28 UTC (rev 3534)
@@ -439,12 +439,17 @@
playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/stop_down.png")));
setPlayerControlsConsistants(false);
- if(remotePlaylist.getPath().endsWith(".att")){
- System.out.println(remotePlaylist.getPath());
+ if(remotePlaylist.getPath().endsWith(".att"))
+ {
fileBrowser.playAttituneFromPath(remotePlaylist.getPath());
}
- else{
- System.out.println("hello, the problem is
here...");
+ else
+ {
+ if(CcCommons.isFrameworkBusy)
+ {
+ return;
+ }
+ CcCommons.isFrameworkBusy = true;
fileBrowser.playGadget(this.currentGadget,
this.currentGadgetParameters.getValues(), "run");
}
}
@@ -2288,6 +2293,10 @@
}
//Scheduled object is a gadget.
else
if(CcCommons.settings.getAlertObjectKind(uid).equalsIgnoreCase("gadget")){
+ if(CcCommons.isFrameworkBusy)
+ {
+ return;
+ }
//getting schedul action.
String action =
CcCommons.settings.getScheduledActionByUUID(uid);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/ServicesLauncher.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/ServicesLauncher.java
2009-01-27 09:33:12 UTC (rev 3533)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/ServicesLauncher.java
2009-01-27 10:24:28 UTC (rev 3534)
@@ -36,7 +36,7 @@
try
{
- Thread.sleep((long)60.0);
+ Thread.sleep(80000);
}
catch (InterruptedException e)
{
@@ -44,19 +44,6 @@
e.printStackTrace();
}
- //Waiting 1 minute again if tooltip is started.
- if(CcCommons.differAlertsStartup){
- try
- {
- Thread.sleep((long)80.0);
- }
- catch (InterruptedException e)
- {
- CcCommons.logger.appendError(e.getStackTrace());
- e.printStackTrace();
- }
- }
-
//Automatic incomming attitune updater. (into /MyTuxAttitunes
folder).
CcCommons.attitunesWatcher = new Watcher();
CcCommons.attitunesWatcher.onUpdateAvailable(this,
"updateAllAttitunesViews");
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/alerts/AlertRestoreThread.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/alerts/AlertRestoreThread.java
2009-01-27 09:33:12 UTC (rev 3533)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/alerts/AlertRestoreThread.java
2009-01-27 10:24:28 UTC (rev 3534)
@@ -47,7 +47,8 @@
}
public void run(){
- try {
+ try
+ {
if(act)
new TaskDefiner(true, time, uid);
else
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/alerts/FiFo.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/alerts/FiFo.java
2009-01-27 09:33:12 UTC (rev 3533)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/alerts/FiFo.java
2009-01-27 10:24:28 UTC (rev 3534)
@@ -38,7 +38,8 @@
//Attitunes fifo.
public static Vector<String> AttitunesFifo = new Vector<String>();
- public FiFo(){
+ public FiFo()
+ {
//Scedulling check function.
try {
new TaskDefiner("fifo", this.getClass(), 5);
------------------------------------------------------------------------------
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
