Jasper Floor pushed to branch feature/CMS-10931 at cms-community / hippo-cms
Commits:
23a09a52 by Jasper Floor at 2017-10-12T09:47:02+02:00
CMS-10931 method names
- - - - -
1 changed file:
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/DefaultWorkflowPlugin.java
Changes:
=====================================
editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/DefaultWorkflowPlugin.java
=====================================
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/DefaultWorkflowPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/DefaultWorkflowPlugin.java
@@ -202,7 +202,7 @@ public class DefaultWorkflowPlugin extends RenderPlugin {
if
(getModel().getNode().isNodeType("hippogallery:imageset")
||
getModel().getNode().isNodeType("hippogallery:exampleAssetSet")) {
- createNewNodeNameWithSuffix(nodeName);
+ createNewFileNodeNameWithBaseNameSuffix(nodeName);
} else {
String locale =
CodecUtils.getLocaleFromNode(getFolder().getNode());
IModel<StringCodec> codec =
CodecUtils.getNodeNameCodecModel(context, locale);
@@ -237,12 +237,12 @@ public class DefaultWorkflowPlugin extends RenderPlugin {
* @param nodeName The node name
* @throws RepositoryException Thrown when it cannot retrieve the
node from the repository
*/
- private void createNewNodeNameWithSuffix(final String nodeName)
throws RepositoryException {
+ private void createNewFileNodeNameWithBaseNameSuffix(final String
nodeName) throws RepositoryException {
name = nodeName;
Node gallery = destination.getChainedModel().getObject();
if (gallery.hasNode(name)) {
- name = addOrIncrementNodeNameSuffix(name);
- createNewNodeNameWithSuffix(name);
+ name = addOrIncrementFileNodeNameBaseNameSuffix(name);
+ createNewFileNodeNameWithBaseNameSuffix(name);
}
}
@@ -259,7 +259,7 @@ public class DefaultWorkflowPlugin extends RenderPlugin {
* @return A node name with a '-1' as suffix attached to the base
name or a node name which already has
* such a suffix (-n) with an incremented (n+1) number of this
suffix.
*/
- private String addOrIncrementNodeNameSuffix(final String nodeName)
{
+ private String addOrIncrementFileNodeNameBaseNameSuffix(final
String nodeName) {
final String baseName = getBaseName(nodeName);
final String extension = getExtension(nodeName);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/23a09a522ee53ee721fe29718dcaf8ddfc4a83c2
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/23a09a522ee53ee721fe29718dcaf8ddfc4a83c2
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
