Commit @5a366079d5a2bad7e72c5813f0fd6d70837c205e

65c08aa

5a36607

app/controllers/CodeApp.java

--- app/controllers/CodeApp.java

+++ app/controllers/CodeApp.java


      * @param branch 브랜치 이름
      * @param path 파일 경로
      */
-	public static Result codeBrowserWithBranch(String userName, String projectName, String branch, String path)
-	    throws UnsupportedOperationException, IOException, SVNException, GitAPIException, ServletException, Exception {
+    public static Result codeBrowserWithBranch(String userName, String projectName, String branch, String path)
+        throws UnsupportedOperationException, IOException, SVNException, GitAPIException, ServletException, Exception {
         Project project = ProjectApp.getProject(userName, projectName);
 
         if (!RepositoryService.VCS_GIT.equals(project.vcs) && !RepositoryService.VCS_SUBVERSION.equals(project.vcs)) {

         
         return ok(view.render(project, branches, recursiveData, branch, path));
     }
-	
-	/**
-	 * AJAX 호출로 지정한 프로젝트 지정한 경로의 정보를 얻고자 할 때 사용된다
-	 * 
-	 * @param userName 프로젝트 소유자 이름
-	 * @param projectName 프로젝트 이름
-	 * @param path 파일 또는 폴더의 경로
-	 */
+    
+    /**
+     * AJAX 호출로 지정한 프로젝트 지정한 경로의 정보를 얻고자 할 때 사용된다
+     * 
+     * @param userName 프로젝트 소유자 이름
+     * @param projectName 프로젝트 이름
+     * @param path 파일 또는 폴더의 경로
+     */
     public static Result ajaxRequest(String userName, String projectName, String path) throws Exception{
         PlayRepository repository = RepositoryService.getRepository(userName, projectName);
         ObjectNode fileInfo = repository.getMetaDataFromPath(path);

65c08aa

5a36607

app/controllers/HelpApp.java

--- app/controllers/HelpApp.java

+++ app/controllers/HelpApp.java


 import views.html.help.*;
 
 public class HelpApp extends Controller {
-	public static Result help() {
-		return ok(toc.render("title.help"));
-	}
+    public static Result help() {
+        return ok(toc.render("title.help"));
+    }
 }

65c08aa

5a36607

app/controllers/ProjectApp.java

--- app/controllers/ProjectApp.java

+++ app/controllers/ProjectApp.java


  */
 public class ProjectApp extends Controller {
 
-	private static final int LOGO_FILE_LIMIT_SIZE = 1024*1000*5; //5M
+    private static final int LOGO_FILE_LIMIT_SIZE = 1024*1000*5; //5M
 
-	/** 프로젝트 로고로 사용할 수 있는 이미지 확장자 */
+    /** 프로젝트 로고로 사용할 수 있는 이미지 확장자 */
     public static final String[] LOGO_TYPE = {"jpg", "jpeg", "png", "gif", "bmp"};
 
     /** 자동완성에서 보여줄 최대 프로젝트 개수 */
     private static final int MAX_FETCH_PROJECTS = 1000;
 
-	private static final int COMMIT_HISTORY_PAGE = 0;
+    private static final int COMMIT_HISTORY_PAGE = 0;
 
-	private static final int COMMIT_HISTORY_SHOW_LIMIT = 10;
+    private static final int COMMIT_HISTORY_SHOW_LIMIT = 10;
 
-	private static final int RECENLTY_ISSUE_SHOW_LIMIT = 10;
+    private static final int RECENLTY_ISSUE_SHOW_LIMIT = 10;
 
-	private static final int RECENLTY_POSTING_SHOW_LIMIT = 10;
+    private static final int RECENLTY_POSTING_SHOW_LIMIT = 10;
 
     private static final int RECENT_PULL_REQUEST_SHOW_LIMIT = 10;
 

 
         if (project == null) {
             return notFound(ErrorViews.NotFound.render("error.notfound"));
-			// No project matches given parameters'" + loginId + "' and project_name '" + projectName + "'"));
+            // No project matches given parameters'" + loginId + "' and project_name '" + projectName + "'"));
         }
 
         project.fixInvalidForkData();

 
         List<Commit> commits = null;
         try {
-			commits = repository.getHistory(COMMIT_HISTORY_PAGE, COMMIT_HISTORY_SHOW_LIMIT, null, null);
+            commits = repository.getHistory(COMMIT_HISTORY_PAGE, COMMIT_HISTORY_SHOW_LIMIT, null, null);
         } catch (NoHeadException e) {
-		// NOOP
+        // NOOP
         }
 
         List<Issue> issues = Issue.findRecentlyCreated(project, RECENLTY_ISSUE_SHOW_LIMIT);

         return ok(overview.render("title.projectHome", project, histories));
     }
 
-	/**
+    /**
      * 신규 프로젝트 생성 페이지로 이동한다.<p />
      *
      * 비로그인 상태({@link models.User#anonymous})이면 로그인 경고메세지와 함께 로그인페이지로 redirect 된다.<br />

      * @param filePart
      * @return {@code filePart}가 null이면 true, {@code filename}이 null이면 true, {@code fileLength}가 0 이하이면 true
      */
-	private static boolean isEmptyFilePart(FilePart filePart) {
-		return filePart == null || filePart.getFilename() == null || filePart.getFilename().length() <= 0;
-	}
+    private static boolean isEmptyFilePart(FilePart filePart) {
+        return filePart == null || filePart.getFilename() == null || filePart.getFilename().length() <= 0;
+    }
 
     /**
      * {@code filename}의 확장자를 체크하여 이미지인지 확인한다.<p />

     /**
      * 프로젝트를 삭제한다.<p />
      *
-	 * {@code loginId}와 {@code projectName}으로 프로젝트 정보를 가져온다.<br />
+     * {@code loginId}와 {@code projectName}으로 프로젝트 정보를 가져온다.<br />
      * 삭제 권한이 없을 경우는 경고 메시지와 함께 설정페이지로 redirect된다. <br />
      *
      * @param loginId the user login id

65c08aa

5a36607

app/controllers/StatisticsApp.java

--- app/controllers/StatisticsApp.java

+++ app/controllers/StatisticsApp.java


 import views.html.project.statistics;
 
 public class StatisticsApp extends Controller {
-	public static Result statistics(String userName, String projectName) {
-		Project project = Project.findByOwnerAndProjectName(userName, projectName);
-		if (project == null) {
-		    return notFound(ErrorViews.NotFound.render("error.notfound"));
-		}
-		return ok(statistics.render("statistics", project));
-	}
+    public static Result statistics(String userName, String projectName) {
+        Project project = Project.findByOwnerAndProjectName(userName, projectName);
+        if (project == null) {
+            return notFound(ErrorViews.NotFound.render("error.notfound"));
+        }
+        return ok(statistics.render("statistics", project));
+    }
 }

65c08aa

5a36607

app/models/AbstractPosting.java

--- app/models/AbstractPosting.java

+++ app/models/AbstractPosting.java


 
     public Resource asResource(final ResourceType type) {
         return new Resource() {
-	        @Override
-	        public String getId() {
-	            return id.toString();
-	        }
+            @Override
+            public String getId() {
+                return id.toString();
+            }
 
-	        @Override
-	        public Project getProject() {
-	            return project;
-	        }
+            @Override
+            public Project getProject() {
+                return project;
+            }
 
-	        @Override
-	        public ResourceType getType() {
+            @Override
+            public ResourceType getType() {
                 return type;
-	        }
+            }
 
             @Override
             public Long getAuthorId() {
                 return authorId;
             }
-	    };
+        };
     }
 
     /**

65c08aa

5a36607

app/models/Issue.java

--- app/models/Issue.java

+++ app/models/Issue.java


     // FIXME 이것이 없이 테스트는 잘 작동하나, view에서 댓글이 달린 이슈들을 필터링하는 라디오버튼을 작동시에 이 메쏘드에서
     // 시행하는 동기화 작업 없이는 작동을 하지 않는다.
 
-	public boolean isOpen() {
-	    return this.state == State.OPEN;
-	}
+    public boolean isOpen() {
+        return this.state == State.OPEN;
+    }
 
-	public boolean isClosed() {
-	    return this.state == State.CLOSED;
-	}
+    public boolean isClosed() {
+        return this.state == State.CLOSED;
+    }
 
     @Override
     public Resource asResource() {

65c08aa

5a36607

app/models/Milestone.java

--- app/models/Milestone.java

+++ app/models/Milestone.java


     }
 
     public int getNumClosedIssues() {
-    	return Issue.finder.where().eq("milestone", this).eq("state", State.CLOSED).findRowCount();
+        return Issue.finder.where().eq("milestone", this).eq("state", State.CLOSED).findRowCount();
     }
 
     public int getNumOpenIssues() {
-    	return Issue.finder.where().eq("milestone", this).eq("state", State.OPEN).findRowCount();
+        return Issue.finder.where().eq("milestone", this).eq("state", State.OPEN).findRowCount();
     }
 
     public List<Issue> sortedByNumberOfIssue(){

     public static List<Milestone> findMilestones(Long projectId,
                                                  State state, String sort, final Direction direction) {
 
-    	OrderParams orderParams = new OrderParams();
+        OrderParams orderParams = new OrderParams();
 
-    	if(!"completionRate".equals(sort)) {
-		orderParams.add(sort, direction);
-    	}
+        if(!"completionRate".equals(sort)) {
+        orderParams.add(sort, direction);
+        }
 
         SearchParams searchParams = new SearchParams().add("project.id", projectId, Matching.EQUALS);
         if(state != null && state != State.ALL) {

         List<Milestone> milestones = FinderTemplate.findBy(orderParams, searchParams, find);
 
         if("completionRate".equals(sort)) {
-        	Collections.sort(milestones, new Comparator<Milestone>() {
-				@Override
-				public int compare(Milestone o1, Milestone o2) {
-					int o1CompletionRate = o1.getCompletionRate();
-					int o2CompletionRate = o2.getCompletionRate();
+            Collections.sort(milestones, new Comparator<Milestone>() {
+                @Override
+                public int compare(Milestone o1, Milestone o2) {
+                    int o1CompletionRate = o1.getCompletionRate();
+                    int o2CompletionRate = o2.getCompletionRate();
 
-					if(direction == Direction.ASC) {
-				        return (o1CompletionRate < o2CompletionRate ? -1 : (o1CompletionRate == o2CompletionRate ? 0 : 1));
-					} else {
-						return (o1CompletionRate < o2CompletionRate ? 1 : (o1CompletionRate == o2CompletionRate ? 0 : -1));
-					}
-				}
-			});
+                    if(direction == Direction.ASC) {
+                        return (o1CompletionRate < o2CompletionRate ? -1 : (o1CompletionRate == o2CompletionRate ? 0 : 1));
+                    } else {
+                        return (o1CompletionRate < o2CompletionRate ? 1 : (o1CompletionRate == o2CompletionRate ? 0 : -1));
+                    }
+                }
+            });
         }
 
         return milestones;

65c08aa

5a36607

app/models/support/Options.java

--- app/models/support/Options.java

+++ app/models/support/Options.java


 import java.util.*;
 
 public class Options extends LinkedHashMap<String, String> {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public Options(String... args) {
-		for (int idx = 0; idx < args.length; idx++) {
-			this.put(String.valueOf(idx + 1), args[idx]);
-		}
-	}
+    public Options(String... args) {
+        for (int idx = 0; idx < args.length; idx++) {
+            this.put(String.valueOf(idx + 1), args[idx]);
+        }
+    }
 }

65c08aa

5a36607

app/playRepository/FileDiff.java

--- app/playRepository/FileDiff.java

+++ app/playRepository/FileDiff.java


     /**
      * Get list of hunks
      *
-	 * @throws java.io.IOException
-	 */
-	public List<Hunk> getHunks()
-			throws IOException {
+     * @throws java.io.IOException
+     */
+    public List<Hunk> getHunks()
+            throws IOException {
 
         List<Hunk> hunks = new ArrayList<>();
 
-		for (int curIdx = 0; curIdx < editList.size();) {
+        for (int curIdx = 0; curIdx < editList.size();) {
             Hunk hunk = new Hunk();
-			Edit curEdit = editList.get(curIdx);
-			final int endIdx = findCombinedEnd(editList, curIdx);
-			final Edit endEdit = editList.get(endIdx);
+            Edit curEdit = editList.get(curIdx);
+            final int endIdx = findCombinedEnd(editList, curIdx);
+            final Edit endEdit = editList.get(endIdx);
 
-			int aCur = Math.max(0, curEdit.getBeginA() - context);
-			int bCur = Math.max(0, curEdit.getBeginB() - context);
-			final int aEnd = Math.min(a.size(), endEdit.getEndA() + context);
-			final int bEnd = Math.min(b.size(), endEdit.getEndB() + context);
+            int aCur = Math.max(0, curEdit.getBeginA() - context);
+            int bCur = Math.max(0, curEdit.getBeginB() - context);
+            final int aEnd = Math.min(a.size(), endEdit.getEndA() + context);
+            final int bEnd = Math.min(b.size(), endEdit.getEndB() + context);
 
             hunk.beginA = aCur;
             hunk.endA = aEnd;
             hunk.beginB = bCur;
             hunk.endB = bEnd;
 
-			while (aCur < aEnd || bCur < bEnd) {
-				if (aCur < curEdit.getBeginA() || endIdx + 1 < curIdx) {
+            while (aCur < aEnd || bCur < bEnd) {
+                if (aCur < curEdit.getBeginA() || endIdx + 1 < curIdx) {
                     hunk.lines.add(new DiffLine(this, DiffLineType.CONTEXT, aCur, bCur,
                             a.getString(aCur)));
-					isEndOfLineMissing = checkEndOfLineMissing(a, aCur);
-					aCur++;
-					bCur++;
-				} else if (aCur < curEdit.getEndA()) {
+                    isEndOfLineMissing = checkEndOfLineMissing(a, aCur);
+                    aCur++;
+                    bCur++;
+                } else if (aCur < curEdit.getEndA()) {
                     hunk.lines.add(new DiffLine(this, DiffLineType.REMOVE, aCur, bCur,
                             a.getString(aCur)));
                     isEndOfLineMissing = checkEndOfLineMissing(a, aCur);
-					aCur++;
-				} else if (bCur < curEdit.getEndB()) {
+                    aCur++;
+                } else if (bCur < curEdit.getEndB()) {
                     hunk.lines.add(new DiffLine(this, DiffLineType.ADD, aCur, bCur,
                             b.getString(bCur)));
                     isEndOfLineMissing = checkEndOfLineMissing(a, aCur);
-					bCur++;
-				}
+                    bCur++;
+                }
 
-				if (end(curEdit, aCur, bCur) && ++curIdx < editList.size())
-					curEdit = editList.get(curIdx);
-			}
+                if (end(curEdit, aCur, bCur) && ++curIdx < editList.size())
+                    curEdit = editList.get(curIdx);
+            }
 
             hunks.add(hunk);
-		}
+        }
 
         return hunks;
-	}
+    }
 
     private int findCombinedEnd(final List<Edit> edits, final int i) {
-		int end = i + 1;
-		while (end < edits.size()
-				&& (combineA(edits, end) || combineB(edits, end)))
-			end++;
-		return end - 1;
-	}
+        int end = i + 1;
+        while (end < edits.size()
+                && (combineA(edits, end) || combineB(edits, end)))
+            end++;
+        return end - 1;
+    }
 
     private boolean combineA(final List<Edit> e, final int i) {
-		return e.get(i).getBeginA() - e.get(i - 1).getEndA() <= 2 * context;
-	}
+        return e.get(i).getBeginA() - e.get(i - 1).getEndA() <= 2 * context;
+    }
 
-	private boolean combineB(final List<Edit> e, final int i) {
-		return e.get(i).getBeginB() - e.get(i - 1).getEndB() <= 2 * context;
-	}
+    private boolean combineB(final List<Edit> e, final int i) {
+        return e.get(i).getBeginB() - e.get(i - 1).getEndB() <= 2 * context;
+    }
 
-	private static boolean end(final Edit edit, final int a, final int b) {
-		return edit.getEndA() <= a && edit.getEndB() <= b;
-	}
+    private static boolean end(final Edit edit, final int a, final int b) {
+        return edit.getEndA() <= a && edit.getEndB() <= b;
+    }
 
     private boolean checkEndOfLineMissing(final RawText text, final int line) {
-		return line + 1 == text.size() && text.isMissingNewlineAtEnd();
-	}
+        return line + 1 == text.size() && text.isMissingNewlineAtEnd();
+    }
 
     /**
      * 주어진 줄 번호와 관련된 diff만 남기고 나머지는 모두 버린다.

65c08aa

5a36607

app/utils/Constants.java

--- app/utils/Constants.java

+++ app/utils/Constants.java


 package utils;
 
 public class Constants {
-	public static final String WARNING = "warning";
-	public static final String INFO = "info";
-	public static final String SUCCESS = "success";
+    public static final String WARNING = "warning";
+    public static final String INFO = "info";
+    public static final String SUCCESS = "success";
 
     public static final String DEFAULT_LOGO_PATH = "public/uploadFiles/";
 

65c08aa

5a36607

app/utils/MenuType.java

--- app/utils/MenuType.java

+++ app/utils/MenuType.java


 package utils;
 
 public enum MenuType {
-	SITE_HOME(1), NEW_PROJECT(2), PROJECTS(3), HELP(4), SITE_SETTING(5), USER(6),
+    SITE_HOME(1), NEW_PROJECT(2), PROJECTS(3), HELP(4), SITE_SETTING(5), USER(6),
     PROJECT_HOME(100), BOARD(101), CODE(102), ISSUE(103), TASK(104), PROJECT_SETTING(105), MILESTONE(106), PULL_REQUEST(107), NONE(0);
 
     private int type;

65c08aa

5a36607

app/utils/TemplateHelper.scala

--- app/utils/TemplateHelper.scala

+++ app/utils/TemplateHelper.scala


   }
 
   def getJSPath(): String = {
-	routes.Assets.at("javascripts/").toString
+    routes.Assets.at("javascripts/").toString
   }
 
   def nullOrEquals(a: String, b: String) = (a == null || b == null) ||  a.equals(b)

65c08aa

5a36607

app/views/code/history.scala.html

--- app/views/code/history.scala.html

+++ app/views/code/history.scala.html


                                 case (user: User, _, _) if !user.isAnonymous => {
 
                                     <a href="@routes.UserApp.userInfo(commit.getAuthor.loginId)" class="avatar-wrap">
-                                    @if( user.avatarUrl == UserApp.DEFAULT_AVATAR_URL ){
+                                    @if(user.avatarUrl == UserApp.DEFAULT_AVATAR_URL){
                                         @if(commit.getAuthorEmail != null) {
                                             <img src="@urlToPicture(commit.getAuthorEmail, 32)">
                                         } else {

65c08aa

5a36607

app/views/issue/view.scala.html

--- app/views/issue/view.scala.html

+++ app/views/issue/view.scala.html


             @**<!--
             <div class="div btn-group btn-flat">
             @for(state <- Issue.availableStates){
-                @if( state.state == issue.state.state ){
+                @if(state.state == issue.state.state){
                 <a @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {href="@routes.IssueApp.nextState(project.owner, project.name, issue.getNumber)"} class="btn active @isFirstState(issue.state) no-gradient">@Messages("issue.state." + issue.state.state)</a>
                 } else {
                 <a @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {href="@routes.IssueApp.nextState(project.owner, project.name, issue.getNumber)"} class="btn no-gradient">@Messages("issue.state." + state.state)</a>

65c08aa

5a36607

app/views/milestone/create.scala.html

--- app/views/milestone/create.scala.html

+++ app/views/milestone/create.scala.html


             contentType: 'application/json',
             url: "@routes.ProjectApp.mentionList(project.owner, project.name)",
             dataType: "json"
-        }).done(function( data ) {
+        }).done(function(data){ 
             memebrList.users = data;
             $("#contents").mention(memebrList);
         });
     }
 
     $("#contents" ).keypress(function(event){
-        if( event.which == 64 ){ // 64 = at
+        if(event.which == 64){ // 64 = at
             _findUserList();
         }
     });

 		});
 	});
 </script>
-}
+}

65c08aa

5a36607

app/views/milestone/edit.scala.html

--- app/views/milestone/edit.scala.html

+++ app/views/milestone/edit.scala.html


             contentType: 'application/json',
             url: "@routes.ProjectApp.mentionList(project.owner, project.name)",
             dataType: "json"
-        }).done(function( data ) {
+        }).done(function(data){
             memebrList.users = data;
             $("#body").mention(memebrList);
         });
     }
 
     $("#contents" ).keypress(function(event){
-        if( event.which == 64 ){ // 64 = at
+        if(event.which == 64){ // 64 = at
             _findUserList();
         }
     });

         });
     });
 </script>
-}
+}

65c08aa

5a36607

app/views/project/members.scala.html

--- app/views/project/members.scala.html

+++ app/views/project/members.scala.html


     <div class="bubble-wrap gray" style="overflow:visible">
         <ul class="members project">
             @for(member <- members){
-                @if( member.user != null){
+                @if(member.user != null){
 
             <li class="member">
                 <a href="@routes.UserApp.userInfo(member.user.loginId)" class="avatar-wrap large pull-left">

    });
 </script>
 
-}
+}

65c08aa

5a36607

app/views/site/partial_pagination.scala.html

--- app/views/site/partial_pagination.scala.html

+++ app/views/site/partial_pagination.scala.html


             @makeLink(x + "", x)
         }
     } else {
-        @for( x <- (currentPageNum - pageNum/2 to currentPageNum + pageNum/2)){
+        @for(x <- (currentPageNum - pageNum/2 to currentPageNum + pageNum/2)){
             @makeLink(x + "", x)
         }
     }

     <li class="@if((page.getPageIndex + 1).equals(index)){active}">
       <a href="@(listUrl + "?pageNum=" + index)" pageNum="@index">@title</a>
     </li>
-}
+}

65c08aa

5a36607

app/views/site/partial_paginationForUserList.scala.html

--- app/views/site/partial_paginationForUserList.scala.html

+++ app/views/site/partial_paginationForUserList.scala.html


             @makeLink(x + "", x)
         }
     } else {
-        @for( x <- (currentPageNum - pageNum/2 to currentPageNum + pageNum/2)){
+        @for(x <- (currentPageNum - pageNum/2 to currentPageNum + pageNum/2)){
             @makeLink(x + "", x)
         }
     }

     <li class="@if((page.getPageIndex + 1).equals(index)){active}">
       <a href="@routes.SiteApp.userList(index - 1)" pageNum="@index">@title</a>
     </li>
-}
+}

...	...	@@ -44,21 +44,21 @@
44	44	*/
45	45	public class ProjectApp extends Controller {
46	46
47		- private static final int LOGO_FILE_LIMIT_SIZE = 102410005; //5M
	47	+ private static final int LOGO_FILE_LIMIT_SIZE = 102410005; //5M
48	48
49		- /** 프로젝트 로고로 사용할 수 있는 이미지 확장자 */
	49	+ /** 프로젝트 로고로 사용할 수 있는 이미지 확장자 */
50	50	public static final String[] LOGO_TYPE = {"jpg", "jpeg", "png", "gif", "bmp"};
51	51
52	52	/** 자동완성에서 보여줄 최대 프로젝트 개수 */
53	53	private static final int MAX_FETCH_PROJECTS = 1000;
54	54
55		- private static final int COMMIT_HISTORY_PAGE = 0;
	55	+ private static final int COMMIT_HISTORY_PAGE = 0;
56	56
57		- private static final int COMMIT_HISTORY_SHOW_LIMIT = 10;
	57	+ private static final int COMMIT_HISTORY_SHOW_LIMIT = 10;
58	58
59		- private static final int RECENLTY_ISSUE_SHOW_LIMIT = 10;
	59	+ private static final int RECENLTY_ISSUE_SHOW_LIMIT = 10;
60	60
61		- private static final int RECENLTY_POSTING_SHOW_LIMIT = 10;
	61	+ private static final int RECENLTY_POSTING_SHOW_LIMIT = 10;
62	62
63	63	private static final int RECENT_PULL_REQUEST_SHOW_LIMIT = 10;
64	64
...	...	@@ -100,7 +100,7 @@
100	100
101	101	if (project == null) {
102	102	return notFound(ErrorViews.NotFound.render("error.notfound"));
103		- // No project matches given parameters'" + loginId + "' and project_name '" + projectName + "'"));
	103	+ // No project matches given parameters'" + loginId + "' and project_name '" + projectName + "'"));
104	104	}
105	105
106	106	project.fixInvalidForkData();
...	...	@@ -113,9 +113,9 @@
113	113
114	114	List<Commit> commits = null;
115	115	try {
116		- commits = repository.getHistory(COMMIT_HISTORY_PAGE, COMMIT_HISTORY_SHOW_LIMIT, null, null);
	116	+ commits = repository.getHistory(COMMIT_HISTORY_PAGE, COMMIT_HISTORY_SHOW_LIMIT, null, null);
117	117	} catch (NoHeadException e) {
118		- // NOOP
	118	+ // NOOP
119	119	}
120	120
121	121	List<Issue> issues = Issue.findRecentlyCreated(project, RECENLTY_ISSUE_SHOW_LIMIT);
...	...	@@ -127,7 +127,7 @@
127	127	return ok(overview.render("title.projectHome", project, histories));
128	128	}
129	129
130		- /**
	130	+ /**
131	131	* 신규 프로젝트 생성 페이지로 이동한다.<p />
132	132	*
133	133	* 비로그인 상태({@link models.User#anonymous})이면 로그인 경고메세지와 함께 로그인페이지로 redirect 된다.<br />
...	...	@@ -273,9 +273,9 @@
273	273	* @param filePart
274	274	* @return {@code filePart}가 null이면 true, {@code filename}이 null이면 true, {@code fileLength}가 0 이하이면 true
275	275	*/
276		- private static boolean isEmptyFilePart(FilePart filePart) {
277		- return filePart == null \|\| filePart.getFilename() == null \|\| filePart.getFilename().length() <= 0;
278		- }
	276	+ private static boolean isEmptyFilePart(FilePart filePart) {
	277	+ return filePart == null \|\| filePart.getFilename() == null \|\| filePart.getFilename().length() <= 0;
	278	+ }
279	279
280	280	/**
281	281	* {@code filename}의 확장자를 체크하여 이미지인지 확인한다.<p />
...	...	@@ -321,7 +321,7 @@
321	321	/**
322	322	* 프로젝트를 삭제한다.<p />
323	323	*
324		- * {@code loginId}와 {@code projectName}으로 프로젝트 정보를 가져온다.<br />
	324	+ * {@code loginId}와 {@code projectName}으로 프로젝트 정보를 가져온다.<br />
325	325	* 삭제 권한이 없을 경우는 경고 메시지와 함께 설정페이지로 redirect된다. <br />
326	326	*
327	327	* @param loginId the user login id

...	...	@@ -161,26 +161,26 @@
161	161
162	162	public Resource asResource(final ResourceType type) {
163	163	return new Resource() {
164		- @Override
165		- public String getId() {
166		- return id.toString();
167		- }
	164	+ @Override
	165	+ public String getId() {
	166	+ return id.toString();
	167	+ }
168	168
169		- @Override
170		- public Project getProject() {
171		- return project;
172		- }
	169	+ @Override
	170	+ public Project getProject() {
	171	+ return project;
	172	+ }
173	173
174		- @Override
175		- public ResourceType getType() {
	174	+ @Override
	175	+ public ResourceType getType() {
176	176	return type;
177		- }
	177	+ }
178	178
179	179	@Override
180	180	public Long getAuthorId() {
181	181	return authorId;
182	182	}
183		- };
	183	+ };
184	184	}
185	185
186	186	/**

...	...	@@ -253,13 +253,13 @@
253	253	// FIXME 이것이 없이 테스트는 잘 작동하나, view에서 댓글이 달린 이슈들을 필터링하는 라디오버튼을 작동시에 이 메쏘드에서
254	254	// 시행하는 동기화 작업 없이는 작동을 하지 않는다.
255	255
256		- public boolean isOpen() {
257		- return this.state == State.OPEN;
258		- }
	256	+ public boolean isOpen() {
	257	+ return this.state == State.OPEN;
	258	+ }
259	259
260		- public boolean isClosed() {
261		- return this.state == State.CLOSED;
262		- }
	260	+ public boolean isClosed() {
	261	+ return this.state == State.CLOSED;
	262	+ }
263	263
264	264	@Override
265	265	public Resource asResource() {

...	...	@@ -65,11 +65,11 @@
65	65	}
66	66
67	67	public int getNumClosedIssues() {
68		- return Issue.finder.where().eq("milestone", this).eq("state", State.CLOSED).findRowCount();
	68	+ return Issue.finder.where().eq("milestone", this).eq("state", State.CLOSED).findRowCount();
69	69	}
70	70
71	71	public int getNumOpenIssues() {
72		- return Issue.finder.where().eq("milestone", this).eq("state", State.OPEN).findRowCount();
	72	+ return Issue.finder.where().eq("milestone", this).eq("state", State.OPEN).findRowCount();
73	73	}
74	74
75	75	public List<Issue> sortedByNumberOfIssue(){
...	...	@@ -182,11 +182,11 @@
182	182	public static List<Milestone> findMilestones(Long projectId,
183	183	State state, String sort, final Direction direction) {
184	184
185		- OrderParams orderParams = new OrderParams();
	185	+ OrderParams orderParams = new OrderParams();
186	186
187		- if(!"completionRate".equals(sort)) {
188		- orderParams.add(sort, direction);
189		- }
	187	+ if(!"completionRate".equals(sort)) {
	188	+ orderParams.add(sort, direction);
	189	+ }
190	190
191	191	SearchParams searchParams = new SearchParams().add("project.id", projectId, Matching.EQUALS);
192	192	if(state != null && state != State.ALL) {
...	...	@@ -196,19 +196,19 @@
196	196	List<Milestone> milestones = FinderTemplate.findBy(orderParams, searchParams, find);
197	197
198	198	if("completionRate".equals(sort)) {
199		- Collections.sort(milestones, new Comparator<Milestone>() {
200		- @Override
201		- public int compare(Milestone o1, Milestone o2) {
202		- int o1CompletionRate = o1.getCompletionRate();
203		- int o2CompletionRate = o2.getCompletionRate();
	199	+ Collections.sort(milestones, new Comparator<Milestone>() {
	200	+ @Override
	201	+ public int compare(Milestone o1, Milestone o2) {
	202	+ int o1CompletionRate = o1.getCompletionRate();
	203	+ int o2CompletionRate = o2.getCompletionRate();
204	204
205		- if(direction == Direction.ASC) {
206		- return (o1CompletionRate < o2CompletionRate ? -1 : (o1CompletionRate == o2CompletionRate ? 0 : 1));
207		- } else {
208		- return (o1CompletionRate < o2CompletionRate ? 1 : (o1CompletionRate == o2CompletionRate ? 0 : -1));
209		- }
210		- }
211		- });
	205	+ if(direction == Direction.ASC) {
	206	+ return (o1CompletionRate < o2CompletionRate ? -1 : (o1CompletionRate == o2CompletionRate ? 0 : 1));
	207	+ } else {
	208	+ return (o1CompletionRate < o2CompletionRate ? 1 : (o1CompletionRate == o2CompletionRate ? 0 : -1));
	209	+ }
	210	+ }
	211	+ });
212	212	}
213	213
214	214	return milestones;

...	...	@@ -80,7 +80,7 @@
80	80	}
81	81
82	82	def getJSPath(): String = {
83		- routes.Assets.at("javascripts/").toString
	83	+ routes.Assets.at("javascripts/").toString
84	84	}
85	85
86	86	def nullOrEquals(a: String, b: String) = (a == null \|\| b == null) \|\| a.equals(b)

...	...	@@ -70,8 +70,8 @@
70	70	* @param branch 브랜치 이름
71	71	* @param path 파일 경로
72	72	*/
73		- public static Result codeBrowserWithBranch(String userName, String projectName, String branch, String path)
74		- throws UnsupportedOperationException, IOException, SVNException, GitAPIException, ServletException, Exception {
	73	+ public static Result codeBrowserWithBranch(String userName, String projectName, String branch, String path)
	74	+ throws UnsupportedOperationException, IOException, SVNException, GitAPIException, ServletException, Exception {
75	75	Project project = ProjectApp.getProject(userName, projectName);
76	76
77	77	if (!RepositoryService.VCS_GIT.equals(project.vcs) && !RepositoryService.VCS_SUBVERSION.equals(project.vcs)) {
...	...	@@ -93,14 +93,14 @@
93	93
94	94	return ok(view.render(project, branches, recursiveData, branch, path));
95	95	}
96		-
97		- /**
98		- * AJAX 호출로 지정한 프로젝트 지정한 경로의 정보를 얻고자 할 때 사용된다
99		- *
100		- * @param userName 프로젝트 소유자 이름
101		- * @param projectName 프로젝트 이름
102		- * @param path 파일 또는 폴더의 경로
103		- */
	96	+
	97	+ /**
	98	+ * AJAX 호출로 지정한 프로젝트 지정한 경로의 정보를 얻고자 할 때 사용된다
	99	+ *
	100	+ * @param userName 프로젝트 소유자 이름
	101	+ * @param projectName 프로젝트 이름
	102	+ * @param path 파일 또는 폴더의 경로
	103	+ */
104	104	public static Result ajaxRequest(String userName, String projectName, String path) throws Exception{
105	105	PlayRepository repository = RepositoryService.getRepository(userName, projectName);
106	106	ObjectNode fileInfo = repository.getMetaDataFromPath(path);

...	...	@@ -5,7 +5,7 @@
5	5	import views.html.help.*;
6	6
7	7	public class HelpApp extends Controller {
8		- public static Result help() {
9		- return ok(toc.render("title.help"));
10		- }
	8	+ public static Result help() {
	9	+ return ok(toc.render("title.help"));
	10	+ }
11	11	}

...	...	@@ -7,11 +7,11 @@
7	7	import views.html.project.statistics;
8	8
9	9	public class StatisticsApp extends Controller {
10		- public static Result statistics(String userName, String projectName) {
11		- Project project = Project.findByOwnerAndProjectName(userName, projectName);
12		- if (project == null) {
13		- return notFound(ErrorViews.NotFound.render("error.notfound"));
14		- }
15		- return ok(statistics.render("statistics", project));
16		- }
	10	+ public static Result statistics(String userName, String projectName) {
	11	+ Project project = Project.findByOwnerAndProjectName(userName, projectName);
	12	+ if (project == null) {
	13	+ return notFound(ErrorViews.NotFound.render("error.notfound"));
	14	+ }
	15	+ return ok(statistics.render("statistics", project));
	16	+ }
17	17	}

...	...	@@ -3,11 +3,11 @@
3	3	import java.util.*;
4	4
5	5	public class Options extends LinkedHashMap<String, String> {
6		- private static final long serialVersionUID = 1L;
	6	+ private static final long serialVersionUID = 1L;
7	7
8		- public Options(String... args) {
9		- for (int idx = 0; idx < args.length; idx++) {
10		- this.put(String.valueOf(idx + 1), args[idx]);
11		- }
12		- }
	8	+ public Options(String... args) {
	9	+ for (int idx = 0; idx < args.length; idx++) {
	10	+ this.put(String.valueOf(idx + 1), args[idx]);
	11	+ }
	12	+ }
13	13	}

...	...	@@ -29,81 +29,81 @@
29	29	/**
30	30	* Get list of hunks
31	31	*
32		- * @throws java.io.IOException
33		- */
34		- public List<Hunk> getHunks()
35		- throws IOException {
	32	+ * @throws java.io.IOException
	33	+ */
	34	+ public List<Hunk> getHunks()
	35	+ throws IOException {
36	36
37	37	List<Hunk> hunks = new ArrayList<>();
38	38
39		- for (int curIdx = 0; curIdx < editList.size();) {
	39	+ for (int curIdx = 0; curIdx < editList.size();) {
40	40	Hunk hunk = new Hunk();
41		- Edit curEdit = editList.get(curIdx);
42		- final int endIdx = findCombinedEnd(editList, curIdx);
43		- final Edit endEdit = editList.get(endIdx);
	41	+ Edit curEdit = editList.get(curIdx);
	42	+ final int endIdx = findCombinedEnd(editList, curIdx);
	43	+ final Edit endEdit = editList.get(endIdx);
44	44
45		- int aCur = Math.max(0, curEdit.getBeginA() - context);
46		- int bCur = Math.max(0, curEdit.getBeginB() - context);
47		- final int aEnd = Math.min(a.size(), endEdit.getEndA() + context);
48		- final int bEnd = Math.min(b.size(), endEdit.getEndB() + context);
	45	+ int aCur = Math.max(0, curEdit.getBeginA() - context);
	46	+ int bCur = Math.max(0, curEdit.getBeginB() - context);
	47	+ final int aEnd = Math.min(a.size(), endEdit.getEndA() + context);
	48	+ final int bEnd = Math.min(b.size(), endEdit.getEndB() + context);
49	49
50	50	hunk.beginA = aCur;
51	51	hunk.endA = aEnd;
52	52	hunk.beginB = bCur;
53	53	hunk.endB = bEnd;
54	54
55		- while (aCur < aEnd \|\| bCur < bEnd) {
56		- if (aCur < curEdit.getBeginA() \|\| endIdx + 1 < curIdx) {
	55	+ while (aCur < aEnd \|\| bCur < bEnd) {
	56	+ if (aCur < curEdit.getBeginA() \|\| endIdx + 1 < curIdx) {
57	57	hunk.lines.add(new DiffLine(this, DiffLineType.CONTEXT, aCur, bCur,
58	58	a.getString(aCur)));
59		- isEndOfLineMissing = checkEndOfLineMissing(a, aCur);
60		- aCur++;
61		- bCur++;
62		- } else if (aCur < curEdit.getEndA()) {
	59	+ isEndOfLineMissing = checkEndOfLineMissing(a, aCur);
	60	+ aCur++;
	61	+ bCur++;
	62	+ } else if (aCur < curEdit.getEndA()) {
63	63	hunk.lines.add(new DiffLine(this, DiffLineType.REMOVE, aCur, bCur,
64	64	a.getString(aCur)));
65	65	isEndOfLineMissing = checkEndOfLineMissing(a, aCur);
66		- aCur++;
67		- } else if (bCur < curEdit.getEndB()) {
	66	+ aCur++;
	67	+ } else if (bCur < curEdit.getEndB()) {
68	68	hunk.lines.add(new DiffLine(this, DiffLineType.ADD, aCur, bCur,
69	69	b.getString(bCur)));
70	70	isEndOfLineMissing = checkEndOfLineMissing(a, aCur);
71		- bCur++;
72		- }
	71	+ bCur++;
	72	+ }
73	73
74		- if (end(curEdit, aCur, bCur) && ++curIdx < editList.size())
75		- curEdit = editList.get(curIdx);
76		- }
	74	+ if (end(curEdit, aCur, bCur) && ++curIdx < editList.size())
	75	+ curEdit = editList.get(curIdx);
	76	+ }
77	77
78	78	hunks.add(hunk);
79		- }
	79	+ }
80	80
81	81	return hunks;
82		- }
	82	+ }
83	83
84	84	private int findCombinedEnd(final List<Edit> edits, final int i) {
85		- int end = i + 1;
86		- while (end < edits.size()
87		- && (combineA(edits, end) \|\| combineB(edits, end)))
88		- end++;
89		- return end - 1;
90		- }
	85	+ int end = i + 1;
	86	+ while (end < edits.size()
	87	+ && (combineA(edits, end) \|\| combineB(edits, end)))
	88	+ end++;
	89	+ return end - 1;
	90	+ }
91	91
92	92	private boolean combineA(final List<Edit> e, final int i) {
93		- return e.get(i).getBeginA() - e.get(i - 1).getEndA() <= 2 * context;
94		- }
	93	+ return e.get(i).getBeginA() - e.get(i - 1).getEndA() <= 2 * context;
	94	+ }
95	95
96		- private boolean combineB(final List<Edit> e, final int i) {
97		- return e.get(i).getBeginB() - e.get(i - 1).getEndB() <= 2 * context;
98		- }
	96	+ private boolean combineB(final List<Edit> e, final int i) {
	97	+ return e.get(i).getBeginB() - e.get(i - 1).getEndB() <= 2 * context;
	98	+ }
99	99
100		- private static boolean end(final Edit edit, final int a, final int b) {
101		- return edit.getEndA() <= a && edit.getEndB() <= b;
102		- }
	100	+ private static boolean end(final Edit edit, final int a, final int b) {
	101	+ return edit.getEndA() <= a && edit.getEndB() <= b;
	102	+ }
103	103
104	104	private boolean checkEndOfLineMissing(final RawText text, final int line) {
105		- return line + 1 == text.size() && text.isMissingNewlineAtEnd();
106		- }
	105	+ return line + 1 == text.size() && text.isMissingNewlineAtEnd();
	106	+ }
107	107
108	108	/**
109	109	* 주어진 줄 번호와 관련된 diff만 남기고 나머지는 모두 버린다.

...	...	@@ -1,9 +1,9 @@
1	1	package utils;
2	2
3	3	public class Constants {
4		- public static final String WARNING = "warning";
5		- public static final String INFO = "info";
6		- public static final String SUCCESS = "success";
	4	+ public static final String WARNING = "warning";
	5	+ public static final String INFO = "info";
	6	+ public static final String SUCCESS = "success";
7	7
8	8	public static final String DEFAULT_LOGO_PATH = "public/uploadFiles/";
9	9

...	...	@@ -1,7 +1,7 @@
1	1	package utils;
2	2
3	3	public enum MenuType {
4		- SITE_HOME(1), NEW_PROJECT(2), PROJECTS(3), HELP(4), SITE_SETTING(5), USER(6),
	4	+ SITE_HOME(1), NEW_PROJECT(2), PROJECTS(3), HELP(4), SITE_SETTING(5), USER(6),
5	5	PROJECT_HOME(100), BOARD(101), CODE(102), ISSUE(103), TASK(104), PROJECT_SETTING(105), MILESTONE(106), PULL_REQUEST(107), NONE(0);
6	6
7	7	private int type;

...	...	@@ -165,7 +165,7 @@
165	165	case (user: User, _, _) if !user.isAnonymous => {
166	166
167	167	<a href="@routes.UserApp.userInfo(commit.getAuthor.loginId)" class="avatar-wrap">
168		- @if( user.avatarUrl == UserApp.DEFAULT_AVATAR_URL ){
	168	+ @if(user.avatarUrl == UserApp.DEFAULT_AVATAR_URL){
169	169	@if(commit.getAuthorEmail != null) {
170	170	<img src="@urlToPicture(commit.getAuthorEmail, 32)">
171	171	} else {

...	...	@@ -73,7 +73,7 @@
73	73	@**<!--
74	74	<div class="div btn-group btn-flat">
75	75	@for(state <- Issue.availableStates){
76		- @if( state.state == issue.state.state ){
	76	+ @if(state.state == issue.state.state){
77	77	<a @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {href="@routes.IssueApp.nextState(project.owner, project.name, issue.getNumber)"} class="btn active @isFirstState(issue.state) no-gradient">@Messages("issue.state." + issue.state.state)</a>
78	78	} else {
79	79	<a @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {href="@routes.IssueApp.nextState(project.owner, project.name, issue.getNumber)"} class="btn no-gradient">@Messages("issue.state." + state.state)</a>

...	...	@@ -65,14 +65,14 @@
65	65	contentType: 'application/json',
66	66	url: "@routes.ProjectApp.mentionList(project.owner, project.name)",
67	67	dataType: "json"
68		- }).done(function( data ) {
	68	+ }).done(function(data){
69	69	memebrList.users = data;
70	70	$("#contents").mention(memebrList);
71	71	});
72	72	}
73	73
74	74	$("#contents" ).keypress(function(event){
75		- if( event.which == 64 ){ // 64 = at
	75	+ if(event.which == 64){ // 64 = at
76	76	_findUserList();
77	77	}
78	78	});
...	...	@@ -91,4 +91,4 @@
91	91	});
92	92	});
93	93	</script>
94		-} (No newline at end of file)
	94	+}

...	...	@@ -70,14 +70,14 @@
70	70	contentType: 'application/json',
71	71	url: "@routes.ProjectApp.mentionList(project.owner, project.name)",
72	72	dataType: "json"
73		- }).done(function( data ) {
	73	+ }).done(function(data){
74	74	memebrList.users = data;
75	75	$("#body").mention(memebrList);
76	76	});
77	77	}
78	78
79	79	$("#contents" ).keypress(function(event){
80		- if( event.which == 64 ){ // 64 = at
	80	+ if(event.which == 64){ // 64 = at
81	81	_findUserList();
82	82	}
83	83	});
...	...	@@ -96,4 +96,4 @@
96	96	});
97	97	});
98	98	</script>
99		-} (No newline at end of file)
	99	+}

...	...	@@ -26,7 +26,7 @@
26	26	<div class="bubble-wrap gray" style="overflow:visible">
27	27	<ul class="members project">
28	28	@for(member <- members){
29		- @if( member.user != null){
	29	+ @if(member.user != null){
30	30
31	31	<li class="member">
32	32	<a href="@routes.UserApp.userInfo(member.user.loginId)" class="avatar-wrap large pull-left">
...	...	@@ -116,4 +116,4 @@
116	116	});
117	117	</script>
118	118
119		-} (No newline at end of file)
	119	+}

...	...	@@ -25,7 +25,7 @@
25	25	@makeLink(x + "", x)
26	26	}
27	27	} else {
28		- @for( x <- (currentPageNum - pageNum/2 to currentPageNum + pageNum/2)){
	28	+ @for(x <- (currentPageNum - pageNum/2 to currentPageNum + pageNum/2)){
29	29	@makeLink(x + "", x)
30	30	}
31	31	}
...	...	@@ -43,4 +43,4 @@
43	43	<li class="@if((page.getPageIndex + 1).equals(index)){active}">
44	44	<a href="@(listUrl + "?pageNum=" + index)" pageNum="@index">@title</a>
45	45	</li>
46		-} (No newline at end of file)
	46	+}

Delete comment