[mashup-dev] svn commit r6393 - trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system

[svn at wso2.org]

Author: tyrell
Date: Mon Aug 20 03:08:07 2007
New Revision: 6393

Modified:
   trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/FunctionSchedulingJob.java
   trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java
Log:
minor changes

Modified: trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/FunctionSchedulingJob.java
==============================================================================
--- trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/FunctionSchedulingJob.java	(original)
+++ trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/FunctionSchedulingJob.java	Mon Aug 20 03:08:07 2007
@@ -33,6 +33,7 @@
         if (jsFunction instanceof Function) {
             ((Function) jsFunction).call(cx, systemHost, systemHost, null);
         } else if (jsFunction instanceof String) {
+            //This is not working at the moment
             cx.evaluateString(systemHost, (String) jsFunction, "Scheduled JavaScripts", 0, null);
         }
 

Modified: trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java
==============================================================================
--- trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java	(original)
+++ trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java	Mon Aug 20 03:08:07 2007
@@ -278,8 +278,6 @@
     public static String jsFunction_setInterval(Context cx, Scriptable thisObj, Object[] arguments,
                                                 Function funObj) throws IOException {
 
-        String jobId = "Unscheduled";
-
         SystemHostObject systemHostObject = checkInstance(thisObj);
 
         // Getting the scheduler
@@ -297,8 +295,8 @@
         Scheduler scheduler = (Scheduler) parameter.getValue();
 
         //Generating UUIDs for job and trigger
-        jobId = UUIDGenerator.getUUID().substring(9);
-        
+        String jobId = UUIDGenerator.getUUID().substring(9);
+
         //Creating the quartz job
         JobDetail jobDetail = new JobDetail(jobId, null, FunctionSchedulingJob.class);
 
@@ -364,7 +362,7 @@
                     startTime = (Date) Context.jsToJava(arguments[2], Date.class);
                 } catch (EvaluatorException e) {
                     throw new AxisFault("Invalid parameter. The third parameter must be the start time in date format.");
-                }                
+                }
 
                 //Storing the session host instance, the jsfunction and contect in jobdata map
                 jobDetail.getJobDataMap().put("cx", cx);
@@ -410,7 +408,7 @@
                 } catch (EvaluatorException e) {
                     throw new AxisFault("Invalid parameter. The fourth parameter must be the end time in date format.");
                 }
-                                     
+
                 //Storing the session host instance, the jsfunction and contect in jobdata map
                 jobDetail.getJobDataMap().put("cx", cx);
                 jobDetail.getJobDataMap().put("jsfunction", jsFunction);