Projects >> zk >>c07d5ac17109901890e24a7a3a2ad2e7d58b6288

Chunk
Conflicting content 
	 * It is used to evaluate EL expression, if any, contained in the value.
	 * @since 5.1.0
	 */
<<<<<<< HEAD
	public String toHTML(PageDefinition pgdef, Page page) {
		final Evaluator eval = pgdef.getEvaluator();
		if (_cond != null && !_cond.isEffective(eval, page))
			return "";

		final StringBuffer sb = new StringBuffer(128)
			.append('<').append(_name);
=======
	public String toHTML(Page page) {
		final boolean bScript = "script".equals(_name),
			bStyle = !bScript && "style".equals(_name);
>>>>>>> 76e009d82a3d72317562d3b57bd5b66cdc0b86d2

		//1. scan content
		final StringBuffer sb = new StringBuffer(128);
Solution content 
	 * It is used to evaluate EL expression, if any, contained in the value.
	 * @since 5.1.0
	 */
	public String toHTML(PageDefinition pgdef, Page page) {
		final Evaluator eval = pgdef.getEvaluator();
		if (_cond != null && !_cond.isEffective(eval, page))
			return "";

		final boolean bScript = "script".equals(_name),
			bStyle = !bScript && "style".equals(_name);

		//1. scan content
		final StringBuffer sb = new StringBuffer(128);
File
HeaderInfo.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
				}
			}

<<<<<<< HEAD
		for (AttrInfo attr: _attrs) {
			final String nm = attr.name;
			String val = (String)attr.value.getValue(eval, page);
			if (bScript && "content".equals(nm)) {
				scriptContent = val;
				continue;
			}
=======
			if (content != null) {
				sb.append('<').append(_name).append(" type=\"text/")
					.append(bScript ? "javascript": "css").append("\">\n")
					.append(content)
					.append("\n');
				if (srcFound) sb.append('\n');
			}
			if (!srcFound)
				return sb.toString(); //no more to generate
		}

		
		sb.append('<').append(bStyle ? "link": _name);
		boolean relFound = false, typeFound = false;
		for (Iterator it = _attrs.iterator(); it.hasNext();) {
			final Object[] p = (Object[])it.next();
			final String nm = (String)p[0];
			if ((bScript || bStyle) && "content".equals(nm))
				continue; //skip

			relFound = bStyle && (relFound || "rel".equals(nm));
			typeFound = (bScript || bStyle) && (typeFound || "type".equals(nm));

			String val = (String)((ExValue)p[1]).getValue(_evalr, page);
			if (val == null || val.length() == 0)
				val = "";
			else if ("href".equals(nm) || ((bScript || bStyle) && "src".equals(nm)))
				val = Executions.encodeURL(val);
>>>>>>> 76e009d82a3d72317562d3b57bd5b66cdc0b86d2

			HTMLs.appendAttribute(sb,
				bStyle && "src".equals(nm) ? "href":
Solution content 
				}
			}

			if (content != null) {
				sb.append('<').append(_name).append(" type=\"text/")
					.append(bScript ? "javascript": "css").append("\">\n")
					.append(content)
					.append("\n');
				if (srcFound) sb.append('\n');
			}
			if (!srcFound)
				return sb.toString(); //no more to generate
		}

		
		sb.append('<').append(bStyle ? "link": _name);
		boolean relFound = false, typeFound = false;
		for (AttrInfo attr: _attrs) {
			final String nm = attr.name;
			if ((bScript || bStyle) && "content".equals(nm))
				continue; //skip

			relFound = bStyle && (relFound || "rel".equals(nm));
			typeFound = (bScript || bStyle) && (typeFound || "type".equals(nm));

			String val = (String)((ExValue)attr.value).getValue(eval, page);
			if (val == null || val.length() == 0)
				val = "";
			else if ("href".equals(nm) || ((bScript || bStyle) && "src".equals(nm)))
				val = Executions.encodeURL(val);

			HTMLs.appendAttribute(sb,
				bStyle && "src".equals(nm) ? "href":
File
HeaderInfo.java
Developer's decision
Manual
Kind of conflict
Cast expression
Comment
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
		} else if ("xel-method".equals(target)) {
			parseXelMethod(pgdef, pi, params);
		} else if ("link".equals(target) || "meta".equals(target)
<<<<<<< HEAD
		|| "script".equals(target)) { //declare a header element
			pgdef.addHeaderInfo(new HeaderInfo(target, params,
=======
		|| "script".equals(target) || "style".equals(target)) { //declare a header element
			pgdef.addHeaderInfo(new HeaderInfo(
				pgdef.getEvaluatorRef(), target, params,
>>>>>>> 76e009d82a3d72317562d3b57bd5b66cdc0b86d2
				ConditionImpl.getInstance(
					(String)params.remove("if"), (String)params.remove("unless"))));
		} else if ("header".equals(target)) { //declare a response header
Solution content 
		} else if ("xel-method".equals(target)) {
			parseXelMethod(pgdef, pi, params);
		} else if ("link".equals(target) || "meta".equals(target)
		|| "script".equals(target) || "style".equals(target)) { //declare a header element
			pgdef.addHeaderInfo(new HeaderInfo(target, params,
				ConditionImpl.getInstance(
					(String)params.remove("if"), (String)params.remove("unless"))));
		} else if ("header".equals(target)) { //declare a response header
File
Parser.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation