From 8341795a6972b2b3ce9c666b1323c331a5c9da9b Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Wed, 23 Jul 2014 10:13:27 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 76893: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 65666: Removed equals and hashcode that use URL (SONAR blocker) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../template/ClassPathRepoTemplateLoader.java | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/source/java/org/alfresco/repo/template/ClassPathRepoTemplateLoader.java b/source/java/org/alfresco/repo/template/ClassPathRepoTemplateLoader.java index 766746e06a..79ef690f28 100644 --- a/source/java/org/alfresco/repo/template/ClassPathRepoTemplateLoader.java +++ b/source/java/org/alfresco/repo/template/ClassPathRepoTemplateLoader.java @@ -158,23 +158,6 @@ public class ClassPathRepoTemplateLoader implements TemplateLoader this.encoding = encoding; } - public boolean equals(Object o) - { - if (o instanceof ClassPathTemplateSource) - { - return url.equals(((ClassPathTemplateSource)o).url); - } - else - { - return false; - } - } - - public int hashCode() - { - return url.hashCode(); - } - public String toString() { return url.toString(); @@ -214,9 +197,6 @@ public class ClassPathRepoTemplateLoader implements TemplateLoader } } - /* (non-Javadoc) - * @see org.alfresco.repo.template.ClassPathRepoTemplateLoader.BaseTemplateSource#getRelativeResource(java.lang.String) - */ @Override protected InputStream getRelativeResource(String name) { @@ -305,9 +285,6 @@ public class ClassPathRepoTemplateLoader implements TemplateLoader } } - /* (non-Javadoc) - * @see org.alfresco.repo.template.ClassPathRepoTemplateLoader.BaseTemplateSource#getRelativeResource(java.lang.String) - */ @Override protected InputStream getRelativeResource(String name) {