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

- getting terminology consistent

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ariel Backenroth
2006-10-20 21:26:31 +00:00
parent 8bfaea9d12
commit d1d378eac0
6 changed files with 63 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java
View File

@@ -107,15 +107,14 @@ public class CreateFormWizard extends BaseWizardBean
/////////////////////////////////////////////////////////////////////////////
private static final String FILE_RENDERING_ENGINE = "template-output-method";
public static final String FILE_RENDERING_ENGINE = "rendering-engine";
private static final String FILE_SCHEMA = "schema";
public static final String FILE_SCHEMA = "schema";
private final static Log LOGGER =
LogFactory.getLog(CreateFormWizard.class);
private final static Log LOGGER = LogFactory.getLog(CreateFormWizard.class);
private String schemaRootTagName;
private String templateName;
private String formName;
private Class renderingEngineType = null;
protected ContentService contentService;
private DataModel renderingEnginesDataModel;
@@ -135,7 +134,7 @@ public class CreateFormWizard extends BaseWizardBean
final FileInfo folderInfo =
this.fileFolderService.create(contentFormsNodeRef,
this.getTemplateName(),
this.getFormName(),
ContentModel.TYPE_FOLDER);
FileInfo fileInfo =
this.fileFolderService.create(folderInfo.getNodeRef(),
@@ -158,7 +157,7 @@ public class CreateFormWizard extends BaseWizardBean
// apply the titled aspect - title and description
Map<QName, Serializable> props = new HashMap<QName, Serializable>(2, 1.0f);
props.put(ContentModel.PROP_TITLE, this.getTemplateName());
props.put(ContentModel.PROP_TITLE, this.getFormName());
props.put(ContentModel.PROP_DESCRIPTION, "");
this.nodeService.addAspect(schemaNodeRef, ContentModel.ASPECT_TITLED, props);
@@ -211,7 +210,7 @@ public class CreateFormWizard extends BaseWizardBean
this.removeUploadedSchemaFile();
this.removeUploadedRenderingEngineFile();
this.schemaRootTagName = null;
this.templateName = null;
this.formName = null;
this.renderingEngineType = null;
this.renderingEngines = new ArrayList<RenderingEngineData>();
this.fileExtension = null;
@@ -248,7 +247,8 @@ public class CreateFormWizard extends BaseWizardBean
}
/**
* @return true if the Add To List button on the Template Output Methods should be disabled
* @return true if the Add To List button on the configure rendering engines
* page should be disabled
*/
public boolean getAddToListDisabled()
{
@@ -272,7 +272,7 @@ public class CreateFormWizard extends BaseWizardBean
}
/**
* Add the selected template output method to the list
* Add the selected rendering engine to the list
*/
public void addSelectedRenderingEngine(ActionEvent event)
{
@@ -280,7 +280,7 @@ public class CreateFormWizard extends BaseWizardBean
{
if (tomd.getFileExtension().equals(this.fileExtension))
{
throw new AlfrescoRuntimeException("template output method with extension " + this.fileExtension +
throw new AlfrescoRuntimeException("rendering engine with extension " + this.fileExtension +
" already exists");
}
}
@@ -298,7 +298,7 @@ public class CreateFormWizard extends BaseWizardBean
/**
* Action handler called when the Remove button is pressed to remove a
* template output method
* rendering engine
*/
public void removeSelectedRenderingEngine(ActionEvent event)
{
@@ -463,7 +463,7 @@ public class CreateFormWizard extends BaseWizardBean
}
/**
* @return Returns the presentationTemplate file or <tt>null</tt>
* @return Returns the rendering engine file or <tt>null</tt>
*/
public File getRenderingEngineFile()
{
@@ -518,21 +518,21 @@ public class CreateFormWizard extends BaseWizardBean
}
/**
* Sets the human friendly name for this template.
* Sets the human friendly name for this form.
*/
public void setTemplateName(final String templateName)
public void setFormName(final String formName)
{
this.templateName = templateName;
this.formName = formName;
}
/**
* @return the human friendly name for this template.
* @return the human friendly name for this form.
*/
public String getTemplateName()
public String getFormName()
{
return (this.templateName == null && this.getSchemaFileName() != null
return (this.formName == null && this.getSchemaFileName() != null
? this.getSchemaFileName().replaceAll("(.+)\\..*", "$1")
: this.templateName);
: this.formName);
}
/**

11
source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
View File

@@ -220,16 +220,19 @@ public class CreateWebContentWizard extends BaseContentWizard
this.content = content;
}
public List<SelectItem> getCreateForms()
/**
* @return the available forms that can be created.
*/
public List<SelectItem> getFormChoices()
{
Collection<Form> ttl = FormsService.getInstance().getForms();
List<SelectItem> sil = new ArrayList<SelectItem>(ttl.size());
final Collection<Form> ttl = FormsService.getInstance().getForms();
final List<SelectItem> sil = new ArrayList<SelectItem>(ttl.size());
for (Form tt : ttl)
{
sil.add(new SelectItem(tt.getName(), tt.getName()));
}
QuickSort sorter = new QuickSort(sil, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
final QuickSort sorter = new QuickSort(sil, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
sorter.sort();
return sil;
}