From ec9703a5aa4bda8d764537ea040e464bd422980b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:10 -0400
Subject: [PATCH] Reformat CmdLineParser
---
src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java b/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java
index 500d6ae..97076ad 100644
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java
@@ -22,7 +22,7 @@
import com.gitblit.models.UserModel;
import com.gitblit.transport.ssh.commands.CommandMetaData;
import com.gitblit.transport.ssh.commands.DispatchCommand;
-import com.gitblit.transport.ssh.commands.ListRegexCommand;
+import com.gitblit.transport.ssh.commands.ListFilterCommand;
import com.gitblit.utils.FlipTable;
import com.gitblit.utils.FlipTable.Borders;
@@ -36,7 +36,7 @@
/* List projects */
@CommandMetaData(name = "list", aliases= { "ls" }, description = "List projects")
- public static class ListProjects extends ListRegexCommand<ProjectModel> {
+ public static class ListProjects extends ListFilterCommand<ProjectModel> {
@Override
protected List<ProjectModel> getItems() {
@@ -46,10 +46,10 @@
List<ProjectModel> projects = gitblit.getProjectModels(user, false);
return projects;
}
-
+
@Override
- protected boolean matches(ProjectModel p) {
- return p.name.matches(regexFilter);
+ protected boolean matches(String filter, ProjectModel p) {
+ return p.name.matches(filter);
}
@Override
@@ -63,14 +63,14 @@
headers = h;
}
- String[][] data = new String[list.size()][];
+ Object[][] data = new Object[list.size()][];
for (int i = 0; i < list.size(); i++) {
ProjectModel p = list.get(i);
if (verbose) {
- data[i] = new String[] { p.name, p.description, formatDate(p.lastChange), "" + p.repositories.size() };
+ data[i] = new Object[] { p.name, p.description, formatDate(p.lastChange), p.repositories.size() };
} else {
- data[i] = new String[] { p.name, formatDate(p.lastChange), "" + p.repositories.size() };
+ data[i] = new Object[] { p.name, formatDate(p.lastChange), p.repositories.size() };
}
}
stdout.println(FlipTable.of(headers, data, Borders.BODY_HCOLS));
--
Gitblit v1.9.1