inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

MT - fix up references to empty/default domain

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-02-05 12:30:12 +00:00
parent 694396d5ed
commit fc136a58de
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java
View File

@@ -334,10 +334,10 @@ public class DictionaryDAOImpl implements DictionaryDAO
private List<CompiledModel> getModelsForUri(String uri) private List<CompiledModel> getModelsForUri(String uri)
{ {
String tenantDomain = tenantService.getCurrentUserDomain(); String tenantDomain = tenantService.getCurrentUserDomain();
if (tenantDomain != "") if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
{ {
// get non-tenant models (if any) // get non-tenant models (if any)
List<CompiledModel> models = getUriToModels("").get(uri); List<CompiledModel> models = getUriToModels(TenantService.DEFAULT_DOMAIN).get(uri);
List<CompiledModel> filteredModels = new ArrayList<CompiledModel>(); List<CompiledModel> filteredModels = new ArrayList<CompiledModel>();
if (models != null) if (models != null)
@@ -374,7 +374,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
return models; return models;
} }
List<CompiledModel> models = getUriToModels("").get(uri); List<CompiledModel> models = getUriToModels(TenantService.DEFAULT_DOMAIN).get(uri);
if (models == null) if (models == null)
{ {
models = Collections.emptyList(); models = Collections.emptyList();
@@ -390,7 +390,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
/* package */ CompiledModel getCompiledModel(QName modelName) /* package */ CompiledModel getCompiledModel(QName modelName)
{ {
String tenantDomain = tenantService.getCurrentUserDomain(); String tenantDomain = tenantService.getCurrentUserDomain();
if (tenantDomain != "") if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
{ {
// get tenant-specific model (if any) // get tenant-specific model (if any)
CompiledModel model = getCompiledModels(tenantDomain).get(modelName); CompiledModel model = getCompiledModels(tenantDomain).get(modelName);
@@ -402,7 +402,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
} }
// get non-tenant model (if any) // get non-tenant model (if any)
CompiledModel model = getCompiledModels("").get(modelName); CompiledModel model = getCompiledModels(TenantService.DEFAULT_DOMAIN).get(modelName);
if (model == null) if (model == null)
{ {
throw new DictionaryException("d_dictionary.model.err.no_model", modelName); throw new DictionaryException("d_dictionary.model.err.no_model", modelName);
@@ -436,7 +436,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
public DataTypeDefinition getDataType(Class javaClass) public DataTypeDefinition getDataType(Class javaClass)
{ {
String tenantDomain = tenantService.getCurrentUserDomain(); String tenantDomain = tenantService.getCurrentUserDomain();
if (tenantDomain != "") if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
{ {
// get tenant models (if any) // get tenant models (if any)
for (CompiledModel model : getCompiledModels(tenantDomain).values()) for (CompiledModel model : getCompiledModels(tenantDomain).values())
@@ -449,7 +449,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
} }
// get non-tenant models (if any) // get non-tenant models (if any)
for (CompiledModel model : getCompiledModels("").values()) for (CompiledModel model : getCompiledModels(TenantService.DEFAULT_DOMAIN).values())
{ {
DataTypeDefinition dataTypeDef = model.getDataType(javaClass); DataTypeDefinition dataTypeDef = model.getDataType(javaClass);
if (dataTypeDef != null) if (dataTypeDef != null)
@@ -462,7 +462,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
} }
else else
{ {
for (CompiledModel model : getCompiledModels("").values()) for (CompiledModel model : getCompiledModels(TenantService.DEFAULT_DOMAIN).values())
{ {
DataTypeDefinition dataTypeDef = model.getDataType(javaClass); DataTypeDefinition dataTypeDef = model.getDataType(javaClass);
if (dataTypeDef != null) if (dataTypeDef != null)
@@ -702,7 +702,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
public boolean isModelInherited(QName modelName) public boolean isModelInherited(QName modelName)
{ {
String tenantDomain = tenantService.getCurrentUserDomain(); String tenantDomain = tenantService.getCurrentUserDomain();
if (tenantDomain != "") if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
{ {
// get tenant-specific model (if any) // get tenant-specific model (if any)
CompiledModel model = getCompiledModels(tenantDomain).get(modelName); CompiledModel model = getCompiledModels(tenantDomain).get(modelName);
@@ -714,13 +714,13 @@ public class DictionaryDAOImpl implements DictionaryDAO
} }
// get non-tenant model (if any) // get non-tenant model (if any)
CompiledModel model = getCompiledModels("").get(modelName); CompiledModel model = getCompiledModels(TenantService.DEFAULT_DOMAIN).get(modelName);
if (model == null) if (model == null)
{ {
throw new DictionaryException("d_dictionary.model.err.no_model", modelName); throw new DictionaryException("d_dictionary.model.err.no_model", modelName);
} }
if (tenantDomain != "") if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
{ {
return true; return true;
} }
@@ -733,7 +733,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
private Map<QName,CompiledModel> getCompiledModels() private Map<QName,CompiledModel> getCompiledModels()
{ {
String tenantDomain = tenantService.getCurrentUserDomain(); String tenantDomain = tenantService.getCurrentUserDomain();
if (tenantDomain != "") if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
{ {
// return all tenant-specific models and all inherited (non-overridden) models // return all tenant-specific models and all inherited (non-overridden) models
Map<QName, CompiledModel> filteredModels = new HashMap<QName, CompiledModel>(); Map<QName, CompiledModel> filteredModels = new HashMap<QName, CompiledModel>();
@@ -742,7 +742,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
Map<QName,CompiledModel> tenantModels = getCompiledModels(tenantDomain); Map<QName,CompiledModel> tenantModels = getCompiledModels(tenantDomain);
// get non-tenant models - these will include core/system models and any additional custom models (which are implicitly available to all tenants) // get non-tenant models - these will include core/system models and any additional custom models (which are implicitly available to all tenants)
Map<QName,CompiledModel> nontenantModels = getCompiledModels(""); Map<QName,CompiledModel> nontenantModels = getCompiledModels(TenantService.DEFAULT_DOMAIN);
// check for overrides // check for overrides
filteredModels.putAll(nontenantModels); filteredModels.putAll(nontenantModels);
@@ -766,7 +766,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
else else
{ {
// return all (non-tenant) models // return all (non-tenant) models
return getCompiledModels(""); return getCompiledModels(TenantService.DEFAULT_DOMAIN);
} }
} }