updated for new org.ibex.js

[org.ibex.mail.git] / src / org / ibex / mail / protocol / GMail.java

diff --git a/src/org/ibex/mail/protocol/GMail.java b/src/org/ibex/mail/protocol/GMail.java
index 3c2e849..823a4a6 100644 (file)
--- a/src/org/ibex/mail/protocol/GMail.java
+++ b/src/org/ibex/mail/protocol/GMail.java
@@ -240,14 +240,14 @@ public class GMail extends Account {
             Log.info(GMail.class, "query: " + query);
             JSArray ret = http(gmail + query, jar);
             Hashtable h = new Hashtable();
-            for(int i=0; i<ret.length(); i++) {
+            for(int i=0; i<ret.size(); i++) {
                 JSArray j = (JSArray)ret.get(i);
-                if (j.elementAt(0).equals("t")) {
-                    for(int k=1; k<j.length(); k++) getSummary((String)((JSArray)j.get(k)).get(0), h);
-                } else if (j.elementAt(0).equals("ct") && labels.length == 0) {
+                if (j.get(0).equals("t")) {
+                    for(int k=1; k<j.size(); k++) getSummary((String)((JSArray)j.get(k)).get(0), h);
+                } else if (j.get(0).equals("ct") && labels.length == 0) {
                     Vec v = new Vec();
-                    j = (JSArray)j.elementAt(1);
-                    for(int k=0; k<j.length(); k++) v.addElement(((JSArray)j.elementAt(k)).elementAt(0));
+                    j = (JSArray)j.get(1);
+                    for(int k=0; k<j.size(); k++) v.addElement(((JSArray)j.get(k)).get(0));
                     v.copyInto(labels = new String[v.size()]);
                 }
             }
@@ -264,9 +264,9 @@ public class GMail extends Account {
     public void getSummary(String id, Hashtable ret) {
         try {
             JSArray js2 = http(gmail + "?search=query&start=0&view=cv&q=in:anywhere&th=" + URLEncoder.encode(id), jar);
-            for(int i2=0; i2<js2.length(); i2++) {
-                JSArray args = (JSArray)js2.elementAt(i2);
-                if (!args.elementAt(0).equals("mi")) continue;
+            for(int i2=0; i2<js2.size(); i2++) {
+                JSArray args = (JSArray)js2.get(i2);
+                if (!args.get(0).equals("mi")) continue;
                 Summary sum = new Summary(args);
                 Log.info(GMail.class, "summary: " + sum.subject);
                 ret.put(sum.id, sum);
@@ -295,11 +295,11 @@ public class GMail extends Account {
         }
         
         public Summary(JSArray m) {
-            try { this.date = new Date(m.elementAt(9).toString()); } catch (Exception e) { this.date = null; }
-            this.id = m.elementAt(3).toString();
-            this.to = Address.parse(m.elementAt(8).toString() + " <" + m.elementAt(10).toString() + ">");
-            this.from = Address.parse(m.elementAt(6).toString()+"<"+m.elementAt(7).toString()+">");
-            this.subject = m.elementAt(15).toString();
+            try { this.date = new Date(m.get(9).toString()); } catch (Exception e) { this.date = null; }
+            this.id = m.get(3).toString();
+            this.to = Address.parse(m.get(8).toString() + " <" + m.get(10).toString() + ">");
+            this.from = Address.parse(m.get(6).toString()+"<"+m.get(7).toString()+">");
+            this.subject = m.get(15).toString();
         }
     }
 
@@ -315,8 +315,8 @@ public class GMail extends Account {
         }
         buf.append("return ret;");
         synchronized(GMail.class) {
-            JS js = JS.fromReader("google", 0, new StringReader(buf.toString()));
-            return (JSArray)js.call(null, null, null, null, 0);
+            JS js = JSU.fromReader("google", 0, new StringReader(buf.toString()));
+            return (JSArray)js.call(JSU.emptyArgs);
         }
     }