Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
f37dcabf
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f37dcabf
编写于
12月 27, 2011
作者:
C
Christoph Kutzinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-12139] Sort workspace file list based on request locale.
上级
f4966f7c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
3 deletion
+20
-3
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/model/DirectoryBrowserSupport.java
core/src/main/java/hudson/model/DirectoryBrowserSupport.java
+17
-3
未找到文件。
changelog.html
浏览文件 @
f37dcabf
...
...
@@ -64,6 +64,9 @@ Upcoming changes</a>
<li
class=
'rfe'
>
Add option to disable mailnotifications for each failed maven module.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-5695"
>
issue 5695
</a>
)
<li
class=
'rfe'
>
Sort workspace file list based on request locale.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-12139"
>
issue 12139
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
...
...
core/src/main/java/hudson/model/DirectoryBrowserSupport.java
浏览文件 @
f37dcabf
...
...
@@ -43,11 +43,13 @@ import java.io.IOException;
import
java.io.InputStream
;
import
java.io.OutputStream
;
import
java.io.Serializable
;
import
java.text.Collator
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Comparator
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.StringTokenizer
;
import
java.util.logging.Logger
;
import
java.util.logging.Level
;
...
...
@@ -227,7 +229,7 @@ public final class DirectoryBrowserSupport implements HttpResponse {
}
else
if
(
serveDirIndex
)
{
// serve directory index
glob
=
new
ChildPathBuilder
();
glob
=
new
ChildPathBuilder
(
req
.
getLocale
()
);
}
if
(
glob
!=
null
)
{
...
...
@@ -392,12 +394,18 @@ public final class DirectoryBrowserSupport implements HttpResponse {
private
static
final
class
FileComparator
implements
Comparator
<
File
>
{
private
Collator
collator
;
public
FileComparator
(
Locale
locale
)
{
this
.
collator
=
Collator
.
getInstance
(
locale
);
}
public
int
compare
(
File
lhs
,
File
rhs
)
{
// directories first, files next
int
r
=
dirRank
(
lhs
)-
dirRank
(
rhs
);
if
(
r
!=
0
)
return
r
;
// otherwise alphabetical
return
lhs
.
getName
().
compareTo
(
rhs
.
getName
());
return
this
.
collator
.
compare
(
lhs
.
getName
(),
rhs
.
getName
());
}
private
int
dirRank
(
File
f
)
{
...
...
@@ -432,12 +440,18 @@ public final class DirectoryBrowserSupport implements HttpResponse {
* (this mechanism is used to skip empty intermediate directory.)
*/
private
static
final
class
ChildPathBuilder
implements
FileCallable
<
List
<
List
<
Path
>>>
{
private
Locale
locale
;
public
ChildPathBuilder
(
Locale
locale
)
{
this
.
locale
=
locale
;
}
public
List
<
List
<
Path
>>
invoke
(
File
cur
,
VirtualChannel
channel
)
throws
IOException
{
List
<
List
<
Path
>>
r
=
new
ArrayList
<
List
<
Path
>>();
File
[]
files
=
cur
.
listFiles
();
if
(
files
!=
null
)
{
Arrays
.
sort
(
files
,
new
FileComparator
());
Arrays
.
sort
(
files
,
new
FileComparator
(
this
.
locale
));
for
(
File
f
:
files
)
{
Path
p
=
new
Path
(
Util
.
rawEncode
(
f
.
getName
()),
f
.
getName
(),
f
.
isDirectory
(),
f
.
length
(),
f
.
canRead
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录