• R/O
  • HTTP
  • SSH
  • HTTPS

JinArchiver: Commit

JinArchiverは、人狼BBSの過去ログを独自のXML形式でローカルディスクに保存するためのツールです。


Commit MetaInfo

Revision1a6a422c010ffa0923fcf83be67ffea8acc8f373 (tree)
Time2019-05-07 17:45:25
AuthorOlyutorskii <olyutorskii@user...>
CommiterOlyutorskii

Log Message

Merge release/v1.503.106

Change Summary

Incremental Difference

--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,25 @@
1+### Git attributes https://git-scm.com/docs/gitattributes
2+
3+* text=auto
4+
5+*.java text diff=java
6+
7+*.xml text eol=lf
8+*.xsd text eol=lf
9+*.dtd text eol=lf
10+*.properties text eol=lf
11+
12+*.txt text
13+*.md text
14+*.yml text
15+
16+*.html text
17+*.css text
18+*.js text
19+
20+*.gif binary
21+*.png binary
22+*.jpeg binary
23+*.jpg binary
24+
25+### EOF ###
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,67 @@
1+##### Git ignore pattern https://git-scm.com/docs/gitignore
2+
3+
4+### Unix
5+
6+/tmp/
7+*~
8+*.swp
9+*.orig
10+# core
11+
12+
13+### macOS
14+
15+*.DS_Store
16+._*
17+__MACOSX
18+
19+
20+### Windows
21+
22+Thumbs.db
23+desktop.ini
24+
25+
26+### JDK
27+
28+hs_err_pid*
29+
30+
31+### Maven
32+
33+/target/
34+
35+
36+### Netbeans
37+
38+/build/
39+/nbbuild/
40+/dist/
41+/nbdist/
42+/nbproject/
43+/nbactions.xml
44+/nb-configuration.xml
45+
46+
47+### Eclipse
48+
49+/bin/
50+/.settings/
51+/.metadata/
52+/.externalToolBuilders/
53+/.classpath
54+/.project
55+/.checkstyle
56+
57+
58+### IntelliJ
59+
60+/.idea/
61+/out/
62+*.iws
63+*.iml
64+*.ipr
65+
66+
67+### EOF ###
--- a/.hgeol
+++ /dev/null
@@ -1,19 +0,0 @@
1-[patterns]
2-
3-**.txt = native
4-
5-**.java = native
6-**.properties = LF
7-
8-**.xml = LF
9-**.xsd = LF
10-**.dtd = LF
11-
12-**.html = LF
13-**.htm = LF
14-**.css = LF
15-
16-**.png = BIN
17-**.gif = BIN
18-**.jpeg = BIN
19-**.jpg = BIN
--- a/.hgignore
+++ /dev/null
@@ -1,36 +0,0 @@
1-#########################
2-# for Mercurial hgignore
3-#########################
4-
5-
6-#####################
7-syntax: regexp
8-
9-^nb-configuration\.xml$
10-^nbactions\.xml$
11-^\.classpath$
12-^\.project$
13-
14-\.orig$
15-\.orig\..*$
16-\.chg\..*$
17-\.rej$
18-\.conflict\~$
19-^target/
20-^build/
21-^bin/
22-^nbproject/
23-^\.settings/
24-
25-
26-#####################
27-syntax: glob
28-
29-.DS_Store
30-__MACOSX
31-[Tt]humbs.db
32-[Dd]esktop.ini
33-core
34-
35-
36-### EOF ###
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,11 @@
44 JinArchiver 変更履歴
55
66
7+1.503.106 (2019-05-07)
8+ ・JinParser 2.101.106 に対応。
9+ ・必須環境をJavaSE8に引き上げ。
10+ ・Mercurial(1.503.5-SNAPSHOT)からGit(1.503.105-SNAPSHOT)へSCMを移行。
11+
712 1.503.4 (2017-04-10)
813 ・F国URL修正に伴い JinCore 1.206.10 に対応。
914
--- a/README.txt
+++ b/README.txt
@@ -12,9 +12,6 @@
1212 JinArchiverは、人狼BBSの過去ログを独自のXML形式でローカルディスクに
1313 保存するためのツールです。
1414
15-※ このアーカイブにはJindolfの実行バイナリは含まれていません。
16-  Jindolfを動かしたい方は、jindolfで始まり拡張子が*.jarであるファイルを
17-  別途入手してください。
1815 ※ 人狼BBSのURLは [ http://ninjinix.com/ ] まで
1916 ※ 人狼BBSを主催するninjin氏は、JinArchiverの製作に一切関与していません。
2017   JinArchiverに関する問い合わせををninjin氏へ投げかけないように!約束だよ!
@@ -31,9 +28,9 @@ java -jar jinarchiver-X.X.X.jar -land wolff -vid 1507 -outdir /tmp
3128
3229 === ソースコードに関して ===
3330
34- - JinArchiverはJava言語(JavaSE7)で記述されたプログラムです。
35- - JinArchiverはJRE1.7に準拠したJava実行環境で利用できるように作られています。
36- 原則として、JRE1.7に準拠した実行系であれば、プラットフォームを選びません。
31+ - JinArchiverはJava言語(JavaSE8)で記述されたプログラムです。
32+ - JinArchiverはJavaSE8に準拠したJava実行環境で利用できるように作られています。
33+ 原則として、JavaSE8に準拠した実行系であれば、プラットフォームを選びません。
3734
3835
3936 === 開発プロジェクト運営元 ===
@@ -54,9 +51,6 @@ java -jar jinarchiver-X.X.X.jar -land wolff -vid 1507 -outdir /tmp
5451 ./LICENSE.txt
5552 ライセンスに関して。
5653
57-./SCM.txt
58- ソースコード管理に関して。
59-
6054 ./pom.xml
6155 Maven3用プロジェクト構成定義ファイル。
6256
--- a/SCM.txt
+++ /dev/null
@@ -1,48 +0,0 @@
1-[UTF-8 Japanese]
2-
3- J i n A r c h i v e r
4- バージョン管理システムに関する情報
5-
6- Copyright(c) 2011 olyutorskii
7-
8-
9-=== バージョン管理体制 ===
10-
11- このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
12- このアーカイブの原本となる開発資産は、
13- https://ja.osdn.net/projects/jindolf/scm/hg/JinArchiver/
14- を上位に持つMercurialリポジトリで管理されています。
15- アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
16- # hg clone http://hg.osdn.net/view/jindolf/JinArchiver
17-
18-
19-=== 各種設定ファイル ===
20-
21-./.hgignore
22-
23-Mercurial 管理の対象外にさせたいファイル群の設定です。
24-IDE独自の設定ファイルは基本的に管理対象外とするつもりです。
25-
26-
27-./.hgeol
28-
29-Mercurial の EOL Extension 用の設定です。
30-非バイナリなテキストファイルの改行コードに関する設定です。
31-・拡張子が *.txt なローカルファイルの改行文字はローカルの環境に合わせる。
32-・拡張子が *.java なローカルファイルの改行文字はローカルの環境に合わせる。
33-・それ以外の非バイナリなローカルファイルの改行文字は基本LFで統一。
34-・リポジトリ上の全ての非バイナリファイルの改行文字は基本LFで統一。
35-というポリシーで運用しています。
36-EOL Extensionを有効にしないと設定が反映されません。
37-
38-
39-=== Mercurial に関するリンク ===
40-
41-・https://www.mercurial-scm.org/
42-・https://www.mercurial-scm.org/wiki/.hgignore
43-・https://www.selenic.com/mercurial/hgignore.5.html
44-・https://www.mercurial-scm.org/wiki/EolExtension
45-・https://tortoisehg.bitbucket.io/
46-
47-
48---- EOF ---
--- a/checkstyle-suppressions.xml
+++ b/config/checkstyle/checkstyle-suppressions.xml
@@ -1,21 +1,24 @@
11 <?xml version="1.0" encoding="UTF-8" ?>
22
33 <!DOCTYPE suppressions PUBLIC
4- "-//Puppy Crawl//DTD Suppressions 1.1//EN"
5- "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
4+ "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
5+ "https://checkstyle.org/dtds/suppressions_1_2.dtd">
66
77 <!--
88 Checkstyle suppressions
9- for Checkstyle 6.19(7.4) or later
9+ for Checkstyle 8.20 or later
1010
11- [ http://checkstyle.sourceforge.net/ ]
11+ [ https://checkstyle.org/ ]
1212
13- Copyright(c) 2010 olyutorskii
13+ Copyright(c) 2019 olyutorskii
1414 -->
1515
1616
1717 <suppressions>
1818
19+ <!-- Annotations -->
20+ <suppress files="" checks="AnnotationOnSameLine" />
21+
1922 <!-- Class Design -->
2023 <suppress files="" checks="DesignForExtension" />
2124
@@ -23,6 +26,7 @@
2326 <suppress files="" checks="ExplicitInitialization" />
2427 <suppress files="" checks="FinalLocalVariable" />
2528 <suppress files="" checks="MagicNumber" />
29+ <suppress files="" checks="OneStatementPerLine" />
2630
2731 <!-- Imports -->
2832 <suppress files="" checks="ImportControl" />
@@ -34,6 +38,9 @@
3438 <suppress files="" checks="FinalParameters" />
3539 <suppress files="" checks="TrailingComment" />
3640
41+ <!-- Modifiers -->
42+ <suppress files="" checks="InterfaceMemberImpliedModifier" />
43+
3744 <!-- Whitespace -->
3845 <suppress files="" checks="SingleSpaceSeparator" />
3946
--- a/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -1,16 +1,16 @@
11 <?xml version="1.0" encoding="UTF-8" ?>
22
33 <!DOCTYPE module PUBLIC
4- "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
5- "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
4+ "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
5+ "https://checkstyle.org/dtds/configuration_1_3.dtd">
66
77 <!--
88 Checkstyle modules
9- for Checkstyle 6.19(7.4) or later
9+ for Checkstyle 8.20 or later
1010
11- [ http://checkstyle.sourceforge.net/ ]
11+ [ https://checkstyle.org/ ]
1212
13- Copyright(c) 2010 olyutorskii
13+ Copyright(c) 2019 olyutorskii
1414 -->
1515
1616
@@ -26,10 +26,9 @@
2626
2727 <!-- Filters -->
2828 <module name="SeverityMatchFilter" />
29- <module name="SuppressionCommentFilter" />
30- <module name="SuppressionFilter" />
29+ <!--module name="SuppressionFilter" /-->
3130 <module name="SuppressWarningsFilter" />
32- <module name="SuppressWithNearbyCommentFilter" />
31+ <module name="SuppressWithPlainTextCommentFilter" />
3332
3433
3534 <!-- Headers -->
@@ -78,15 +77,31 @@
7877 <module name="FileTabCharacter" />
7978
8079
80+ <module name="BeforeExecutionExclusionFileFilter">
81+ <property name="fileNamePattern" value="module\-info\.java$" />
82+ </module>
83+
84+
8185 <module name="TreeWalker">
8286
83- <property name="tabWidth" value="8"/>
84- <property name="fileExtensions" value="java"/>
87+ <property name="tabWidth" value="8" />
88+ <property name="fileExtensions" value="java" />
89+
90+ <module name="SuppressWarningsHolder" />
91+
92+
93+ <!-- Filters -->
94+
95+ <module name="SuppressionCommentFilter" />
96+ <module name="SuppressWithNearbyCommentFilter" />
97+ <!--module name="SuppressionXpathFilter" /-->
98+ <!--module name="SuppressionXpathSingleFilter" /-->
8599
86100
87101 <!-- Annotations -->
88102
89103 <module name="AnnotationLocation" />
104+ <module name="AnnotationOnSameLine" />
90105 <module name="AnnotationUseStyle" />
91106 <module name="MissingDeprecated" />
92107 <module name="MissingOverride" />
@@ -164,7 +179,7 @@
164179 <module name="PackageDeclaration" />
165180 <module name="ParameterAssignment" />
166181 <module name="RequireThis">
167- <!--property name="checkMethods" value="false" /-->
182+ <property name="checkMethods" value="false" />
168183 </module>
169184 <module name="ReturnCount" />
170185 <module name="SimplifyBooleanExpression" />
@@ -182,7 +197,7 @@
182197 <module name="AvoidStaticImport" />
183198 <module name="CustomImportOrder" />
184199 <module name="IllegalImport" />
185- <module name="ImportControl" />
200+ <!--module name="ImportControl" /-->
186201 <module name="ImportOrder" />
187202 <module name="RedundantImport" />
188203 <module name="UnusedImports" />
@@ -225,14 +240,13 @@
225240
226241 <module name="ArrayTypeStyle" />
227242 <module name="AvoidEscapedUnicodeCharacters">
228- <property name="allowEscapesForControlCharacters" value="true"/>
229- <property name="allowByTailComment" value="true"/>
230- <property name="allowIfAllCharactersEscaped" value="true"/>
231- <property name="allowNonPrintableEscapes" value="true"/>
243+ <property name="allowEscapesForControlCharacters" value="true" />
244+ <property name="allowByTailComment" value="true" />
245+ <property name="allowIfAllCharactersEscaped" value="true" />
246+ <property name="allowNonPrintableEscapes" value="true" />
232247 </module>
233248 <module name="CommentsIndentation" />
234249 <module name="DescendantToken" />
235- <module name="FileContentsHolder" />
236250 <module name="FinalParameters" />
237251 <module name="Indentation">
238252 <property name="caseIndent" value="0" />
@@ -248,6 +262,8 @@
248262
249263 <!-- Modifiers -->
250264
265+ <module name="ClassMemberImpliedModifier" />
266+ <module name="InterfaceMemberImpliedModifier" />
251267 <module name="ModifierOrder" />
252268 <module name="RedundantModifier" />
253269
@@ -260,6 +276,7 @@
260276 <module name="ClassTypeParameterName" />
261277 <module name="ConstantName" />
262278 <module name="InterfaceTypeParameterName" />
279+ <module name="LambdaParameterName" />
263280 <module name="LocalFinalVariableName" />
264281 <module name="LocalVariableName" />
265282 <module name="MemberName" />
@@ -352,7 +369,7 @@
352369 <module name="SingleSpaceSeparator" />
353370 <module name="TypecastParenPad" />
354371 <module name="WhitespaceAfter" >
355- <property name="tokens" value="COMMA, SEMI,"/>
372+ <property name="tokens" value="COMMA, SEMI," />
356373 </module>
357374 <module name="WhitespaceAround">
358375 <property
--- /dev/null
+++ b/config/pmd/pmdrules.xml
@@ -0,0 +1,97 @@
1+<?xml version="1.0" encoding="UTF-8" ?>
2+
3+<!--
4+ Custom rule set
5+ for PMD [ https://pmd.github.io/ ] 6.13.0 or later
6+
7+ Copyright(c) 2019 olyutorskii
8+-->
9+
10+<ruleset
11+ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
12+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
13+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
14+ http://pmd.sourceforge.net/ruleset_2_0_0.xsd"
15+ name="Custom ruleset"
16+>
17+
18+ <description>
19+ custom rulesets
20+ </description>
21+
22+ <rule ref="category/java/bestpractices.xml" />
23+
24+ <rule ref="category/java/codestyle.xml" >
25+ <exclude name="CommentDefaultAccessModifier" />
26+ <exclude name="DefaultPackage" />
27+ <exclude name="IfElseStmtsMustUseBraces" />
28+ <exclude name="IfStmtsMustUseBraces" />
29+ <exclude name="LocalVariableCouldBeFinal" />
30+ <exclude name="MethodArgumentCouldBeFinal" />
31+ <exclude name="OnlyOneReturn" />
32+ <exclude name="UnnecessaryLocalBeforeReturn" />
33+ <exclude name="UnnecessaryReturn" />
34+ </rule>
35+ <rule ref="category/java/codestyle.xml/ControlStatementBraces" >
36+ <properties>
37+ <property name="checkIfElseStmt" value="false"/>
38+ <property name="checkSingleIfStmt" value="false"/>
39+ </properties>
40+ </rule>
41+ <rule ref="category/java/codestyle.xml/LongVariable" >
42+ <properties>
43+ <property name="minimum" value="25"/>
44+ </properties>
45+ </rule>
46+ <rule ref="category/java/codestyle.xml/ShortVariable" >
47+ <properties>
48+ <property name="minimum" value="2"/>
49+ </properties>
50+ </rule>
51+
52+ <rule ref="category/java/design.xml" >
53+ <exclude name="AvoidThrowingNullPointerException" />
54+ <exclude name="AvoidUncheckedExceptionsInSignatures" />
55+ <exclude name="LawOfDemeter" />
56+ <exclude name="LoosePackageCoupling" />
57+ </rule>
58+ <rule ref="category/java/design.xml/NcssCount" >
59+ <properties>
60+ <property name="methodReportLevel" value="50"/>
61+ </properties>
62+ </rule>
63+
64+ <rule ref="category/java/documentation.xml" />
65+ <rule ref="category/java/documentation.xml/CommentRequired" >
66+ <properties>
67+ <property name="fieldCommentRequirement" value="Ignored"/>
68+ </properties>
69+ </rule>
70+ <rule ref="category/java/documentation.xml/CommentSize" >
71+ <properties>
72+ <property name="maxLines" value="25"/>
73+ </properties>
74+ </rule>
75+
76+ <rule ref="category/java/errorprone.xml" >
77+ <exclude name="AvoidLiteralsInIfCondition" />
78+ <exclude name="BeanMembersShouldSerialize" />
79+ <exclude name="DataflowAnomalyAnalysis" />
80+ </rule>
81+
82+ <rule ref="category/java/multithreading.xml" />
83+
84+ <rule ref="category/java/performance.xml" >
85+ <exclude name="ConsecutiveAppendsShouldReuse" />
86+ <exclude name="RedundantFieldInitializer" />
87+ </rule>
88+
89+ <rule ref="category/java/security.xml" />
90+
91+ <!--rule ref="category/pom/errorprone.xml" /-->
92+
93+ <!--rule ref="category/xml/errorprone.xml" /-->
94+
95+</ruleset>
96+
97+<!-- EOF -->
--- a/fixcrlf.xml
+++ /dev/null
@@ -1,65 +0,0 @@
1-<?xml version="1.0" encoding="UTF-8" ?>
2-
3-<!-- ====================================================================== -->
4-<!-- Ant build file (http://ant.apache.org/) for Ant 1.8.0 or later. -->
5-<!-- ====================================================================== -->
6-
7-<project basedir=".">
8-<description>
9-CAUTION : This is not build-file for project-building.
10-It's just adapting project-files for native environment.
11-</description>
12-
13-<!-- ====================================================================== -->
14-<!-- sanitize files for native environment -->
15-<!-- ====================================================================== -->
16-
17- <target description="sanitize files" name="sanitize" >
18- <echo message="sanitize files..." />
19-
20- <fixcrlf
21- srcDir="." includes="*.txt"
22- encoding="UTF-8" outputencoding="UTF-8"
23- tablength="8" tab="remove"
24- eof="remove"
25- />
26-
27- <fixcrlf
28- srcDir="./src/" includes="**/*.java"
29- encoding="UTF-8" outputencoding="UTF-8"
30- tablength="4" tab="remove" javafiles="true"
31- eof="remove"
32- />
33-
34- <fixcrlf
35- srcDir="./src/" includes="**/*.properties"
36- encoding="ISO-8859-1" outputencoding="ISO-8859-1"
37- eol="lf"
38- eof="remove"
39- />
40-
41- <fixcrlf
42- srcDir="./src/" includes="**/*.xml,**/*.xsd,**/*.dtd"
43- encoding="UTF-8" outputencoding="UTF-8"
44- tablength="8" tab="remove"
45- eol="lf"
46- eof="remove"
47- />
48-
49- <fixcrlf
50- srcDir="./src/" includes="**/*.html,**/*.htm,**/*.css"
51- encoding="UTF-8" outputencoding="UTF-8"
52- tablength="8" tab="remove"
53- eol="lf"
54- eof="remove"
55- />
56-
57- <chmod type="file" perm="a-x">
58- <fileset dir="." includes="**/*" excludes="**/*.sh" />
59- </chmod>
60-
61- </target>
62-
63-</project>
64-
65-<!-- EOF -->
--- a/pmdrules.xml
+++ /dev/null
@@ -1,117 +0,0 @@
1-<?xml version="1.0" encoding="UTF-8" ?>
2-
3-<!--
4- Custom rule set
5- for PMD [ https://pmd.github.io/ ] 5.5.2 or later
6-
7- Copyright(c) 2016 olyutorskii
8--->
9-
10-<ruleset
11- xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
12- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
13- xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
14- http://pmd.sourceforge.net/ruleset_2_0_0.xsd"
15- name="Custom ruleset"
16->
17-
18- <description>
19- custom rulesets
20- </description>
21-
22- <rule ref="rulesets/java/android.xml" />
23-
24- <rule ref="rulesets/java/basic.xml" />
25-
26- <rule ref="rulesets/java/braces.xml">
27- <exclude name="IfElseStmtsMustUseBraces" />
28- <exclude name="IfStmtsMustUseBraces" />
29- </rule>
30-
31- <rule ref="rulesets/java/clone.xml" />
32-
33- <rule ref="rulesets/java/codesize.xml" />
34-
35- <rule ref="rulesets/java/comments.xml">
36- <exclude name="CommentDefaultAccessModifier" />
37- </rule>
38- <rule ref="rulesets/java/comments.xml/CommentRequired" >
39- <properties>
40- <property name="fieldCommentRequirement" value="Ignored"/>
41- </properties>
42- </rule>
43- <rule ref="rulesets/java/comments.xml/CommentSize" >
44- <properties>
45- <property name="maxLines" value="25"/>
46- </properties>
47- </rule>
48-
49- <rule ref="rulesets/java/controversial.xml">
50- <exclude name="DefaultPackage" />
51- <exclude name="OnlyOneReturn" />
52- <exclude name="DataflowAnomalyAnalysis" />
53- <exclude name="AvoidLiteralsInIfCondition" />
54- </rule>
55-
56- <rule ref="rulesets/java/coupling.xml">
57- <exclude name="LoosePackageCoupling" />
58- <exclude name="LawOfDemeter" />
59- </rule>
60-
61- <rule ref="rulesets/java/design.xml">
62- <exclude name="UnnecessaryLocalBeforeReturn" />
63- <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
64- </rule>
65-
66- <rule ref="rulesets/java/empty.xml" />
67-
68- <rule ref="rulesets/java/finalizers.xml" />
69-
70- <rule ref="rulesets/java/imports.xml" />
71-
72- <rule ref="rulesets/java/j2ee.xml">
73- <exclude name="DoNotUseThreads" />
74- </rule>
75-
76- <rule ref="rulesets/java/logging-jakarta-commons.xml" />
77-
78- <rule ref="rulesets/java/javabeans.xml">
79- <exclude name="BeanMembersShouldSerialize" />
80- </rule>
81-
82- <rule ref="rulesets/java/logging-java.xml" />
83-
84- <rule ref="rulesets/java/junit.xml" />
85-
86- <rule ref="rulesets/java/migrating.xml" />
87-
88- <rule ref="rulesets/java/naming.xml">
89- <exclude name="ShortVariable" />
90- <exclude name="LongVariable" />
91- </rule>
92-
93- <rule ref="rulesets/java/optimizations.xml">
94- <exclude name="LocalVariableCouldBeFinal" />
95- <exclude name="MethodArgumentCouldBeFinal" />
96- <exclude name="RedundantFieldInitializer" />
97- </rule>
98-
99- <rule ref="rulesets/java/strictexception.xml" />
100-
101- <rule ref="rulesets/java/strings.xml">
102- <exclude name="ConsecutiveAppendsShouldReuse" />
103- </rule>
104-
105- <rule ref="rulesets/java/sunsecure.xml" />
106-
107- <rule ref="rulesets/java/typeresolution.xml" />
108-
109- <rule ref="rulesets/java/unnecessary.xml">
110- <exclude name="UnnecessaryReturn" />
111- </rule>
112-
113- <rule ref="rulesets/java/unusedcode.xml" />
114-
115-</ruleset>
116-
117-<!-- EOF -->
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
1616 <groupId>jp.sourceforge.jindolf</groupId>
1717 <artifactId>jinarchiver</artifactId>
1818
19- <version>1.503.4</version>
19+ <version>1.503.106</version>
2020
2121 <packaging>jar</packaging>
2222 <name>JinArchiver</name>
@@ -58,20 +58,18 @@
5858 <contributors/>
5959 <mailingLists/>
6060
61- <prerequisites>
62- <maven>3.0.1</maven>
63- </prerequisites>
61+ <!-- prerequisites/ -->
6462
6563 <modules/>
6664
6765 <scm>
68- <connection>scm:hg:http://hg.osdn.net/view/jindolf/JinArchiver</connection>
69- <developerConnection>scm:hg:ssh://hg.osdn.net//hgroot/jindolf/JinArchiver</developerConnection>
70- <url>https://osdn.net/projects/jindolf/scm/hg/JinArchiver/</url>
66+ <connection>scm:git:git://git.osdn.net/gitroot/jindolf/JinArchiver.git</connection>
67+ <developerConnection>scm:git:https://scm.osdn.net/gitroot/jindolf/JinArchiver.git</developerConnection>
68+ <url>https://osdn.net/projects/jindolf/scm/git/JinArchiver</url>
7169 </scm>
7270
7371 <issueManagement>
74- <system>OSDN.NET</system>
72+ <system>OSDN.net</system>
7573 <url>https://ja.osdn.net/projects/jindolf/ticket/</url>
7674 </issueManagement>
7775
@@ -79,8 +77,8 @@
7977 <distributionManagement/>
8078
8179 <properties>
82- <maven.compiler.source>1.7</maven.compiler.source>
83- <maven.compiler.target>1.7</maven.compiler.target>
80+ <maven.compiler.source>1.8</maven.compiler.source>
81+ <maven.compiler.target>1.8</maven.compiler.target>
8482
8583 <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
8684 <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
@@ -89,25 +87,31 @@
8987 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9088 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
9189
92- <site.locales>en</site.locales>
93- <javadoc.locale>en</javadoc.locale>
94- <findbugs.jvmArgs>-Duser.language=en</findbugs.jvmArgs>
90+ <locale>en</locale>
91+ <site.locales>${locale}</site.locales>
92+ <javadoc.locale>${locale}</javadoc.locale>
93+ <spotbugs.jvmArgs>-Duser.language=${locale}</spotbugs.jvmArgs>
9594
96- <jacoco-plugin.version>0.7.9</jacoco-plugin.version>
95+ <!-- Walk around: JDK 11 javadoc + Maven -->
96+ <detectJavaApiLink>false</detectJavaApiLink>
9797
98- <checkstyle-plugin.version>2.17</checkstyle-plugin.version>
99- <checkstyleruntime.version>6.19</checkstyleruntime.version>
100- <checkstyle.config.location>${project.basedir}/checkstyle.xml</checkstyle.config.location>
101- <checkstyle.suppressions.location>${project.basedir}/checkstyle-suppressions.xml</checkstyle.suppressions.location>
98+ <surefire-plugin.version>3.0.0-M3</surefire-plugin.version>
99+ <jacoco-plugin.version>0.8.3</jacoco-plugin.version>
100+
101+ <checkstyle-plugin.version>3.0.0</checkstyle-plugin.version>
102+ <checkstyleruntime.version>8.20</checkstyleruntime.version>
103+ <checkstyle.config.location>${project.basedir}/config/checkstyle/checkstyle.xml</checkstyle.config.location>
104+ <checkstyle.suppressions.location>${project.basedir}/config/checkstyle/checkstyle-suppressions.xml</checkstyle.suppressions.location>
102105 <checkstyle.enable.rss>false</checkstyle.enable.rss>
103106
104- <pmd-plugin.version>3.7</pmd-plugin.version>
107+ <pmd-plugin.version>3.12.0</pmd-plugin.version>
108+ <pmd.analysisCache>true</pmd.analysisCache>
105109
106- <findbugs-plugin.version>3.0.4</findbugs-plugin.version>
107- <findbugs.effort>Max</findbugs.effort>
108- <findbugs.threshold>Low</findbugs.threshold>
110+ <spotbugs-plugin.version>3.1.11</spotbugs-plugin.version>
111+ <spotbugs.effort>Max</spotbugs.effort>
112+ <spotbugs.threshold>Low</spotbugs.threshold>
109113 <!-- for Jenkins -->
110- <findbugs.xmlOutput>true</findbugs.xmlOutput>
114+ <spotbugs.xmlOutput>true</spotbugs.xmlOutput>
111115
112116 <project.mainentry>jp.sourceforge.jindolf.archiver.JinArchiver</project.mainentry>
113117
@@ -125,9 +129,9 @@
125129 </dependency>
126130
127131 <dependency>
128- <groupId>jp.sourceforge.jindolf</groupId>
132+ <groupId>jp.osdn.jindolf</groupId>
129133 <artifactId>jinparser</artifactId>
130- <version>1.409.4</version>
134+ <version>2.101.106</version>
131135 <scope>compile</scope>
132136 </dependency>
133137
@@ -150,7 +154,6 @@
150154 <dependency>
151155 <groupId>com.puppycrawl.tools</groupId>
152156 <artifactId>checkstyle</artifactId>
153- <!--artifactId>checkstyle-backport-jre6</artifactId-->
154157 <version>${checkstyleruntime.version}</version>
155158 </dependency>
156159 </dependencies>
@@ -168,7 +171,7 @@
168171 <plugin>
169172 <groupId>org.apache.maven.plugins</groupId>
170173 <artifactId>maven-clean-plugin</artifactId>
171- <version>3.0.0</version>
174+ <version>3.1.0</version>
172175 <configuration>
173176 <filesets>
174177 <fileset>
@@ -195,32 +198,40 @@
195198 <plugin>
196199 <groupId>org.apache.maven.plugins</groupId>
197200 <artifactId>maven-enforcer-plugin</artifactId>
198- <version>1.4.1</version>
199- <configuration>
200- <rules>
201- <requireMavenVersion>
202- <version>[3.0.1,)</version>
203- </requireMavenVersion>
204- <requireJavaVersion>
205- <version>[1.7,)</version>
206- </requireJavaVersion>
207- </rules>
208- </configuration>
201+ <version>3.0.0-M2</version>
202+ <executions>
203+ <execution>
204+ <id>enforce-versions</id>
205+ <goals>
206+ <goal>enforce</goal>
207+ </goals>
208+ <configuration>
209+ <rules>
210+ <requireMavenVersion>
211+ <version>[3.3.9,)</version>
212+ </requireMavenVersion>
213+ <requireJavaVersion>
214+ <version>[1.8,)</version>
215+ </requireJavaVersion>
216+ </rules>
217+ </configuration>
218+ </execution>
219+ </executions>
209220 </plugin>
210221
211222 <plugin>
212223 <groupId>org.apache.maven.plugins</groupId>
213224 <artifactId>maven-resources-plugin</artifactId>
214- <version>3.0.2</version>
225+ <version>3.1.0</version>
215226 </plugin>
216227
217228 <plugin>
218229 <groupId>org.apache.maven.plugins</groupId>
219230 <artifactId>maven-compiler-plugin</artifactId>
220- <version>3.6.1</version>
231+ <version>3.8.0</version>
221232 <configuration>
222- <source>1.7</source> <!-- for NetBeans IDE -->
223- <target>1.7</target>
233+ <source>1.8</source> <!-- for NetBeans IDE -->
234+ <target>1.8</target>
224235 <compilerArguments>
225236 <Xlint/>
226237 </compilerArguments>
@@ -232,7 +243,7 @@
232243 <plugin>
233244 <groupId>org.apache.maven.plugins</groupId>
234245 <artifactId>maven-surefire-plugin</artifactId>
235- <version>2.19.1</version>
246+ <version>${surefire-plugin.version}</version>
236247 <configuration>
237248 <enableAssertions>true</enableAssertions>
238249 </configuration>
@@ -282,7 +293,7 @@
282293 <plugin>
283294 <groupId>org.apache.maven.plugins</groupId>
284295 <artifactId>maven-jar-plugin</artifactId>
285- <version>3.0.2</version>
296+ <version>3.1.1</version>
286297 <configuration>
287298 <archive>
288299 <manifest>
@@ -301,12 +312,12 @@
301312 <plugin>
302313 <groupId>org.apache.maven.plugins</groupId>
303314 <artifactId>maven-shade-plugin</artifactId>
304- <version>3.0.0</version>
315+ <version>3.2.1</version>
305316 <executions>
306317 <execution>
307318 <phase>package</phase>
308319 <goals>
309- <goal>shade</goal>
320+ <goal>shade</goal>
310321 </goals>
311322 <configuration>
312323 <createDependencyReducedPom>false</createDependencyReducedPom>
@@ -341,13 +352,13 @@
341352 <plugin>
342353 <groupId>org.apache.maven.plugins</groupId>
343354 <artifactId>maven-install-plugin</artifactId>
344- <version>2.5.2</version>
355+ <version>3.0.0-M1</version>
345356 </plugin>
346357
347358 <plugin>
348359 <groupId>org.apache.maven.plugins</groupId>
349360 <artifactId>maven-deploy-plugin</artifactId>
350- <version>2.8.2</version>
361+ <version>3.0.0-M1</version>
351362 </plugin>
352363
353364
@@ -356,7 +367,7 @@
356367 <plugin>
357368 <groupId>org.apache.maven.plugins</groupId>
358369 <artifactId>maven-site-plugin</artifactId>
359- <version>3.6</version>
370+ <version>3.7.1</version>
360371 <configuration>
361372 <locales>${site.locales}</locales>
362373 </configuration>
@@ -368,7 +379,7 @@
368379 <plugin>
369380 <groupId>org.apache.maven.plugins</groupId>
370381 <artifactId>maven-assembly-plugin</artifactId>
371- <version>3.0.0</version>
382+ <version>3.1.1</version>
372383 <configuration>
373384 <descriptors>
374385 <descriptor>src/assembly/src.xml</descriptor>
@@ -382,6 +393,23 @@
382393 <version>${checkstyle-plugin.version}</version>
383394 </plugin>
384395
396+ <plugin>
397+ <groupId>org.apache.maven.plugins</groupId>
398+ <artifactId>maven-pmd-plugin</artifactId>
399+ <version>${pmd-plugin.version}</version>
400+ <configuration>
401+ <rulesets>
402+ <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
403+ </rulesets>
404+ </configuration>
405+ </plugin>
406+
407+ <plugin>
408+ <groupId>com.github.spotbugs</groupId>
409+ <artifactId>spotbugs-maven-plugin</artifactId>
410+ <version>${spotbugs-plugin.version}</version>
411+ </plugin>
412+
385413 </plugins>
386414
387415 <resources>
@@ -438,7 +466,7 @@
438466 <plugin>
439467 <groupId>org.apache.maven.plugins</groupId>
440468 <artifactId>maven-project-info-reports-plugin</artifactId>
441- <version>2.9</version>
469+ <version>3.0.0</version>
442470 <configuration>
443471 <linkOnly>true</linkOnly>
444472 <offline>true</offline>
@@ -448,20 +476,20 @@
448476 <reports>
449477 <report>index</report>
450478 <report>summary</report>
451- <report>license</report>
479+ <report>licenses</report>
452480 <report>dependency-info</report>
453481 <report>dependencies</report>
454482 <report>dependency-convergence</report>
455483 <report>plugins</report>
456484 <report>plugin-management</report>
457- <report>project-team</report>
458- <report>issue-tracking</report>
485+ <report>team</report>
486+ <report>issue-management</report>
459487 <report>scm</report>
460488 <!--
461489 <report>dependency-management</report>
462490 <report>distribution-management</report>
463- <report>cim</report>
464- <report>mailing-list</report>
491+ <report>ci-management</report>
492+ <report>mailing-lists</report>
465493 <report>modules</report>
466494 -->
467495 </reports>
@@ -472,15 +500,17 @@
472500 <plugin>
473501 <groupId>org.apache.maven.plugins</groupId>
474502 <artifactId>maven-javadoc-plugin</artifactId>
475- <version>2.10.4</version>
503+ <version>3.1.0</version>
476504 <configuration>
477505 <author>false</author>
478506 <notimestamp>true</notimestamp>
479507 <quiet>true</quiet>
480508 <show>protected</show>
481- <locale>${javadoc.locale}</locale>
482509 <header>${project.name} ${project.version} API</header>
483510 <version>true</version>
511+ <locale>${javadoc.locale}</locale>
512+ <!-- for JDK11 javadoc -->
513+ <additionalJOption>-J-Duser.language=${javadoc.locale}</additionalJOption>
484514 </configuration>
485515 <reportSets>
486516 <reportSet>
@@ -494,13 +524,13 @@
494524 <plugin>
495525 <groupId>org.apache.maven.plugins</groupId>
496526 <artifactId>maven-jxr-plugin</artifactId>
497- <version>2.5</version>
527+ <version>3.0.0</version>
498528 </plugin>
499529
500530 <plugin>
501531 <groupId>org.apache.maven.plugins</groupId>
502532 <artifactId>maven-surefire-report-plugin</artifactId>
503- <version>2.19.1</version>
533+ <version>${surefire-plugin.version}</version>
504534 </plugin>
505535
506536 <plugin>
@@ -535,7 +565,7 @@
535565 <version>${pmd-plugin.version}</version>
536566 <configuration>
537567 <rulesets>
538- <ruleset>${project.basedir}/pmdrules.xml</ruleset>
568+ <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
539569 </rulesets>
540570 </configuration>
541571 <reportSets>
@@ -549,9 +579,9 @@
549579 </plugin>
550580
551581 <plugin>
552- <groupId>org.codehaus.mojo</groupId>
553- <artifactId>findbugs-maven-plugin</artifactId>
554- <version>${findbugs-plugin.version}</version>
582+ <groupId>com.github.spotbugs</groupId>
583+ <artifactId>spotbugs-maven-plugin</artifactId>
584+ <version>${spotbugs-plugin.version}</version>
555585 </plugin>
556586
557587 </plugins>
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -8,7 +8,7 @@
88 >
99
1010 <!--
11- OSDN.NET用リリースファイル構成定義ファイル
11+ OSDN.net用リリースファイル構成定義ファイル
1212 Maven3 assembly用
1313 -->
1414
@@ -24,6 +24,7 @@
2424 <includes>
2525 <include>*.xml</include>
2626 <include>*.txt</include>
27+ <include>*.md</include>
2728 </includes>
2829 <excludes>
2930 <exclude>nb-configuration.xml</exclude>
@@ -35,6 +36,10 @@
3536 <directory>${project.basedir}/src</directory>
3637 <useDefaultExcludes>true</useDefaultExcludes>
3738 </fileSet>
39+ <fileSet>
40+ <directory>${project.basedir}/config</directory>
41+ <useDefaultExcludes>true</useDefaultExcludes>
42+ </fileSet>
3843 </fileSets>
3944
4045 </assembly>
--- a/src/main/java/jp/sourceforge/jindolf/archiver/Builder.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/Builder.java
@@ -7,20 +7,19 @@
77
88 package jp.sourceforge.jindolf.archiver;
99
10+import io.bitbucket.olyutorskii.jiocema.DecodeBreakException;
11+import io.bitbucket.olyutorskii.jiocema.DecodeNotifier;
1012 import java.io.IOException;
1113 import java.io.InputStream;
1214 import java.net.URL;
1315 import java.net.URLConnection;
1416 import java.nio.charset.Charset;
15-import jp.sourceforge.jindolf.parser.ContentBuilder;
16-import jp.sourceforge.jindolf.parser.ContentBuilderSJ;
17-import jp.sourceforge.jindolf.parser.ContentBuilderUCS2;
18-import jp.sourceforge.jindolf.parser.DecodeException;
19-import jp.sourceforge.jindolf.parser.DecodedContent;
20-import jp.sourceforge.jindolf.parser.HtmlParseException;
21-import jp.sourceforge.jindolf.parser.HtmlParser;
22-import jp.sourceforge.jindolf.parser.SjisDecoder;
23-import jp.sourceforge.jindolf.parser.StreamDecoder;
17+import jp.osdn.jindolf.parser.HtmlParseException;
18+import jp.osdn.jindolf.parser.HtmlParser;
19+import jp.osdn.jindolf.parser.content.ContentBuilder;
20+import jp.osdn.jindolf.parser.content.ContentBuilderSJ;
21+import jp.osdn.jindolf.parser.content.DecodedContent;
22+import jp.osdn.jindolf.parser.content.SjisNotifier;
2423
2524 /**
2625 * 入力から内部構造を生成する。
@@ -45,27 +44,27 @@ public final class Builder{
4544 * @param istream 入力ストリーム
4645 * @return デコード結果
4746 * @throws IOException 入力エラー
48- * @throws DecodeException デコードエラー
47+ * @throws DecodeBreakException デコードエラー
4948 */
5049 public static DecodedContent contentFromStream(Charset charset,
5150 InputStream istream)
52- throws IOException, DecodeException{
53- StreamDecoder decoder;
51+ throws IOException, DecodeBreakException{
52+ DecodeNotifier decoder;
5453 ContentBuilder builder;
5554
5655 String name = charset.name();
5756 if("Shift_JIS".equalsIgnoreCase(name)){
58- decoder = new SjisDecoder();
57+ decoder = new SjisNotifier();
5958 builder = new ContentBuilderSJ(BUF_SZ);
6059 }else if("UTF-8".equalsIgnoreCase(name)){
61- decoder = new StreamDecoder(charset.newDecoder());
62- builder = new ContentBuilderUCS2(BUF_SZ);
60+ decoder = new DecodeNotifier(charset.newDecoder());
61+ builder = new ContentBuilder(BUF_SZ);
6362 }else{
6463 assert false;
6564 return null;
6665 }
6766
68- decoder.setDecodeHandler(builder);
67+ decoder.setCharDecodeListener(builder);
6968
7069 decoder.decode(istream);
7170
@@ -78,11 +77,11 @@ public final class Builder{
7877 * 村の各日々をロードしパースする。
7978 * @param villageData 村情報
8079 * @throws IOException 入力エラー
81- * @throws DecodeException デコードエラー
80+ * @throws DecodeBreakException デコードエラー
8281 * @throws HtmlParseException パースエラー
8382 */
8483 public static void fillVillageData(VillageData villageData)
85- throws IOException, DecodeException, HtmlParseException {
84+ throws IOException, DecodeBreakException, HtmlParseException {
8685 HtmlParser parser = new HtmlParser();
8786 Handler handler = new Handler();
8887 parser.setBasicHandler (handler);
--- a/src/main/java/jp/sourceforge/jindolf/archiver/EventData.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/EventData.java
@@ -10,9 +10,9 @@ package jp.sourceforge.jindolf.archiver;
1010 import java.io.IOException;
1111 import java.util.LinkedList;
1212 import java.util.List;
13+import jp.osdn.jindolf.parser.content.DecodedContent;
1314 import jp.sourceforge.jindolf.corelib.GameRole;
1415 import jp.sourceforge.jindolf.corelib.SysEventType;
15-import jp.sourceforge.jindolf.parser.DecodedContent;
1616
1717 /**
1818 * システムイベント モデル。
--- a/src/main/java/jp/sourceforge/jindolf/archiver/Handler.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/Handler.java
@@ -9,6 +9,12 @@ package jp.sourceforge.jindolf.archiver;
99
1010 import java.util.regex.Matcher;
1111 import java.util.regex.Pattern;
12+import jp.osdn.jindolf.parser.EntityConverter;
13+import jp.osdn.jindolf.parser.HtmlAdapter;
14+import jp.osdn.jindolf.parser.HtmlParseException;
15+import jp.osdn.jindolf.parser.PageType;
16+import jp.osdn.jindolf.parser.SeqRange;
17+import jp.osdn.jindolf.parser.content.DecodedContent;
1218 import jp.sourceforge.jindolf.corelib.DisclosureType;
1319 import jp.sourceforge.jindolf.corelib.EventFamily;
1420 import jp.sourceforge.jindolf.corelib.GameRole;
@@ -18,12 +24,6 @@ import jp.sourceforge.jindolf.corelib.SysEventType;
1824 import jp.sourceforge.jindolf.corelib.TalkType;
1925 import jp.sourceforge.jindolf.corelib.Team;
2026 import jp.sourceforge.jindolf.corelib.VillageTag;
21-import jp.sourceforge.jindolf.parser.DecodedContent;
22-import jp.sourceforge.jindolf.parser.EntityConverter;
23-import jp.sourceforge.jindolf.parser.HtmlAdapter;
24-import jp.sourceforge.jindolf.parser.HtmlParseException;
25-import jp.sourceforge.jindolf.parser.PageType;
26-import jp.sourceforge.jindolf.parser.SeqRange;
2727
2828 /**
2929 * パーサ用ハンドラ。
--- a/src/main/java/jp/sourceforge/jindolf/archiver/HttpAccess.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/HttpAccess.java
@@ -7,22 +7,22 @@
77
88 package jp.sourceforge.jindolf.archiver;
99
10+import io.bitbucket.olyutorskii.jiocema.DecodeBreakException;
1011 import java.io.IOException;
1112 import java.io.InputStream;
1213 import java.net.URL;
1314 import java.nio.charset.Charset;
1415 import java.util.LinkedList;
1516 import java.util.List;
17+import jp.osdn.jindolf.parser.HtmlAdapter;
18+import jp.osdn.jindolf.parser.HtmlParseException;
19+import jp.osdn.jindolf.parser.HtmlParser;
20+import jp.osdn.jindolf.parser.PageType;
21+import jp.osdn.jindolf.parser.SeqRange;
22+import jp.osdn.jindolf.parser.content.DecodedContent;
1623 import jp.sourceforge.jindolf.corelib.LandDef;
1724 import jp.sourceforge.jindolf.corelib.LandState;
1825 import jp.sourceforge.jindolf.corelib.PeriodType;
19-import jp.sourceforge.jindolf.parser.DecodeException;
20-import jp.sourceforge.jindolf.parser.DecodedContent;
21-import jp.sourceforge.jindolf.parser.HtmlAdapter;
22-import jp.sourceforge.jindolf.parser.HtmlParseException;
23-import jp.sourceforge.jindolf.parser.HtmlParser;
24-import jp.sourceforge.jindolf.parser.PageType;
25-import jp.sourceforge.jindolf.parser.SeqRange;
2626
2727 /**
2828 * 人狼HTTPサーバ内のリソース情報を展開する。
@@ -65,13 +65,13 @@ public final class HttpAccess{
6565 * @param landDef 国指定
6666 * @param vid 村番号
6767 * @return ロード元情報一覧
68- * @throws DecodeException デコードエラー
68+ * @throws DecodeBreakException デコードエラー
6969 * @throws HtmlParseException パースエラー
7070 * @throws IOException 入力エラー
7171 */
7272 public static List<PeriodResource> loadResourceList(LandDef landDef,
7373 int vid)
74- throws DecodeException,
74+ throws DecodeBreakException,
7575 HtmlParseException,
7676 IOException {
7777 URL url = getPeriodListURL(landDef, vid);
--- a/src/main/java/jp/sourceforge/jindolf/archiver/JinArchiver.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/JinArchiver.java
@@ -7,6 +7,7 @@
77
88 package jp.sourceforge.jindolf.archiver;
99
10+import io.bitbucket.olyutorskii.jiocema.DecodeBreakException;
1011 import java.io.BufferedOutputStream;
1112 import java.io.BufferedReader;
1213 import java.io.BufferedWriter;
@@ -24,9 +25,8 @@ import java.text.MessageFormat;
2425 import java.util.List;
2526 import java.util.Properties;
2627 import javax.xml.validation.Validator;
28+import jp.osdn.jindolf.parser.HtmlParseException;
2729 import jp.sourceforge.jindolf.corelib.LandDef;
28-import jp.sourceforge.jindolf.parser.DecodeException;
29-import jp.sourceforge.jindolf.parser.HtmlParseException;
3030 import org.xml.sax.SAXException;
3131
3232 /**
@@ -185,7 +185,7 @@ public final class JinArchiver{
185185 }catch(IOException e){
186186 abortWithException(e);
187187 return;
188- }catch(DecodeException e){
188+ }catch(DecodeBreakException e){
189189 abortWithException(e);
190190 return;
191191 }catch(HtmlParseException e){
@@ -251,11 +251,11 @@ public final class JinArchiver{
251251 * @param vid 村番号
252252 * @return 村情報
253253 * @throws IOException 入出力エラー
254- * @throws DecodeException デコードエラー
254+ * @throws DecodeBreakException デコードエラー
255255 * @throws HtmlParseException パースエラー
256256 */
257257 public static VillageData load(LandDef landDef, int vid)
258- throws IOException, DecodeException, HtmlParseException{
258+ throws IOException, DecodeBreakException, HtmlParseException{
259259 List<PeriodResource> resourceList =
260260 HttpAccess.loadResourceList(landDef, vid);
261261 VillageData villageData = new VillageData(resourceList);
--- a/src/main/java/jp/sourceforge/jindolf/archiver/PeriodData.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/PeriodData.java
@@ -11,9 +11,9 @@ import java.io.IOException;
1111 import java.net.URI;
1212 import java.util.LinkedList;
1313 import java.util.List;
14+import jp.osdn.jindolf.parser.content.DecodedContent;
1415 import jp.sourceforge.jindolf.corelib.DisclosureType;
1516 import jp.sourceforge.jindolf.corelib.SysEventType;
16-import jp.sourceforge.jindolf.parser.DecodedContent;
1717
1818 /**
1919 * Periodモデル。
--- a/src/main/java/jp/sourceforge/jindolf/archiver/TopicData.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/TopicData.java
@@ -10,7 +10,7 @@ package jp.sourceforge.jindolf.archiver;
1010 import java.io.IOException;
1111 import java.util.LinkedList;
1212 import java.util.List;
13-import jp.sourceforge.jindolf.parser.DecodedContent;
13+import jp.osdn.jindolf.parser.content.DecodedContent;
1414
1515 /**
1616 * テキスト行の集合。
--- a/src/main/java/jp/sourceforge/jindolf/archiver/Win31j.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/Win31j.java
@@ -12,8 +12,8 @@ import java.nio.charset.CharacterCodingException;
1212 import java.nio.charset.Charset;
1313 import java.nio.charset.CharsetDecoder;
1414 import java.nio.charset.CodingErrorAction;
15-import jp.sourceforge.jindolf.parser.DecodeErrorInfo;
16-import jp.sourceforge.jindolf.parser.DecodedContent;
15+import jp.osdn.jindolf.parser.content.DecodeErrorInfo;
16+import jp.osdn.jindolf.parser.content.DecodedContent;
1717
1818 /**
1919 * windows-31jエンコーディング(機種依存文字)に関する諸々。
--- a/src/main/java/jp/sourceforge/jindolf/archiver/XmlOut.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/XmlOut.java
@@ -17,8 +17,8 @@ import java.util.Calendar;
1717 import java.util.GregorianCalendar;
1818 import java.util.List;
1919 import java.util.TimeZone;
20-import jp.sourceforge.jindolf.parser.DecodeErrorInfo;
21-import jp.sourceforge.jindolf.parser.DecodedContent;
20+import jp.osdn.jindolf.parser.content.DecodeErrorInfo;
21+import jp.osdn.jindolf.parser.content.DecodedContent;
2222
2323
2424 /**
--- a/src/test/java/jp/sourceforge/jindolf/archiver/XmlOutTest.java
+++ b/src/test/java/jp/sourceforge/jindolf/archiver/XmlOutTest.java
@@ -5,8 +5,8 @@ package jp.sourceforge.jindolf.archiver;
55
66 import java.io.StringWriter;
77 import java.io.Writer;
8-import jp.sourceforge.jindolf.parser.DecodeErrorInfo;
9-import jp.sourceforge.jindolf.parser.DecodedContent;
8+import jp.osdn.jindolf.parser.content.DecodeErrorInfo;
9+import jp.osdn.jindolf.parser.content.DecodedContent;
1010 import org.junit.After;
1111 import org.junit.AfterClass;
1212 import org.junit.Before;
Show on old repository browser