Projects >> zk >>41333981817c8e5ce132789554207a06edb2b169

Chunk
Conflicting content 
	ExtendletContext _webctx;
	/** DSP interpretation cache. */
<<<<<<< HEAD
	ResourceCache _cache;
=======
	ResourceCache _cache;
>>>>>>> 47f748d0676e39f697848dab08c0c93207ec8533
	private Boolean _debugJS;

	//Public Utilities
Solution content 
	ExtendletContext _webctx;
	/** DSP interpretation cache. */
	ResourceCache _cache;
	private Boolean _debugJS;

	//Public Utilities
File
AbstractExtendlet.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
	HttpServletResponse response, String path)
	throws ServletException, IOException {
		byte[] data;
<<<<<<< HEAD
		String pkg = null;
=======
		boolean zkpkg = false;
>>>>>>> 47f748d0676e39f697848dab08c0c93207ec8533
			
		/* 2011/4/27 Tony:
		 * Here we don't use "org.zkoss.web.classWebResource.cache" directly,
Solution content 
	HttpServletResponse response, String path)
	throws ServletException, IOException {
		byte[] data;
		String pkg = null;
			
		/* 2011/4/27 Tony:
		 * Here we don't use "org.zkoss.web.classWebResource.cache" directly,
File
WpdExtendlet.java
Developer's decision
Version 1
Kind of conflict
Variable
Chunk
Conflicting content 
		} else {
			final WpdContent wc = (WpdContent)rawdata;
			data = wc.toByteArray(reqctx);
<<<<<<< HEAD
			pkg = wc.name;
			cacheable = wc.cacheable;
=======
			cacheable = wc.cacheable;
			zkpkg = wc.zkpkg;
>>>>>>> 47f748d0676e39f697848dab08c0c93207ec8533
		}
		if (cacheable)
			org.zkoss.zk.fn.JspFns.setCacheControl(getServletContext(),
Solution content 
		} else {
			final WpdContent wc = (WpdContent)rawdata;
			data = wc.toByteArray(reqctx);
			pkg = wc.name;
			cacheable = wc.cacheable;
		}
		if (cacheable)
			org.zkoss.zk.fn.JspFns.setCacheControl(getServletContext(),
File
WpdExtendlet.java
Developer's decision
Version 1
Kind of conflict
Variable
Chunk
Conflicting content 
	}

	/**  Loader used with ResourceCache. */
<<<<<<< HEAD
	private class WpdLoader extends ExtendletLoader {
=======
	private class WpdLoader extends ExtendletLoader {
>>>>>>> 47f748d0676e39f697848dab08c0c93207ec8533
		private WpdLoader() {
		}
Solution content 
	}

	/**  Loader used with ResourceCache. */
	private class WpdLoader extends ExtendletLoader {
		private WpdLoader() {
		}
File
WpdExtendlet.java
Developer's decision
Version 1
Kind of conflict
Class signature
Chunk
Conflicting content 
	}
			
	private class WpdContent {
<<<<<<< HEAD
		/** The package name*/
		private final String name;
=======
>>>>>>> 47f748d0676e39f697848dab08c0c93207ec8533
		private final String _dir;
		private final List _cnt = new LinkedList();
		/** Whether it is cacheable. */
Solution content 
	}
			
	private class WpdContent {
		/** The package name*/
		private final String name;
		private final String _dir;
		private final List _cnt = new LinkedList();
		/** Whether it is cacheable. */
File
WpdExtendlet.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
		private void addHost(WebApp wapp, String clientPackages) {
			_cnt.add(new Object[] {wapp, clientPackages});
		}
<<<<<<< HEAD
		@SuppressWarnings("unchecked")
=======
>>>>>>> 47f748d0676e39f697848dab08c0c93207ec8533
		private byte[] toByteArray(RequestContext reqctx)
		throws ServletException, IOException {
			final ByteArrayOutputStream out = new ByteArrayOutputStream();
Solution content 
		private void addHost(WebApp wapp, String clientPackages) {
			_cnt.add(new Object[] {wapp, clientPackages});
		}
		@SuppressWarnings("unchecked")
		private byte[] toByteArray(RequestContext reqctx)
		throws ServletException, IOException {
			final ByteArrayOutputStream out = new ByteArrayOutputStream();
File
WpdExtendlet.java
Developer's decision
Version 1
Kind of conflict
Annotation