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
This commit is contained in:
Mark Rogers
2014-07-23 10:13:27 +00:00
parent eb646c22b0
commit 8341795a69

View File

@@ -158,23 +158,6 @@ public class ClassPathRepoTemplateLoader implements TemplateLoader
this.encoding = encoding; 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() public String toString()
{ {
return url.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 @Override
protected InputStream getRelativeResource(String name) 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 @Override
protected InputStream getRelativeResource(String name) protected InputStream getRelativeResource(String name)
{ {