mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5118 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5119 . - OpenSearch Proxy svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5121 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5122 . - Extract sample OpenSearch engine registrations into extension config file. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -34,7 +34,9 @@ public class FormatRegistry
|
||||
private static final Log logger = LogFactory.getLog(FormatRegistry.class);
|
||||
|
||||
private Map<String, String> formats;
|
||||
private Map<String, String> mimetypes;
|
||||
private Map<String, Map<String, String>> agentFormats;
|
||||
private Map<String, Map<String, String>> agentMimetypes;
|
||||
|
||||
|
||||
/**
|
||||
@@ -43,7 +45,9 @@ public class FormatRegistry
|
||||
public FormatRegistry()
|
||||
{
|
||||
formats = new HashMap<String, String>();
|
||||
mimetypes = new HashMap<String, String>();
|
||||
agentFormats = new HashMap<String, Map<String, String>>();
|
||||
agentMimetypes = new HashMap<String, Map<String, String>>();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -56,13 +60,16 @@ public class FormatRegistry
|
||||
{
|
||||
// retrieve formats list for agent
|
||||
Map<String, String> formatsForAgent = formats;
|
||||
Map<String, String> mimetypesForAgent = mimetypes;
|
||||
if (agent != null)
|
||||
{
|
||||
formatsForAgent = agentFormats.get(agent);
|
||||
if (formatsForAgent == null)
|
||||
{
|
||||
formatsForAgent = new HashMap<String, String>();
|
||||
mimetypesForAgent = new HashMap<String, String>();
|
||||
agentFormats.put(agent, formatsForAgent);
|
||||
agentMimetypes.put(agent, mimetypesForAgent);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,6 +85,7 @@ public class FormatRegistry
|
||||
}
|
||||
|
||||
formatsForAgent.put(entry.getKey(), entry.getValue());
|
||||
mimetypesForAgent.put(entry.getValue(), entry.getKey());
|
||||
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Registered API format '" + entry.getKey() + "' with mime type '" + entry.getValue() + "' (agent: " + agent + ")");
|
||||
@@ -111,5 +119,33 @@ public class FormatRegistry
|
||||
|
||||
return mimetype;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the format for the specified user agent and mimetype
|
||||
*
|
||||
* @param agent
|
||||
* @param mimetype
|
||||
* @return format (or null, if one is not registered)
|
||||
*/
|
||||
public String getFormat(String agent, String mimetype)
|
||||
{
|
||||
String format = null;
|
||||
|
||||
if (agent != null)
|
||||
{
|
||||
Map<String, String> mimetypesForAgent = agentMimetypes.get(agent);
|
||||
if (mimetypesForAgent != null)
|
||||
{
|
||||
format = mimetypesForAgent.get(mimetype);
|
||||
}
|
||||
}
|
||||
|
||||
if (format == null)
|
||||
{
|
||||
format = mimetypes.get(mimetype);
|
||||
}
|
||||
|
||||
return format;
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user