Author: jerome
Date: 2009-02-03 12:31:40 +0100 (Tue, 03 Feb 2009)
New Revision: 3553
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
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/Logger.java
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/gadget/GadgetsFramework.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
Log:
* Fixed : #103 ?\226?\128?\148 Play button protection needed for medias gadgets.
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
2009-02-03 11:00:02 UTC (rev 3552)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
2009-02-03 11:31:40 UTC (rev 3553)
@@ -111,17 +111,21 @@
MyTuxDirectory = new File(System.getProperty("user.home") +
File.separator + "MyTux");
TuxDroidSettingsDirectory = new
File(MyTuxDirectory.getAbsolutePath() + File.separator + "TuxDroidSettings");
+ //Fixed files.
- //Initialize log file.
- try
- {
- logger = new Logger();
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
+ MyTuxGadgetsDirectory = new
File(MyTuxDirectory.getAbsolutePath() + File.separator + "MyTuxGadgets");
+ MyTuxAttitunesDirectory = new
File(MyTuxDirectory.getAbsolutePath() + File.separator + "MyTuxAttitunes");
+ MyTuxTools = new File(MyTuxDirectory.getAbsolutePath() +
File.separator + "MyTuxTools");
+ TuxDroidSettingsFile = new
File(TuxDroidSettingsDirectory.getAbsolutePath() + File.separator +
"settings.xml");
+ TuxHelpFiles = InstallerPaths.directoryControlCenterHelps;
+ //Temporaries files.
+ GdgTempDirectory = new
File(System.getProperty("java.io.tmpdir") + File.separator + "MyTux/gdgTmp");
+ AttTempDirectory = new
File(System.getProperty("java.io.tmpdir") + File.separator +
"MyTux/tempDirectory");
+ TgfGeneratorTemp = new
File(System.getProperty("java.io.tmpdir") + File.separator +
"MyTux/tgfGenerator");
+
+ logger = new Logger();
+
logger.append("Initializing locutors list", true);
//Initialize locutors list.
Locutors.add("bruno");
@@ -142,20 +146,7 @@
Locutors.add("celia");
Locutors.add("erik");
Locutors.add("emma");
- logger.appendDone();
-
- //Fixed files.
-
- MyTuxGadgetsDirectory = new
File(MyTuxDirectory.getAbsolutePath() + File.separator + "MyTuxGadgets");
- MyTuxAttitunesDirectory = new
File(MyTuxDirectory.getAbsolutePath() + File.separator + "MyTuxAttitunes");
- MyTuxTools = new File(MyTuxDirectory.getAbsolutePath() +
File.separator + "MyTuxTools");
- TuxDroidSettingsFile = new
File(TuxDroidSettingsDirectory.getAbsolutePath() + File.separator +
"settings.xml");
- TuxHelpFiles = InstallerPaths.directoryControlCenterHelps;
-
- //Temporaries files.
- GdgTempDirectory = new
File(System.getProperty("java.io.tmpdir") + File.separator + "MyTux/gdgTmp");
- AttTempDirectory = new
File(System.getProperty("java.io.tmpdir") + File.separator +
"MyTux/tempDirectory");
- TgfGeneratorTemp = new
File(System.getProperty("java.io.tmpdir") + File.separator +
"MyTux/tgfGenerator");
+ logger.appendDone();
}
/**
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-02-03 11:00:02 UTC (rev 3552)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-02-03 11:31:40 UTC (rev 3553)
@@ -2732,6 +2732,11 @@
playflag = !playflag;
if (!playflag)
{
+ if(fileBrowser.getFramework().gadget != null)
+ {
+ System.out.println("One gadget is already
running");
+ return;
+ }
CCRemoteActions.deleteContext();
setFrameworkBusy(true); //Set the framework busy.
playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/stop_down.png")));
@@ -2848,7 +2853,7 @@
fileBrowser.stopPlaying(CcConstants.TYPE_ATTITUNES,
CcConstants.TYPE_REMOTELIST);
}
else{
- playedGadget.getGadget().stop();
+
fileBrowser.getFramework().stopCurrentGadget();
}
}
fileBrowser.stopPlaying(CcCommons.type,
CcCommons.view);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Logger.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Logger.java
2009-02-03 11:00:02 UTC (rev 3552)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Logger.java
2009-02-03 11:31:40 UTC (rev 3553)
@@ -36,7 +36,7 @@
private Object mutex = new Object();
- public Logger() throws IOException
+ public Logger()
{
if(!CcCommons.TuxDroidSettingsDirectory.exists())
{
@@ -48,7 +48,12 @@
log.delete();
}
- log.createNewFile();
+ try
+ {
+ log.createNewFile();
+ }
+ catch (IOException e) {
+ }
this.append("Control Center log file");
this.append("\n--------------------------------------");
}
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-02-03 11:00:02 UTC (rev 3552)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/alerts/FiFo.java
2009-02-03 11:31:40 UTC (rev 3553)
@@ -89,7 +89,7 @@
//Then trigger gadgets events.
try{
CcCommons.dispatcher.triggerEvent(GadgetFifo.get(0));
- this.addToGadgetsWatcher("RELEASE EVENT
Gadget: " + new File(GadgetFifo.get(0)).getName());
+ this.addToGadgetsWatcher("RELEASE EVENT
Gadget: " + GadgetFifo.get(0));
GadgetFifo.remove(0);
}
catch(NullPointerException except){}
@@ -101,7 +101,7 @@
if(AttitunesFifo.size() < 0)
return;
CcCommons.dispatcher.triggerEvent(AttitunesFifo.get(0));
- this.addToAttitunesWatcher("RELEASE
EVENT Attitune: " + new File(AttitunesFifo.get(0)).getName());
+ this.addToAttitunesWatcher("RELEASE
EVENT Attitune: " + AttitunesFifo.get(0));
AttitunesFifo.remove(0);
}catch(Exception except){}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
2009-02-03 11:00:02 UTC (rev 3552)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
2009-02-03 11:31:40 UTC (rev 3553)
@@ -59,10 +59,13 @@
Object... parameters) {
if(GadgetsFramework.gadget == null){
return;
- }
+ }
+
// Example of global notification handling
if ((name.equalsIgnoreCase("speak")) ||
(name.contains("message"))){
- if(talk){
+
+ if(talk)
+ {
gadget = source;
String str = "";
@@ -74,7 +77,8 @@
CcCommons.tux.tts.speak(str);
FiFo.canRelease = true;
}
- else{
+ else
+ {
changes.firePropertyChange("gadget-talk", null, null);
}
}
@@ -94,8 +98,11 @@
" stopped");
CcCommons.logger.append("Gadget action : " +
gadget.getGadget().getDescription().getName() +
" stopped", true);
+ //Reset the gadgets notifications fifo.
if(talk)
- changes.firePropertyChange("Gadget-stopped",
null, null);
+ changes.firePropertyChange("Gadget-stopped",
null, null);
+ GadgetsFramework.gadget = null;
+
}
public void trace(GadgetInstance gadgetInstance, String
message) {
@@ -219,10 +226,12 @@
* Stop current registered gadget.
*/
public void stopCurrentGadget(){
- if(GadgetsFramework.gadget != null)
- GadgetsFramework.gadget.abort();
- GadgetsFramework.gadget.getGadget().stop();
+ try
+ {
+ gadget.abort();
gadget = null;
+ }
+ catch(NullPointerException noGadgetRunning){}
}
public void start() {
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2009-02-03 11:00:02 UTC (rev 3552)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2009-02-03 11:31:40 UTC (rev 3553)
@@ -599,11 +599,8 @@
}
}
}
- catch(Exception e)
- {
- CcCommons.logger.appendError(e.getStackTrace());
- e.printStackTrace();
- }
+ catch(Exception e){}
+
}
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
