branch feature/GIT updated (81692d8 -> 8b6c59f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/GIT in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from 81692d8 Fix the redirection when logging out new 8b6c59f Remove a useless and not modular attribute of BrowseResultDto The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8b6c59f1e207940270118e5dc199d08b9a374e38 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Tue May 12 15:12:33 2015 +0200 Remove a useless and not modular attribute of BrowseResultDto Summary of changes: .../java/org/nuiton/scmwebeditor/GitConnection.java | 2 +- .../java/org/nuiton/scmwebeditor/SvnConnection.java | 7 ------- .../org/nuiton/scmwebeditor/actions/BrowseAction.java | 7 ++----- .../org/nuiton/scmwebeditor/dto/BrowseResultDto.java | 19 ++++--------------- 4 files changed, 7 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/GIT in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 8b6c59f1e207940270118e5dc199d08b9a374e38 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Tue May 12 15:12:33 2015 +0200 Remove a useless and not modular attribute of BrowseResultDto --- .../java/org/nuiton/scmwebeditor/GitConnection.java | 2 +- .../java/org/nuiton/scmwebeditor/SvnConnection.java | 7 ------- .../org/nuiton/scmwebeditor/actions/BrowseAction.java | 7 ++----- .../org/nuiton/scmwebeditor/dto/BrowseResultDto.java | 19 ++++--------------- 4 files changed, 7 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/nuiton/scmwebeditor/GitConnection.java b/src/main/java/org/nuiton/scmwebeditor/GitConnection.java index 2aa166b..9f7226e 100644 --- a/src/main/java/org/nuiton/scmwebeditor/GitConnection.java +++ b/src/main/java/org/nuiton/scmwebeditor/GitConnection.java @@ -88,7 +88,7 @@ public class GitConnection implements ScmConnection { if (lastPart.contains(".")) { // if the path is for a file - addressGit = address.substring(0, address.length() - lastPart.length() - 1); + addressGit = address.replace(lastPart, ""); fileName = address.substring(address.lastIndexOf("/") + 1); } else { // if the path is for a directory diff --git a/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java b/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java index faa79f6..b88f13b 100644 --- a/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java +++ b/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java @@ -21,7 +21,6 @@ */ package org.nuiton.scmwebeditor; -import com.jgeppert.struts2.jquery.tree.result.TreeNode; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -174,12 +173,6 @@ public class SvnConnection implements ScmConnection { if (log.isDebugEnabled()) { log.debug("The entry at '" + url + "' is a file."); } - TreeNode node = new TreeNode(); - node.setId(url); - node.setTitle(url.substring(url.lastIndexOf("/") + 1)); - node.setState(TreeNode.NODE_STATE_LEAF); - node.setIcon("ui-icon-document"); - resultDto.getNodes().add(node); return resultDto; } resultDto.setNumberOfFiles(0); diff --git a/src/main/java/org/nuiton/scmwebeditor/actions/BrowseAction.java b/src/main/java/org/nuiton/scmwebeditor/actions/BrowseAction.java index 5673d03..36c34b1 100644 --- a/src/main/java/org/nuiton/scmwebeditor/actions/BrowseAction.java +++ b/src/main/java/org/nuiton/scmwebeditor/actions/BrowseAction.java @@ -196,9 +196,6 @@ public class BrowseAction extends AbstractScmWebEditorAction implements ServletR if (resultDto.getSelectedBranch() != null) { selectedBranch = resultDto.getSelectedBranch(); } - if (resultDto.getNodes() != null) { - nodes = resultDto.getNodes(); - } numberOfFiles = resultDto.getNumberOfFiles(); String dtoError = resultDto.getError(); @@ -245,7 +242,7 @@ public class BrowseAction extends AbstractScmWebEditorAction implements ServletR node.setIcon("ui-icon-document"); } - resultDto.getNodes().add(node); + nodes.add(node); } } @@ -257,7 +254,7 @@ public class BrowseAction extends AbstractScmWebEditorAction implements ServletR TreeNode node = new TreeNode(); node.setId(value); node.setTitle(value.substring(value.lastIndexOf("/") + 1)); - resultDto.getNodes().add(node); + nodes.add(node); } } diff --git a/src/main/java/org/nuiton/scmwebeditor/dto/BrowseResultDto.java b/src/main/java/org/nuiton/scmwebeditor/dto/BrowseResultDto.java index 1c153e7..b0faf47 100644 --- a/src/main/java/org/nuiton/scmwebeditor/dto/BrowseResultDto.java +++ b/src/main/java/org/nuiton/scmwebeditor/dto/BrowseResultDto.java @@ -1,9 +1,10 @@ package org.nuiton.scmwebeditor.dto; -import com.jgeppert.struts2.jquery.tree.result.TreeNode; - -import java.util.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; public class BrowseResultDto { @@ -29,9 +30,6 @@ public class BrowseResultDto { /** the name of the selected branch on the SCM */ protected String selectedBranch; - /** the nodes for the tree that displays the files and directories */ - protected List<TreeNode> nodes; - /** the number of files in the current folder */ protected int numberOfFiles; @@ -39,7 +37,6 @@ public class BrowseResultDto { public BrowseResultDto() { files = new LinkedList<String>(); directories = new HashMap<String, String>(); - nodes = new ArrayList<TreeNode>(); } public int getNumberOfFiles() { @@ -89,12 +86,4 @@ public class BrowseResultDto { public void setSelectedBranch(String selectedBranch) { this.selectedBranch = selectedBranch; } - - public List<TreeNode> getNodes() { - return nodes; - } - - public void setNodes(List<TreeNode> nodes) { - this.nodes = nodes; - } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm