svn commit: r1057634 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java

[pe...@apache.org]

Author: pete
Date: Tue Jan 11 13:56:13 2011
New Revision: 1057634

URL: http://svn.apache.org/viewvc?rev=1057634&view=rev
Log:
remove unused code that is several years old (and was supposed to cache text templates)

Modified:
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java?rev=1057634&r1=1057633&r2=1057634&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java Tue Jan 11 13:56:13 2011
@@ -17,12 +17,9 @@
 package org.apache.wicket.util.template;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.wicket.Application;
-import org.apache.wicket.MetaDataKey;
 import org.apache.wicket.javascript.IJavaScriptCompressor;
 import org.apache.wicket.util.io.Streams;
 import org.apache.wicket.util.lang.Packages;
@@ -40,58 +37,13 @@ import org.slf4j.LoggerFactory;
  * @author Eelco Hillenius
  * @since 1.2.6
  */
-// TODO cache templates application scoped with a watch
 public class PackagedTextTemplate extends TextTemplate
 {
-	private static final class CachedTextTemplate implements Serializable
-	{
-		private static final long serialVersionUID = 1L;
-
-		CachedTextTemplate(String text)
-		{
-		}
-	}
-
-	private static final class CachedTextTemplateKey implements Serializable
-	{
-		private static final long serialVersionUID = 1L;
-
-		private final String className;
-
-		CachedTextTemplateKey(Class<?> clazz, String path)
-		{
-			className = clazz.getName();
-		}
-
-	}
-
-	private static final class TextTemplateCache implements Serializable
-	{
-		private static final long serialVersionUID = 1L;
-
-		private final Map<CachedTextTemplateKey, CachedTextTemplate> cache = new ConcurrentHashMap<CachedTextTemplateKey, CachedTextTemplate>();
-
-		CachedTextTemplate get(CachedTextTemplateKey key)
-		{
-			return cache.get(key);
-		}
-
-		void put(CachedTextTemplateKey key, CachedTextTemplate value)
-		{
-			cache.put(key, value);
-		}
-	}
-
 	/** log. */
 	private static final Logger log = LoggerFactory.getLogger(PackagedTextTemplate.class);
 
 	private static final long serialVersionUID = 1L;
 
-	private static final MetaDataKey<TextTemplateCache> TEXT_TEMPLATE_CACHE_KEY = new MetaDataKey<TextTemplateCache>()
-	{
-		private static final long serialVersionUID = 1L;
-	};
-
 	/** The content type used if not provided in the constructor */
 	public static final String DEFAULT_CONTENT_TYPE = "text";
 
@@ -155,7 +107,6 @@ public class PackagedTextTemplate extend
 		String path = Packages.absolutePath(clazz, fileName);
 
 		Application app = Application.get();
-		app.getMetaData(TEXT_TEMPLATE_CACHE_KEY);
 
 		// first try default class loading locator to find the resource
 		IResourceStream stream = app.getResourceSettings()