Projects >> zk >>486bb016517012c4c5076c29edf7351bf2095822

Chunk
Conflicting content
public class Version {
	/** The version UID used to identify the resources.
	 */
<<<<<<< HEAD
	public static final String UID = "5.0.0";
=======
	public static final String UID = "3.5.2";
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
}
Solution content
public class Version {
	/** The version UID used to identify the resources.
	 */
	public static final String UID = "5.0.0";
}
File
Version.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content
public class Version {
	/** Returns the version UID.
	 */
<<<<<<< HEAD
	public static final String UID = "5.0.0";
=======
	public static final String UID = "3.5.2";
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
}
Solution content
public class Version {
	/** Returns the version UID.
	 */
	public static final String UID = "5.0.0";
}
File
Version.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content
public class Version {
	/** The version UID used to identify the resources.
	 */
<<<<<<< HEAD
	public static final String UID = "5.0.0";
=======
	public static final String UID = "3.5.2";
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
	/** The release version. The official version.
	 * It is the same as {@link org.zkoss.zk.ui.WebApp#getVersion}.
	 * @since 3.0.0
Solution content
public class Version {
	/** The version UID used to identify the resources.
	 */
	public static final String UID = "5.0.0";
	/** The release version. The official version.
	 * It is the same as {@link org.zkoss.zk.ui.WebApp#getVersion}.
	 * @since 3.0.0
File
Version.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content
	 * It is the same as {@link org.zkoss.zk.ui.WebApp#getVersion}.
	 * @since 3.0.0
	 */
<<<<<<< HEAD
	public static final String RELEASE = "5.0.0-FL";
=======
	public static final String RELEASE = "3.5.2-FL";
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
}
Solution content
	 * It is the same as {@link org.zkoss.zk.ui.WebApp#getVersion}.
	 * @since 3.0.0
	 */
	public static final String RELEASE = "5.0.0-FL";
}
File
Version.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content
public class Version {
	/** Returns the version UID.
	 */
<<<<<<< HEAD
	public static final String UID = "5.0.0";
=======
	public static final String UID = "3.5.2";
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
}
Solution content
public class Version {
	/** Returns the version UID.
	 */
	public static final String UID = "5.0.0";
}
File
Version.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content
public class Version {
	/** Returns the version UID.
	 */
<<<<<<< HEAD
	public static final String UID = "5.0.0";
=======
	public static final String UID = "3.5.2";
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
}
Solution content
public class Version {
	/** Returns the version UID.
	 */
	public static final String UID = "5.0.0";
}
File
Version.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content
public class Version {
	/** Returns the version UID.
	 */
<<<<<<< HEAD
	public static final String UID = "5.0.0";
=======
	public static final String UID = "3.5.2";
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
}
Solution content
public class Version {
	/** Returns the version UID.
	 */
	public static final String UID = "5.0.0";
}
File
Version.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content
public class Version {
	/** Returns the version UID.
	 */
<<<<<<< HEAD
	public static final String UID = "5.0.0";
=======
	public static final String UID = "3.5.2";
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
}
Solution content
public class Version {
	/** Returns the version UID.
	 */
	public static final String UID = "5.0.0";
}
File
Version.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content
	public String getZclass() {
		return _zclass == null ? "z-list-group" : super.getZclass();
	}
<<<<<<< HEAD

=======
	public String getOuterAttrs() {
		final StringBuffer sb = new StringBuffer(64).append( super.getOuterAttrs());
		HTMLs.appendAttribute(sb, "z.open", isOpen());
		HTMLs.appendAttribute(sb, "z.nostripe", true);
		if (getListbox().inPagingMold())
			HTMLs.appendAttribute(sb, "z."+Events.ON_OPEN, true);
		else appendAsapAttr(sb, Events.ON_OPEN);
		return sb.toString();
	}
	public void onChildAdded(Component child) {
		super.onChildAdded(child);
		invalidate();
	}
	public void onChildRemoved(Component child) {
		super.onChildRemoved(child);
		invalidate();
	}
	//Cloneable//
	public Object clone() {
		final Listgroup clone = (Listgroup)super.clone();
		clone.init();
		return clone;
	}
	//-- Serializable --//
	private synchronized void readObject(java.io.ObjectInputStream s)
	throws java.io.IOException, ClassNotFoundException {
		s.defaultReadObject();
		init();
	}
	
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
	//-- ComponentCtrl --//
	protected Object newExtraCtrl() {
		return new ExtraCtrl();
Solution content
	public String getZclass() {
		return _zclass == null ? "z-list-group" : super.getZclass();
	}

	//Cloneable//
	public Object clone() {
		final Listgroup clone = (Listgroup)super.clone();
		clone.init();
		return clone;
	}
	//-- Serializable --//
	private synchronized void readObject(java.io.ObjectInputStream s)
	throws java.io.IOException, ClassNotFoundException {
		s.defaultReadObject();
		init();
	}
	
	//-- ComponentCtrl --//
	protected Object newExtraCtrl() {
		return new ExtraCtrl();
File
Listgroup.java
Developer's decision
Combination
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content
public class Version {
	/** Returns the version UID.
	 */
<<<<<<< HEAD
	public static final String UID = "5.0.0";
=======
	public static final String UID = "3.5.2";
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
}
Solution content
public class Version {
	/** Returns the version UID.
	 */
	public static final String UID = "5.0.0";
}
File
Version.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content
public class Version {
	/** Returns the version UID.
	 */
<<<<<<< HEAD
	public static final String UID = "5.0.0";
=======
	public static final String UID = "3.5.2";
>>>>>>> 1960304da0d450a9539584e8bc00b650940677ac
}
Solution content
public class Version {
	/** Returns the version UID.
	 */
	public static final String UID = "5.0.0";
}
File
Version.java
Developer's decision
Version 1
Kind of conflict
Attribute