diff --git a/project-build.xml b/project-build.xml
index 9bb90a8bb9..b20acb50cd 100644
--- a/project-build.xml
+++ b/project-build.xml
@@ -57,8 +57,15 @@
+
+
+
+
+
+
+
-
+
diff --git a/source/java/org/alfresco/web/bean/AdvancedSearchBean.java b/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
index 0cb53e33c4..4d7d5aabbd 100644
--- a/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
+++ b/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
@@ -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));
}
}
diff --git a/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java
index 7d42c2845a..e1905fc872 100644
--- a/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java
@@ -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));
}
}
diff --git a/source/java/org/alfresco/web/config/WebClientConfigTest.java b/source/java/org/alfresco/web/config/WebClientConfigTest.java
index f3beaf3e01..a04f8da503 100644
--- a/source/java/org/alfresco/web/config/WebClientConfigTest.java
+++ b/source/java/org/alfresco/web/config/WebClientConfigTest.java
@@ -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 steps = wizard.getSteps();
+ List steps = wizard.getStepsAsList();
assertNotNull("steps should not be null", steps);
// retrieve step1 information and check it is correct
diff --git a/source/java/org/alfresco/web/config/WizardsConfigElement.java b/source/java/org/alfresco/web/config/WizardsConfigElement.java
index bf7fb4fb70..7e642572a2 100644
--- a/source/java/org/alfresco/web/config/WizardsConfigElement.java
+++ b/source/java/org/alfresco/web/config/WizardsConfigElement.java
@@ -158,7 +158,7 @@ public class WizardsConfigElement extends ConfigElementAdapter
{
protected String name;
protected String managedBean;
- protected List steps = new ArrayList(4);
+ protected Map steps = new LinkedHashMap(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 getSteps()
+ public Map getSteps()
{
return this.steps;
}
- public StepConfig getStepByName(String name)
+ public List getStepsAsList()
{
- StepConfig step = null;
+ List stepList = new ArrayList(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);
}
/**
diff --git a/source/web/images/icons/topic.gif b/source/web/images/icons/topic.gif
index e36e8c7ac7..db9aeb309c 100644
Binary files a/source/web/images/icons/topic.gif and b/source/web/images/icons/topic.gif differ