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

fix build problem with message bundles, changed list to map in wizard config, added null checks when using custom types and fixed topic.gif

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-03-21 15:45:04 +00:00
parent ebf71bf211
commit 6d7516ecd1
6 changed files with 66 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/web/bean/AdvancedSearchBean.java
View File

@@ -584,20 +584,23 @@ public class AdvancedSearchBean
for (String type : types)
{
QName idQName = Repository.resolveToQName(type);
TypeDefinition typeDef = dictionaryService.getType(idQName);
if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
if (idQName != null)
{
// try and get label from the dictionary
String label = typeDef.getTitle();
TypeDefinition typeDef = dictionaryService.getType(idQName);
// else just use the localname
if (label == null)
if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
{
label = idQName.getLocalName();
// try and get label from the dictionary
String label = typeDef.getTitle();
// else just use the localname
if (label == null)
{
label = idQName.getLocalName();
}
this.contentTypes.add(new SelectItem(idQName.toString(), label));
}
this.contentTypes.add(new SelectItem(idQName.toString(), label));
}
}

59
source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java
View File

@@ -508,38 +508,41 @@ public abstract class BaseContentWizard extends AbstractWizardBean
for (ConfigElement child : typesCfg.getChildren())
{
QName idQName = Repository.resolveToQName(child.getAttribute("name"));
TypeDefinition typeDef = this.dictionaryService.getType(idQName);
if (typeDef != null &&
this.dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
if (idQName != null)
{
// look for a client localized string
String label = null;
String msgId = child.getAttribute("displayLabelId");
if (msgId != null)
{
label = Application.getMessage(context, msgId);
}
TypeDefinition typeDef = this.dictionaryService.getType(idQName);
// if there wasn't an externalized string look for one in the config
if (label == null)
if (typeDef != null &&
this.dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
{
label = child.getAttribute("displayLabel");
// look for a client localized string
String label = null;
String msgId = child.getAttribute("displayLabelId");
if (msgId != null)
{
label = Application.getMessage(context, msgId);
}
// if there wasn't an externalized string look for one in the config
if (label == null)
{
label = child.getAttribute("displayLabel");
}
// if there wasn't a client based label try and get it from the dictionary
if (label == null)
{
label = typeDef.getTitle();
}
// finally, just use the localname
if (label == null)
{
label = idQName.getLocalName();
}
this.objectTypes.add(new SelectItem(idQName.toString(), label));
}
// if there wasn't a client based label try and get it from the dictionary
if (label == null)
{
label = typeDef.getTitle();
}
// finally, just use the localname
if (label == null)
{
label = idQName.getLocalName();
}
this.objectTypes.add(new SelectItem(idQName.toString(), label));
}
}

2
source/java/org/alfresco/web/config/WebClientConfigTest.java
View File

@@ -713,7 +713,7 @@ public class WebClientConfigTest extends BaseTest
assertEquals("description-id", "advanced_space_details_description", wizard.getDescriptionId());
assertNull("title should be null", wizard.getTitle());
assertNull("description should be null", wizard.getDescription());
List<StepConfig> steps = wizard.getSteps();
List<StepConfig> steps = wizard.getStepsAsList();
assertNotNull("steps should not be null", steps);
// retrieve step1 information and check it is correct

25
source/java/org/alfresco/web/config/WizardsConfigElement.java
View File

@@ -158,7 +158,7 @@ public class WizardsConfigElement extends ConfigElementAdapter
{
protected String name;
protected String managedBean;
protected List<StepConfig> steps = new ArrayList<StepConfig>(4);
protected Map<String, StepConfig> steps = new LinkedHashMap<String, StepConfig>(4);
public WizardConfig(String name, String bean,
String title, String titleId,
@@ -185,7 +185,7 @@ public class WizardsConfigElement extends ConfigElementAdapter
public void addStep(StepConfig step)
{
this.steps.add(step);
this.steps.put(step.getName(), step);
}
public int getNumberSteps()
@@ -193,25 +193,26 @@ public class WizardsConfigElement extends ConfigElementAdapter
return this.steps.size();
}
public List<StepConfig> getSteps()
public Map<String, StepConfig> getSteps()
{
return this.steps;
}
public StepConfig getStepByName(String name)
public List<StepConfig> getStepsAsList()
{
StepConfig step = null;
List<StepConfig> stepList = new ArrayList<StepConfig>(this.steps.size());
for (StepConfig currentStep : this.steps)
for (StepConfig stepCfg : this.steps.values())
{
if (currentStep.getName().equals(name))
{
step = currentStep;
break;
}
stepList.add(stepCfg);
}
return step;
return stepList;
}
public StepConfig getStepByName(String name)
{
return this.steps.get(name);
}
/**