fixed some silly errors

alebianco · alebianco · commit ecf5b7dcdab1 · 2012-10-11T17:24:45.000+02:00
diff --git a/source/actionscript/agnostic/src/eu/alebianco/air/extensions/analytics/GATracker.as b/source/actionscript/agnostic/src/eu/alebianco/air/extensions/analytics/GATracker.as
@@ -71,7 +71,7 @@ package eu.alebianco.air.extensions.analytics
 			try
 			{
 				getInstance();
-				supported = instance.context.call("isSupported") == false;
+				supported = instance.context.call("isSupported") == true;
 			}
 			catch(error:Error)
 			{
@@ -165,7 +165,7 @@ package eu.alebianco.air.extensions.analytics
 			{
 				native = handleResult(context.call("getVersion"), String) as String;
 			}
-			finally 
+			catch(error:Error)
 			{
 				native = "<unknown>";
 			}
diff --git a/source/android/src/eu/alebianco/air/extensions/analytics/functions/SetCustomVar.java b/source/android/src/eu/alebianco/air/extensions/analytics/functions/SetCustomVar.java
@@ -64,15 +64,15 @@ public FREObject call(FREContext context, FREObject[] args) {
         	name = args[1].getAsString();
         } catch (Exception e) {
             FREUtils.logEvent(context, LogLevel.FATAL, "Unable to read the 'name' parameter.\n(Exception:[name:%s,reason:%s,method:%s])", 
-            		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());
+            		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());
             return FREUtils.createRuntimeException("ArgumentError", 0, "Unable to read the 'name' parameter on method '%s'.", FREUtils.getClassName());
         }
         
         try {
         	value = args[2].getAsString();
         } catch (Exception e) {
         	FREUtils.logEvent(context, LogLevel.FATAL, "Unable to read the 'value' parameter.\n(Exception:[name:%s,reason:%s,method:%s])", 
-        			FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());
+        			FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());
         	return FREUtils.createRuntimeException("ArgumentError", 0, "Unable to read the 'value' parameter on method '%s'.", FREUtils.getClassName());
         }
         
@@ -81,7 +81,7 @@ public FREObject call(FREContext context, FREObject[] args) {
 	        	scope = (args.length >= 4) ? Math.max(1, Math.min(3, args[3].getAsInt())) : 3;
 	        } catch (Exception e) {
                 FREUtils.logEvent(context, LogLevel.WARN, "Unable to read the 'scope' parameter.\n(Exception:[name:%s,reason:%s,method:%s])", 
-                		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());
+                		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());
 	        }
         }
         
diff --git a/source/android/src/eu/alebianco/air/extensions/analytics/functions/StartNewSession.java b/source/android/src/eu/alebianco/air/extensions/analytics/functions/StartNewSession.java
@@ -62,7 +62,7 @@ public FREObject call(FREContext context, FREObject[] args) {
         	interval = args[1].getAsInt();
         } catch (Exception e) {
             FREUtils.logEvent(context, LogLevel.FATAL, "Unable to read the 'interval' parameter.\n(Exception:[name:%s,reason:%s,method:%s])", 
-            		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());
+            		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());
             return FREUtils.createRuntimeException("ArgumentError", 0, "Unable to read the 'interval' parameter on method '%s'.", FREUtils.getClassName());
         }
 
diff --git a/source/android/src/eu/alebianco/air/extensions/analytics/functions/TrackEvent.java b/source/android/src/eu/alebianco/air/extensions/analytics/functions/TrackEvent.java
@@ -64,7 +64,7 @@ public FREObject call(FREContext context, FREObject[] args) {
             action = args[1].getAsString();
         } catch (Exception e) {
             FREUtils.logEvent(context, LogLevel.FATAL, "Unable to read the 'action' parameter.\n(Exception:[name:%s,reason:%s,method:%s])", 
-            		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());
+            		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());
             return FREUtils.createRuntimeException("ArgumentError", 0, "Unable to read the 'action' parameter on method '%s'.", FREUtils.getClassName());
         }
 
@@ -73,7 +73,7 @@ public FREObject call(FREContext context, FREObject[] args) {
                 label = args[2].getAsString();
             } catch (Exception e) {
                 FREUtils.logEvent(context, LogLevel.WARN, "Unable to read the 'label' parameter.\n(Exception:[name:%s,reason:%s,method:%s])", 
-                		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());
+                		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());
             }
         }
 
@@ -82,7 +82,7 @@ public FREObject call(FREContext context, FREObject[] args) {
                 value = args[3].getAsInt();
             } catch (Exception e) {
                 FREUtils.logEvent(context, LogLevel.WARN, "Unable to read the 'value' parameter.\n(Exception:[name:%s,reason:%s,method:%s])", 
-                		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());
+                		FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());
             }
         }
         
diff --git a/source/android/src/eu/alebianco/air/extensions/utils/FREUtils.java b/source/android/src/eu/alebianco/air/extensions/utils/FREUtils.java
@@ -32,25 +32,25 @@ public static String stripPackageFromClassName(String className)
     	return className.substring(className.lastIndexOf(".") + 1);
     }
     
-    private static StackTraceElement getStackInfo(int i)
-    {
-    	return new Exception().getStackTrace()[i];
-    }
     private static StackTraceElement getStackInfo()
     {
-    	return getStackInfo(1);
+    	return new Exception().getStackTrace()[2];
     }
 
 	public static FREObject createRuntimeException(String className, int id, String message, Object... data) {
         
 		FREObject error = null;
         FREObject[] args = new FREObject[2] ;
         try {
-        	args[2] = FREObject.newObject(id);
-        	args[1] = FREObject.newObject(String.format(message, data));
+        	args[0] = FREObject.newObject(String.format(message, data));
+            args[1] = FREObject.newObject(id);
             error = FREObject.newObject(className, args);
-		} catch (Exception e1) {
-			Log.println(LogLevel.ERROR.getPriority(), LOGTAG, String.format("Inception Error: Unable to create the runtime exception to notify the application about the previous error.\n[Error:(type:%s, message:%s]", stripPackageFromClassName(className), String.format(message, data)));
+		} catch (Exception e) {
+			Log.println(LogLevel.ERROR.getPriority(), LOGTAG, String.format("Inception Error: Unable to create the runtime exception to notify the application about the previous error.\n" +
+                    "[Error:(type:%s, message:%s]\n" +
+                    "[Error:(type:%s, message:%s]",
+                    stripPackageFromClassName(e.toString()), e.getMessage(),
+                    stripPackageFromClassName(className), String.format(message, data)));
 		}
         return error;
 	}

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ package eu.alebianco.air.extensions.analytics`
`71`	`71`	`try`
`72`	`72`	`{`
`73`	`73`	`getInstance();`
`74`		`- supported = instance.context.call("isSupported") == false;`
	`74`	`+ supported = instance.context.call("isSupported") == true;`
`75`	`75`	`}`
`76`	`76`	`catch(error:Error)`
`77`	`77`	`{`
`@@ -165,7 +165,7 @@ package eu.alebianco.air.extensions.analytics`
`165`	`165`	`{`
`166`	`166`	`native = handleResult(context.call("getVersion"), String) as String;`
`167`	`167`	`}`
`168`		`- finally`
	`168`	`+ catch(error:Error)`
`169`	`169`	`{`
`170`	`170`	`native = "<unknown>";`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,15 +64,15 @@ public FREObject call(FREContext context, FREObject[] args) {`
`64`	`64`	`name = args[1].getAsString();`
`65`	`65`	`} catch (Exception e) {`
`66`	`66`	`FREUtils.logEvent(context, LogLevel.FATAL, "Unable to read the 'name' parameter.\n(Exception:[name:%s,reason:%s,method:%s])",`
`67`		`- FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());`
	`67`	`+ FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());`
`68`	`68`	`return FREUtils.createRuntimeException("ArgumentError", 0, "Unable to read the 'name' parameter on method '%s'.", FREUtils.getClassName());`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`try {`
`72`	`72`	`value = args[2].getAsString();`
`73`	`73`	`} catch (Exception e) {`
`74`	`74`	`FREUtils.logEvent(context, LogLevel.FATAL, "Unable to read the 'value' parameter.\n(Exception:[name:%s,reason:%s,method:%s])",`
`75`		`- FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());`
	`75`	`+ FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());`
`76`	`76`	`return FREUtils.createRuntimeException("ArgumentError", 0, "Unable to read the 'value' parameter on method '%s'.", FREUtils.getClassName());`
`77`	`77`	`}`
`78`	`78`
`@@ -81,7 +81,7 @@ public FREObject call(FREContext context, FREObject[] args) {`
`81`	`81`	`scope = (args.length >= 4) ? Math.max(1, Math.min(3, args[3].getAsInt())) : 3;`
`82`	`82`	`} catch (Exception e) {`
`83`	`83`	`FREUtils.logEvent(context, LogLevel.WARN, "Unable to read the 'scope' parameter.\n(Exception:[name:%s,reason:%s,method:%s])",`
`84`		`- FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());`
	`84`	`+ FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public FREObject call(FREContext context, FREObject[] args) {`
`62`	`62`	`interval = args[1].getAsInt();`
`63`	`63`	`} catch (Exception e) {`
`64`	`64`	`FREUtils.logEvent(context, LogLevel.FATAL, "Unable to read the 'interval' parameter.\n(Exception:[name:%s,reason:%s,method:%s])",`
`65`		`- FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());`
	`65`	`+ FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());`
`66`	`66`	`return FREUtils.createRuntimeException("ArgumentError", 0, "Unable to read the 'interval' parameter on method '%s'.", FREUtils.getClassName());`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public FREObject call(FREContext context, FREObject[] args) {`
`64`	`64`	`action = args[1].getAsString();`
`65`	`65`	`} catch (Exception e) {`
`66`	`66`	`FREUtils.logEvent(context, LogLevel.FATAL, "Unable to read the 'action' parameter.\n(Exception:[name:%s,reason:%s,method:%s])",`
`67`		`- FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());`
	`67`	`+ FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());`
`68`	`68`	`return FREUtils.createRuntimeException("ArgumentError", 0, "Unable to read the 'action' parameter on method '%s'.", FREUtils.getClassName());`
`69`	`69`	`}`
`70`	`70`
`@@ -73,7 +73,7 @@ public FREObject call(FREContext context, FREObject[] args) {`
`73`	`73`	`label = args[2].getAsString();`
`74`	`74`	`} catch (Exception e) {`
`75`	`75`	`FREUtils.logEvent(context, LogLevel.WARN, "Unable to read the 'label' parameter.\n(Exception:[name:%s,reason:%s,method:%s])",`
`76`		`- FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());`
	`76`	`+ FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`@@ -82,7 +82,7 @@ public FREObject call(FREContext context, FREObject[] args) {`
`82`	`82`	`value = args[3].getAsInt();`
`83`	`83`	`} catch (Exception e) {`
`84`	`84`	`FREUtils.logEvent(context, LogLevel.WARN, "Unable to read the 'value' parameter.\n(Exception:[name:%s,reason:%s,method:%s])",`
`85`		`- FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), e.getMessage(), FREUtils.getClassName());`
	`85`	`+ FREUtils.stripPackageFromClassName(e.toString()), e.getMessage(), FREUtils.getClassName());`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`