This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit f32eba17e908a7ac21631daced871eef2f7177af Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 5 15:47:08 2015 +0200 Make the date shorter in the form to view the file history --- .../main/java/org/nuiton/scmwebeditor/git/GitConnection.java | 10 ++++++++-- .../main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java | 12 ++++++++---- swe-ui-web/src/main/webapp/css/main.css | 5 ++++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java index 365af80..0bb91cd 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java @@ -52,6 +52,8 @@ import javax.naming.AuthenticationException; import java.io.*; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -541,7 +543,7 @@ public class GitConnection implements ScmConnection { @Override public Map<ScmRevision, String> getRevisions(String address, String username, String password) { - final int MAX_MESSAGE_LENGTH = 32; + final int MAX_MESSAGE_LENGTH = 64; String pathOnRepo = address.replace(addressGit + "/", ""); Map<ScmRevision, String> revisions = new TreeMap<ScmRevision, String>(); @@ -594,7 +596,11 @@ public class GitConnection implements ScmConnection { long commitTime = ((long) commit.getCommitTime()) * 1000; Date commitDate = new Date(commitTime); - msg += " - " + commitDate; + + DateFormat displayDf = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + String formattedDate = displayDf.format(commitDate); + + msg += " - " + formattedDate; // adding the revision to the Map ScmRevision scmRev = new ScmRevision(commit.getName(), commitTime); diff --git a/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java index bfd6c18..bec40e6 100644 --- a/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java +++ b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java @@ -512,7 +512,7 @@ public class SvnConnection implements ScmConnection { @Override public Map<ScmRevision, String> getRevisions(String address, String username, String password) throws AuthenticationException { - final int MAX_MESSAGE_LENGTH = 32; + final int MAX_MESSAGE_LENGTH = 64; String url = address.substring(0, address.lastIndexOf('/')); String file = address.substring(address.lastIndexOf('/') + 1); @@ -561,16 +561,20 @@ public class SvnConnection implements ScmConnection { // getting the date String date = ((SVNFileRevision) fileRev).getRevisionProperties().getStringValue(SVNRevisionProperty.DATE); - DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); + DateFormat svnDf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); Date commitDate = null; try { - commitDate = df.parse(date); + commitDate = svnDf.parse(date); } catch (ParseException e) { if (log.isErrorEnabled()) { log.error("Can not parse date " + date); } } - msg += " - " + commitDate; + + DateFormat displayDf = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + String formattedDate = displayDf.format(commitDate); + + msg += " - " + formattedDate; // adding the revision to the Map ScmRevision scmRev = new ScmRevision(String.valueOf(revNum), commitDate.getTime()); diff --git a/swe-ui-web/src/main/webapp/css/main.css b/swe-ui-web/src/main/webapp/css/main.css index 4c3053f..1e9ef1c 100644 --- a/swe-ui-web/src/main/webapp/css/main.css +++ b/swe-ui-web/src/main/webapp/css/main.css @@ -510,7 +510,6 @@ ul#repositoryButtons li, ul#repositoryButtonsImg li { #historyContent { border: 1px solid black; overflow: auto; - min-height: 150px; padding: 5px; } @@ -520,4 +519,8 @@ ul#repositoryButtons li, ul#repositoryButtonsImg li { #viewHistoryButton { margin-top: 10px; +} + +#revisionsList { + width: 100%; } \ No newline at end of file -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.