Author: lindner
Date: Sun Jan 11 21:20:32 2009
New Revision: 733628
URL: http://svn.apache.org/viewvc?rev=733628&view=rev
Log:
SHINDIG-836 | Patch from Vincent Siveton | use standard boolean parsing routines
Modified:
incubator/shindig/branches/1.0.x-incubating/ (props changed)
incubator/shindig/branches/1.0.x-incubating/java/common/src/test/java/org/apache/shindig/common/AllTests.java
(props changed)
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
Propchange: incubator/shindig/branches/1.0.x-incubating/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 11 21:20:32 2009
@@ -1 +1 @@
-/incubator/shindig/trunk:724511-724522,724874,724915,724939,726597,727032-727033,727048,733593,733596-733622
+/incubator/shindig/trunk:724511-724522,724874,724915,724939,726597,727032-727033,727048,733593,733596-733626
Propchange:
incubator/shindig/branches/1.0.x-incubating/java/common/src/test/java/org/apache/shindig/common/AllTests.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 11 21:20:32 2009
@@ -1 +1 @@
-/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java:733619-733622
+/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java:733619-733626
Modified:
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java?rev=733628&r1=733627&r2=733628&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
Sun Jan 11 21:20:32 2009
@@ -73,7 +73,7 @@
}
String require = config.get(container, LOCKED_DOMAIN_REQUIRED_KEY);
- required.put(container, "true".equals(require));
+ required.put(container, Boolean.parseBoolean(require));
}
}
}
Modified:
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java?rev=733628&r1=733627&r2=733628&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
Sun Jan 11 21:20:32 2009
@@ -186,7 +186,7 @@
private void injectBaseTag(Gadget gadget, Node headTag) {
GadgetContext context = gadget.getContext();
- if ("true".equals(containerConfig.get(context.getContainer(),
INSERT_BASE_ELEMENT_KEY))) {
+ if (Boolean.parseBoolean(containerConfig.get(context.getContainer(),
INSERT_BASE_ELEMENT_KEY))) {
Uri base = gadget.getSpec().getUrl();
View view = gadget.getCurrentView();
if (view != null && view.getHref() != null) {
Modified:
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=733628&r1=733627&r2=733628&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
Sun Jan 11 21:20:32 2009
@@ -378,7 +378,7 @@
*/
public boolean getBoolAttribute(String name) {
String value = getAttribute(name);
- return !(value == null || "false".equals(value));
+ return Boolean.parseBoolean(value);
}
/**