• R/O
  • SSH

JinCore: Commit

JinCoreライブラリは、Jindolf プロジェクトのコア共通部分を構成するJavaパッケージです。


Commit MetaInfo

Revision2c502dc47cdc360e89654e4bc3fb25c2c4e5f27d (tree)
Time2017-04-08 22:53:43
Author <olyutorskii@user...>

Log Message

release/1.206.10 とマージ

Change Summary

Incremental Difference

diff -r c2de0ea443c2 -r 2c502dc47cdc .hgignore
--- a/.hgignore Fri Jun 17 01:48:37 2016 +0900
+++ b/.hgignore Sat Apr 08 22:53:43 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 c2de0ea443c2 -r 2c502dc47cdc CHANGELOG.txt
--- a/CHANGELOG.txt Fri Jun 17 01:48:37 2016 +0900
+++ b/CHANGELOG.txt Sat Apr 08 22:53:43 2017 +0900
@@ -4,6 +4,10 @@
44 JinCore 変更履歴
55
66
7+1.206.10 (2017-04-08)
8+ ・F国URL変更に対応。
9+ ・ja.osdn.net対応。
10+
711 1.206.8 (2016-06-17)
812 ・必須環境をJRE7に引き上げ。
913 ・Mavenプラグイン更新。
diff -r c2de0ea443c2 -r 2c502dc47cdc README.txt
--- a/README.txt Fri Jun 17 01:48:37 2016 +0900
+++ b/README.txt Sat Apr 08 22:53:43 2017 +0900
@@ -37,7 +37,7 @@
3737
3838 === 開発プロジェクト運営元 ===
3939
40- https://osdn.jp/projects/jindolf/ まで。
40+ https://ja.osdn.net/projects/jindolf/ まで。
4141
4242
4343 === ディレクトリ内訳構成 ===
@@ -59,6 +59,15 @@
5959 ./pom.xml
6060 Maven3用プロジェクト構成定義ファイル。
6161
62+./checkstyle.xml
63+ Checkstyle用configファイル。
64+
65+./pmdrules.xml
66+ PMD用ルール定義ファイル。
67+
68+./src/assembly/src.xml
69+ ソースアーカイブ構成定義ファイル。
70+
6271 ./src/main/java/
6372 Javaのソースコード。
6473
@@ -68,17 +77,5 @@
6877 ./src/test/java/
6978 JUnit 4.* 用のユニットテストコード。
7079
71-./src/main/config/
72- 各種ビルド・構成管理に必要なファイル群。
73-
74-./src/main/config/checks.xml
75- Checkstyle用configファイル。
76-
77-./src/main/config/pmdrules.xml
78- PMD用ルール定義ファイル。
79-
80-./src/main/assembly/descriptor.xml
81- ソースアーカイブ構成定義ファイル。
82-
8380
8481 --- EOF ---
diff -r c2de0ea443c2 -r 2c502dc47cdc SCM.txt
--- a/SCM.txt Fri Jun 17 01:48:37 2016 +0900
+++ b/SCM.txt Sat Apr 08 22:53:43 2017 +0900
@@ -10,10 +10,10 @@
1010
1111 このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
1212 このアーカイブの原本となる開発資産は、
13- https://osdn.jp/projects/jindolf/scm/hg/JinCore/
13+ https://ja.osdn.net/projects/jindolf/scm/hg/JinCore/
1414 を上位に持つMercurialリポジトリで管理されています。
1515 アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
16- # hg clone http://hg.osdn.jp/view/jindolf/JinCore
16+ # hg clone http://hg.osdn.net/view/jindolf/JinCore
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 c2de0ea443c2 -r 2c502dc47cdc checkstyle-suppressions.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/checkstyle-suppressions.xml Sat Apr 08 22:53:43 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 c2de0ea443c2 -r 2c502dc47cdc checkstyle.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/checkstyle.xml Sat Apr 08 22:53:43 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 c2de0ea443c2 -r 2c502dc47cdc pmdrules.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pmdrules.xml Sat Apr 08 22:53:43 2017 +0900
@@ -0,0 +1,113 @@
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+ </rule>
64+
65+ <rule ref="rulesets/java/empty.xml" />
66+
67+ <rule ref="rulesets/java/finalizers.xml" />
68+
69+ <rule ref="rulesets/java/imports.xml" />
70+
71+ <rule ref="rulesets/java/j2ee.xml" />
72+
73+ <rule ref="rulesets/java/logging-jakarta-commons.xml" />
74+
75+ <rule ref="rulesets/java/javabeans.xml">
76+ <exclude name="BeanMembersShouldSerialize" />
77+ </rule>
78+
79+ <rule ref="rulesets/java/logging-java.xml" />
80+
81+ <rule ref="rulesets/java/junit.xml" />
82+
83+ <rule ref="rulesets/java/migrating.xml" />
84+
85+ <rule ref="rulesets/java/naming.xml">
86+ <exclude name="ShortVariable" />
87+ </rule>
88+
89+ <rule ref="rulesets/java/optimizations.xml">
90+ <exclude name="LocalVariableCouldBeFinal" />
91+ <exclude name="MethodArgumentCouldBeFinal" />
92+ <exclude name="RedundantFieldInitializer" />
93+ </rule>
94+
95+ <rule ref="rulesets/java/strictexception.xml" />
96+
97+ <rule ref="rulesets/java/strings.xml">
98+ <exclude name="ConsecutiveAppendsShouldReuse" />
99+ </rule>
100+
101+ <rule ref="rulesets/java/sunsecure.xml" />
102+
103+ <rule ref="rulesets/java/typeresolution.xml" />
104+
105+ <rule ref="rulesets/java/unnecessary.xml">
106+ <exclude name="UnnecessaryReturn" />
107+ </rule>
108+
109+ <rule ref="rulesets/java/unusedcode.xml" />
110+
111+</ruleset>
112+
113+<!-- EOF -->
diff -r c2de0ea443c2 -r 2c502dc47cdc pom.xml
--- a/pom.xml Fri Jun 17 01:48:37 2016 +0900
+++ b/pom.xml Sat Apr 08 22:53:43 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>jincore</artifactId>
1818
19- <version>1.206.9-SNAPSHOT</version>
19+ <version>1.206.10</version>
2020
2121 <packaging>jar</packaging>
2222 <name>JinCore</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/JinCore</connection>
69- <developerConnection>scm:hg:ssh://hg.osdn.jp//hgroot/jindolf/JinCore</developerConnection>
70- <url>https://osdn.jp/projects/jindolf/scm/hg/JinCore/</url>
68+ <connection>scm:hg:http://hg.osdn.net/view/jindolf/JinCore</connection>
69+ <developerConnection>scm:hg:ssh://hg.osdn.net//hgroot/jindolf/JinCore</developerConnection>
70+ <url>https://osdn.net/projects/jindolf/scm/hg/JinCore/</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/>
@@ -114,31 +128,33 @@
114128 <pluginRepositories/>
115129
116130 <build>
117- <pluginManagement/>
131+
132+ <pluginManagement>
133+
134+ <plugins>
135+
136+ <plugin>
137+ <groupId>org.apache.maven.plugins</groupId>
138+ <artifactId>maven-checkstyle-plugin</artifactId>
139+ <version>${checkstyle-plugin.version}</version>
140+ <dependencies>
141+ <dependency>
142+ <groupId>com.puppycrawl.tools</groupId>
143+ <artifactId>checkstyle</artifactId>
144+ <!--artifactId>checkstyle-backport-jre6</artifactId-->
145+ <version>${checkstyleruntime.version}</version>
146+ </dependency>
147+ </dependencies>
148+ </plugin>
149+
150+ </plugins>
151+
152+ </pluginManagement>
118153
119154 <plugins>
120155
121- <plugin>
122- <groupId>org.apache.maven.plugins</groupId>
123- <artifactId>maven-enforcer-plugin</artifactId>
124- <version>1.4.1</version>
125- <configuration>
126- <rules>
127- <requireMavenVersion>
128- <version>[3.3,)</version>
129- </requireMavenVersion>
130- <requireJavaVersion>
131- <version>[1.7,)</version>
132- </requireJavaVersion>
133- </rules>
134- </configuration>
135- </plugin>
136156
137- <plugin>
138- <groupId>org.apache.maven.plugins</groupId>
139- <artifactId>maven-install-plugin</artifactId>
140- <version>2.5.2</version>
141- </plugin>
157+ <!-- clean lifecycle -->
142158
143159 <plugin>
144160 <groupId>org.apache.maven.plugins</groupId>
@@ -149,40 +165,122 @@
149165 <fileset>
150166 <directory>${project.basedir}</directory>
151167 <includes>
152- <include>**/.DS_Store</include>
153- <include>**/_MACOSX</include>
168+ <include>**/*~</include>
169+ <include>**/*.swp</include>
170+ <include>**/*.DS_Store</include>
171+ <include>**/._*</include>
172+ <include>**/__MACOSX</include>
154173 <include>**/Thumbs.db</include>
155- <include>**/thumbs.db</include>
156- <include>**/Desktop.ini</include>
157174 <include>**/desktop.ini</include>
158175 <include>**/core</include>
176+ <include>**/hs_err_pid*</include>
159177 </includes>
160178 </fileset>
161179 </filesets>
162180 </configuration>
163181 </plugin>
164182
183+
184+ <!-- default lifecycle -->
185+
165186 <plugin>
166187 <groupId>org.apache.maven.plugins</groupId>
167- <artifactId>maven-compiler-plugin</artifactId>
168- <version>3.5.1</version>
188+ <artifactId>maven-enforcer-plugin</artifactId>
189+ <version>1.4.1</version>
169190 <configuration>
170- <source>1.7</source> <!-- for NetBeans IDE -->
171- <target>1.7</target>
172- <showDeprecation>true</showDeprecation>
173- <showWarnings>true</showWarnings>
174- <compilerArguments>
175- <Xlint/>
176- </compilerArguments>
191+ <rules>
192+ <requireMavenVersion>
193+ <version>[3.0.1,)</version>
194+ </requireMavenVersion>
195+ <requireJavaVersion>
196+ <version>[1.7,)</version>
197+ </requireJavaVersion>
198+ </rules>
177199 </configuration>
178200 </plugin>
179201
180202 <plugin>
181203 <groupId>org.apache.maven.plugins</groupId>
204+ <artifactId>maven-resources-plugin</artifactId>
205+ <version>3.0.2</version>
206+ </plugin>
207+
208+ <plugin>
209+ <groupId>org.apache.maven.plugins</groupId>
210+ <artifactId>maven-compiler-plugin</artifactId>
211+ <version>3.6.1</version>
212+ <configuration>
213+ <source>1.7</source> <!-- for NetBeans IDE -->
214+ <target>1.7</target>
215+ <compilerArguments>
216+ <Xlint/>
217+ </compilerArguments>
218+ <showWarnings>true</showWarnings>
219+ <showDeprecation>true</showDeprecation>
220+ </configuration>
221+ </plugin>
222+
223+ <plugin>
224+ <groupId>org.apache.maven.plugins</groupId>
225+ <artifactId>maven-surefire-plugin</artifactId>
226+ <version>2.19.1</version>
227+ <configuration>
228+ <enableAssertions>true</enableAssertions>
229+ </configuration>
230+ </plugin>
231+
232+ <plugin>
233+ <groupId>org.jacoco</groupId>
234+ <artifactId>jacoco-maven-plugin</artifactId>
235+ <version>${jacoco-plugin.version}</version>
236+ <executions>
237+ <execution>
238+ <id>default-prepare-agent</id>
239+ <goals>
240+ <goal>prepare-agent</goal>
241+ </goals>
242+ </execution>
243+ <execution>
244+ <id>default-report</id>
245+ <phase>prepare-package</phase>
246+ <goals>
247+ <goal>report</goal>
248+ </goals>
249+ </execution>
250+ <execution>
251+ <id>default-check</id>
252+ <goals>
253+ <goal>check</goal>
254+ </goals>
255+ <configuration>
256+ <rules>
257+ <rule implementation="org.jacoco.maven.RuleConfiguration">
258+ <element>BUNDLE</element>
259+ <limits>
260+ <limit implementation="org.jacoco.report.check.Limit">
261+ <counter>COMPLEXITY</counter>
262+ <value>COVEREDRATIO</value>
263+ <minimum>0.0</minimum>
264+ </limit>
265+ </limits>
266+ </rule>
267+ </rules>
268+ </configuration>
269+ </execution>
270+ </executions>
271+ </plugin>
272+
273+ <plugin>
274+ <groupId>org.apache.maven.plugins</groupId>
182275 <artifactId>maven-jar-plugin</artifactId>
183- <version>3.0.0</version>
276+ <version>3.0.2</version>
184277 <configuration>
185278 <archive>
279+ <manifest>
280+ <addDefaultImplementationEntries>
281+ true
282+ </addDefaultImplementationEntries>
283+ </manifest>
186284 <manifestEntries>
187285 <Built-By>${project.organization.name}</Built-By>
188286 </manifestEntries>
@@ -192,20 +290,8 @@
192290
193291 <plugin>
194292 <groupId>org.apache.maven.plugins</groupId>
195- <artifactId>maven-assembly-plugin</artifactId>
196- <version>2.6</version>
197- <configuration>
198- <archiveBaseDirectory>.</archiveBaseDirectory>
199- <descriptors>
200- <descriptor>src/main/assembly/descriptor.xml</descriptor>
201- </descriptors>
202- </configuration>
203- </plugin>
204-
205- <plugin>
206- <groupId>org.apache.maven.plugins</groupId>
207293 <artifactId>maven-source-plugin</artifactId>
208- <version>3.0.0</version>
294+ <version>3.0.1</version>
209295 <configuration>
210296 <includePom>true</includePom>
211297 <archive>
@@ -227,76 +313,46 @@
227313
228314 <plugin>
229315 <groupId>org.apache.maven.plugins</groupId>
230- <artifactId>maven-resources-plugin</artifactId>
231- <version>3.0.0</version>
316+ <artifactId>maven-install-plugin</artifactId>
317+ <version>2.5.2</version>
232318 </plugin>
233319
234320 <plugin>
235321 <groupId>org.apache.maven.plugins</groupId>
236- <artifactId>maven-surefire-plugin</artifactId>
237- <version>2.19.1</version>
238- <configuration>
239- <skipTests>false</skipTests>
240- <enableAssertions>true</enableAssertions>
241- </configuration>
322+ <artifactId>maven-deploy-plugin</artifactId>
323+ <version>2.8.2</version>
242324 </plugin>
243325
326+
327+ <!-- site lifecycle -->
328+
244329 <plugin>
245330 <groupId>org.apache.maven.plugins</groupId>
246331 <artifactId>maven-site-plugin</artifactId>
247- <version>3.5.1</version>
332+ <version>3.6</version>
248333 <configuration>
249- <generateReports>true</generateReports>
250- <locales>ja</locales>
251- <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
252- <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
334+ <locales>${site.locales}</locales>
335+ </configuration>
336+ </plugin>
337+
338+
339+ <!-- goals without lifecycle -->
340+
341+ <plugin>
342+ <groupId>org.apache.maven.plugins</groupId>
343+ <artifactId>maven-assembly-plugin</artifactId>
344+ <version>3.0.0</version>
345+ <configuration>
346+ <descriptors>
347+ <descriptor>src/assembly/src.xml</descriptor>
348+ </descriptors>
253349 </configuration>
254350 </plugin>
255351
256352 <plugin>
257353 <groupId>org.apache.maven.plugins</groupId>
258354 <artifactId>maven-checkstyle-plugin</artifactId>
259- <version>2.15</version>
260- <!-- config from property value -->
261- </plugin>
262-
263- <plugin>
264- <groupId>org.apache.maven.plugins</groupId>
265- <artifactId>maven-pmd-plugin</artifactId>
266- <version>3.6</version>
267- <configuration>
268- <targetJdk>${maven.compiler.target}</targetJdk>
269- <rulesets>
270- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
271- </rulesets>
272- </configuration>
273- </plugin>
274-
275- <plugin>
276- <groupId>org.codehaus.mojo</groupId>
277- <artifactId>findbugs-maven-plugin</artifactId>
278- <version>3.0.3</version>
279- <configuration>
280- <effort>Max</effort>
281- <threshold>Low</threshold>
282- <!-- for Jenkins -->
283- <findbugsXmlOutput>true</findbugsXmlOutput>
284- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
285- <xmlOutput>true</xmlOutput>
286- </configuration>
287- </plugin>
288-
289- <plugin>
290- <groupId>org.codehaus.mojo</groupId>
291- <artifactId>cobertura-maven-plugin</artifactId>
292- <version>2.7</version>
293- <configuration>
294- <encoding>${project.build.sourceEncoding}</encoding>
295- <formats>
296- <format>html</format>
297- <format>xml</format> <!-- for Jenkins -->
298- </formats>
299- </configuration>
355+ <version>${checkstyle-plugin.version}</version>
300356 </plugin>
301357
302358 </plugins>
@@ -335,7 +391,7 @@
335391 <exclude>**/version.properties</exclude>
336392
337393 <exclude>**/.DS_Store</exclude>
338- <exclude>**/_MACOSX</exclude>
394+ <exclude>**/__MACOSX</exclude>
339395 <exclude>**/Thumbs.db</exclude>
340396 <exclude>**/thumbs.db</exclude>
341397 <exclude>**/Desktop.ini</exclude>
@@ -366,19 +422,20 @@
366422 <report>index</report>
367423 <report>summary</report>
368424 <report>license</report>
425+ <report>dependency-info</report>
369426 <report>dependencies</report>
427+ <report>dependency-convergence</report>
370428 <report>plugins</report>
429+ <report>plugin-management</report>
430+ <report>project-team</report>
431+ <report>issue-tracking</report>
371432 <report>scm</report>
372- <report>project-team</report>
373433 <!--
374- <report>dependency-convergence</report>
375- <report>dependency-info</report>
376434 <report>dependency-management</report>
377435 <report>distribution-management</report>
378- <report>issue-tracking</report>
436+ <report>cim</report>
379437 <report>mailing-list</report>
380438 <report>modules</report>
381- <report>plugin-management</report>
382439 -->
383440 </reports>
384441 </reportSet>
@@ -388,12 +445,15 @@
388445 <plugin>
389446 <groupId>org.apache.maven.plugins</groupId>
390447 <artifactId>maven-javadoc-plugin</artifactId>
391- <version>2.10.3</version>
448+ <version>2.10.4</version>
392449 <configuration>
393- <skip>false</skip>
450+ <author>false</author>
394451 <notimestamp>true</notimestamp>
395452 <quiet>true</quiet>
396453 <show>protected</show>
454+ <locale>${javadoc.locale}</locale>
455+ <header>${project.name} ${project.version} API</header>
456+ <version>true</version>
397457 </configuration>
398458 <reportSets>
399459 <reportSet>
@@ -408,48 +468,31 @@
408468 <groupId>org.apache.maven.plugins</groupId>
409469 <artifactId>maven-jxr-plugin</artifactId>
410470 <version>2.5</version>
411- <configuration>
412- <skip>false</skip>
413- </configuration>
414471 </plugin>
415472
416473 <plugin>
417474 <groupId>org.apache.maven.plugins</groupId>
418475 <artifactId>maven-surefire-report-plugin</artifactId>
419476 <version>2.19.1</version>
420- <configuration>
421- <showSuccess>false</showSuccess>
422- </configuration>
477+ </plugin>
478+
479+ <plugin>
480+ <groupId>org.jacoco</groupId>
481+ <artifactId>jacoco-maven-plugin</artifactId>
482+ <version>${jacoco-plugin.version}</version>
423483 <reportSets>
424484 <reportSet>
425485 <reports>
426- <report>report-only</report>
486+ <report>report</report>
427487 </reports>
428488 </reportSet>
429489 </reportSets>
430490 </plugin>
431491
432492 <plugin>
433- <groupId>org.codehaus.mojo</groupId>
434- <artifactId>cobertura-maven-plugin</artifactId>
435- <version>2.7</version>
436- <configuration>
437- <encoding>${project.build.sourceEncoding}</encoding>
438- <formats>
439- <format>html</format>
440- <format>xml</format> <!-- for Jenkins -->
441- </formats>
442- </configuration>
443- </plugin>
444-
445- <plugin>
446493 <groupId>org.apache.maven.plugins</groupId>
447494 <artifactId>maven-checkstyle-plugin</artifactId>
448- <version>2.15</version>
449- <configuration>
450- <skip>false</skip>
451- <!-- config from property value -->
452- </configuration>
495+ <version>${checkstyle-plugin.version}</version>
453496 <reportSets>
454497 <reportSet>
455498 <reports>
@@ -462,12 +505,10 @@
462505 <plugin>
463506 <groupId>org.apache.maven.plugins</groupId>
464507 <artifactId>maven-pmd-plugin</artifactId>
465- <version>3.6</version>
508+ <version>${pmd-plugin.version}</version>
466509 <configuration>
467- <skip>false</skip>
468- <targetJdk>${maven.compiler.target}</targetJdk>
469510 <rulesets>
470- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
511+ <ruleset>${project.basedir}/pmdrules.xml</ruleset>
471512 </rulesets>
472513 </configuration>
473514 <reportSets>
@@ -483,29 +524,7 @@
483524 <plugin>
484525 <groupId>org.codehaus.mojo</groupId>
485526 <artifactId>findbugs-maven-plugin</artifactId>
486- <version>3.0.3</version>
487- <configuration>
488- <skip>false</skip>
489- <effort>Max</effort>
490- <threshold>Low</threshold>
491- <!-- for Jenkins -->
492- <findbugsXmlOutput>true</findbugsXmlOutput>
493- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
494- <xmlOutput>true</xmlOutput>
495- <!-- excludeFilterFile/ -->
496- </configuration>
497- </plugin>
498-
499- <plugin>
500- <groupId>org.codehaus.mojo</groupId>
501- <artifactId>javancss-maven-plugin</artifactId>
502- <version>2.1</version>
503- </plugin>
504-
505- <plugin>
506- <groupId>org.codehaus.mojo</groupId>
507- <artifactId>jdepend-maven-plugin</artifactId>
508- <version>2.0</version>
527+ <version>${findbugs-plugin.version}</version>
509528 </plugin>
510529
511530 </plugins>
diff -r c2de0ea443c2 -r 2c502dc47cdc src/assembly/src.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/assembly/src.xml Sat Apr 08 22:53:43 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 c2de0ea443c2 -r 2c502dc47cdc src/main/assembly/descriptor.xml
--- a/src/main/assembly/descriptor.xml Fri Jun 17 01:48:37 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 c2de0ea443c2 -r 2c502dc47cdc src/main/config/checks.xml
--- a/src/main/config/checks.xml Fri Jun 17 01:48:37 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 c2de0ea443c2 -r 2c502dc47cdc src/main/config/pmdrules.xml
--- a/src/main/config/pmdrules.xml Fri Jun 17 01:48:37 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 c2de0ea443c2 -r 2c502dc47cdc src/main/config/suppressions.xml
--- a/src/main/config/suppressions.xml Fri Jun 17 01:48:37 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-<!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-</suppressions>
41-
42-
43-<!-- EOF -->
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/Destiny.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/Destiny.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/Destiny.java Sat Apr 08 22:53:43 2017 +0900
@@ -30,7 +30,7 @@
3030 * コンストラクタ。
3131 * @param message 死因メッセージ
3232 */
33- private Destiny(String message){
33+ Destiny(String message){
3434 this.message = message.intern();
3535 return;
3636 }
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/DisclosureType.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/DisclosureType.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/DisclosureType.java Sat Apr 08 22:53:43 2017 +0900
@@ -26,7 +26,7 @@
2626 * コンストラクタ。
2727 * @param xmlName XML用シンボル
2828 */
29- private DisclosureType(String xmlName){
29+ DisclosureType(String xmlName){
3030 this.xmlName = xmlName.intern();
3131 return;
3232 }
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/EventFamily.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/EventFamily.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/EventFamily.java Sat Apr 08 22:53:43 2017 +0900
@@ -26,7 +26,7 @@
2626 * コンストラクタ。
2727 * @param divClass divタグclass名
2828 */
29- private EventFamily(String divClass){
29+ EventFamily(String divClass){
3030 this.divClass = divClass;
3131 return;
3232 }
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/GameRole.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/GameRole.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/GameRole.java Sat Apr 08 22:53:43 2017 +0900
@@ -68,11 +68,11 @@
6868 * @param team 陣営
6969 * @param order 順位
7070 */
71- private GameRole(String roleName,
72- char shortName,
73- String xmlName,
74- Team team,
75- int order ){
71+ GameRole(String roleName,
72+ char shortName,
73+ String xmlName,
74+ Team team,
75+ int order ){
7676 this.roleName = roleName.intern();
7777 this.shortName = shortName;
7878 this.xmlName = xmlName.intern();
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/LandState.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/LandState.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/LandState.java Sat Apr 08 22:53:43 2017 +0900
@@ -26,7 +26,7 @@
2626 * コンストラクタ。
2727 * @param xmlName XML用シンボル
2828 */
29- private LandState(String xmlName){
29+ LandState(String xmlName){
3030 this.xmlName = xmlName.intern();
3131 return;
3232 }
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/PeriodType.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/PeriodType.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/PeriodType.java Sat Apr 08 22:53:43 2017 +0900
@@ -26,7 +26,7 @@
2626 * コンストラクタ。
2727 * @param xmlName XML用シンボル
2828 */
29- private PeriodType(String xmlName){
29+ PeriodType(String xmlName){
3030 this.xmlName = xmlName.intern();
3131 return;
3232 }
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/SysEventType.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/SysEventType.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/SysEventType.java Sat Apr 08 22:53:43 2017 +0900
@@ -80,7 +80,7 @@
8080 * コンストラクタ。
8181 * @param family イベントファミリ
8282 */
83- private SysEventType(EventFamily family){
83+ SysEventType(EventFamily family){
8484 this.family = family;
8585 return;
8686 }
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/TalkType.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/TalkType.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/TalkType.java Sat Apr 08 22:53:43 2017 +0900
@@ -28,7 +28,7 @@
2828 * コンストラクタ。
2929 * @param xmlName XML用シンボル
3030 */
31- private TalkType(String xmlName){
31+ TalkType(String xmlName){
3232 this.xmlName = xmlName.intern();
3333 return;
3434 }
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/Team.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/Team.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/Team.java Sat Apr 08 22:53:43 2017 +0900
@@ -28,7 +28,7 @@
2828 * @param teamName 陣営名
2929 * @param xmlName XML用シンボル
3030 */
31- private Team(String teamName, String xmlName){
31+ Team(String teamName, String xmlName){
3232 this.teamName = teamName.intern();
3333 this.xmlName = xmlName.intern();
3434 return;
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/VillageState.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/VillageState.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/VillageState.java Sat Apr 08 22:53:43 2017 +0900
@@ -31,7 +31,7 @@
3131 * コンストラクタ。
3232 * @param xmlName XML用シンボル
3333 */
34- private VillageState(String xmlName){
34+ VillageState(String xmlName){
3535 this.xmlName = xmlName.intern();
3636 return;
3737 }
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/VillageTag.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/VillageTag.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/VillageTag.java Sat Apr 08 22:53:43 2017 +0900
@@ -134,7 +134,7 @@
134134 * 隠しコンストラクタ。
135135 * @param tagName 村名
136136 */
137- private VillageTag(String tagName){
137+ VillageTag(String tagName){
138138 this.tagName = tagName.intern();
139139 return;
140140 }
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/java/jp/sourceforge/jindolf/corelib/package-info.java
--- a/src/main/java/jp/sourceforge/jindolf/corelib/package-info.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/package-info.java Sat Apr 08 22:53:43 2017 +0900
@@ -61,7 +61,7 @@
6161 *
6262 * @see <a href="http://jindolf.osdn.jp/">
6363 * Jindolfポータルサイト</a>
64- * @see <a href="https://osdn.jp/projects/jindolf/devel/">
64+ * @see <a href="https://ja.osdn.net/projects/jindolf/devel/">
6565 * Jindolf開発プロジェクト</a>
6666 */
6767
diff -r c2de0ea443c2 -r 2c502dc47cdc src/main/resources/jp/sourceforge/jindolf/corelib/resources/xml/landDefList.xml
--- a/src/main/resources/jp/sourceforge/jindolf/corelib/resources/xml/landDefList.xml Fri Jun 17 01:48:37 2016 +0900
+++ b/src/main/resources/jp/sourceforge/jindolf/corelib/resources/xml/landDefList.xml Sat Apr 08 22:53:43 2017 +0900
@@ -13,7 +13,7 @@
1313 xsi:schemaLocation="http://jindolf.sourceforge.jp/xml/ns/401
1414 http://jindolf.sourceforge.jp/xml/xsd/coreXML-090829.xsd"
1515 xml:lang="ja-JP"
16- update="2011-10-18T03:00:00+09:00"
16+ update="2017-04-08T01:42:00+09:00"
1717 >
1818
1919 <!--
@@ -197,8 +197,8 @@
197197 landState="historical"
198198 minMembers="11"
199199 maxMembers="16"
200- webURI="http://ninjin002.x0.com/wolff/"
201- cgiURI="http://ninjin002.x0.com/wolff/index.rb"
200+ webURI="http://ninjinix.x0.com/wolff/"
201+ cgiURI="http://ninjinix.x0.com/wolff/index.rb"
202202 tombFaceIconURI="./plugin_wolf/img/face99.jpg"
203203 tombBodyIconURI="./plugin_wolf/img/body99.jpg"
204204 faceIconURITemplate="./plugin_wolf/img/face{0,number,#00}.jpg"
diff -r c2de0ea443c2 -r 2c502dc47cdc src/test/java/jp/sourceforge/jindolf/corelib/LandDefTest.java
--- a/src/test/java/jp/sourceforge/jindolf/corelib/LandDefTest.java Fri Jun 17 01:48:37 2016 +0900
+++ b/src/test/java/jp/sourceforge/jindolf/corelib/LandDefTest.java Sat Apr 08 22:53:43 2017 +0900
@@ -380,7 +380,7 @@
380380
381381 assertEquals("http://ninjinix.x0.com/wolf/",
382382 selectLand("wolf").getWebURI().toString());
383- assertEquals("http://ninjin002.x0.com/wolff/",
383+ assertEquals("http://ninjinix.x0.com/wolff/",
384384 selectLand("wolff").getWebURI().toString());
385385 assertEquals("http://www.wolfg.x0.com/",
386386 selectLand("wolfg").getWebURI().toString());
@@ -397,7 +397,7 @@
397397
398398 assertEquals("http://ninjinix.x0.com/wolf/index.rb",
399399 selectLand("wolf").getCgiURI().toString());
400- assertEquals("http://ninjin002.x0.com/wolff/index.rb",
400+ assertEquals("http://ninjinix.x0.com/wolff/index.rb",
401401 selectLand("wolff").getCgiURI().toString());
402402 assertEquals("http://www.wolfg.x0.com/index.rb",
403403 selectLand("wolfg").getCgiURI().toString());
Show on old repository browser