Configuration changes

- each wizard now has its own list of types
- made the inline text editing page the default page in create content wizard
- dialog and wizard config is now global
- fixed problem with create content wizard action

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-05-12 11:33:48 +00:00
parent 2120371a7c
commit d6f4146c86
12 changed files with 89 additions and 97 deletions

View File

@@ -306,12 +306,12 @@ public abstract class BaseActionWizard extends BaseWizardBean
}
else
{
logger.warn("Could not find aspects configuration element");
logger.warn("Could not find 'aspects' configuration element");
}
}
else
{
logger.warn("Could not find Action Wizards configuration section");
logger.warn("Could not find 'Action Wizards' configuration section");
}
}
@@ -334,10 +334,10 @@ public abstract class BaseActionWizard extends BaseWizardBean
// add any configured content sub-types to the list
ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance());
Config wizardCfg = svc.getConfig("Custom Content Types");
Config wizardCfg = svc.getConfig("Action Wizards");
if (wizardCfg != null)
{
ConfigElement typesCfg = wizardCfg.getConfigElement("content-types");
ConfigElement typesCfg = wizardCfg.getConfigElement("specialise-types");
if (typesCfg != null)
{
for (ConfigElement child : typesCfg.getChildren())
@@ -373,12 +373,12 @@ public abstract class BaseActionWizard extends BaseWizardBean
}
else
{
logger.warn("Could not find 'content-types' configuration element");
logger.warn("Could not find 'specialise-types' configuration element");
}
}
else
{
logger.warn("Could not find 'Custom Content Types' configuration section");
logger.warn("Could not find 'Action Wizards' configuration section");
}
}
@@ -456,12 +456,12 @@ public abstract class BaseActionWizard extends BaseWizardBean
}
else
{
logger.warn("Could not find transformers configuration element");
logger.warn("Could not find 'transformers' configuration element");
}
}
else
{
logger.warn("Could not find Action Wizards configuration section");
logger.warn("Could not find 'Action Wizards' configuration section");
}
}
@@ -509,12 +509,12 @@ public abstract class BaseActionWizard extends BaseWizardBean
}
else
{
logger.warn("Could not find image-transformers configuration element");
logger.warn("Could not find 'image-transformers' configuration element");
}
}
else
{
logger.warn("Could not find Action Wizards configuration section");
logger.warn("Could not find 'Action Wizards' configuration section");
}
}

View File

@@ -246,7 +246,7 @@ public abstract class BaseContentWizard extends BaseWizardBean
// add any configured content sub-types to the list
ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance());
Config wizardCfg = svc.getConfig("Custom Content Types");
Config wizardCfg = svc.getConfig("Content Wizards");
if (wizardCfg != null)
{
ConfigElement typesCfg = wizardCfg.getConfigElement("content-types");
@@ -305,7 +305,7 @@ public abstract class BaseContentWizard extends BaseWizardBean
}
else
{
logger.warn("Could not find 'Custom Content Types' configuration section");
logger.warn("Could not find 'Content Wizards' configuration section");
}
}

View File

@@ -243,7 +243,7 @@ public class CreateRuleWizard extends BaseActionWizard
Config wizardCfg = svc.getConfig("Action Wizards");
if (wizardCfg != null)
{
ConfigElement typesCfg = wizardCfg.getConfigElement("types");
ConfigElement typesCfg = wizardCfg.getConfigElement("subtypes");
if (typesCfg != null)
{
this.modelTypes = new ArrayList<SelectItem>();
@@ -277,12 +277,12 @@ public class CreateRuleWizard extends BaseActionWizard
}
else
{
logger.warn("Could not find types configuration element");
logger.warn("Could not find 'subtypes' configuration element");
}
}
else
{
logger.warn("Could not find Action Wizards configuration section");
logger.warn("Could not find 'Action Wizards' configuration section");
}
}

View File

@@ -470,7 +470,7 @@ public class CreateSpaceWizard extends BaseWizardBean
// add any configured content sub-types to the list
Config wizardCfg = Application.getConfigService(FacesContext.getCurrentInstance()).
getConfig("Custom Folder Types");
getConfig("Space Wizards");
if (wizardCfg != null)
{
ConfigElement typesCfg = wizardCfg.getConfigElement("folder-types");
@@ -548,7 +548,7 @@ public class CreateSpaceWizard extends BaseWizardBean
}
else
{
logger.warn("Could not find 'Custom Folder Types' configuration section");
logger.warn("Could not find 'Space Wizards' configuration section");
}
}

View File

@@ -499,7 +499,7 @@ public abstract class BaseContentWizard extends AbstractWizardBean
// add any configured content sub-types to the list
ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance());
Config wizardCfg = svc.getConfig("Custom Content Types");
Config wizardCfg = svc.getConfig("Content Wizards");
if (wizardCfg != null)
{
ConfigElement typesCfg = wizardCfg.getConfigElement("content-types");
@@ -558,7 +558,7 @@ public abstract class BaseContentWizard extends AbstractWizardBean
}
else
{
logger.warn("Could not find 'Custom Content Types' configuration section");
logger.warn("Could not find 'Content Wizards' configuration section");
}
}

View File

@@ -558,7 +558,7 @@ public class NewSpaceWizard extends AbstractWizardBean
// add any configured content sub-types to the list
Config wizardCfg = Application.getConfigService(FacesContext.getCurrentInstance()).
getConfig("Custom Folder Types");
getConfig("Space Wizards");
if (wizardCfg != null)
{
ConfigElement typesCfg = wizardCfg.getConfigElement("folder-types");
@@ -624,7 +624,7 @@ public class NewSpaceWizard extends AbstractWizardBean
}
else
{
logger.warn("Could not find 'Custom Folder Types' configuration section");
logger.warn("Could not find 'Space Wizards' configuration section");
}
}