Projects >> zk >>2a309bbc2b1738bfe1e3dd2b0ecc9a308d50f1f3

Chunk
Conflicting content 
<<<<<<< HEAD
=======
			Components.pathToComponent((String)fwd, this): (Component)fwd;
	}
	private static final String NONE = "";
	private static String _id2uuidPrefix = NONE, _id2uuidPrefix2;
	private static int _id2uuidPageOfs;
	private static String id2Uuid(String id) {
		if (id.length() > 0) {
			if (_id2uuidPrefix == NONE) {
				_id2uuidPrefix = Library.getProperty(Attributes.ID_TO_UUID_PREFIX);
				if (_id2uuidPrefix != null) {
					Library.setProperty(Attributes.UUID_RECYCLE_DISABLED, "true"); //disable it

					_id2uuidPageOfs = _id2uuidPrefix.indexOf("${page}");
					if (_id2uuidPageOfs >= 0) {
						_id2uuidPrefix2 = _id2uuidPrefix.substring(_id2uuidPageOfs + 7);
						_id2uuidPrefix = _id2uuidPrefix.substring(0, _id2uuidPageOfs);
					}
				}
			}
			if (_id2uuidPrefix != null) {
				if (_id2uuidPageOfs >= 0) {
					final ExecutionCtrl execCtrl = (ExecutionCtrl)Executions.getCurrent();
					if (execCtrl != null) {
						final Page page = execCtrl.getCurrentPage();
						if (page != null)
							return _id2uuidPrefix + page.getId() + _id2uuidPrefix2 + id;
					}
				}
				return _id2uuidPrefix + id;
			}
		}
		return null;
	}

>>>>>>> 742cdb18a6cd6d1a78e6ec39650ac89f94f50ece
	/** Returns the default mold for the given class.
	 * 
Default: check the library property called xxx.mold, where xxx is
	 * the name of the give class.
Solution content 
			Components.pathToComponent((String)fwd, this): (Component)fwd;
	}

	/** Returns the default mold for the given class.
	 * 
Default: check the library property called xxx.mold, where xxx is
	 * the name of the give class.
File
AbstractComponent.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Chunk
Conflicting content 
import java.io.StringWriter;
import java.io.Writer;

<<<<<<< HEAD
import org.zkoss.html.HTMLs;
=======
import org.zkoss.lang.Strings;
import org.zkoss.xml.HTMLs;
>>>>>>> 742cdb18a6cd6d1a78e6ec39650ac89f94f50ece
import org.zkoss.xml.XMLs;
import org.zkoss.idom.Namespace;
Solution content 
import java.io.StringWriter;
import java.io.Writer;

import org.zkoss.lang.Strings;
import org.zkoss.html.HTMLs;
import org.zkoss.xml.XMLs;
import org.zkoss.idom.Namespace;
File
HtmlNativeComponent.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
		String s = conf.getElementValue("repeat-uuid", true);
		if (s != null) config.setRepeatUuid(!"false".equals(s));
<<<<<<< HEAD
=======

		s = conf.getElementValue("id-to-uuid-prefix", true);
		if (s != null) {
			log.warning("id-to-uuid-prefix deprecated, " + conf.getLocator());
			Library.setProperty(Attributes.ID_TO_UUID_PREFIX, s);
			//library-wide property
		}
>>>>>>> 742cdb18a6cd6d1a78e6ec39650ac89f94f50ece
	}
	/** Parses client-config. */
	private static void parseClientConfig(Configuration config, Element conf) {
Solution content 
		String s = conf.getElementValue("repeat-uuid", true);
		if (s != null) config.setRepeatUuid(!"false".equals(s));
	}
	/** Parses client-config. */
	private static void parseClientConfig(Configuration config, Element conf) {
File
ConfigParser.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
import java.io.IOException;

import org.zkoss.lang.Objects;
<<<<<<< HEAD
import org.zkoss.html.HTMLs;

=======
>>>>>>> 742cdb18a6cd6d1a78e6ec39650ac89f94f50ece
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.*;
Solution content 
import java.io.IOException;

import org.zkoss.lang.Objects;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.*;
File
Slider.java
Developer's decision
Version 2
Kind of conflict
Import