From 419e8296ea76c5f1db1abbaa88b39b538fa42403 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Mon, 10 Jan 2011 11:57:49 -0800 Subject: [PATCH] LayoutLib: move asserts around. Change-Id: I6fcfcf2e6fad1d9fa172b9a8c20c72fa2533e7fa --- .../bridge/android/BridgeTypedArray.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java index 886ef2ac5729d..4fb280d585cd8 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java @@ -328,11 +328,12 @@ public final class BridgeTypedArray extends TypedArray { } // looks like were unable to resolve the color value. - assert false; Bridge.getLog().warning(null, String.format( "Unable to resolve color value \"%1$s\" in attribute \"%2$s\"", value, mNames[index])); + assert false; + return null; } @@ -406,11 +407,12 @@ public final class BridgeTypedArray extends TypedArray { } // looks like we were unable to resolve the dimension value - assert false; Bridge.getLog().warning(null, String.format( "Unable to resolve dimension value \"%1$s\" in attribute \"%2$s\"", s, mNames[index])); + assert false; + return defValue; } @@ -536,11 +538,12 @@ public final class BridgeTypedArray extends TypedArray { } // looks like we were unable to resolve the fraction value - assert false; Bridge.getLog().warning(null, String.format( "Unable to resolve fraction value \"%1$s\" in attribute \"%2$s\"", value, mNames[index])); + assert false; + return defValue; } @@ -644,9 +647,11 @@ public final class BridgeTypedArray extends TypedArray { return idValue.intValue(); } - assert false; Bridge.getLog().warning(null, String.format( "Unable to resolve id \"%1$s\" for attribute \"%2$s\"", value, mNames[index])); + + assert false; + return defValue; } @@ -679,11 +684,12 @@ public final class BridgeTypedArray extends TypedArray { } // looks like we were unable to resolve the drawable - assert false; Bridge.getLog().warning(null, String.format( "Unable to resolve drawable \"%1$s\" in attribute \"%2$s\"", stringValue, mNames[index])); + assert false; + return null; }