From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Tue, 20 Feb 2007 21:20:02 +0000 (+0000)
Subject: Fixed a bug in description.xml OR-rule parsing. This fixes #426
X-Git-Tag: 6.7.0.beta1~6565
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7eff58f102e79486cce78799e1ae17cb99f20f89;p=vaadin-framework.git

Fixed a bug in description.xml OR-rule parsing. This fixes #426

svn changeset:742/svn branch:toolkit
---

diff --git a/src/com/itmill/toolkit/terminal/web/Theme.java b/src/com/itmill/toolkit/terminal/web/Theme.java
index a80e1baf76..15c4030f43 100644
--- a/src/com/itmill/toolkit/terminal/web/Theme.java
+++ b/src/com/itmill/toolkit/terminal/web/Theme.java
@@ -235,6 +235,7 @@ public class Theme extends DefaultHandler {
 		// Theme must explicitly support the given mode
 		RequirementCollection rc = (RequirementCollection) supportedModes
 				.get(mode);
+		
 		if (rc == null || !rc.isMet(terminal))
 			return false;
 
@@ -705,8 +706,9 @@ public class Theme extends DefaultHandler {
 		 */
 		public boolean isMet(WebBrowser terminal) {
 			for (Iterator i = this.requirements.iterator(); i.hasNext();) {
-				if (!((Requirement) i.next()).isMet(terminal))
+				if (!((Requirement) i.next()).isMet(terminal)) {
 					return false;
+				}
 			}
 			return true;
 		}
@@ -763,8 +765,9 @@ public class Theme extends DefaultHandler {
 		 */
 		public boolean isMet(WebBrowser terminal) {
 			for (Iterator i = this.requirements.iterator(); i.hasNext();) {
-				if (!((Requirement) i.next()).isMet(terminal))
+				if (((Requirement) i.next()).isMet(terminal)) {
 					return true;
+				}
 			}
 			return false;
 		}
@@ -799,9 +802,7 @@ public class Theme extends DefaultHandler {
 		}
 
 		public boolean isMet(WebBrowser terminal) {
-			if (terminal.getBrowserApplication().indexOf(this.agentSubstring) > 0)
-				return true;
-			return false;
+			return terminal.getBrowserApplication().indexOf(this.agentSubstring) > 0;
 		}
 
 		/**