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

Merge from HEAD into WCM-DEV2. Also fixes build breakage in

Browse Source 
jndi-client and catalina-virtual that I introduced earlier. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-07-24 18:27:41 +00:00
parent ca9496d090
commit f6355ea108
171 changed files with 11880 additions and 3450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
View File

@@ -230,24 +230,31 @@ public abstract class BaseActionWizard extends BaseWizardBean
{
QName idQName = Repository.resolveToQName(child.getAttribute("name"));
// try and get the display label from config
String label = Utils.getDisplayLabel(context, child);
// if there wasn't a client based label try and get it from the dictionary
if (label == null)
if (idQName != null)
{
AspectDefinition aspectDef = this.dictionaryService.getAspect(idQName);
if (aspectDef != null)
// try and get the display label from config
String label = Utils.getDisplayLabel(context, child);
// if there wasn't a client based label try and get it from the dictionary
if (label == null)
{
label = aspectDef.getTitle();
}
else
{
label = idQName.getLocalName();
AspectDefinition aspectDef = this.dictionaryService.getAspect(idQName);
if (aspectDef != null)
{
label = aspectDef.getTitle();
}
else
{
label = idQName.getLocalName();
}
}
this.aspects.add(new SelectItem(idQName.toString(), label));
}
else
{
logger.warn("Failed to resolve aspect '" + child.getAttribute("name") + "'");
}
this.aspects.add(new SelectItem(idQName.toString(), label));
}
// make sure the list is sorted by the label
@@ -875,6 +882,11 @@ public abstract class BaseActionWizard extends BaseWizardBean
}
}
public int hashCode()
{
return authority.hashCode();
}
private String name;
private String authority;
}