From: Haruaki Tamada
Date: Wed, 13 Apr 2011 08:14:12 +0000 (+0900)
Subject: ドキュメントをutf-8にして,ドキュメントを読み込むときにエンコーディングを指定するようにした.
X-Git-Url: http://git.osdn.net/view?p=stigmata%2Fstigmata.git;a=commitdiff_plain;h=db57496ff9e0f4f774ae0caccd87e681231eb9f5
ドキュメントをutf-8にして,ドキュメントを読み込むときにエンコーディングを指定するようにした.
---
diff --git a/pom.xml b/pom.xml
index 656b628..d768e4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,12 @@
jp.sourceforge.stigmata
+ cflib
+ 1.0.0
+ compile
+
+
+ jp.sourceforge.stigmata
digger
3.0.0-SNAPSHOT
compile
diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ShowTextAction.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ShowTextAction.java
index 94e96c9..258bda9 100644
--- a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ShowTextAction.java
+++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ShowTextAction.java
@@ -78,7 +78,7 @@ abstract class ShowTextAction extends AbstractAction{
protected String loadStringFromFile(URL url){
try{
String line;
- BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()));
+ BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream(), "utf-8"));
StringWriter writer = new StringWriter();
PrintWriter out = new PrintWriter(writer);
while((line = in.readLine()) != null){
diff --git a/src/main/java/jp/sourceforge/stigmata/utils/Utility.java b/src/main/java/jp/sourceforge/stigmata/utils/Utility.java
index fc1be95..72c8697 100644
--- a/src/main/java/jp/sourceforge/stigmata/utils/Utility.java
+++ b/src/main/java/jp/sourceforge/stigmata/utils/Utility.java
@@ -59,7 +59,7 @@ public class Utility{
if(flag){
try{
JarFile jarfile = new JarFile(pluginFile);
- JarEntry entry = jarfile.getJarEntry("META-INF/services/jp.sourceforge.stigmata.spi.BirthmarkSpi");
+ JarEntry entry = jarfile.getJarEntry("META-INF/services/jp.sourceforge.stigmata.spi.BirthmarkService");
if(entry == null){
messages.add("install.error.servicedescriptor.missing");
flag = false;
diff --git a/src/main/resources/META-INF/license.txt.ja b/src/main/resources/META-INF/license.txt.ja
index 5284b97..2c0be00 100644
--- a/src/main/resources/META-INF/license.txt.ja
+++ b/src/main/resources/META-INF/license.txt.ja
@@ -1,186 +1,186 @@
Apache License
- Version 2.0A2004N1
+ Version 2.0ã2004å¹´1æ
http://www.apache.org/licenses/
-gpA¡»A¨æÑÐzÉÖ·éð
-
-1. è`
-
- uCZXvÆÍA±ÌhL
gÌæ1©çæ9ÜÅÅè`µÄ¢
- éAgpA¡»A¨æÑÐzÉÖ·éððwµÜ·B
-
- uCZT[vÆÍAì LÒA é¢Íì LÒªCZX
- t^ÎÛƵÄFß½ÒðwµÜ·B
-
- u@lvÆÍAs×ÒÆAs×ÒðÇ·é©s×ÒÉæèdzêé©s
- ×Ò¤ÊÌÇºÉ é¼Ì·×ÄÌÒÆ©ç¬éAÌðwµÜ·B±Ì
- è`ɨ¯éuÇvÆÍA(i) _ñܽͻ̼ÉæèA¼ÚܽÍÔÚ
- IɱÌ@lÌwöEocðs¤ ÀAÜ½Í (ii) ±Ì@lÌ50%ÈãÌ
- ®ÌL Ü½Í (iii) óvL ðL·é±ÆðwµÜ·B
-
- u ȽvÆÍA{CZXÉæèt^³êé ðsg·éÂlܽÍ
- @lðwµÜ·B
-
- u\[Xv`®ÆÍA\tgEFAÌ\[XR[hAhL
g\[XA
- Ýèt@CÆ¢Á½AÏXðÁ¦éÌÉDsÈ`®ðwµÜ·B
-
- uIuWFNgv`®ÆÍARpC³ê½IuWFNgR[hA¶¬³
- ê½hL
gA¼ÌfBAÖÌÏ·¨Æ¢Á½A\[X`®Ì@BI
- ÈÏ·Éæ趶é`®ðwµÜ·B
-
- u¬Ê¨vÆÍA\[X`®Å éÆIuWFNg`®Å éÆðâí¸A
- »ì¨É}üܽÍYt³êéiãoÌt^É᪠éjì \¦Å¦³
- ê½ì¨ÅA{CZXÉîâÄpª³êéàÌðwµÜ·B
-
- uh¶¬Ê¨vÆÍAÒWãÌüùAðAÈÈÇA¬Ê¨ðîɵĢ
- ÄSÌƵÄIWiì¨ÆÄ×éæ¤È»ì¨SÊðwµÜ·B{
- CZXÅÍA¬Ê¨âh¶¬Ê¨©çª£Å«é»ì¨âA¬Ê¨âh¶
- ¬Ê¨ÌC^tF[XÖÌPÈéNiܽͼOÉæéoChjðA
- h¶¬Ê¨ÉÜßܹñB
-
- uRgr
[VvÆÍA¬Ê¨ÌIWio[WÈçÑɬ
- ʨܽÍh¶¬Ê¨ÖÌÏXâÇÁàÜßÄAì LÒ é¢Íì
- LÒªFß½ÂlܽÍ@lÉæé¬Ê¨ÖÌgÝÝðÓ}µÄC
- ZT[Éño³êéì¨SÊðwµÜ·B±Ìè`ɨ¯éuñovÆ
- ÍA¬Ê¨ð_¶½èüÇ·é½ßÉCZT[ܽͻÌãÒÉæè
- dzêédqI[OXgA\[XR[hÇVXeAâèÇÕ
- VXeÆ¢Á½AdqIû@AûªAܽÍÊÅACZT[ܽÍ
- »ÌãÒÉîñðé±ÆðwµÜ·B½¾µAì LÒªÊÅ
- uRgr
[VÅÈ¢vƾ¦µ½àÌÍ«Ü·B
-
- uRgr
[^[vÆÍACZT[¨æÑ»Ìãð±ßéÂlÜ
- ½Í@lÅA©ªÌRgr
[VªCZT[Éó̳êĬÊ
- ¨ÉgÝÜê½ÒðwµÜ·B
-
-2. ì CZXÌt^
-
- {CZXÌðÉ]ÁÄAeRgr
[^[Í È½ÉεA\[
- X`®Å êIuWFNg`®Å êA¬Ê¨¨æÑh¶¬Ê¨ð¡»µ½
- èAh¶¬Ê¨ð쬵½èAöÉ\¦µ½èAöÉÀsµ½èATuC
- ZXµ½èAÐzµ½è·éA³úÀÅ¢EKÍÅñÆèIÅgp¿³¿
- ÅæèÁµs\Èì CZXðt^µÜ·B
-
-3. ÁCZXÌt^
-
- {CZXÌðÉ]ÁÄAeRgr
[^[Í È½ÉεA¬Ê
- ¨ð쬵½èAgpµ½èA̵½èAÌpÉñµ½èAC|[
- gµ½èA»Ì¼Ìû@ÅÚ]µ½è·éA³úÀÅ¢EKÍÅñÆèIÅ
- gp¿³¿ÅæèÁµs\Èi±ÌžLµ½àÌÍjÁCZ
- Xðt^µÜ·B½¾µA±Ìæ¤ÈCZXÍARgr
[^[É
- æÁÄCZXÂ\ÈÁ\¿Ì¤¿AYRgr
[^[ÌRg
- r
[VðPÆܽÍY·é¬Ê¨ÆgÝí¹Äp¢é±ÆÅK
- RIÉNQ³êéàÌÉÌÝKp³êÜ·B ȽªN©ÉεAð·¿
- â½iðÜßÄA¬Ê¨ é¢Í¬Ê¨ÉgÝÜê½Rgr
[V
- ª¼ÚܽÍÔÚIÈÁNQɽéƵÄÁi×ðN±µ½êA
- {CZXÉîÃ¢Ä È½Ét^³ê½ÁCZXÍA»¤µ½i
- ת³®ÉN±³ê½_ÅI¹·éàÌƵܷB
-
-4. ÄÐz
-
- ȽÍA\[X`®Å êIuWFNg`®Å êAÏXÌL³ÉÖíç
- ¸AȺÌðð·×Ľ·Àèɨ¢ÄA¬Ê¨Ü½Í»Ìh¶¬Ê¨
- ÌRs[ð¡»µ½èÐzµ½è·é±ÆªÅ«Ü·B
-
- 1. ¬Ê¨Ü½Íh¶¬Ê¨Ì¼ÌóÌÒÉ{CZXÌRs[àn·±ÆB
-
- 2. ÏXðÁ¦½t@CÉ¢ÄÍA ȽªÏXµ½Æ¢¤±Æªæ
- í©éæ¤Èmðüêé±ÆB
-
- 3. \[X`®Ìh¶¬Ê¨ðÐz·éêÍA\[X`®Ì¬Ê¨ÉÜÜ
- êÄ¢éì AÁA¤WA¨æÑA®É¢ÄÌmðAh¶¬Ê
- ¨ÌDZÉàÖWµÈ¢àÌÍ¢ÄA·×Äh¶¬Ê¨Éüêé±ÆB
- 4. ¬Ê¨ÌêƵÄuNOTICEvÉ·éeLXgt@CªÜÜê
- Ä¢éêÍA»¤µ½NOTICEt@CÉÜÜêÄ¢éA®mÌRs[
- ðAh¶¬Ê¨ÌDZÉàÖWµÈ¢àÌÍ¢ÄAÐz·éh¶¬Ê
- ¨Éüêé±ÆB»ÌÛA̤¿ÌÈÆà1ÓÉ}ü·é±ÆB
- (i) h¶¬Ê¨ÌêƵÄÐz·éNOTICEeLXgt@CA(ii) \[
- X`®Ü½ÍhL
gih¶¬Ê¨Æ¤ÉhL
gðÐz·é
- êjA(iii) h¶¬Ê¨ÉæÁĶ¬³êé\¦i±¤µ½æOÒ
- mð·èޱƪWIÈâèûÉÈÁÄ¢éêjBNOTICEt@C
- ÌàeÍ ÜÅîñ`BpÅ ÁÄA{CZXðC³·éàÌ
- Å ÁÄÍÈèܹñB ȽÍÐz·éh¶¬Ê¨É©ªÌA®m
- ði¬Ê¨©çÌNOTICEeLXgÉÀ×ÄAܽͻÌt^ƵÄjÇ
- ÁÅ«Ü·ªA±êÍ»¤µ½ÇÁÌA®mª{CZXÌC³Æ
- ðß³ê騻êªÈ¢êÉÀçêÜ·B
-
- ȽͩªÌC³¨É©çÌì \¦ðÇÁ·é±ÆªÅ«A©ªÌC
- ³¨ÌgpA¡»AܽÍÐzÉ¢ÄA é¢Í»¤µ½h¶¬Ê¨ÌS
- ÌÉ¢ÄAtÁIÈCZXðܽÍÙÈéCZXððݯé
- ±ÆªÅ«Ü·B½¾µA±êͬʨÉ¢ÄÌ È½ÌgpA¡»A¨
- æÑÐzªA»êÈOÌ_Å{CZXÌðÉ]ÁÄ¢éêÉÀçê
- Ü·B
-
-5. Rgr
[VÌño
-
- ÁÉfèªÈ¢ÀèA Ƚª¬Ê¨ÖÌgÝÝðÓ}µÄCZT[
- Éñoµ½Rgr
[VÍAtÁIÈðªÈ¯êÎA{CZ
- XÌðÉ]¤àÌƵܷBãqÌKèÉ©©íç¸A»¤µ½Rg
- r
[VÉÖµÄ È½ªCZT[Æñ¾©àµêÈ¢ÊÌC
- ZX_ñÌððA±±Å³øɵ½èC³µ½è·é±ÆÍ èܹñB
-
-6. ¤W
-
- {CZXÅÍA¬Ê¨ÌoðLqµ½èNOTICEt@CÌàeð¡»
- ·éÆ«ÉKvÉÈéÃŵKIÈg¢ûÍÊƵÄACZT[̤
- A¤WAT[rX}[NAܽͻi¼Ìgp ðt^µÜ¹ñB
-
-7. ÛØÌÛF
-
- Kp³êé@¥Ü½ÍÊÅ̯ÓÉæÁĽ¶çêÈ¢ÀèACZT[
- ͬʨði»µÄRgr
[^[Íe©ÌRgr
[Vðj
- u»óÌÜÜvñ·éàÌƵA¾¦Ù¦ðâí¸A^CgAñNQ«A
- ¤ÆIÈgpÂ\«A¨æÑÁèÌÚIÉηéK«ðÜßA¢©ÈéÛ
- ØàðàñµÜ¹ñB ȽͬʨÌgpâÄÐzÌKØ«ð©ªÅ
- »f·éÓCðÂƤÉA{CZXÉæèt^³êé ðsg·é
- ±Æɺ¤·×ÄÌXNð¤±ÆÉÈèÜ·B
-
-8. ÓÇÀ
-
- ¢©Èéð¨æÑ@_ɨ¢ÄàAs@s×i߸ðÜÞjA_ñAÜ
- ½Í»Ì¼¢©ÈéêÅàAKp³êé@¥Ü½ÍÊÅ̯ÓÉæÁÄ
- ½¶çêÈ¢ÀèARgr
[^[Í{CZXܽͬʨÌg¢
- ûÉÖAµÄ¶¶é¼Ú¹QAÔÚ¹QAôIȹQAÁʹQA¦±I
- ¹QAܽÍʹQðÜßAcÆ Ì¹¸AƱÌâ~ARs
[^[
- áQܽÍëì®A»Ì¼Ì¤Æã̹Q⹸ÈÇA¢©Èé¹QÉε
- ÄàA½Æ¦»¤µ½¹QÌÂ\«ð½Æ¦mç³êÄ¢½ÆµÄàA È
- ½ÉÓCðíÈ¢àÌƵܷB
-
-9. ÛØܽÍÇÁIÓCÌø«ó¯
-
- ¬Ê¨Ü½Í»Ìh¶¬Ê¨ðÄÐz·éÛA ȽÍT|[gAÛØA¹
- QâAܽͻ̼ÌÓCâA{CZXɵµÈ¢ ðñ¦µA
- ±êðL¿É·é±ÆªÅ«Ü·B½¾µA»¤µ½ÓCðø«ó¯éêA
- Ƚͻê𩪩g̽ßɾ¯©ÈÓCƵÄs¦éÌÅ ÁÄA¼
- ÌRgr
[^[̽ßÉs¤±ÆÍūܹñBܽA Ƚͻ¤
- µ½ÛØâÇÁIÓC̹¢Å¼ÌRgr
[^[ÉÓCª~è©©Á
- ½è
vªo³ê½ÆµÄàA»êçÌRgr
[^[ɹQªy
- ÔÌðh®Æ¤ÉeRgr
[^[̹Qðâ·é±Æɯӵȯ
- êÎÈèܹñB
-
-gpA¡»A¨æÑÐzÉÖ·éðÌIíè
-
-t^F Apache LicenseÌKpÌdû
-
- Ƚ̻ì¨ÉApache LicenseðKp·éÆ«ÍAÌè^¶ðYtµÄ
- ¾³¢B½¾µA"[]"ÅÍÜêÄ¢éªÍA Ƚ©g̯ÊîñÉu
- «·¦Ä¾³¢i»ÌÛApÊÍæè«Ü·jBܽA±Ì¶¾ðY
- ·ét@C`®ÉÁ½Rg\¶ÅÍñž³¢B³çÉAæO
- ÒA[JCuàÅ̯ÊðeÕÉ·é½ßAt@C¼Ü½ÍNX¼Èç
- ÑÉï|ྪì \¦Æ¯¶uóüy[WvÉ»êéæ¤É·é±Æð
- ¨©ßµÜ·B
-
- Copyright [yyyy] [ì LÒ̼O]
-
- Apache License Version 2.0iu{CZXvjÉîâÄCZ
- X³êÜ·B Ƚª±Ìt@Cðgp·é½ßÉÍA{CZX
- É]íȯêÎÈèܹñB{CZXÌRs[ͺLÌê©çü
- èÅ«Ü·B
+使ç¨ãè¤è£½ãããã³é å¸ã«é¢ããæ¡é
+
+1. å®ç¾©
+
+ ãã©ã¤ã»ã³ã¹ãã¨ã¯ããã®ããã¥ã¡ã³ãã®ç¬¬1é
ãã第9é
ã¾ã§ã§å®ç¾©ãã¦ã
+ ãã使ç¨ãè¤è£½ãããã³é å¸ã«é¢ããæ¡é
ãæãã¾ãã
+
+ ãã©ã¤ã»ã³ãµã¼ãã¨ã¯ãèä½æ¨©ææè
ããããã¯èä½æ¨©ææè
ãã©ã¤ã»ã³ã¹
+ ä»ä¸å¯¾è±¡ã¨ãã¦èªããè
ãæãã¾ãã
+
+ ãæ³äººãã¨ã¯ãè¡çºè
ã¨ãè¡çºè
ã管çãããè¡çºè
ã«ãã管çããããè¡
+ çºè
å
±éã®ç®¡çä¸ã«ããä»ã®ãã¹ã¦ã®è
ã¨ããæãé£åä½ãæãã¾ãããã®
+ å®ç¾©ã«ãããã管çãã¨ã¯ã(i) å¥ç´ã¾ãã¯ãã®ä»ã«ãããç´æ¥ã¾ãã¯éæ¥
+ çã«ãã®æ³äººã®ææ®ã»çµå¶ãè¡ã権éãã¾ã㯠(ii) ãã®æ³äººã®50%以ä¸ã®
+ æ ªå¼ã®ææ権ã¾ã㯠(iii) åçææ権ãæãããã¨ãæãã¾ãã
+
+ ãããªããã¨ã¯ãæ¬ã©ã¤ã»ã³ã¹ã«ããä»ä¸ããã権å©ãè¡ä½¿ããå人ã¾ãã¯
+ æ³äººãæãã¾ãã
+
+ ãã½ã¼ã¹ãå½¢å¼ã¨ã¯ãã½ããã¦ã§ã¢ã®ã½ã¼ã¹ã³ã¼ããããã¥ã¡ã³ãã½ã¼ã¹ã
+ è¨å®ãã¡ã¤ã«ã¨ãã£ããå¤æ´ãå ããã®ã«å¥½é½åãªå½¢å¼ãæãã¾ãã
+
+ ããªãã¸ã§ã¯ããå½¢å¼ã¨ã¯ãã³ã³ãã¤ã«ããããªãã¸ã§ã¯ãã³ã¼ããçæã
+ ããããã¥ã¡ã³ããä»ã®ã¡ãã£ã¢ã¸ã®å¤æç©ã¨ãã£ããã½ã¼ã¹å½¢å¼ã®æ©æ¢°ç
+ ãªå¤æã«ããçããå½¢å¼ãæãã¾ãã
+
+ ãææç©ãã¨ã¯ãã½ã¼ã¹å½¢å¼ã§ããã¨ãªãã¸ã§ã¯ãå½¢å¼ã§ããã¨ãåããã
+ 製ä½ç©ã«æ¿å
¥ã¾ãã¯æ·»ä»ãããï¼å¾åºã®ä»é²ã«ä¾ãããï¼èä½æ¨©è¡¨ç¤ºã§ç¤ºã
+ ããèä½ç©ã§ãæ¬ã©ã¤ã»ã³ã¹ã«åºã¥ãã¦å©ç¨ã許ããããã®ãæãã¾ãã
+
+ ãæ´¾çææç©ãã¨ã¯ãç·¨éä¸ã®æ¹è¨ã注解ãæ¨æ²ãªã©ãææç©ãåºã«ãã¦ã
+ ã¦å
¨ä½ã¨ãã¦ãªãªã¸ãã«èä½ç©ã¨å¼ã¹ããããªè£½ä½ç©å
¨è¬ãæãã¾ããæ¬ã©
+ ã¤ã»ã³ã¹ã§ã¯ãææç©ãæ´¾çææç©ããåé¢ã§ãã製ä½ç©ããææç©ãæ´¾ç
+ ææç©ã®ã¤ã³ã¿ãã§ã¼ã¹ã¸ã®åãªããªã³ã¯ï¼ã¾ãã¯ååã«ãããã¤ã³ãï¼ãã
+ æ´¾çææç©ã«å«ãã¾ããã
+
+ ãã³ã³ããªãã¥ã¼ã·ã§ã³ãã¨ã¯ãææç©ã®ãªãªã¸ãã«ãã¼ã¸ã§ã³ãªãã³ã«æ
+ æç©ã¾ãã¯æ´¾çææç©ã¸ã®å¤æ´ã追å ãå«ãã¦ãèä½æ¨©ææè
ãããã¯èä½
+ 権ææè
ãèªããå人ã¾ãã¯æ³äººã«ããææç©ã¸ã®çµã¿è¾¼ã¿ãæå³ãã¦ã©ã¤
+ ã»ã³ãµã¼ã«æåºãããèä½ç©å
¨è¬ãæãã¾ãããã®å®ç¾©ã«ããããæåºãã¨
+ ã¯ãææç©ãè«ãããæ¹è¯ããããã«ã©ã¤ã»ã³ãµã¼ã¾ãã¯ãã®ä»£çè
ã«ãã
+ 管çãããé»åçã¡ã¼ãªã³ã°ãªã¹ããã½ã¼ã¹ã³ã¼ã管çã·ã¹ãã ãåé¡è¿½è·¡
+ ã·ã¹ãã ã¨ãã£ããé»åçæ¹æ³ãå£é ãã¾ãã¯æ¸é¢ã§ãã©ã¤ã»ã³ãµã¼ã¾ãã¯
+ ãã®ä»£çè
ã«æ
å ±ãéããã¨ãæãã¾ãããã ããèä½æ¨©ææè
ãæ¸é¢ã§
+ ãã³ã³ããªãã¥ã¼ã·ã§ã³ã§ãªããã¨æ示ãããã®ã¯é¤ãã¾ãã
+
+ ãã³ã³ããªãã¥ã¼ã¿ã¼ãã¨ã¯ãã©ã¤ã»ã³ãµã¼ããã³ãã®ä»£çãåããå人ã¾
+ ãã¯æ³äººã§ãèªåã®ã³ã³ããªãã¥ã¼ã·ã§ã³ãã©ã¤ã»ã³ãµã¼ã«åé ããã¦ææ
+ ç©ã«çµã¿è¾¼ã¾ããè
ãæãã¾ãã
+
+2. èä½æ¨©ã©ã¤ã»ã³ã¹ã®ä»ä¸
+
+ æ¬ã©ã¤ã»ã³ã¹ã®æ¡é
ã«å¾ã£ã¦ãåã³ã³ããªãã¥ã¼ã¿ã¼ã¯ããªãã«å¯¾ããã½ã¼
+ ã¹å½¢å¼ã§ãããªãã¸ã§ã¯ãå½¢å¼ã§ãããææç©ããã³æ´¾çææç©ãè¤è£½ãã
+ ããæ´¾çææç©ãä½æããããå
¬ã«è¡¨ç¤ºããããå
¬ã«å®è¡ãããããµãã©ã¤
+ ã»ã³ã¹ããããé å¸ããããããç¡æéã§ä¸çè¦æ¨¡ã§éç¬å çã§ä½¿ç¨æç¡æ
+ ã§åãæ¶ãä¸è½ãªèä½æ¨©ã©ã¤ã»ã³ã¹ãä»ä¸ãã¾ãã
+
+3. ç¹è¨±ã©ã¤ã»ã³ã¹ã®ä»ä¸
+
+ æ¬ã©ã¤ã»ã³ã¹ã®æ¡é
ã«å¾ã£ã¦ãåã³ã³ããªãã¥ã¼ã¿ã¼ã¯ããªãã«å¯¾ããææ
+ ç©ãä½æãããã使ç¨ãããã販売ãããã販売ç¨ã«æä¾ããããã¤ã³ãã¼
+ ããããããã®ä»ã®æ¹æ³ã§ç§»è»¢ããããããç¡æéã§ä¸çè¦æ¨¡ã§éç¬å çã§
+ 使ç¨æç¡æã§åãæ¶ãä¸è½ãªï¼ãã®é
ã§æè¨ãããã®ã¯é¤ãï¼ç¹è¨±ã©ã¤ã»ã³
+ ã¹ãä»ä¸ãã¾ãããã ãããã®ãããªã©ã¤ã»ã³ã¹ã¯ãã³ã³ããªãã¥ã¼ã¿ã¼ã«
+ ãã£ã¦ã©ã¤ã»ã³ã¹å¯è½ãªç¹è¨±ç³è«ã®ãã¡ãå½è©²ã³ã³ããªãã¥ã¼ã¿ã¼ã®ã³ã³ã
+ ãªãã¥ã¼ã·ã§ã³ãåç¬ã¾ãã¯è©²å½ããææç©ã¨çµã¿åããã¦ç¨ãããã¨ã§å¿
+ ç¶çã«ä¾µå®³ããããã®ã«ã®ã¿é©ç¨ããã¾ããããªãã誰ãã«å¯¾ãã交差è«æ±
+ ãå訴ãå«ãã¦ãææç©ãããã¯ææç©ã«çµã¿è¾¼ã¾ããã³ã³ããªãã¥ã¼ã·ã§
+ ã³ãç´æ¥ã¾ãã¯éæ¥çãªç¹è¨±ä¾µå®³ã«å½ããã¨ãã¦ç¹è¨±è¨´è¨ãèµ·ãããå ´åã
+ æ¬ã©ã¤ã»ã³ã¹ã«åºã¥ãã¦ããªãã«ä»ä¸ãããç¹è¨±ã©ã¤ã»ã³ã¹ã¯ããããã訴
+ è¨ãæ£å¼ã«èµ·ããããæç¹ã§çµäºãããã®ã¨ãã¾ãã
+
+4. åé å¸
+
+ ããªãã¯ãã½ã¼ã¹å½¢å¼ã§ãããªãã¸ã§ã¯ãå½¢å¼ã§ãããå¤æ´ã®æç¡ã«é¢ãã
+ ãã以ä¸ã®æ¡ä»¶ããã¹ã¦æºããéãã«ããã¦ãææç©ã¾ãã¯ãã®æ´¾çææç©
+ ã®ã³ãã¼ãè¤è£½ãããé å¸ããããããã¨ãã§ãã¾ãã
+
+ 1. ææç©ã¾ãã¯æ´¾çææç©ã®ä»ã®åé è
ã«æ¬ã©ã¤ã»ã³ã¹ã®ã³ãã¼ã渡ããã¨ã
+
+ 2. å¤æ´ãå ãããã¡ã¤ã«ã«ã¤ãã¦ã¯ãããªããå¤æ´ããã¨ãããã¨ããã
+ ããããããªåç¥ãå
¥ãããã¨ã
+
+ 3. ã½ã¼ã¹å½¢å¼ã®æ´¾çææç©ãé å¸ããå ´åã¯ãã½ã¼ã¹å½¢å¼ã®ææç©ã«å«ã¾
+ ãã¦ããèä½æ¨©ãç¹è¨±ãåæ¨ãããã³å¸°å±ã«ã¤ãã¦ã®åç¥ããæ´¾çææ
+ ç©ã®ã©ãã«ãé¢ä¿ããªããã®ã¯é¤ãã¦ããã¹ã¦æ´¾çææç©ã«å
¥ãããã¨ã
+ 4. ææç©ã®ä¸é¨ã¨ãã¦ãNOTICEãã«ç¸å½ããããã¹ããã¡ã¤ã«ãå«ã¾ã
+ ã¦ããå ´åã¯ãããããNOTICEãã¡ã¤ã«ã«å«ã¾ãã¦ãã帰å±åç¥ã®ã³ãã¼
+ ããæ´¾çææç©ã®ã©ãã«ãé¢ä¿ããªããã®ã¯é¤ãã¦ãé å¸ããæ´¾çææ
+ ç©ã«å
¥ãããã¨ããã®éã次ã®ãã¡ã®å°ãªãã¨ã1ç®æã«æ¿å
¥ãããã¨ã
+ (i) æ´¾çææç©ã®ä¸é¨ã¨ãã¦é å¸ããNOTICEããã¹ããã¡ã¤ã«ã(ii) ã½ã¼
+ ã¹å½¢å¼ã¾ãã¯ããã¥ã¡ã³ãï¼æ´¾çææç©ã¨å
±ã«ããã¥ã¡ã³ããé å¸ãã
+ å ´åï¼ã(iii) æ´¾çææç©ã«ãã£ã¦çæããã表示ï¼ãããã第ä¸è
å
+ ç¥ãçãè¾¼ããã¨ãæ¨æºçãªããæ¹ã«ãªã£ã¦ããå ´åï¼ãNOTICEãã¡ã¤
+ ã«ã®å
容ã¯ããã¾ã§æ
å ±ä¼éç¨ã§ãã£ã¦ãæ¬ã©ã¤ã»ã³ã¹ãä¿®æ£ãããã®
+ ã§ãã£ã¦ã¯ãªãã¾ãããããªãã¯é å¸ããæ´¾çææç©ã«èªåã®å¸°å±åç¥
+ ãï¼ææç©ããã®NOTICEããã¹ãã«ä¸¦ã¹ã¦ãã¾ãã¯ãã®ä»é²ã¨ãã¦ï¼è¿½
+ å ã§ãã¾ãããããã¯ãããã追å ã®å¸°å±åç¥ãæ¬ã©ã¤ã»ã³ã¹ã®ä¿®æ£ã¨
+ 解éããããããããªãå ´åã«éããã¾ãã
+
+ ããªãã¯èªåã®ä¿®æ£ç©ã«èªãã®èä½æ¨©è¡¨ç¤ºã追å ãããã¨ãã§ããèªåã®ä¿®
+ æ£ç©ã®ä½¿ç¨ãè¤è£½ãã¾ãã¯é å¸ã«ã¤ãã¦ããããã¯ããããæ´¾çææç©ã®å
¨
+ ä½ã«ã¤ãã¦ãä»å çãªã©ã¤ã»ã³ã¹æ¡é
ã¾ãã¯ç°ãªãã©ã¤ã»ã³ã¹æ¡é
ãè¨ãã
+ ãã¨ãã§ãã¾ãããã ããããã¯ææç©ã«ã¤ãã¦ã®ããªãã®ä½¿ç¨ãè¤è£½ãã
+ ãã³é å¸ãããã以å¤ã®ç¹ã§æ¬ã©ã¤ã»ã³ã¹ã®æ¡é
ã«å¾ã£ã¦ããå ´åã«éãã
+ ã¾ãã
+
+5. ã³ã³ããªãã¥ã¼ã·ã§ã³ã®æåº
+
+ ç¹ã«æãããªãéããããªããææç©ã¸ã®çµã¿è¾¼ã¿ãæå³ãã¦ã©ã¤ã»ã³ãµã¼
+ ã«æåºããã³ã³ããªãã¥ã¼ã·ã§ã³ã¯ãä»å çãªæ¡é
ããªããã°ãæ¬ã©ã¤ã»ã³
+ ã¹ã®æ¡é
ã«å¾ããã®ã¨ãã¾ããä¸è¿°ã®è¦å®ã«ããããããããããã³ã³ããª
+ ãã¥ã¼ã·ã§ã³ã«é¢ãã¦ããªããã©ã¤ã»ã³ãµã¼ã¨çµãã ãããããªãå¥ã®ã©ã¤
+ ã»ã³ã¹å¥ç´ã®æ¡é
ããããã§ç¡å¹ã«ãããä¿®æ£ããããããã¨ã¯ããã¾ããã
+
+6. åæ¨
+
+ æ¬ã©ã¤ã»ã³ã¹ã§ã¯ãææç©ã®åºæãè¨è¿°ãããNOTICEãã¡ã¤ã«ã®å
容ãè¤è£½
+ ããã¨ãã«å¿
è¦ã«ãªã妥å½ã§æ
£ç¿çãªä½¿ãæ¹ã¯å¥ã¨ãã¦ãã©ã¤ã»ã³ãµã¼ã®å
+ å·ãåæ¨ããµã¼ãã¹ãã¼ã¯ãã¾ãã¯è£½ååã®ä½¿ç¨æ¨©ãä»ä¸ãã¾ããã
+
+7. ä¿è¨¼ã®å¦èª
+
+ é©ç¨ãããæ³å¾ã¾ãã¯æ¸é¢ã§ã®åæã«ãã£ã¦å½ããããªãéããã©ã¤ã»ã³ãµã¼
+ ã¯ææç©ãï¼ããã¦ã³ã³ããªãã¥ã¼ã¿ã¼ã¯åèªã®ã³ã³ããªãã¥ã¼ã·ã§ã³ãï¼
+ ãç¾ç¶ã®ã¾ã¾ãæä¾ãããã®ã¨ããæ示é»ç¤ºãåãããã¿ã¤ãã«ãé侵害æ§ã
+ åæ¥çãªä½¿ç¨å¯è½æ§ãããã³ç¹å®ã®ç®çã«å¯¾ããé©åæ§ãå«ãããããªãä¿
+ 証ãæ¡ä»¶ãæä¾ãã¾ãããããªãã¯ææç©ã®ä½¿ç¨ãåé å¸ã®é©åæ§ãèªåã§
+ å¤æãã責任ãæã¤ã¨å
±ã«ãæ¬ã©ã¤ã»ã³ã¹ã«ããä»ä¸ããã権å©ãè¡ä½¿ãã
+ ãã¨ã«ä¼´ããã¹ã¦ã®ãªã¹ã¯ãè² ããã¨ã«ãªãã¾ãã
+
+8. 責任ã®å¶é
+
+ ãããªãæ¡ä»¶ããã³æ³çè«ã«ããã¦ããä¸æ³è¡çºï¼é失ãå«ãï¼ãå¥ç´ãã¾
+ ãã¯ãã®ä»ãããªãå ´åã§ããé©ç¨ãããæ³å¾ã¾ãã¯æ¸é¢ã§ã®åæã«ãã£ã¦
+ å½ããããªãéããã³ã³ããªãã¥ã¼ã¿ã¼ã¯æ¬ã©ã¤ã»ã³ã¹ã¾ãã¯ææç©ã®ä½¿ã
+ æ¹ã«é¢é£ãã¦çããç´æ¥æ害ãéæ¥æ害ãå¶çºçãªæ害ãç¹å¥æ害ãæ²ç½°ç
+ æ害ãã¾ãã¯çµææ害ãå«ããå¶æ¥æ¨©ã®æ失ãæ¥åã®åæ¢ãã³ã³ãã¥ã¼ã¿ã¼
+ é害ã¾ãã¯èª¤ä½åããã®ä»ã®åæ¥ä¸ã®æ害ãæ失ãªã©ããããªãæ害ã«å¯¾ã
+ ã¦ãããã¨ãããããæ害ã®å¯è½æ§ããã¨ãç¥ãããã¦ããã¨ãã¦ããããª
+ ãã«è²¬ä»»ãè² ããªããã®ã¨ãã¾ãã
+
+9. ä¿è¨¼ã¾ãã¯è¿½å ç責任ã®å¼ãåã
+
+ ææç©ã¾ãã¯ãã®æ´¾çææç©ãåé å¸ããéãããªãã¯ãµãã¼ããä¿è¨¼ãæ
+ 害è£åãã¾ãã¯ãã®ä»ã®è²¬ä»»ããæ¬ã©ã¤ã»ã³ã¹ã«çç¾ããªã権å©ãæ示ãã
+ ãããææã«ãããã¨ãã§ãã¾ãããã ãããããã責任ãå¼ãåããå ´åã
+ ããªãã¯ãããèªåèªèº«ã®ããã«ã ãèªå·±è²¬ä»»ã¨ãã¦è¡ããã®ã§ãã£ã¦ãä»
+ ã®ã³ã³ããªãã¥ã¼ã¿ã¼ã®ããã«è¡ããã¨ã¯ã§ãã¾ãããã¾ããããªãã¯ãã
+ ããä¿è¨¼ã追å ç責任ã®ããã§ä»ã®ã³ã³ããªãã¥ã¼ã¿ã¼ã«è²¬ä»»ãéãããã£
+ ããè³ åè¦æ±ãåºãããã¨ãã¦ãããããã®ã³ã³ããªãã¥ã¼ã¿ã¼ã«æ害ãå
+ ã¶ã®ãé²ãã¨å
±ã«åã³ã³ããªãã¥ã¼ã¿ã¼ã®æ害ãè£åãããã¨ã«åæããªã
+ ãã°ãªãã¾ããã
+
+使ç¨ãè¤è£½ãããã³é å¸ã«é¢ããæ¡é
ã®çµãã
+
+ä»é²ï¼ Apache Licenseã®é©ç¨ã®ä»æ¹
+
+ ããªãã®è£½ä½ç©ã«Apache Licenseãé©ç¨ããã¨ãã¯ã次ã®å®åæãæ·»ä»ãã¦
+ ãã ããããã ãã"[]"ã§å²ã¾ãã¦ããé¨åã¯ãããªãèªèº«ã®èå¥æ
å ±ã«ç½®
+ ãæãã¦ãã ããï¼ãã®éãè§æ¬å¼§ã¯åãé¤ãã¾ãï¼ãã¾ãããã®æè¨ã該
+ å½ãããã¡ã¤ã«å½¢å¼ã«åã£ãã³ã¡ã³ãæ§æã§å²ãã§ãã ãããããã«ã第ä¸
+ è
ã¢ã¼ã«ã¤ãå
ã§ã®èå¥ã容æã«ããããããã¡ã¤ã«åã¾ãã¯ã¯ã©ã¹åãªã
+ ã³ã«è¶£æ¨èª¬æãèä½æ¨©è¡¨ç¤ºã¨åããå°å·ãã¼ã¸ãã«ç¾ããããã«ãããã¨ã
+ ãå§ããã¾ãã
+
+ Copyright [yyyy] [èä½æ¨©ææè
ã®åå]
+
+ Apache License Version 2.0ï¼ãæ¬ã©ã¤ã»ã³ã¹ãï¼ã«åºã¥ãã¦ã©ã¤ã»ã³
+ ã¹ããã¾ããããªãããã®ãã¡ã¤ã«ã使ç¨ããããã«ã¯ãæ¬ã©ã¤ã»ã³ã¹
+ ã«å¾ããªããã°ãªãã¾ãããæ¬ã©ã¤ã»ã³ã¹ã®ã³ãã¼ã¯ä¸è¨ã®å ´æããå
¥
+ æã§ãã¾ãã
http://www.apache.org/licenses/LICENSE-2.0
- Kp³êé@¥Ü½ÍÊÅ̯ÓÉæÁĽ¶çêÈ¢ÀèA{C
- ZXÉîâÄÐz³êé\tgEFAÍA¾¦Ù¦ðâí¸A¢©
- ÈéÛØàðàȵÉu»óÌÜÜvÐz³êÜ·B{CZXÅ
- Ì Æ§ÀðKèµ½¶¾É¢ÄÍA{CZXðQƵľ
- ³¢B
\ No newline at end of file
+ é©ç¨ãããæ³å¾ã¾ãã¯æ¸é¢ã§ã®åæã«ãã£ã¦å½ããããªãéããæ¬ã©ã¤
+ ã»ã³ã¹ã«åºã¥ãã¦é å¸ãããã½ããã¦ã§ã¢ã¯ãæ示é»ç¤ºãåããããã
+ ãªãä¿è¨¼ãæ¡ä»¶ããªãã«ãç¾ç¶ã®ã¾ã¾ãé å¸ããã¾ããæ¬ã©ã¤ã»ã³ã¹ã§
+ ã®æ¨©å©ã¨å¶éãè¦å®ããæè¨ã«ã¤ãã¦ã¯ãæ¬ã©ã¤ã»ã³ã¹ãåç
§ãã¦ãã
+ ããã
\ No newline at end of file
diff --git a/src/main/resources/META-INF/services/jp.sourceforge.stigmata.spi.BirthmarkExtractorService b/src/main/resources/META-INF/services/jp.sourceforge.stigmata.spi.BirthmarkExtractorService
index a9dd8e0..7338e1a 100644
--- a/src/main/resources/META-INF/services/jp.sourceforge.stigmata.spi.BirthmarkExtractorService
+++ b/src/main/resources/META-INF/services/jp.sourceforge.stigmata.spi.BirthmarkExtractorService
@@ -1,7 +1,6 @@
-jp.sourceforge.stigmata.birthmarks.extractors.ConstantValueOfFieldVariableBirthmarkExtractorService
-jp.sourceforge.stigmata.birthmarks.extractors.InheritanceStructureBirthmarkExtractorService
-jp.sourceforge.stigmata.birthmarks.extractors.SequentialMethodCallBirthmarkExtractorService
-jp.sourceforge.stigmata.birthmarks.extractors.UsedClassesBirthmarkExtractorService
-jp.sourceforge.stigmata.birthmarks.extractors.KGramBasedBirthmarkExtractorService
-jp.sourceforge.stigmata.birthmarks.extractors.FrequencyMethodCallBirthmarkExtractorService
-jp.sourceforge.stigmata.birthmarks.extractors.FrequencyUsedClassesBirthmarkExtractorService
+jp.sourceforge.stigmata.birthmarks.cvfv.ConstantValueOfFieldVariableBirthmarkExtractorService
+jp.sourceforge.stigmata.birthmarks.is.InheritanceStructureBirthmarkExtractorService
+jp.sourceforge.stigmata.birthmarks.smc.SequentialMethodCallBirthmarkExtractorService
+jp.sourceforge.stigmata.birthmarks.uc.UsedClassesBirthmarkExtractorService
+jp.sourceforge.stigmata.birthmarks.fmc.FrequencyMethodCallBirthmarkExtractorService
+jp.sourceforge.stigmata.birthmarks.fuc.FrequencyUsedClassesBirthmarkExtractorService
diff --git a/src/main/resources/resources/about.html b/src/main/resources/resources/about.html
index d917062..b711648 100644
--- a/src/main/resources/resources/about.html
+++ b/src/main/resources/resources/about.html
@@ -7,7 +7,7 @@
Stigmata version: ${implementation.version}
Copyright (C) by Haruaki Tamada, Ph.D.,
-${implementation.vendor} 2004-2008,
+${implementation.vendor} 2004-2011,
All right reserved.
Latest version is available at
@@ -16,7 +16,7 @@ Stigmata is developed on Java SE 6.
Dependencies
-Stigmata uses ASM 3.1 for engineering Java bytecode.
+Stigmata uses ASM 3.3 for engineering Java bytecode.
http://asm.objectweb.org/
Stigmata uses following libraries developed by Apache Software Foundation.
@@ -38,7 +38,7 @@ Stigmata uses icons provided by FAMFAMFAM.
License & Copyright
-Copyright 2004-2007 Haruaki Tamada
+Copyright 2004-2011 Haruaki Tamada
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/src/main/resources/resources/about.html.ja b/src/main/resources/resources/about.html.ja
index 93b9293..7c21203 100644
--- a/src/main/resources/resources/about.html.ja
+++ b/src/main/resources/resources/about.html.ja
@@ -1,21 +1,21 @@
-Stigmata o[W: ${implementation.version}
+Stigmata ãã¼ã¸ã§ã³: ${implementation.version}
Copyright (C) by Haruaki Tamada, Ph.D.,
-${implementation.vendor} 2004-2008,
+${implementation.vendor} 2004-2011,
All right reserved.
-Stigmata ÌÅVo[WÍ
+Stigmata ã®ææ°ãã¼ã¸ã§ã³ã¯
http://stigmata.sourceforge.jp/
-©çæ¾Â\Å·DܽCStigmata Í Java SE 6 ÅJ³êĢܷD
+ããåå¾å¯è½ã§ãï¼ã¾ãï¼Stigmata 㯠Java SE 6 ã§éçºããã¦ãã¾ãï¼
-˶Cu
-StigmataÍ Java oCgR[h𵤽ßCASM 3.1ðpµÄ¢Ü·D
+ä¾åã©ã¤ãã©ãª
+Stigmata㯠Java ãã¤ãã³ã¼ããæ±ãããï¼ASM 3.3ãå©ç¨ãã¦ãã¾ãï¼
http://asm.objectweb.org/
-StigmataÍApache Software FoundationªJµ½ÈºÌCuðpµÄ¢Ü·D
+Stigmataã¯Apache Software Foundationãéçºãã以ä¸ã®ã©ã¤ãã©ãªãå©ç¨ãã¦ãã¾ãï¼
http://www.apache.org/
@@ -26,22 +26,22 @@ Stigmata
-StigmataÍMDS(Multi-Dimensional Scaling)ÌvZ̽ßÉJama (Java matrix package)ðpµÄ¢Ü·D
+Stigmataã¯MDS(Multi-Dimensional Scaling)ã®è¨ç®ã®ããã«Jama (Java matrix package)ãå©ç¨ãã¦ãã¾ãï¼
http://math.nist.gov/javanumerics/jama/
-StigmataÍFAMFAMFAMªñµÄ¢éACRðpµÄ¢Ü·D
+Stigmataã¯FAMFAMFAMãæä¾ãã¦ããã¢ã¤ã³ã³ãå©ç¨ãã¦ãã¾ãï¼
http://www.famfamfam.com/
-CZX&ì
+ã©ã¤ã»ã³ã¹&èä½æ¨©
-Copyright 2004-2008 Êc tº (Haruaki Tamada)
+Copyright 2004-2011 çç° æ¥æ (Haruaki Tamada)
-Apache License Version 2.0iu{CZXvjÉîâÄCZX³êÜ·B Ƚª±Ìt@Cðgp·é½ßÉÍA{CZXÉ]íȯêÎÈèܹñB{CZXÌRs[ͺLÌê©çüèÅ«Ü·B
+Apache License Version 2.0ï¼ãæ¬ã©ã¤ã»ã³ã¹ãï¼ã«åºã¥ãã¦ã©ã¤ã»ã³ã¹ããã¾ããããªãããã®ãã¡ã¤ã«ã使ç¨ããããã«ã¯ãæ¬ã©ã¤ã»ã³ã¹ã«å¾ããªããã°ãªãã¾ãããæ¬ã©ã¤ã»ã³ã¹ã®ã³ãã¼ã¯ä¸è¨ã®å ´æããå
¥æã§ãã¾ãã
http://www.apache.org/licenses/LICENSE-2.0
-Kp³êé@¥Ü½ÍÊÅ̯ÓÉæÁĽ¶çêÈ¢ÀèA{CZXÉîâÄÐz³êé\tgEFAÍA¾¦Ù¦ðâí¸A¢©ÈéÛØàðàȵÉu»óÌÜÜvÐz³êÜ·B{CZXÅÌ Æ§ÀðKèµ½¶¾É¢ÄÍA{CZXðQƵľ³¢B
+é©ç¨ãããæ³å¾ã¾ãã¯æ¸é¢ã§ã®åæã«ãã£ã¦å½ããããªãéããæ¬ã©ã¤ã»ã³ã¹ã«åºã¥ãã¦é å¸ãããã½ããã¦ã§ã¢ã¯ãæ示é»ç¤ºãåããããããªãä¿è¨¼ãæ¡ä»¶ããªãã«ãç¾ç¶ã®ã¾ã¾ãé å¸ããã¾ããæ¬ã©ã¤ã»ã³ã¹ã§ã®æ¨©å©ã¨å¶éãè¦å®ããæè¨ã«ã¤ãã¦ã¯ãæ¬ã©ã¤ã»ã³ã¹ãåç
§ãã¦ãã ããã