• R/O
  • SSH

JinParser: Commit

JinParserライブラリは、CGIゲーム「人狼BBS」のクライアント制作者向けに作られたJavaライブラリです。


Commit MetaInfo

Revision06d9e4c356ac9e9ad7035fa9f67571e17908c22f (tree)
Zeit2017-04-09 12:23:22
Autor <olyutorskii@user...>

Log Message

release/1.409.4 とマージ

Ändern Zusammenfassung

Diff

diff -r e21d4481babc -r 06d9e4c356ac .hgignore
--- a/.hgignore Mon Jun 27 00:10:27 2016 +0900
+++ b/.hgignore Sun Apr 09 12:23:22 2017 +0900
@@ -27,7 +27,7 @@
2727 syntax: glob
2828
2929 .DS_Store
30-_MACOSX
30+__MACOSX
3131 [Tt]humbs.db
3232 [Dd]esktop.ini
3333 core
diff -r e21d4481babc -r 06d9e4c356ac CHANGELOG.txt
--- a/CHANGELOG.txt Mon Jun 27 00:10:27 2016 +0900
+++ b/CHANGELOG.txt Sun Apr 09 12:23:22 2017 +0900
@@ -4,6 +4,9 @@
44 JinParser 変更履歴
55
66
7+1.409.4 (2017-04-09)
8+ ・F国URL修正に伴い JinCore 1.206.10 に対応。
9+
710 1.409.2 (2016-06-25)
811 ・SMP面文字代替処理のオンオフを可能に。
912
diff -r e21d4481babc -r 06d9e4c356ac README.txt
--- a/README.txt Mon Jun 27 00:10:27 2016 +0900
+++ b/README.txt Sun Apr 09 12:23:22 2017 +0900
@@ -43,7 +43,7 @@
4343
4444 === 開発プロジェクト運営元 ===
4545
46- https://osdn.jp/projects/jindolf/devel/ まで。
46+ https://ja.osdn.net/projects/jindolf/ まで。
4747
4848
4949 === ディレクトリ内訳構成 ===
@@ -65,6 +65,15 @@
6565 ./pom.xml
6666 Maven3用プロジェクト構成定義ファイル。
6767
68+./checkstyle.xml
69+ Checkstyle用configファイル。
70+
71+./pmdrules.xml
72+ PMD用ルール定義ファイル。
73+
74+./src/assembly/src.xml
75+ ソースアーカイブ構成定義ファイル。
76+
6877 ./src/main/java/
6978 Javaのソースコード。
7079
@@ -77,17 +86,4 @@
7786 ./src/test/java/sample/
7887 サンプルのパーサ実装。
7988
80-./src/main/config/
81- 各種ビルド・構成管理に必要なファイル群。
82-
83-./src/main/config/checks.xml
84- Checkstyle用configファイル。
85-
86-./src/main/config/pmdrules.xml
87- PMD用ルール定義ファイル。
88-
89-./src/main/assembly/descriptor.xml
90- ソースアーカイブ構成定義ファイル。
91-
92-
9389 --- EOF ---
diff -r e21d4481babc -r 06d9e4c356ac SCM.txt
--- a/SCM.txt Mon Jun 27 00:10:27 2016 +0900
+++ b/SCM.txt Sun Apr 09 12:23:22 2017 +0900
@@ -10,10 +10,10 @@
1010
1111 このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
1212 このアーカイブの原本となる開発資産は、
13- https://osdn.jp/projects/jindolf/scm/hg/JinParser/
13+ https://ja.osdn.net/projects/jindolf/scm/hg/JinParser/
1414 を上位に持つMercurialリポジトリで管理されています。
1515 アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
16- # hg clone http://hg.osdn.jp/view/jindolf/JinParser
16+ # hg clone http://hg.osdn.net/view/jindolf/JinParser
1717
1818
1919 === 各種設定ファイル ===
@@ -42,7 +42,7 @@
4242 ・https://www.mercurial-scm.org/wiki/.hgignore
4343 ・https://www.selenic.com/mercurial/hgignore.5.html
4444 ・https://www.mercurial-scm.org/wiki/EolExtension
45-・http://tortoisehg.bitbucket.org/
45+・https://tortoisehg.bitbucket.io/
4646
4747
4848 --- EOF ---
diff -r e21d4481babc -r 06d9e4c356ac checkstyle-suppressions.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/checkstyle-suppressions.xml Sun Apr 09 12:23:22 2017 +0900
@@ -0,0 +1,43 @@
1+<?xml version="1.0" encoding="UTF-8" ?>
2+
3+<!DOCTYPE suppressions PUBLIC
4+ "-//Puppy Crawl//DTD Suppressions 1.1//EN"
5+ "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
6+
7+<!--
8+ Checkstyle suppressions
9+ for Checkstyle 6.19(7.4) or later
10+
11+ [ http://checkstyle.sourceforge.net/ ]
12+
13+ Copyright(c) 2010 olyutorskii
14+-->
15+
16+
17+<suppressions>
18+
19+ <!-- Class Design -->
20+ <suppress files="" checks="DesignForExtension" />
21+
22+ <!-- Coding -->
23+ <suppress files="" checks="ExplicitInitialization" />
24+ <suppress files="" checks="FinalLocalVariable" />
25+ <suppress files="" checks="MagicNumber" />
26+
27+ <!-- Imports -->
28+ <suppress files="" checks="ImportControl" />
29+
30+ <!-- Javadoc Comments -->
31+ <suppress files="" checks="SummaryJavadocCheck" />
32+
33+ <!-- Miscellaneous -->
34+ <suppress files="" checks="FinalParameters" />
35+ <suppress files="" checks="TrailingComment" />
36+
37+ <!-- Whitespace -->
38+ <suppress files="" checks="SingleSpaceSeparator" />
39+
40+</suppressions>
41+
42+
43+<!-- EOF -->
diff -r e21d4481babc -r 06d9e4c356ac checkstyle.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/checkstyle.xml Sun Apr 09 12:23:22 2017 +0900
@@ -0,0 +1,380 @@
1+<?xml version="1.0" encoding="UTF-8" ?>
2+
3+<!DOCTYPE module PUBLIC
4+ "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
5+ "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
6+
7+<!--
8+ Checkstyle modules
9+ for Checkstyle 6.19(7.4) or later
10+
11+ [ http://checkstyle.sourceforge.net/ ]
12+
13+ Copyright(c) 2010 olyutorskii
14+-->
15+
16+
17+<module name="Checker">
18+
19+ <property name="charset" value="UTF-8" />
20+ <property name="localeCountry" value="JP" />
21+ <property name="localeLanguage" value="en" />
22+ <!--property name="localeLanguage" value="ja" /-->
23+ <property name="fileExtensions" value="java, xml, properties" />
24+ <property name="severity" value="error" />
25+
26+
27+ <!-- Filters -->
28+ <module name="SeverityMatchFilter" />
29+ <module name="SuppressionCommentFilter" />
30+ <module name="SuppressionFilter" />
31+ <module name="SuppressWarningsFilter" />
32+ <module name="SuppressWithNearbyCommentFilter" />
33+
34+
35+ <!-- Headers -->
36+ <module name="Header">
37+ <property name="header" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;" />
38+ <property name="fileExtensions" value="xml" />
39+ </module>
40+ <module name="RegexpHeader">
41+ <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" />
42+ <property name="multiLines" value="2" />
43+ <property name="fileExtensions" value="java" />
44+ </module>
45+
46+
47+ <!-- Javadoc Comments -->
48+ <module name="JavadocPackage" />
49+
50+
51+ <!-- Miscellaneous -->
52+ <module name="NewlineAtEndOfFile">
53+ <property name="fileExtensions" value="java" />
54+ </module>
55+ <module name="Translation" />
56+ <module name="UniqueProperties" />
57+
58+
59+ <!-- Regexp -->
60+ <module name="RegexpMultiline">
61+ <property name="format" value="[\u000b\f\u001a]" />
62+ </module>
63+ <module name="RegexpOnFilename" />
64+ <module name="RegexpSingleline">
65+ <property name="format" value="\s+$" />
66+ </module>
67+ <module name="RegexpSingleline">
68+ <!-- scm conflict -->
69+ <property name="format" value="&lt;&lt;&lt;&lt;&lt;" />
70+ </module>
71+
72+
73+ <!-- Size Violations -->
74+ <module name="FileLength" />
75+
76+
77+ <!-- Whitespace -->
78+ <module name="FileTabCharacter" />
79+
80+
81+ <module name="TreeWalker">
82+
83+ <property name="tabWidth" value="8"/>
84+ <property name="fileExtensions" value="java"/>
85+
86+
87+ <!-- Annotations -->
88+
89+ <module name="AnnotationLocation" />
90+ <module name="AnnotationUseStyle" />
91+ <module name="MissingDeprecated" />
92+ <module name="MissingOverride" />
93+ <module name="PackageAnnotation" />
94+ <module name="SuppressWarnings" />
95+ <module name="SuppressWarningsHolder" />
96+
97+
98+ <!-- Block Checks -->
99+
100+ <module name="AvoidNestedBlocks" />
101+ <module name="EmptyBlock" />
102+ <module name="EmptyCatchBlock" />
103+ <module name="LeftCurly" />
104+ <module name="NeedBraces">
105+ <property name="allowSingleLineStatement" value="true" />
106+ </module>
107+ <module name="RightCurly" />
108+
109+
110+ <!-- Class Design -->
111+
112+ <module name="DesignForExtension" />
113+ <module name="FinalClass" />
114+ <module name="HideUtilityClassConstructor" />
115+ <module name="InnerTypeLast" />
116+ <module name="InterfaceIsType" />
117+ <module name="MutableException" />
118+ <module name="OneTopLevelClass" />
119+ <module name="ThrowsCount" />
120+ <module name="VisibilityModifier" />
121+
122+
123+ <!-- Coding -->
124+
125+ <module name="ArrayTrailingComma" />
126+ <module name="AvoidInlineConditionals" />
127+ <module name="CovariantEquals" />
128+ <module name="DeclarationOrder" />
129+ <module name="DefaultComesLast" />
130+ <module name="EmptyStatement" />
131+ <module name="EqualsAvoidNull" />
132+ <module name="EqualsHashCode" />
133+ <module name="ExplicitInitialization" />
134+ <module name="FallThrough" />
135+ <module name="FinalLocalVariable" />
136+ <module name="HiddenField">
137+ <property name="ignoreConstructorParameter" value="true" />
138+ <property name="ignoreSetter" value="true" />
139+ <property name="setterCanReturnItsClass" value="true" />
140+ <property name="ignoreAbstractMethods" value="true" />
141+ </module>
142+ <module name="IllegalCatch" />
143+ <module name="IllegalInstantiation" />
144+ <module name="IllegalThrows" />
145+ <module name="IllegalToken">
146+ <property name="tokens" value="LITERAL_NATIVE" />
147+ </module>
148+ <module name="IllegalTokenText" />
149+ <module name="IllegalType" />
150+ <module name="InnerAssignment" />
151+ <module name="MagicNumber" />
152+ <module name="MissingCtor" />
153+ <module name="MissingSwitchDefault" />
154+ <module name="ModifiedControlVariable" />
155+ <module name="MultipleStringLiterals" />
156+ <module name="MultipleVariableDeclarations" />
157+ <module name="NestedForDepth" />
158+ <module name="NestedIfDepth" />
159+ <module name="NestedTryDepth" />
160+ <module name="NoClone" />
161+ <module name="NoFinalizer" />
162+ <module name="OneStatementPerLine" />
163+ <module name="OverloadMethodsDeclarationOrder" />
164+ <module name="PackageDeclaration" />
165+ <module name="ParameterAssignment" />
166+ <module name="RequireThis">
167+ <!--property name="checkMethods" value="false" /-->
168+ </module>
169+ <module name="ReturnCount" />
170+ <module name="SimplifyBooleanExpression" />
171+ <module name="SimplifyBooleanReturn" />
172+ <module name="StringLiteralEquality" />
173+ <module name="SuperClone" />
174+ <module name="SuperFinalize" />
175+ <module name="UnnecessaryParentheses" />
176+ <module name="VariableDeclarationUsageDistance" />
177+
178+
179+ <!-- Imports -->
180+
181+ <module name="AvoidStarImport" />
182+ <module name="AvoidStaticImport" />
183+ <module name="CustomImportOrder" />
184+ <module name="IllegalImport" />
185+ <module name="ImportControl" />
186+ <module name="ImportOrder" />
187+ <module name="RedundantImport" />
188+ <module name="UnusedImports" />
189+
190+
191+ <!-- Javadoc Comments -->
192+
193+ <module name="AtclauseOrder" />
194+ <module name="JavadocMethod" />
195+ <module name="JavadocParagraph" />
196+ <module name="JavadocStyle">
197+ <property
198+ name="endOfSentenceFormat"
199+ value="([。.?!][ \t\n\r\f&lt;])|([。.?!]$)" />
200+ <property name="checkEmptyJavadoc" value="true" />
201+ <property name="checkHtml" value="true" />
202+ </module>
203+ <module name="JavadocTagContinuationIndentation" />
204+ <module name="JavadocType" />
205+ <module name="JavadocVariable">
206+ <property name="scope" value="protected" />
207+ </module>
208+ <module name="NonEmptyAtclauseDescription" />
209+ <module name="SingleLineJavadoc" />
210+ <module name="SummaryJavadocCheck" />
211+ <module name="WriteTag" />
212+
213+
214+ <!-- Metrics -->
215+
216+ <module name="BooleanExpressionComplexity" />
217+ <module name="ClassDataAbstractionCoupling" />
218+ <module name="ClassFanOutComplexity" />
219+ <module name="CyclomaticComplexity" />
220+ <module name="JavaNCSS" />
221+ <module name="NPathComplexity" />
222+
223+
224+ <!-- Miscellaneous -->
225+
226+ <module name="ArrayTypeStyle" />
227+ <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"/>
232+ </module>
233+ <module name="CommentsIndentation" />
234+ <module name="DescendantToken" />
235+ <module name="FileContentsHolder" />
236+ <module name="FinalParameters" />
237+ <module name="Indentation">
238+ <property name="caseIndent" value="0" />
239+ </module>
240+ <module name="OuterTypeFilename" />
241+ <module name="TodoComment">
242+ <property name="format" value="TODO" />
243+ </module>
244+ <module name="TrailingComment" />
245+ <module name="UncommentedMain" />
246+ <module name="UpperEll" />
247+
248+
249+ <!-- Modifiers -->
250+
251+ <module name="ModifierOrder" />
252+ <module name="RedundantModifier" />
253+
254+
255+ <!-- Naming Conventions -->
256+
257+ <module name="AbbreviationAsWordInName" />
258+ <module name="AbstractClassName" />
259+ <module name="CatchParameterName" />
260+ <module name="ClassTypeParameterName" />
261+ <module name="ConstantName" />
262+ <module name="InterfaceTypeParameterName" />
263+ <module name="LocalFinalVariableName" />
264+ <module name="LocalVariableName" />
265+ <module name="MemberName" />
266+ <module name="MethodName" />
267+ <module name="MethodTypeParameterName" />
268+ <module name="PackageName" />
269+ <module name="ParameterName" />
270+ <module name="StaticVariableName" />
271+ <module name="TypeName" />
272+
273+
274+ <!-- Regex -->
275+
276+ <module name="Regexp">
277+ <property name="format" value="@author" />
278+ <property name="illegalPattern" value="true" />
279+ </module>
280+ <module name="Regexp">
281+ <property name="format" value="^ \* Copyright\(c\)" />
282+ </module>
283+ <module name="Regexp">
284+ <property name="format" value="^ \* License : The MIT License" />
285+ <property name="duplicateLimit" value="1" />
286+ </module>
287+ <module name="RegexpSinglelineJava">
288+ <property name="format" value="\u0000" />
289+ </module>
290+
291+
292+ <!-- Size Violations -->
293+
294+ <module name="AnonInnerLength" />
295+ <module name="ExecutableStatementCount" />
296+ <module name="LineLength">
297+ <property name="max" value="78" />
298+ </module>
299+ <module name="MethodCount" />
300+ <module name="MethodLength" />
301+ <module name="OuterTypeNumber" />
302+ <module name="ParameterNumber" />
303+
304+
305+ <!-- Whitespace -->
306+
307+ <module name="EmptyForInitializerPad" />
308+ <module name="EmptyForIteratorPad" />
309+ <module name="EmptyLineSeparator">
310+ <property
311+ name="tokens"
312+ value="PACKAGE_DEF,
313+ IMPORT,
314+ CLASS_DEF,
315+ INTERFACE_DEF,
316+ ENUM_DEF,
317+ STATIC_INIT,
318+ INSTANCE_INIT,
319+ METHOD_DEF,
320+ CTOR_DEF,
321+ "
322+ />
323+ </module>
324+ <module name="GenericWhitespace" />
325+ <module name="MethodParamPad">
326+ <property
327+ name="tokens"
328+ value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL"
329+ />
330+ </module>
331+ <module name="NoLineWrap" />
332+ <module name="NoWhitespaceAfter">
333+ <property name="allowLineBreaks" value="false" />
334+ <property name="tokens" value="INC, DEC, DOT" />
335+ </module>
336+ <module name="NoWhitespaceBefore">
337+ <property name="allowLineBreaks" value="false" />
338+ <property name="tokens" value="COMMA, POST_INC, POST_DEC" />
339+ </module>
340+ <module name="OperatorWrap" />
341+ <module name="ParenPad">
342+ <property name="option" value="nospace" />
343+ <property
344+ name="tokens"
345+ value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL"
346+ />
347+ </module>
348+ <module name="SeparatorWrap">
349+ <property name="tokens" value="DOT" />
350+ <property name="option" value="nl" />
351+ </module>
352+ <module name="SingleSpaceSeparator" />
353+ <module name="TypecastParenPad" />
354+ <module name="WhitespaceAfter" >
355+ <property name="tokens" value="COMMA, SEMI,"/>
356+ </module>
357+ <module name="WhitespaceAround">
358+ <property
359+ name="tokens"
360+ value="ASSIGN,
361+ LAND, LOR,
362+ BAND, BOR, BXOR, BSR,
363+ BAND_ASSIGN, BOR_ASSIGN, BXOR_ASSIGN, BSR_ASSIGN,
364+ SL, SR,
365+ SL_ASSIGN, SR_ASSIGN,
366+ MINUS, STAR, DIV, MOD,
367+ PLUS_ASSIGN, MINUS_ASSIGN,
368+ STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
369+ EQUAL, NOT_EQUAL, GT, GE, LT, LE,
370+ "
371+ />
372+ </module>
373+
374+
375+ </module>
376+
377+
378+</module>
379+
380+<!-- EOF -->
diff -r e21d4481babc -r 06d9e4c356ac pmdrules.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pmdrules.xml Sun Apr 09 12:23:22 2017 +0900
@@ -0,0 +1,115 @@
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+
74+ <rule ref="rulesets/java/logging-jakarta-commons.xml" />
75+
76+ <rule ref="rulesets/java/javabeans.xml">
77+ <exclude name="BeanMembersShouldSerialize" />
78+ </rule>
79+
80+ <rule ref="rulesets/java/logging-java.xml" />
81+
82+ <rule ref="rulesets/java/junit.xml" />
83+
84+ <rule ref="rulesets/java/migrating.xml" />
85+
86+ <rule ref="rulesets/java/naming.xml">
87+ <exclude name="ShortVariable" />
88+ <exclude name="LongVariable" />
89+ </rule>
90+
91+ <rule ref="rulesets/java/optimizations.xml">
92+ <exclude name="LocalVariableCouldBeFinal" />
93+ <exclude name="MethodArgumentCouldBeFinal" />
94+ <exclude name="RedundantFieldInitializer" />
95+ </rule>
96+
97+ <rule ref="rulesets/java/strictexception.xml" />
98+
99+ <rule ref="rulesets/java/strings.xml">
100+ <exclude name="ConsecutiveAppendsShouldReuse" />
101+ </rule>
102+
103+ <rule ref="rulesets/java/sunsecure.xml" />
104+
105+ <rule ref="rulesets/java/typeresolution.xml" />
106+
107+ <rule ref="rulesets/java/unnecessary.xml">
108+ <exclude name="UnnecessaryReturn" />
109+ </rule>
110+
111+ <rule ref="rulesets/java/unusedcode.xml" />
112+
113+</ruleset>
114+
115+<!-- EOF -->
diff -r e21d4481babc -r 06d9e4c356ac pom.xml
--- a/pom.xml Mon Jun 27 00:10:27 2016 +0900
+++ b/pom.xml Sun Apr 09 12:23:22 2017 +0900
@@ -8,7 +8,7 @@
88 xmlns="http://maven.apache.org/POM/4.0.0"
99 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
11- http://maven.apache.org/maven-v4_0_0.xsd"
11+ http://maven.apache.org/xsd/maven-4.0.0.xsd"
1212 >
1313 <modelVersion>4.0.0</modelVersion>
1414 <!--parent/-->
@@ -16,7 +16,7 @@
1616 <groupId>jp.sourceforge.jindolf</groupId>
1717 <artifactId>jinparser</artifactId>
1818
19- <version>1.409.3-SNAPSHOT</version>
19+ <version>1.409.4</version>
2020
2121 <packaging>jar</packaging>
2222 <name>JinParser</name>
@@ -26,18 +26,18 @@
2626 -->作られたJavaライブラリです。<!--
2727 --></description>
2828
29- <url>https://osdn.jp/projects/jindolf/devel/</url>
29+ <url>https://ja.osdn.net/projects/jindolf/devel/</url>
3030 <inceptionYear>2009</inceptionYear>
3131
3232 <organization>
3333 <name>Jindolf Partners</name>
34- <url>https://osdn.jp/projects/jindolf/devel/</url>
34+ <url>https://ja.osdn.net/projects/jindolf/devel/</url>
3535 </organization>
3636
3737 <licenses>
3838 <license>
3939 <name>The MIT License</name>
40- <url>https://opensource.org/licenses/mit-license.php</url>
40+ <url>https://opensource.org/licenses/MIT</url>
4141 <distribution>manual</distribution>
4242 </license>
4343 </licenses>
@@ -47,7 +47,7 @@
4747 <id>olyutorskii</id>
4848 <url>https://sites.google.com/site/olyutorskiipit/</url>
4949 <organization>Jindolf Partners</organization>
50- <organizationUrl>https://osdn.jp/projects/jindolf/devel/</organizationUrl>
50+ <organizationUrl>https://ja.osdn.net/projects/jindolf/devel/</organizationUrl>
5151 <roles>
5252 <role>Project Founder</role>
5353 <role>Java Developer</role>
@@ -59,42 +59,56 @@
5959 <mailingLists/>
6060
6161 <prerequisites>
62- <maven>3.3</maven>
62+ <maven>3.0.1</maven>
6363 </prerequisites>
6464
6565 <modules/>
6666
6767 <scm>
68- <connection>scm:hg:http://hg.osdn.jp/view/jindolf/JinParser</connection>
69- <developerConnection>scm:hg:ssh://hg.osdn.jp//hgroot/jindolf/JinParser</developerConnection>
70- <url>https://osdn.jp/projects/jindolf/scm/hg/JinParser/</url>
68+ <connection>scm:hg:http://hg.osdn.net/view/jindolf/JinParser</connection>
69+ <developerConnection>scm:hg:ssh://hg.osdn.net//hgroot/jindolf/JinParser</developerConnection>
70+ <url>https://osdn.net/projects/jindolf/scm/hg/JinParser/</url>
7171 </scm>
7272
7373 <issueManagement>
74- <system>OSDN.JP</system>
75- <url>https://osdn.jp/projects/jindolf/ticket/</url>
74+ <system>OSDN.NET</system>
75+ <url>https://ja.osdn.net/projects/jindolf/ticket/</url>
7676 </issueManagement>
7777
7878 <ciManagement/>
7979 <distributionManagement/>
8080
8181 <properties>
82- <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
83-
8482 <maven.compiler.source>1.7</maven.compiler.source>
8583 <maven.compiler.target>1.7</maven.compiler.target>
8684
8785 <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
8886 <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
8987
88+ <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
9089 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9190 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
9291
93- <project.mainconf>${project.basedir}/src/main/config</project.mainconf>
92+ <site.locales>en</site.locales>
93+ <javadoc.locale>en</javadoc.locale>
94+ <findbugs.jvmArgs>-Duser.language=en</findbugs.jvmArgs>
9495
95- <checkstyle.config.location>${project.mainconf}/checks.xml</checkstyle.config.location>
96+ <jacoco-plugin.version>0.7.9</jacoco-plugin.version>
97+
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>
96102 <checkstyle.enable.rss>false</checkstyle.enable.rss>
97103
104+ <pmd-plugin.version>3.7</pmd-plugin.version>
105+
106+ <findbugs-plugin.version>3.0.4</findbugs-plugin.version>
107+ <findbugs.effort>Max</findbugs.effort>
108+ <findbugs.threshold>Low</findbugs.threshold>
109+ <!-- for Jenkins -->
110+ <findbugs.xmlOutput>true</findbugs.xmlOutput>
111+
98112 </properties>
99113
100114 <dependencyManagement/>
@@ -111,7 +125,7 @@
111125 <dependency>
112126 <groupId>jp.sourceforge.jindolf</groupId>
113127 <artifactId>jincore</artifactId>
114- <version>1.206.8</version>
128+ <version>1.206.10</version>
115129 <scope>compile</scope>
116130 </dependency>
117131
@@ -121,31 +135,33 @@
121135 <pluginRepositories/>
122136
123137 <build>
124- <pluginManagement/>
138+
139+ <pluginManagement>
140+
141+ <plugins>
142+
143+ <plugin>
144+ <groupId>org.apache.maven.plugins</groupId>
145+ <artifactId>maven-checkstyle-plugin</artifactId>
146+ <version>${checkstyle-plugin.version}</version>
147+ <dependencies>
148+ <dependency>
149+ <groupId>com.puppycrawl.tools</groupId>
150+ <artifactId>checkstyle</artifactId>
151+ <!--artifactId>checkstyle-backport-jre6</artifactId-->
152+ <version>${checkstyleruntime.version}</version>
153+ </dependency>
154+ </dependencies>
155+ </plugin>
156+
157+ </plugins>
158+
159+ </pluginManagement>
125160
126161 <plugins>
127162
128- <plugin>
129- <groupId>org.apache.maven.plugins</groupId>
130- <artifactId>maven-enforcer-plugin</artifactId>
131- <version>1.4.1</version>
132- <configuration>
133- <rules>
134- <requireMavenVersion>
135- <version>[3.3,)</version>
136- </requireMavenVersion>
137- <requireJavaVersion>
138- <version>[1.7,)</version>
139- </requireJavaVersion>
140- </rules>
141- </configuration>
142- </plugin>
143163
144- <plugin>
145- <groupId>org.apache.maven.plugins</groupId>
146- <artifactId>maven-install-plugin</artifactId>
147- <version>2.5.2</version>
148- </plugin>
164+ <!-- clean lifecycle -->
149165
150166 <plugin>
151167 <groupId>org.apache.maven.plugins</groupId>
@@ -156,40 +172,122 @@
156172 <fileset>
157173 <directory>${project.basedir}</directory>
158174 <includes>
159- <include>**/.DS_Store</include>
160- <include>**/_MACOSX</include>
175+ <include>**/*~</include>
176+ <include>**/*.swp</include>
177+ <include>**/*.DS_Store</include>
178+ <include>**/._*</include>
179+ <include>**/__MACOSX</include>
161180 <include>**/Thumbs.db</include>
162- <include>**/thumbs.db</include>
163- <include>**/Desktop.ini</include>
164181 <include>**/desktop.ini</include>
165182 <include>**/core</include>
183+ <include>**/hs_err_pid*</include>
166184 </includes>
167185 </fileset>
168186 </filesets>
169187 </configuration>
170188 </plugin>
171189
190+
191+ <!-- default lifecycle -->
192+
172193 <plugin>
173194 <groupId>org.apache.maven.plugins</groupId>
174- <artifactId>maven-compiler-plugin</artifactId>
175- <version>3.5.1</version>
195+ <artifactId>maven-enforcer-plugin</artifactId>
196+ <version>1.4.1</version>
176197 <configuration>
177- <source>1.7</source> <!-- for NetBeans IDE -->
178- <target>1.7</target>
179- <showDeprecation>true</showDeprecation>
180- <showWarnings>true</showWarnings>
181- <compilerArguments>
182- <Xlint/>
183- </compilerArguments>
198+ <rules>
199+ <requireMavenVersion>
200+ <version>[3.0.1,)</version>
201+ </requireMavenVersion>
202+ <requireJavaVersion>
203+ <version>[1.7,)</version>
204+ </requireJavaVersion>
205+ </rules>
184206 </configuration>
185207 </plugin>
186208
187209 <plugin>
188210 <groupId>org.apache.maven.plugins</groupId>
211+ <artifactId>maven-resources-plugin</artifactId>
212+ <version>3.0.2</version>
213+ </plugin>
214+
215+ <plugin>
216+ <groupId>org.apache.maven.plugins</groupId>
217+ <artifactId>maven-compiler-plugin</artifactId>
218+ <version>3.6.1</version>
219+ <configuration>
220+ <source>1.7</source> <!-- for NetBeans IDE -->
221+ <target>1.7</target>
222+ <compilerArguments>
223+ <Xlint/>
224+ </compilerArguments>
225+ <showWarnings>true</showWarnings>
226+ <showDeprecation>true</showDeprecation>
227+ </configuration>
228+ </plugin>
229+
230+ <plugin>
231+ <groupId>org.apache.maven.plugins</groupId>
232+ <artifactId>maven-surefire-plugin</artifactId>
233+ <version>2.19.1</version>
234+ <configuration>
235+ <enableAssertions>true</enableAssertions>
236+ </configuration>
237+ </plugin>
238+
239+ <plugin>
240+ <groupId>org.jacoco</groupId>
241+ <artifactId>jacoco-maven-plugin</artifactId>
242+ <version>${jacoco-plugin.version}</version>
243+ <executions>
244+ <execution>
245+ <id>default-prepare-agent</id>
246+ <goals>
247+ <goal>prepare-agent</goal>
248+ </goals>
249+ </execution>
250+ <execution>
251+ <id>default-report</id>
252+ <phase>prepare-package</phase>
253+ <goals>
254+ <goal>report</goal>
255+ </goals>
256+ </execution>
257+ <execution>
258+ <id>default-check</id>
259+ <goals>
260+ <goal>check</goal>
261+ </goals>
262+ <configuration>
263+ <rules>
264+ <rule implementation="org.jacoco.maven.RuleConfiguration">
265+ <element>BUNDLE</element>
266+ <limits>
267+ <limit implementation="org.jacoco.report.check.Limit">
268+ <counter>COMPLEXITY</counter>
269+ <value>COVEREDRATIO</value>
270+ <minimum>0.0</minimum>
271+ </limit>
272+ </limits>
273+ </rule>
274+ </rules>
275+ </configuration>
276+ </execution>
277+ </executions>
278+ </plugin>
279+
280+ <plugin>
281+ <groupId>org.apache.maven.plugins</groupId>
189282 <artifactId>maven-jar-plugin</artifactId>
190- <version>3.0.0</version>
283+ <version>3.0.2</version>
191284 <configuration>
192285 <archive>
286+ <manifest>
287+ <addDefaultImplementationEntries>
288+ true
289+ </addDefaultImplementationEntries>
290+ </manifest>
193291 <manifestEntries>
194292 <Built-By>${project.organization.name}</Built-By>
195293 </manifestEntries>
@@ -199,20 +297,8 @@
199297
200298 <plugin>
201299 <groupId>org.apache.maven.plugins</groupId>
202- <artifactId>maven-assembly-plugin</artifactId>
203- <version>2.6</version>
204- <configuration>
205- <archiveBaseDirectory>.</archiveBaseDirectory>
206- <descriptors>
207- <descriptor>src/main/assembly/descriptor.xml</descriptor>
208- </descriptors>
209- </configuration>
210- </plugin>
211-
212- <plugin>
213- <groupId>org.apache.maven.plugins</groupId>
214300 <artifactId>maven-source-plugin</artifactId>
215- <version>3.0.0</version>
301+ <version>3.0.1</version>
216302 <configuration>
217303 <includePom>true</includePom>
218304 <archive>
@@ -234,76 +320,46 @@
234320
235321 <plugin>
236322 <groupId>org.apache.maven.plugins</groupId>
237- <artifactId>maven-resources-plugin</artifactId>
238- <version>3.0.0</version>
323+ <artifactId>maven-install-plugin</artifactId>
324+ <version>2.5.2</version>
239325 </plugin>
240326
241327 <plugin>
242328 <groupId>org.apache.maven.plugins</groupId>
243- <artifactId>maven-surefire-plugin</artifactId>
244- <version>2.19.1</version>
245- <configuration>
246- <skipTests>false</skipTests>
247- <enableAssertions>true</enableAssertions>
248- </configuration>
329+ <artifactId>maven-deploy-plugin</artifactId>
330+ <version>2.8.2</version>
249331 </plugin>
250332
333+
334+ <!-- site lifecycle -->
335+
251336 <plugin>
252337 <groupId>org.apache.maven.plugins</groupId>
253338 <artifactId>maven-site-plugin</artifactId>
254- <version>3.5.1</version>
339+ <version>3.6</version>
255340 <configuration>
256- <generateReports>true</generateReports>
257- <locales>ja</locales>
258- <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
259- <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
341+ <locales>${site.locales}</locales>
342+ </configuration>
343+ </plugin>
344+
345+
346+ <!-- goals without lifecycle -->
347+
348+ <plugin>
349+ <groupId>org.apache.maven.plugins</groupId>
350+ <artifactId>maven-assembly-plugin</artifactId>
351+ <version>3.0.0</version>
352+ <configuration>
353+ <descriptors>
354+ <descriptor>src/assembly/src.xml</descriptor>
355+ </descriptors>
260356 </configuration>
261357 </plugin>
262358
263359 <plugin>
264360 <groupId>org.apache.maven.plugins</groupId>
265361 <artifactId>maven-checkstyle-plugin</artifactId>
266- <version>2.15</version>
267- <!-- config from property value -->
268- </plugin>
269-
270- <plugin>
271- <groupId>org.apache.maven.plugins</groupId>
272- <artifactId>maven-pmd-plugin</artifactId>
273- <version>3.6</version>
274- <configuration>
275- <targetJdk>${maven.compiler.target}</targetJdk>
276- <rulesets>
277- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
278- </rulesets>
279- </configuration>
280- </plugin>
281-
282- <plugin>
283- <groupId>org.codehaus.mojo</groupId>
284- <artifactId>findbugs-maven-plugin</artifactId>
285- <version>3.0.3</version>
286- <configuration>
287- <effort>Max</effort>
288- <threshold>Low</threshold>
289- <!-- for Jenkins -->
290- <findbugsXmlOutput>true</findbugsXmlOutput>
291- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
292- <xmlOutput>true</xmlOutput>
293- </configuration>
294- </plugin>
295-
296- <plugin>
297- <groupId>org.codehaus.mojo</groupId>
298- <artifactId>cobertura-maven-plugin</artifactId>
299- <version>2.7</version>
300- <configuration>
301- <encoding>${project.build.sourceEncoding}</encoding>
302- <formats>
303- <format>html</format>
304- <format>xml</format> <!-- for Jenkins -->
305- </formats>
306- </configuration>
362+ <version>${checkstyle-plugin.version}</version>
307363 </plugin>
308364
309365 </plugins>
@@ -342,7 +398,7 @@
342398 <exclude>**/version.properties</exclude>
343399
344400 <exclude>**/.DS_Store</exclude>
345- <exclude>**/_MACOSX</exclude>
401+ <exclude>**/__MACOSX</exclude>
346402 <exclude>**/Thumbs.db</exclude>
347403 <exclude>**/thumbs.db</exclude>
348404 <exclude>**/Desktop.ini</exclude>
@@ -373,19 +429,20 @@
373429 <report>index</report>
374430 <report>summary</report>
375431 <report>license</report>
432+ <report>dependency-info</report>
376433 <report>dependencies</report>
434+ <report>dependency-convergence</report>
377435 <report>plugins</report>
436+ <report>plugin-management</report>
437+ <report>project-team</report>
438+ <report>issue-tracking</report>
378439 <report>scm</report>
379- <report>project-team</report>
380440 <!--
381- <report>dependency-convergence</report>
382- <report>dependency-info</report>
383441 <report>dependency-management</report>
384442 <report>distribution-management</report>
385- <report>issue-tracking</report>
443+ <report>cim</report>
386444 <report>mailing-list</report>
387445 <report>modules</report>
388- <report>plugin-management</report>
389446 -->
390447 </reports>
391448 </reportSet>
@@ -395,12 +452,15 @@
395452 <plugin>
396453 <groupId>org.apache.maven.plugins</groupId>
397454 <artifactId>maven-javadoc-plugin</artifactId>
398- <version>2.10.3</version>
455+ <version>2.10.4</version>
399456 <configuration>
400- <skip>false</skip>
457+ <author>false</author>
401458 <notimestamp>true</notimestamp>
402459 <quiet>true</quiet>
403460 <show>protected</show>
461+ <locale>${javadoc.locale}</locale>
462+ <header>${project.name} ${project.version} API</header>
463+ <version>true</version>
404464 </configuration>
405465 <reportSets>
406466 <reportSet>
@@ -415,48 +475,31 @@
415475 <groupId>org.apache.maven.plugins</groupId>
416476 <artifactId>maven-jxr-plugin</artifactId>
417477 <version>2.5</version>
418- <configuration>
419- <skip>false</skip>
420- </configuration>
421478 </plugin>
422479
423480 <plugin>
424481 <groupId>org.apache.maven.plugins</groupId>
425482 <artifactId>maven-surefire-report-plugin</artifactId>
426483 <version>2.19.1</version>
427- <configuration>
428- <showSuccess>false</showSuccess>
429- </configuration>
484+ </plugin>
485+
486+ <plugin>
487+ <groupId>org.jacoco</groupId>
488+ <artifactId>jacoco-maven-plugin</artifactId>
489+ <version>${jacoco-plugin.version}</version>
430490 <reportSets>
431491 <reportSet>
432492 <reports>
433- <report>report-only</report>
493+ <report>report</report>
434494 </reports>
435495 </reportSet>
436496 </reportSets>
437497 </plugin>
438498
439499 <plugin>
440- <groupId>org.codehaus.mojo</groupId>
441- <artifactId>cobertura-maven-plugin</artifactId>
442- <version>2.7</version>
443- <configuration>
444- <encoding>${project.build.sourceEncoding}</encoding>
445- <formats>
446- <format>html</format>
447- <format>xml</format> <!-- for Jenkins -->
448- </formats>
449- </configuration>
450- </plugin>
451-
452- <plugin>
453500 <groupId>org.apache.maven.plugins</groupId>
454501 <artifactId>maven-checkstyle-plugin</artifactId>
455- <version>2.15</version>
456- <configuration>
457- <skip>false</skip>
458- <!-- config from property value -->
459- </configuration>
502+ <version>${checkstyle-plugin.version}</version>
460503 <reportSets>
461504 <reportSet>
462505 <reports>
@@ -469,12 +512,10 @@
469512 <plugin>
470513 <groupId>org.apache.maven.plugins</groupId>
471514 <artifactId>maven-pmd-plugin</artifactId>
472- <version>3.6</version>
515+ <version>${pmd-plugin.version}</version>
473516 <configuration>
474- <skip>false</skip>
475- <targetJdk>${maven.compiler.target}</targetJdk>
476517 <rulesets>
477- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
518+ <ruleset>${project.basedir}/pmdrules.xml</ruleset>
478519 </rulesets>
479520 </configuration>
480521 <reportSets>
@@ -490,29 +531,7 @@
490531 <plugin>
491532 <groupId>org.codehaus.mojo</groupId>
492533 <artifactId>findbugs-maven-plugin</artifactId>
493- <version>3.0.3</version>
494- <configuration>
495- <skip>false</skip>
496- <effort>Max</effort>
497- <threshold>Low</threshold>
498- <!-- for Jenkins -->
499- <findbugsXmlOutput>true</findbugsXmlOutput>
500- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
501- <xmlOutput>true</xmlOutput>
502- <!-- excludeFilterFile/ -->
503- </configuration>
504- </plugin>
505-
506- <plugin>
507- <groupId>org.codehaus.mojo</groupId>
508- <artifactId>javancss-maven-plugin</artifactId>
509- <version>2.1</version>
510- </plugin>
511-
512- <plugin>
513- <groupId>org.codehaus.mojo</groupId>
514- <artifactId>jdepend-maven-plugin</artifactId>
515- <version>2.0</version>
534+ <version>${findbugs-plugin.version}</version>
516535 </plugin>
517536
518537 </plugins>
diff -r e21d4481babc -r 06d9e4c356ac src/assembly/src.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/assembly/src.xml Sun Apr 09 12:23:22 2017 +0900
@@ -0,0 +1,42 @@
1+<?xml version="1.0" encoding="UTF-8" ?>
2+
3+<assembly
4+ xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
5+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
7+ http://maven.apache.org/xsd/assembly-2.0.0.xsd"
8+>
9+
10+<!--
11+ OSDN.NET用リリースファイル構成定義ファイル
12+ Maven3 assembly用
13+-->
14+
15+ <id>src</id>
16+
17+ <formats>
18+ <format>zip</format>
19+ </formats>
20+
21+ <fileSets>
22+ <fileSet>
23+ <directory>${project.basedir}</directory>
24+ <includes>
25+ <include>*.xml</include>
26+ <include>*.txt</include>
27+ </includes>
28+ <excludes>
29+ <exclude>nb-configuration.xml</exclude>
30+ <exclude>nbactions.xml</exclude>
31+ </excludes>
32+ <useDefaultExcludes>true</useDefaultExcludes>
33+ </fileSet>
34+ <fileSet>
35+ <directory>${project.basedir}/src</directory>
36+ <useDefaultExcludes>true</useDefaultExcludes>
37+ </fileSet>
38+ </fileSets>
39+
40+</assembly>
41+
42+<!-- EOF -->
diff -r e21d4481babc -r 06d9e4c356ac src/main/assembly/descriptor.xml
--- a/src/main/assembly/descriptor.xml Mon Jun 27 00:10:27 2016 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
1-<?xml version="1.0" encoding="UTF-8" ?>
2-
3-<assembly
4- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
5- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
7- http://maven.apache.org/xsd/assembly-1.1.3.xsd"
8->
9-
10-<!--
11- OSDN.JP用リリースファイル構成定義ファイル
12- Maven2(or3) assembly用
13--->
14-
15- <id>src</id>
16-
17- <formats>
18- <format>zip</format>
19- </formats>
20-
21- <fileSets>
22- <fileSet>
23- <directory>.</directory>
24- <includes>
25- <include>pom.xml</include>
26- <include>fixcrlf.xml</include>
27- <include>*.txt</include>
28- </includes>
29- <excludes>
30- <exclude>nb-configuration.xml</exclude>
31- <exclude>nbactions.xml</exclude>
32- </excludes>
33- <useDefaultExcludes>true</useDefaultExcludes>
34- </fileSet>
35- <fileSet>
36- <directory>src/</directory>
37- <useDefaultExcludes>true</useDefaultExcludes>
38- </fileSet>
39- </fileSets>
40-
41-</assembly>
42-
43-<!-- EOF -->
diff -r e21d4481babc -r 06d9e4c356ac src/main/config/checks.xml
--- a/src/main/config/checks.xml Mon Jun 27 00:10:27 2016 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,425 +0,0 @@
1-<?xml version="1.0" encoding="UTF-8" ?>
2-
3-<!DOCTYPE module PUBLIC
4- "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
5- "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
6-
7-<!--
8- Checkstyle用チェック項目定義。
9-
10- Checkstyle 6.1 以降向けに記述。
11-
12- [ http://checkstyle.sourceforge.net/ ]
13-
14- Copyright(c) 2010 olyutorskii
15--->
16-
17-
18-<module name="Checker">
19-
20- <property name="charset" value="UTF-8" />
21- <property name="localeCountry" value="JP" />
22- <property name="localeLanguage" value="ja" />
23- <property name="severity" value="error" />
24-
25-
26- <!-- Filters -->
27- <module name="SeverityMatchFilter" />
28- <module name="SuppressionCommentFilter" />
29- <module name="SuppressionFilter">
30- <property name="file" value="src/main/config/suppressions.xml" />
31- </module>
32- <module name="SuppressWarningsFilter" />
33- <module name="SuppressWithNearbyCommentFilter" />
34-
35-
36- <!-- Headers -->
37- <module name="RegexpHeader">
38- <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" />
39- <property name="multiLines" value="2" />
40- <property name="fileExtensions" value="java" />
41- </module>
42-
43-
44- <!-- Javadoc Comments -->
45- <module name="JavadocPackage" />
46-
47-
48- <!-- Miscellaneous -->
49- <module name="NewlineAtEndOfFile">
50- <property name="fileExtensions" value="java" />
51- </module>
52- <module name="Translation" />
53- <module name="UniqueProperties" />
54-
55-
56- <!-- Regexp -->
57- <module name="RegexpMultiline">
58- <property name="format" value="[\u000b\f\u001a]" />
59- </module>
60-<!--<module name="RegexpOnFilename" /> 6.15 or later -->
61- <module name="RegexpSingleline">
62- <property name="format" value="\s+$" />
63- </module>
64- <module name="RegexpSingleline">
65- <!-- scm conflict -->
66- <property name="format" value="&lt;&lt;&lt;&lt;&lt;" />
67- </module>
68-
69-
70- <!-- Size Violations -->
71- <module name="FileLength">
72- <property name="max" value="2000"/>
73- </module>
74-
75-
76- <!-- Whitespace -->
77- <module name="FileTabCharacter" />
78-
79-
80- <module name="TreeWalker">
81-
82- <property name="tabWidth" value="8"/>
83-
84-
85- <!-- Annotations -->
86-
87- <module name="AnnotationLocation" />
88- <module name="AnnotationUseStyle" />
89- <module name="MissingDeprecated" />
90- <module name="MissingOverride" />
91- <module name="PackageAnnotation" />
92- <module name="SuppressWarnings" />
93- <module name="SuppressWarningsHolder" />
94-
95-
96- <!-- Block Checks -->
97- <module name="AvoidNestedBlocks" />
98- <module name="EmptyBlock" />
99-<!-- <module name="EmptyCatchBlock" /> 6.4 or later -->
100- <module name="LeftCurly" />
101- <module name="NeedBraces">
102- <property name="tokens" value="LITERAL_DO" />
103- </module>
104- <module name="RightCurly" />
105-
106-
107- <!-- Class Design -->
108-
109- <module name="DesignForExtension" />
110- <module name="FinalClass" />
111- <module name="HideUtilityClassConstructor" />
112- <module name="InnerTypeLast" />
113- <module name="InterfaceIsType" />
114- <module name="MutableException" />
115- <module name="OneTopLevelClass" />
116- <module name="ThrowsCount">
117- <property name="max" value="4" />
118- </module>
119- <module name="VisibilityModifier" />
120-
121-
122- <!-- Coding -->
123-
124- <module name="ArrayTrailingComma" />
125- <module name="AvoidInlineConditionals" />
126- <module name="CovariantEquals" />
127- <module name="DeclarationOrder" />
128- <module name="DefaultComesLast" />
129- <module name="EmptyStatement" />
130- <module name="EqualsAvoidNull" />
131- <module name="EqualsHashCode" />
132- <module name="ExplicitInitialization" />
133- <module name="FallThrough" />
134- <module name="FinalLocalVariable" />
135- <module name="HiddenField">
136- <property name="ignoreConstructorParameter" value="true" />
137- <property name="ignoreSetter" value="true" />
138- <property name="ignoreAbstractMethods" value="true" />
139- </module>
140- <module name="IllegalCatch" />
141- <module name="IllegalInstantiation" />
142- <module name="IllegalThrows" />
143- <module name="IllegalToken">
144- <property name="tokens" value="LITERAL_NATIVE" />
145- </module>
146- <module name="IllegalTokenText">
147- <property name="tokens" value="NUM_INT, NUM_LONG" />
148- <property name="format" value="^0_*[0-7]" />
149- <property name="message" value="inhibit octal number" />
150- </module>
151- <module name="IllegalType" />
152- <module name="InnerAssignment" />
153- <module name="MagicNumber" />
154- <module name="MissingCtor" />
155- <module name="MissingSwitchDefault" />
156- <module name="ModifiedControlVariable" />
157- <module name="MultipleStringLiterals" />
158- <module name="MultipleVariableDeclarations" />
159- <module name="SimplifyBooleanExpression" />
160- <module name="SimplifyBooleanReturn" />
161- <module name="StringLiteralEquality" />
162- <module name="NestedForDepth" />
163- <module name="NestedIfDepth" />
164- <module name="NestedTryDepth" />
165- <module name="NoClone" />
166- <module name="NoFinalizer" />
167- <module name="OneStatementPerLine" />
168- <module name="OverloadMethodsDeclarationOrder" />
169- <module name="PackageDeclaration" />
170- <module name="ParameterAssignment" />
171- <module name="RequireThis">
172- <property name="checkMethods" value="false" />
173- </module>
174- <module name="ReturnCount">
175- <property name="max" value="5" />
176- </module>
177- <module name="SimplifyBooleanExpression" />
178- <module name="SimplifyBooleanReturn" />
179- <module name="StringLiteralEquality" />
180- <module name="SuperClone" />
181- <module name="SuperFinalize" />
182- <module name="UnnecessaryParentheses" />
183- <module name="VariableDeclarationUsageDistance">
184- <property name="allowedDistance" value="5" />
185- </module>
186-
187-
188- <!-- Imports -->
189-
190- <module name="AvoidStarImport" />
191- <module name="AvoidStaticImport" />
192- <module name="CustomImportOrder" />
193- <module name="IllegalImport" />
194- <module name="ImportControl" />
195- <module name="ImportOrder" />
196- <module name="RedundantImport" />
197- <module name="UnusedImports" />
198-
199-
200- <!-- Javadoc Comments -->
201-
202- <module name="AtclauseOrder" />
203- <module name="JavadocMethod" />
204- <module name="JavadocParagraph" />
205- <module name="JavadocStyle">
206- <property
207- name="endOfSentenceFormat"
208- value="([。.?!][ \t\n\r\f&lt;])|([。.?!]$)" />
209- <property name="checkEmptyJavadoc" value="true" />
210- <property name="checkHtml" value="true" />
211- </module>
212- <module name="JavadocTagContinuationIndentation" />
213- <module name="JavadocType" />
214- <module name="JavadocVariable">
215- <property name="scope" value="protected" />
216- </module>
217- <module name="NonEmptyAtclauseDescription" />
218- <module name="SingleLineJavadoc" />
219- <module name="SummaryJavadocCheck" />
220- <module name="WriteTag" />
221-
222-
223- <!-- Metrics -->
224-
225- <module name="BooleanExpressionComplexity" />
226- <module name="ClassDataAbstractionCoupling" />
227- <module name="ClassFanOutComplexity" />
228- <module name="CyclomaticComplexity" />
229- <module name="JavaNCSS" />
230- <module name="NPathComplexity" />
231-
232-
233- <!-- Miscellaneous -->
234-
235- <module name="ArrayTypeStyle" />
236- <module name="AvoidEscapedUnicodeCharacters">
237- <property name="allowEscapesForControlCharacters" value="true"/>
238- <property name="allowByTailComment" value="true"/>
239- <property name="allowIfAllCharactersEscaped" value="true"/>
240- <property name="allowNonPrintableEscapes" value="true"/>
241- </module>
242-<!-- <module name="CommentsIndentation" /> 6.10 or later -->
243- <module name="DescendantToken" />
244- <module name="FileContentsHolder" />
245- <module name="FinalParameters" />
246- <module name="Indentation">
247- <property name="caseIndent" value="0" />
248- </module>
249- <module name="OuterTypeFilename" />
250- <module name="TodoComment">
251- <property name="format" value="TODO" />
252- </module>
253- <module name="TrailingComment" />
254- <module name="UncommentedMain" />
255- <module name="UpperEll" />
256-
257-
258- <!-- Modifiers -->
259-
260- <module name="ModifierOrder" />
261- <module name="RedundantModifier" />
262-
263-
264- <!-- Naming Conventions -->
265-
266- <module name="AbbreviationAsWordInName" />
267- <module name="AbstractClassName">
268- <property
269- name="format"
270- value="^Abstract.*$|^.*Factory$|^.*Builder$|^.*Adapter$"
271- />
272- </module>
273-<!-- <module name="CatchParameterName" /> 6.14 or later -->
274- <module name="ClassTypeParameterName" />
275- <module name="ConstantName" />
276- <module name="InterfaceTypeParameterName" />
277- <module name="LocalFinalVariableName">
278- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
279- </module>
280- <module name="LocalVariableName">
281- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
282- </module>
283- <module name="MemberName">
284- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
285- </module>
286- <module name="MethodName" />
287- <module name="MethodTypeParameterName" />
288- <module name="PackageName" />
289- <module name="ParameterName">
290- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
291- </module>
292- <module name="StaticVariableName">
293- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
294- </module>
295- <module name="TypeName" />
296-
297-
298- <!-- Regex -->
299-
300- <module name="Regexp">
301- <property name="format" value="@author" />
302- <property name="illegalPattern" value="true" />
303- </module>
304- <module name="Regexp">
305- <property name="format" value="^ \* Copyright\(c\)" />
306- </module>
307- <module name="Regexp">
308- <property name="format" value="^ \* License : The MIT License" />
309- <property name="duplicateLimit" value="1" />
310- </module>
311- <module name="RegexpSinglelineJava">
312- <property name="format" value="\u0000" />
313- </module>
314-
315-
316- <!-- Size Violations -->
317-
318- <module name="AnonInnerLength" />
319- <module name="ExecutableStatementCount" />
320- <module name="LineLength">
321- <property name="max" value="78" />
322- </module>
323- <module name="MethodCount" />
324- <module name="MethodLength" />
325- <module name="OuterTypeNumber" />
326- <module name="ParameterNumber" />
327-
328-
329- <!-- Whitespace -->
330-
331- <module name="EmptyForInitializerPad" />
332- <module name="EmptyForIteratorPad" />
333- <module name="EmptyLineSeparator">
334- <property
335- name="tokens"
336- value="PACKAGE_DEF,
337- IMPORT,
338- CLASS_DEF,
339- INTERFACE_DEF,
340- ENUM_DEF,
341- STATIC_INIT,
342- INSTANCE_INIT,
343- METHOD_DEF,
344- CTOR_DEF,
345- "
346- />
347- </module>
348- <module name="GenericWhitespace" />
349- <module name="MethodParamPad">
350- <property
351- name="tokens"
352- value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL"
353- />
354- </module>
355- <module name="NoLineWrap" />
356- <module name="NoWhitespaceAfter">
357- <property name="allowLineBreaks" value="false" />
358- <property name="tokens" value="INC, DEC, DOT" />
359- </module>
360- <module name="NoWhitespaceBefore">
361- <property name="allowLineBreaks" value="false" />
362- <property name="tokens" value="COMMA, POST_INC, POST_DEC" />
363- </module>
364- <module name="NoWhitespaceBefore">
365- <property name="allowLineBreaks" value="true" />
366- <property name="tokens" value="SEMI" />
367- </module>
368- <module name="OperatorWrap">
369- <property name="option" value="eol" />
370- <property
371- name="tokens"
372- value="ASSIGN,
373- BAND_ASSIGN, BOR_ASSIGN, BXOR_ASSIGN,
374- PLUS_ASSIGN, MINUS_ASSIGN,
375- STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
376- SL_ASSIGN, SR_ASSIGN, BSR_ASSIGN"
377- />
378- </module>
379- <module name="OperatorWrap">
380- <property name="option" value="nl" />
381- <property
382- name="tokens"
383- value="QUESTION,
384- BAND, BOR, BXOR,
385- PLUS, MINUS, STAR, DIV, MOD,
386- LAND, LOR,
387- EQUAL, NOT_EQUAL"
388- />
389- </module>
390- <module name="ParenPad">
391- <property name="option" value="nospace" />
392- <property
393- name="tokens"
394- value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL"
395- />
396- </module>
397- <module name="SeparatorWrap">
398- <property name="tokens" value="DOT" />
399- <property name="option" value="nl" />
400- </module>
401- <module name="TypecastParenPad" />
402- <module name="WhitespaceAfter" />
403- <module name="WhitespaceAround">
404- <property
405- name="tokens"
406- value="ASSIGN,
407- LAND, LOR,
408- BAND, BOR, BXOR, BSR,
409- BAND_ASSIGN, BOR_ASSIGN, BXOR_ASSIGN, BSR_ASSIGN,
410- SL, SR,
411- SL_ASSIGN, SR_ASSIGN,
412- MINUS, STAR, DIV, MOD,
413- PLUS_ASSIGN, MINUS_ASSIGN,
414- STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
415- EQUAL, NOT_EQUAL, GT, GE, LT, LE,
416- "
417- />
418- </module>
419-
420-
421- </module>
422-
423-</module>
424-
425-<!-- EOF -->
diff -r e21d4481babc -r 06d9e4c356ac src/main/config/pmdrules.xml
--- a/src/main/config/pmdrules.xml Mon Jun 27 00:10:27 2016 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
1-<?xml version="1.0" encoding="UTF-8" ?>
2-
3-<!--
4- PMD用ルールセット定義
5-
6- PMD [ https://pmd.github.io/ ] 5.3 以降用に記述されています。
7-
8- Copyright(c) 2016 olyutorskii
9--->
10-
11-<ruleset
12- xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
13- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14- xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
15- http://pmd.sourceforge.net/ruleset_2_0_0.xsd"
16- name="Custom ruleset"
17->
18-
19- <description>
20- custom rulesets for project
21- </description>
22-
23-<!--
24- <rule ref="rulesets/java/android.xml" />
25--->
26-
27- <rule ref="rulesets/java/basic.xml" />
28-
29- <rule ref="rulesets/java/braces.xml">
30- <exclude name="IfElseStmtsMustUseBraces" />
31- <exclude name="IfStmtsMustUseBraces" />
32- </rule>
33-
34- <rule ref="rulesets/java/clone.xml" />
35-
36- <rule ref="rulesets/java/codesize.xml">
37- <exclude name="TooManyMethods" />
38- </rule>
39- <rule ref="rulesets/java/codesize.xml/TooManyMethods">
40- <properties>
41- <property name="maxmethods" value="25"/>
42- </properties>
43- </rule>
44-
45- <rule ref="rulesets/java/comments.xml">
46- <exclude name="CommentRequired" />
47- <exclude name="CommentSize" />
48- </rule>
49- <rule ref="rulesets/java/comments.xml/CommentRequired" >
50- <properties>
51- <property name="fieldCommentRequirement" value="Ignored"/>
52- </properties>
53- </rule>
54- <rule ref="rulesets/java/comments.xml/CommentSize" >
55- <properties>
56- <property name="maxLines" value="25"/>
57- </properties>
58- </rule>
59-
60- <rule ref="rulesets/java/controversial.xml">
61- <exclude name="NullAssignment" />
62- <exclude name="OnlyOneReturn" />
63- <exclude name="DefaultPackage" />
64- <exclude name="DataflowAnomalyAnalysis" />
65- <exclude name="AvoidUsingShortType" />
66- <exclude name="AvoidLiteralsInIfCondition" />
67- <exclude name="UseConcurrentHashMap" />
68- </rule>
69-
70- <rule ref="rulesets/java/coupling.xml">
71- <exclude name="LoosePackageCoupling" />
72- <exclude name="LawOfDemeter" />
73- </rule>
74-
75- <rule ref="rulesets/java/design.xml">
76- <exclude name="SimplifyBooleanReturns" />
77- <exclude name="ConfusingTernary" />
78- <exclude name="UnnecessaryLocalBeforeReturn" />
79- <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
80- </rule>
81-
82- <rule ref="rulesets/java/empty.xml" />
83-
84- <rule ref="rulesets/java/finalizers.xml" />
85-
86- <rule ref="rulesets/java/imports.xml" />
87-
88-<!--
89- <rule ref="rulesets/java/j2ee.xml" />
90- <rule ref="rulesets/java/javabeans.xml" />
91--->
92-
93- <rule ref="rulesets/java/junit.xml" />
94-
95-<!--
96- <rule ref="rulesets/java/logging-jakarta-commons.xml" />
97--->
98-
99- <rule ref="rulesets/java/logging-java.xml" />
100-
101- <rule ref="rulesets/java/migrating.xml" />
102-<!--
103- <rule ref="rulesets/java/migrating_to_XX.xml" />
104--->
105-
106- <rule ref="rulesets/java/naming.xml">
107- <exclude name="ShortVariable" />
108- <exclude name="LongVariable" />
109- <exclude name="AvoidFieldNameMatchingMethodName" />
110- </rule>
111- <rule ref="rulesets/java/naming.xml/LongVariable">
112- <properties>
113- <property name="minimum" value="25"/>
114- </properties>
115- </rule>
116-
117- <rule ref="rulesets/java/optimizations.xml">
118- <exclude name="LocalVariableCouldBeFinal" />
119- <exclude name="MethodArgumentCouldBeFinal" />
120- <exclude name="RedundantFieldInitializer" />
121- </rule>
122-
123- <rule ref="rulesets/java/strictexception.xml">
124- <exclude name="AvoidThrowingNullPointerException" />
125- </rule>
126-
127- <rule ref="rulesets/java/strings.xml" />
128-
129- <rule ref="rulesets/java/sunsecure.xml" />
130-
131- <rule ref="rulesets/java/typeresolution.xml" />
132-
133- <rule ref="rulesets/java/unnecessary.xml">
134- <exclude name="UnnecessaryReturn" />
135- <exclude name="UselessParentheses" />
136- </rule>
137-
138- <rule ref="rulesets/java/unusedcode.xml" />
139-
140-</ruleset>
141-
142-<!-- EOF -->
diff -r e21d4481babc -r 06d9e4c356ac src/main/config/suppressions.xml
--- a/src/main/config/suppressions.xml Mon Jun 27 00:10:27 2016 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
1-<?xml version="1.0" encoding="UTF-8" ?>
2-
3-<!DOCTYPE suppressions PUBLIC
4- "-//Puppy Crawl//DTD Suppressions 1.1//EN"
5- "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
6-
7-<!--
8- Checkstyle用警告抑止設定
9- ※ SuppressionFilter モジュール用
10-
11- [ http://checkstyle.sourceforge.net/ ]
12-
13- Copyright(c) 2010 olyutorskii
14--->
15-
16-
17-<suppressions>
18-
19- <!-- Class Design -->
20- <suppress files="" checks="DesignForExtension" />
21-
22- <!-- Coding -->
23- <suppress files="" checks="ExplicitInitialization" />
24- <suppress files="" checks="FinalLocalVariable" />
25- <suppress files="" checks="MagicNumber" />
26-
27- <!-- Imports -->
28- <suppress files="" checks="ImportControl" />
29-
30- <!-- Javadoc Comments -->
31- <suppress files="" checks="SummaryJavadocCheck" />
32- <!-- 句読点対応待ち -->
33- <suppress files="" checks="SingleLineJavadoc" />
34- <!-- ignoredTagsプロパティ対応待ち -->
35-
36- <!-- Miscellaneous -->
37- <suppress files="" checks="FinalParameters" />
38- <suppress files="" checks="TrailingComment" />
39-
40- <suppress files="HtmlParser.java" checks="DeclarationOrder" />
41- <suppress files="SysEventParser.java" checks="DeclarationOrder" />
42- <suppress files="TalkParser.java" checks="DeclarationOrder" />
43-
44-</suppressions>
45-
46-
47-<!-- EOF -->
diff -r e21d4481babc -r 06d9e4c356ac src/main/java/jp/sourceforge/jindolf/parser/AbstractParser.java
--- a/src/main/java/jp/sourceforge/jindolf/parser/AbstractParser.java Mon Jun 27 00:10:27 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/parser/AbstractParser.java Sun Apr 09 12:23:22 2017 +0900
@@ -192,8 +192,8 @@
192192 */
193193 protected boolean findProbe(Pattern pattern){
194194 switchPattern(pattern);
195- if( getMatcher().find() ) return true;
196- return false;
195+ boolean result = getMatcher().find();
196+ return result;
197197 }
198198
199199 /**
@@ -203,8 +203,8 @@
203203 */
204204 protected boolean lookingAtProbe(Pattern pattern){
205205 switchPattern(pattern);
206- if( getMatcher().lookingAt() ) return true;
207- return false;
206+ boolean result = getMatcher().lookingAt();
207+ return result;
208208 }
209209
210210 /**
@@ -214,8 +214,8 @@
214214 */
215215 protected boolean matchesProbe(Pattern pattern){
216216 switchPattern(pattern);
217- if( getMatcher().matches() ) return true;
218- return false;
217+ boolean result = getMatcher().matches();
218+ return result;
219219 }
220220
221221 /**
@@ -266,8 +266,8 @@
266266 * @return ヒットしていたらtrue
267267 */
268268 protected boolean isGroupMatched(int group){
269- if(matchStart(group) >= 0) return true;
270- return false;
269+ boolean result = matchStart(group) >= 0;
270+ return result;
271271 }
272272
273273 /**
@@ -355,18 +355,24 @@
355355 for( ; regionStart < regionEnd; regionStart++){
356356 char letter = rawContent.charAt(regionStart);
357357
358+ boolean spaceCh;
358359 switch(letter){
359360 case '\u0020':
360361 case '\t':
361362 case '\n':
362363 case '\r':
363- hasSpace = true;
364- continue;
364+ spaceCh = true;
365+ break;
365366 default:
367+ spaceCh = false;
366368 break;
367369 }
368370
369- break;
371+ if(spaceCh){
372+ hasSpace = true;
373+ }else{
374+ break;
375+ }
370376 }
371377
372378 if(hasSpace){
diff -r e21d4481babc -r 06d9e4c356ac src/main/java/jp/sourceforge/jindolf/parser/ContentBuilderSJ.java
--- a/src/main/java/jp/sourceforge/jindolf/parser/ContentBuilderSJ.java Mon Jun 27 00:10:27 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/parser/ContentBuilderSJ.java Sun Apr 09 12:23:22 2017 +0900
@@ -99,14 +99,8 @@
9999 int limit = offset + length;
100100 for(int bpos = offset; bpos < limit; bpos++){
101101 byte bval = errorArray[bpos];
102- if( ! this.hasByte1st){
103- if(ShiftJis.isShiftJIS1stByte(bval)){
104- this.byte1st = bval;
105- this.hasByte1st = true;
106- }else{
107- getContent().addDecodeError(bval);
108- }
109- }else{
102+
103+ if(this.hasByte1st){
110104 if(ShiftJis.isShiftJIS2ndByte(bval)){ // 文字集合エラー
111105 getContent().addDecodeError(this.byte1st, bval);
112106 this.hasByte1st = false;
@@ -119,7 +113,15 @@
119113 getContent().addDecodeError(bval);
120114 this.hasByte1st = false;
121115 }
116+ }else{
117+ if(ShiftJis.isShiftJIS1stByte(bval)){
118+ this.byte1st = bval;
119+ this.hasByte1st = true;
120+ }else{
121+ getContent().addDecodeError(bval);
122+ }
122123 }
124+
123125 }
124126
125127 return;
diff -r e21d4481babc -r 06d9e4c356ac src/main/java/jp/sourceforge/jindolf/parser/DecodeException.java
--- a/src/main/java/jp/sourceforge/jindolf/parser/DecodeException.java Mon Jun 27 00:10:27 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/parser/DecodeException.java Sun Apr 09 12:23:22 2017 +0900
@@ -18,6 +18,9 @@
1818 @SuppressWarnings("serial")
1919 public class DecodeException extends Exception{
2020
21+ private static final char CH_SP = '\u0020';
22+
23+
2124 private final int bytePos;
2225 private final int charPos;
2326
@@ -87,15 +90,15 @@
8790 */
8891 @Override
8992 public String getMessage(){
90- StringBuilder result = new StringBuilder();
93+ StringBuilder result = new StringBuilder(20);
9194
9295 String message = super.getMessage();
9396 if(message != null && message.length() > 0){
94- result.append(message).append(' ');
97+ result.append(message).append(CH_SP);
9598 }
9699
97100 result.append("bytePos=").append(this.bytePos);
98- result.append(' ');
101+ result.append(CH_SP);
99102 result.append("charPos=").append(this.charPos);
100103
101104 return result.toString();
diff -r e21d4481babc -r 06d9e4c356ac src/main/java/jp/sourceforge/jindolf/parser/EntityConverter.java
--- a/src/main/java/jp/sourceforge/jindolf/parser/EntityConverter.java Mon Jun 27 00:10:27 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/parser/EntityConverter.java Sun Apr 09 12:23:22 2017 +0900
@@ -224,7 +224,7 @@
224224 * @param regex 置換元パターン正規表現
225225 * @param altTxt 置換文字列。
226226 */
227- private RegexRep(String regex, String altTxt){
227+ RegexRep(String regex, String altTxt){
228228 this.regex = regex;
229229 this.altTxt = altTxt;
230230 return;
diff -r e21d4481babc -r 06d9e4c356ac src/main/java/jp/sourceforge/jindolf/parser/ShiftJis.java
--- a/src/main/java/jp/sourceforge/jindolf/parser/ShiftJis.java Mon Jun 27 00:10:27 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/parser/ShiftJis.java Sun Apr 09 12:23:22 2017 +0900
@@ -43,11 +43,10 @@
4343 * @return シフトJISの1バイト目でありうるならtrue
4444 */
4545 public static boolean isShiftJIS1stByte(byte bval){
46- if( (byte) 0x81 <= bval && bval <= (byte) 0x9f
47- || (byte) 0xe0 <= bval && bval <= (byte) 0xfc){
48- return true;
49- }
50- return false;
46+ boolean result =
47+ (byte) 0x81 <= bval && bval <= (byte) 0x9f
48+ || (byte) 0xe0 <= bval && bval <= (byte) 0xfc;
49+ return result;
5150 }
5251
5352 /**
@@ -57,11 +56,10 @@
5756 * @return シフトJISの2バイト目でありうるならtrue
5857 */
5958 public static boolean isShiftJIS2ndByte(byte bval){
60- if( (byte) 0x40 <= bval && bval <= (byte) 0x7e
61- || (byte) 0x80 <= bval && bval <= (byte) 0xfc){
62- return true;
63- }
64- return false;
59+ boolean result =
60+ (byte) 0x40 <= bval && bval <= (byte) 0x7e
61+ || (byte) 0x80 <= bval && bval <= (byte) 0xfc;
62+ return result;
6563 }
6664
6765 /**
@@ -72,11 +70,10 @@
7270 * @return シフトJISならtrue
7371 */
7472 public static boolean isShiftJIS(byte b1st, byte b2nd){
75- if( ShiftJis.isShiftJIS1stByte(b1st)
76- && ShiftJis.isShiftJIS2ndByte(b2nd)){
77- return true;
78- }
79- return false;
73+ boolean result =
74+ ShiftJis.isShiftJIS1stByte(b1st)
75+ && ShiftJis.isShiftJIS2ndByte(b2nd);
76+ return result;
8077 }
8178
8279 }
diff -r e21d4481babc -r 06d9e4c356ac src/test/java/jp/sourceforge/jindolf/parser/ContentBuilderSJTest.java
--- a/src/test/java/jp/sourceforge/jindolf/parser/ContentBuilderSJTest.java Mon Jun 27 00:10:27 2016 +0900
+++ b/src/test/java/jp/sourceforge/jindolf/parser/ContentBuilderSJTest.java Sun Apr 09 12:23:22 2017 +0900
@@ -92,6 +92,8 @@
9292
9393 /**
9494 * Test of SjisDecoder & ContentBuilder.
95+ * @throws java.io.IOException
96+ * @throws jp.sourceforge.jindolf.parser.DecodeException
9597 */
9698 @Test
9799 public void testDecoding() throws IOException, DecodeException{
@@ -172,6 +174,8 @@
172174
173175 /**
174176 * Test of unmappable character.
177+ * @throws java.io.IOException
178+ * @throws jp.sourceforge.jindolf.parser.DecodeException
175179 */
176180 @Test
177181 public void testUnmap() throws IOException, DecodeException{
@@ -272,6 +276,8 @@
272276
273277 /**
274278 * Test of malformed character.
279+ * @throws java.io.IOException
280+ * @throws jp.sourceforge.jindolf.parser.DecodeException
275281 */
276282 @Test
277283 public void testMalform() throws IOException, DecodeException{
@@ -327,6 +333,8 @@
327333
328334 /**
329335 * Test of Bounds buffering.
336+ * @throws java.io.IOException
337+ * @throws jp.sourceforge.jindolf.parser.DecodeException
330338 */
331339 @Test
332340 public void testBounds() throws IOException, DecodeException{
Show on old repository browser