From flyson ＠ users.sourceforge.jp  Sat Oct  8 02:16:35 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sat, 8 Oct 2005 02:16:35 +0900
Subject: [Bbs2ch-cvs 20] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051007171635.8C77B2AC01B@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/abone.js
diff -u bbs2chreader/content/bbs2chreader/abone.js:1.4 bbs2chreader/content/bbs2chreader/abone.js:1.5
--- bbs2chreader/content/bbs2chreader/abone.js:1.4	Mon Feb 14 22:02:00 2005
+++ bbs2chreader/content/bbs2chreader/abone.js	Sat Oct  8 02:16:35 2005
@@ -178,7 +178,7 @@
 		function checkAbone(aNgArray, aCheckString){
 			aCheckString = Bbs2chGlobal.fromSJIS(aCheckString);
 			for(var i=0; i<aNgArray.length; i++){
-				if(aNgArray[i] && aCheckString.match(aNgArray[i]))
+				if(aNgArray[i] && aCheckString.indexOf(aNgArray[i]) != -1)
 					return true;
 			}
 			return false;

From flyson ＠ users.sourceforge.jp  Sat Oct  8 02:26:27 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sat, 8 Oct 2005 02:26:27 +0900
Subject: [Bbs2ch-cvs 21] CVS update: bbs2chreader/components
Message-ID: <20051007172627.457082AC01B@users.sourceforge.jp>

Index: bbs2chreader/components/nsBbs2chChannel.js
diff -u bbs2chreader/components/nsBbs2chChannel.js:1.3 bbs2chreader/components/nsBbs2chChannel.js:1.4
--- bbs2chreader/components/nsBbs2chChannel.js:1.3	Fri Sep  9 20:48:27 2005
+++ bbs2chreader/components/nsBbs2chChannel.js	Sat Oct  8 02:26:27 2005
@@ -40,7 +40,6 @@
 }
 
 nsBbs2chChannel.prototype = {
-
 	QueryInterface: function(aIID){
 		if(aIID.equals(Components.interfaces.nsIBbs2chChannel))  return this;
 		if(aIID.equals(Components.interfaces.nsIChannel))  return this;
@@ -162,7 +161,13 @@
 
 	requestRespond: function(aData, aDataLength){
 		if(!this._cacheMode){
-			this._cacheOutputStream.write(aData, aDataLength);
+			try{
+				this._cacheOutputStream.write(aData, aDataLength);
+			}catch(ex){
+				this._cacheOutputStream.close();
+				this._cacheEntry.close();
+				this._cacheMode = true;
+			}
 		}
 
 		this._stringStream.setData(aData, aDataLength);

From flyson ＠ users.sourceforge.jp  Sun Oct  9 03:39:43 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 9 Oct 2005 03:39:43 +0900
Subject: [Bbs2ch-cvs 22] CVS update: bbs2chreader
Message-ID: <20051008183943.D0F732AC00E@users.sourceforge.jp>

Index: bbs2chreader/install.rdf
diff -u bbs2chreader/install.rdf:1.11 bbs2chreader/install.rdf:1.12
--- bbs2chreader/install.rdf:1.11	Fri Sep  9 20:49:21 2005
+++ bbs2chreader/install.rdf	Sun Oct  9 03:39:43 2005
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:name>bbs2chreader</em:name>
 		<em:id>{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}</em:id>
-		<em:version>0.2.6</em:version>
+		<em:version>0.2.6+</em:version>
 		<em:description>2ch(Japanese Web Forum) Reader</em:description>
 		<em:optionsURL>chrome://bbs2chreader/content/settings/settings.xul</em:optionsURL>
 		<em:homepageURL>http://bbs2ch.sourceforge.jp/</em:homepageURL>
@@ -17,7 +17,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>1.0</em:minVersion>
-				<em:maxVersion>1.4</em:maxVersion>
+				<em:maxVersion>1.4.1</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 

From flyson ＠ users.sourceforge.jp  Tue Oct 11 22:17:31 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Tue, 11 Oct 2005 22:17:31 +0900
Subject: [Bbs2ch-cvs 23] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051011131731.6CAC92AC014@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-items.js
diff -u bbs2chreader/content/bbs2chreader/board-items.js:1.10 bbs2chreader/content/bbs2chreader/board-items.js:1.11
--- bbs2chreader/content/bbs2chreader/board-items.js:1.10	Tue Aug 23 22:09:42 2005
+++ bbs2chreader/content/bbs2chreader/board-items.js	Tue Oct 11 22:17:31 2005
@@ -320,11 +320,12 @@
 
 	search: function(aSearchString){
 		if(!this._lastItems) this._lastItems = this.items.concat();
-	
+		aSearchString = aSearchString.toLowerCase();
+		
 		var resultItems = new Array();
 		for(var i=0; i<this._lastItems.length; i++){
-			var title = this._lastItems[i].title;
-			if(title.match(new RegExp(aSearchString, "i")))
+			var title = this._lastItems[i].title.toLowerCase();;
+			if(title.indexOf(aSearchString) != -1)
 					resultItems.push(this._lastItems[i]);
 		}
 		return this._items = resultItems;

From flyson ＠ users.sourceforge.jp  Sun Oct 16 11:05:25 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 16 Oct 2005 11:05:25 +0900
Subject: [Bbs2ch-cvs 24] CVS update: bbs2chreader/content/bbs2chreader/test
Message-ID: <20051016020525.BB2B42AC01F@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/test/thread-test.js
diff -u /dev/null bbs2chreader/content/bbs2chreader/test/thread-test.js:1.1
--- /dev/null	Sun Oct 16 11:05:25 2005
+++ bbs2chreader/content/bbs2chreader/test/thread-test.js	Sun Oct 16 11:05:25 2005
@@ -0,0 +1,218 @@
+/*
+	case "thread:":
+		tmpChannel = Components.classes["@mozilla.org/bbs2ch-channel;1"]
+						.createInstance(Components.interfaces.nsIBbs2chChannel);
+		tmpChannel.init(aURI, "text/plain", "Shift_JIS",
+						new b2rThreadFactory().create(aURI));
+		break;
+
+*/
+
+
+function b2rThreadFactory(){
+}
+
+b2rThreadFactory.prototype = {
+
+	create: function(aThreadURI){
+		var bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
+					.getService(Components.interfaces.nsIBbs2chService);
+		var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+					.getService(Components.interfaces.nsIIOService);
+
+		var threadURLSpec = aThreadURI.spec.replace(/^bbs2ch:thread-test:/, "");
+		try{
+			var threadURL = ioService.newURI(threadURLSpec, null, null)
+					.QueryInterface(Components.interfaces.nsIURL);
+		}catch(ex){
+			return new b2rThread();
+		}
+		
+			// 板のタイプをチェック
+		var threadType = bbs2chService.getBoardType(threadURL.spec);
+		switch(threadType){
+			case bbs2chService.BOARD_TYPE_2CH:
+				return new b2r2chThread();
+			case bbs2chService.BOARD_TYPE_JBBS:
+				return new b2rJbbsThread();
+		}
+		return new b2rThread();
+	}
+
+}
+
+
+
+
+function b2rThread(){
+}
+
+b2rThread.prototype = {
+	init: function(aChannel){
+		this._channel = aChannel;
+		this._bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
+					.getService(Components.interfaces.nsIBbs2chService);
+		this._ioService = Components.classes["@mozilla.org/network/io-service;1"]
+					.getService(Components.interfaces.nsIIOService);
+		
+		this.startThread();
+	},
+
+	startThread: function(){
+		var threadURLSpec = this._channel.URI.spec.replace(/^bbs2ch:thread-test:/, "");
+		this.requestRespond("BAD URL :\t" + threadURLSpec);
+		this.requestEnd();
+	},
+
+	requestRespond: function(aString){
+		aString = String(aString);
+		this._channel.requestRespond(aString, aString.length);
+	},
+
+	requestEnd: function(){
+		this._channel.requestEnd();
+	}
+}
+
+
+
+
+function b2r2chThread(){
+}
+
+b2r2chThread.prototype = {
+
+// ********** ********* プロパティ ********** **********
+
+	get threadURL(){
+		return this._threadURL;
+	},
+
+	get boardURL(){
+		return this._boardURL;
+	},
+
+	get type(){
+		return this._type;
+	},
+
+	get datURL(){
+		if(!this._datURL){
+			var datURLSpec = this.boardURL.resolve("dat/" + this.datID + ".dat");
+			this._datURL = this._ioService.newURI(datURLSpec, null, null)
+						.QueryInterface(Components.interfaces.nsIURL);
+		}
+		return this._datURL;
+	},
+
+	get datFile(){
+		return this._datFile;
+	},
+
+	get idxFile(){
+		return this._idxFile;
+	},
+
+	get datID(){
+		if(!this._datID)
+			this._datID = this.threadURL.directory.match(/\/(\d{9,10})/) ? RegExp.$1 : null;
+		return this._datID;
+	},
+
+	get title(){
+		return this._title;
+	},
+
+	get optionsStart(){
+	  return (this.threadURL.fileName.match(/(\d+)\-/)) ? RegExp.$1 : null;
+	},
+	get optionsLast(){
+	  return (this.threadURL.fileName.match(/l(\d+)/)) ? RegExp.$1 : null;
+	},
+	get optionsEnd(){
+	  return (this.threadURL.fileName.match(/\-(\d+)/)) ? RegExp.$1 : null;
+	},
+	get optionsNoFirst(){
+	  return (this.threadURL.fileName.indexOf("n") != -1);
+	},
+
+
+// ********** ********* メソッド ********** **********
+
+
+	startThread: function(){
+
+			// threadURL
+		var threadURLSpec = this._channel.URI.spec.replace(/^bbs2ch:thread-test:/, "");
+		this._threadURL = this._ioService.newURI(threadURLSpec, null, null)
+							.QueryInterface(Components.interfaces.nsIURL);
+			// URL が、DAT ID で終わるときは "/" を追加する
+		if(this.threadURL.fileName.match(/^\d{9,10}$/))
+			this._threadURL = this._ioService.newURI(threadURLSpec + "/", null, null)
+						.QueryInterface(Components.interfaces.nsIURL);
+		this._boardURL = this._bbs2chService.getBoardURL(this.threadURL.spec);
+		this._type = this._bbs2chService.getBoardType(this.threadURL.spec);
+		this._datFile = this._bbs2chService.getLogFileAtURL(
+								this.boardURL.resolve(this.datID + ".dat"));
+		this._idxFile = this._bbs2chService.getLogFileAtURL(
+								this.boardURL.resolve(this.datID + ".idx"));
+
+			// idx ファイルからタイトル等を取得
+		if(this.idxFile.exists()){
+			var idxContent =  this._bbs2chService.readFile(this.idxFile.path);
+
+			this._title = idxContent.match(/^title=(.+)/m) ? RegExp.$1 : "";
+			this._lineCount = idxContent.match(/^lineCount=(.+)/m) ? Number(RegExp.$1) : 0;
+			this._lastModified = idxContent.match(/^lastModified=(.+)/m) ? RegExp.$1 : "";
+			this._eTag = idxContent.match(/^etag=(.+)/m) ? RegExp.$1 : "";
+		}else{
+			this._title = "";
+			this._lineCount = 0;
+			this._lastModified = "";
+			this._eTag = "";
+		}
+
+		this.requestRespond("Thread URL    : " + this.threadURL.spec + "\n");
+		this.requestRespond("Board URL     : " + this.boardURL.spec + "\n");
+		this.requestRespond("DAT URL       : " + this.datURL.spec + "\n");
+		this.requestRespond("Type          : " + this.type + "\n");
+		this.requestRespond("DAT ID        : " + this.datID + "\n");
+		this.requestRespond("DAT File      : " + this.datFile.path + "\n");
+		this.requestRespond("IDX File      : " + this.idxFile.path + "\n");
+		this.requestRespond("----- ----- -----\n");
+		this.requestRespond("Title         : " + this.title + "\n");
+		this.requestRespond("LineCount     : " + this._lineCount + "\n");
+		this.requestRespond("LastModified  : " + this._lastModified + "\n");
+		this.requestRespond("ETag          : " + this._eTag + "\n");
+		this.requestRespond("----- ----- -----\n");
+		this.requestRespond("URL Options \n");
+		this.requestRespond("  Start       : " + this.optionsStart + "\n");
+		this.requestRespond("  Last        : " + this.optionsLast + "\n");
+		this.requestRespond("  End         : " + this.optionsEnd + "\n");
+		this.requestRespond("  NoFirst     : " + this.optionsNoFirst + "\n");
+		this.requestEnd();
+	}
+
+}
+b2r2chThread.prototype.__proto__ = b2rThread.prototype;
+
+
+
+
+function b2rJbbsThread(){
+}
+
+b2rJbbsThread.prototype = {
+
+	get datURL(){
+		if(!this._datURL){
+			var datURLSpec = this.threadURL.resolve("./").replace("read.cgi", "rawmode.cgi");
+			this._datURL = this._ioService.newURI(datURLSpec, null, null)
+						.QueryInterface(Components.interfaces.nsIURL);
+		}
+		return this._datURL;
+	},
+
+}
+b2rJbbsThread.prototype.__proto__ = b2r2chThread.prototype;
+

From flyson ＠ users.sourceforge.jp  Sun Oct 16 11:05:25 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 16 Oct 2005 11:05:25 +0900
Subject: [Bbs2ch-cvs 25] CVS update: bbs2chreader/components
Message-ID: <20051016020525.E7DD32AC025@users.sourceforge.jp>

Index: bbs2chreader/components/nsBbs2chProtocolHandler.js
diff -u bbs2chreader/components/nsBbs2chProtocolHandler.js:1.4 bbs2chreader/components/nsBbs2chProtocolHandler.js:1.5
--- bbs2chreader/components/nsBbs2chProtocolHandler.js:1.4	Sat Sep 17 04:36:51 2005
+++ bbs2chreader/components/nsBbs2chProtocolHandler.js	Sun Oct 16 11:05:25 2005
@@ -95,6 +95,13 @@
 									.createInstance(Components.interfaces.nsIBbs2chChannel);
 				tmpChannel.init(aURI, "text/html", "Shift_JIS", new Bbs2chThread());
 				break;
+			case "thread-test:" :
+				this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/test/thread-test.js");
+				var threadFactory = new b2rThreadFactory();
+				tmpChannel = Components.classes["@mozilla.org/bbs2ch-channel;1"]
+									.createInstance(Components.interfaces.nsIBbs2chChannel);
+				tmpChannel.init(aURI, "text/plain", "Shift_JIS", threadFactory.create(aURI));
+				break;
 			case "board-rss:" :
 				tmpChannel = Components.classes["@mozilla.org/bbs2ch-channel;1"]
 									.createInstance(Components.interfaces.nsIBbs2chChannel);

From flyson ＠ users.sourceforge.jp  Mon Oct 17 22:19:33 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Mon, 17 Oct 2005 22:19:33 +0900
Subject: [Bbs2ch-cvs 26] CVS update: bbs2chreader/content/bbs2chreader/res
Message-ID: <20051017131933.256142AC02F@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/res/outside.txt
diff -u bbs2chreader/content/bbs2chreader/res/outside.txt:1.1 bbs2chreader/content/bbs2chreader/res/outside.txt:1.2
--- bbs2chreader/content/bbs2chreader/res/outside.txt:1.1	Sat Feb  5 21:53:10 2005
+++ bbs2chreader/content/bbs2chreader/res/outside.txt	Mon Oct 17 22:19:33 2005
@@ -1,10 +1,12 @@
 # ??????
 # URL????????????????
-# ?????????
-#	type-2ch	2ch ? BBS
-#	type-machi	??BBS
-#	type-jbbs	livedoor ????
-#	type-page	??y??
+#	0 = 2ch ? BBS
+#	1 = ? 2ch ? BBS (???)
+#	2 = Be ＠ 2ch BBS
+#	3 = livedoor ???? BBS
+#	4 = ??BBS (???)
+#	5 = ??y??
 #
-http://bbs2ch.sourceforge.jp/	bbs2chreader ???	type-page
-http://jbbs.livedoor.jp/computer/351/	Monazilla ＠ JBBS	type-jbbs
+http://bbs2ch.sourceforge.jp/	bbs2chreader ???	5
+http://yy22.kakiko.com/bbs2ch/	bbs2ch ????	0
+http://jbbs.livedoor.jp/computer/351/	Monazilla ＠ JBBS	3

From flyson ＠ users.sourceforge.jp  Mon Oct 17 22:19:33 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Mon, 17 Oct 2005 22:19:33 +0900
Subject: [Bbs2ch-cvs 27] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051017131933.477592AC043@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/bbsmenu-ds.js
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.10 bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.11
--- bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.10	Tue Sep 27 21:22:14 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-ds.js	Mon Oct 17 22:19:33 2005
@@ -114,7 +114,7 @@
 		var outsideContainer = this.rdf.makeSeqContainer("urn:bbs2ch:bbsmenu:outside-board");
 		this.rdf.setLiteralProperty(outsideContainer.Resource, NS_BBS2CH + "title", "OUTSIDE");
 
-		var regOutsideLine = /^(http:\/\/.*)\t(.+)\t(type-.+)/;
+		var regOutsideLine = /^(http:\/\/.*)\t(.+)\t(\d)/;
 			// 外部板リストが存在しないときはテンプレートから作る
 		if(!this.outsideFile.exists()){
 			var templateContent = this._bbs2chService.readLocalURI(

From flyson ＠ users.sourceforge.jp  Thu Oct 20 22:30:31 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 20 Oct 2005 22:30:31 +0900
Subject: [Bbs2ch-cvs 28] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051020133031.694B02AC035@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-page.js
diff -u bbs2chreader/content/bbs2chreader/board-page.js:1.21 bbs2chreader/content/bbs2chreader/board-page.js:1.22
--- bbs2chreader/content/bbs2chreader/board-page.js:1.21	Sat Aug  6 01:55:06 2005
+++ bbs2chreader/content/bbs2chreader/board-page.js	Thu Oct 20 22:30:31 2005
@@ -73,7 +73,7 @@
 
 		// ツリーの偶数行に色をつける
 	if(gBbs2chService.pref.getBoolPref("fls.bbs2chreader.enable_tree_stripe"))
-		gTreeSubject.setAttribute("stripe", "true");
+			gTreeSubject.setAttribute("stripe", "true");
 
 	if(gBbs2chService.pref.getBoolPref("fls.bbs2chreader.board_auto_update")){
 		subjectUpdate();
@@ -608,13 +608,16 @@
 		treeNode.hidden = false;
 	},
 
-	getRowProperties: function(aIndex, aProperties){},
+	getRowProperties: function(aIndex, aProperties){
+		var status = "s" + this._items[aIndex].status;
+		aProperties.AppendElement(this._atomService.getAtom(status));
+	},
 	getCellProperties: function(aRow, aColID, aProperties){
 		if(typeof(aColID) != "string") aColID = aColID.id; // XXX Gecko 1.7/1.8 互換
+		var status = "s" + this._items[aRow].status;
+		aProperties.AppendElement(this._atomService.getAtom(status));
 		if(aColID =="colStatus"){
-			var status = "s" + this._items[aRow].status;
 			aProperties.AppendElement(this._atomService.getAtom("icon"));
-			aProperties.AppendElement(this._atomService.getAtom(status));
 		}
 	},
 	getColumnProperties: function(aColID, aColElement, aProperties){},

From flyson ＠ users.sourceforge.jp  Thu Oct 20 22:53:36 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 20 Oct 2005 22:53:36 +0900
Subject: [Bbs2ch-cvs 29] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051020135336.E72502AC035@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-page.js
diff -u bbs2chreader/content/bbs2chreader/board-page.js:1.22 bbs2chreader/content/bbs2chreader/board-page.js:1.23
--- bbs2chreader/content/bbs2chreader/board-page.js:1.22	Thu Oct 20 22:30:31 2005
+++ bbs2chreader/content/bbs2chreader/board-page.js	Thu Oct 20 22:53:36 2005
@@ -130,10 +130,14 @@
 		}
 	}
 	function sortFunc(aItemA, aItemB){
-		return(aItemA[sortProperty] - aItemB[sortProperty]);
+		var propA = aItemA[sortProperty];
+		var propB = aItemB[sortProperty];
+		return((propA > propB) - (propA < propB));
 	}
 	function reverseFunc(aItemA, aItemB){
-		return(aItemB[sortProperty] - aItemA[sortProperty]);
+		var propA = aItemA[sortProperty];
+		var propB = aItemB[sortProperty];
+		return((propB > propA) - (propB < propA));
 	}	
 	if(sortCol && sortDirection=="ascending") gBoardItems.items.sort(sortFunc);
 	if(sortCol && sortDirection=="descending") gBoardItems.items.sort(reverseFunc);
@@ -596,10 +600,14 @@
 		}
 
 		function sortFunc(aItemA, aItemB){
-			return(aItemA[property] - aItemB[property]);
+			var propA = aItemA[property];
+			var propB = aItemB[property];
+			return((propA > propB) - (propA < propB));
 		}
 		function reverseFunc(aItemA, aItemB){
-			return(aItemB[property] - aItemA[property]);
+			var propA = aItemA[property];
+			var propB = aItemB[property];
+			return((propB > propA) - (propB < propA));
 		}
 
 		treeNode.hidden = true;

From flyson ＠ users.sourceforge.jp  Sat Oct 22 13:14:14 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sat, 22 Oct 2005 13:14:14 +0900
Subject: [Bbs2ch-cvs 30] CVS update: bbs2chreader/content/bbs2chreader/res
Message-ID: <20051022041414.AF5E52AC00E@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/res/outside.txt
diff -u bbs2chreader/content/bbs2chreader/res/outside.txt:1.2 bbs2chreader/content/bbs2chreader/res/outside.txt:1.3
--- bbs2chreader/content/bbs2chreader/res/outside.txt:1.2	Mon Oct 17 22:19:33 2005
+++ bbs2chreader/content/bbs2chreader/res/outside.txt	Sat Oct 22 13:14:14 2005
@@ -1,12 +1,12 @@
 # ??????
 # URL????????????????
-#	0 = 2ch ? BBS
-#	1 = ? 2ch ? BBS (???)
-#	2 = Be ＠ 2ch BBS
-#	3 = livedoor ???? BBS
-#	4 = ??BBS (???)
-#	5 = ??y??
+#   type-2ch    = 2ch ? BBS
+#   type-old2ch = ? 2ch ? BBS (???)
+#   type-be2ch  = Be ＠ 2ch BBS
+#   type-jbbs   = livedoor ???? BBS
+#   type-machi  = ??BBS (???)
+#   type-page   = ??y??
 #
-http://bbs2ch.sourceforge.jp/	bbs2chreader ???	5
-http://yy22.kakiko.com/bbs2ch/	bbs2ch ????	0
-http://jbbs.livedoor.jp/computer/351/	Monazilla ＠ JBBS	3
+http://bbs2ch.sourceforge.jp/	bbs2chreader ???	type-page
+http://yy22.kakiko.com/bbs2ch/	bbs2ch ????	type-2ch
+http://jbbs.livedoor.jp/computer/351/	Monazilla ＠ JBBS	type-jbbs

From flyson ＠ users.sourceforge.jp  Sat Oct 22 13:14:14 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sat, 22 Oct 2005 13:14:14 +0900
Subject: [Bbs2ch-cvs 31] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051022041414.CDF052AC0D9@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/bbsmenu-ds.js
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.11 bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.12
--- bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.11	Mon Oct 17 22:19:33 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-ds.js	Sat Oct 22 13:14:14 2005
@@ -114,7 +114,6 @@
 		var outsideContainer = this.rdf.makeSeqContainer("urn:bbs2ch:bbsmenu:outside-board");
 		this.rdf.setLiteralProperty(outsideContainer.Resource, NS_BBS2CH + "title", "OUTSIDE");
 
-		var regOutsideLine = /^(http:\/\/.*)\t(.+)\t(\d)/;
 			// 外部板リストが存在しないときはテンプレートから作る
 		if(!this.outsideFile.exists()){
 			var templateContent = this._bbs2chService.readLocalURI(
@@ -123,12 +122,24 @@
 		}
 		var outsideLines = this._bbs2chService.readFile(this.outsideFile.path);
 		outsideLines = this._bbs2chService.fromSJIS(outsideLines).split("\n");
+
+		var regOutsideLine = /^(http:\/\/.*)\t(.+)\t(type-.+)/;
+		var typeHash = new Array();
+		typeHash["type-2ch"]    = 0;
+		typeHash["type-old2ch"] = 1;
+		typeHash["type-be2ch"]  = 2;
+		typeHash["type-jbbs"]   = 3;
+		typeHash["type-machi"]  = 4;
+		typeHash["type-page"]   = 5;
 		for(var i=0; i<outsideLines.length; i++){
 			var line = outsideLines[i];
 			if(regOutsideLine.test(line)){
-				var board = this.rdf.appendResource(RegExp.$1, outsideContainer);
-				this.rdf.setLiteralProperty(board, NS_BBS2CH + "title", RegExp.$2);
-				this.rdf.setLiteralProperty(board, NS_BBS2CH + "type", RegExp.$3);
+				if(RegExp.$3 in typeHash){
+					var board = this.rdf.appendResource(RegExp.$1, outsideContainer);
+					var type = typeHash[RegExp.$3];
+					this.rdf.setLiteralProperty(board, NS_BBS2CH + "title", RegExp.$2);
+					this.rdf.setLiteralProperty(board, NS_BBS2CH + "type", type);
+				}
 			}
 		}
 		rootContainer.AppendElement(outsideContainer.Resource);

From flyson ＠ users.sourceforge.jp  Sun Oct 23 21:14:10 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 23 Oct 2005 21:14:10 +0900
Subject: [Bbs2ch-cvs 32] CVS update: bbs2chreader/content/bbs2chreader/test
Message-ID: <20051023121410.367622AC00F@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/test/thread-test.js
diff -u bbs2chreader/content/bbs2chreader/test/thread-test.js:1.1 bbs2chreader/content/bbs2chreader/test/thread-test.js:1.2
--- bbs2chreader/content/bbs2chreader/test/thread-test.js:1.1	Sun Oct 16 11:05:25 2005
+++ bbs2chreader/content/bbs2chreader/test/thread-test.js	Sun Oct 23 21:14:10 2005
@@ -190,15 +190,148 @@
 		this.requestRespond("  Last        : " + this.optionsLast + "\n");
 		this.requestRespond("  End         : " + this.optionsEnd + "\n");
 		this.requestRespond("  NoFirst     : " + this.optionsNoFirst + "\n");
+		this.requestRespond("----- ----- -----\n\n");
+		this.datDownload();
+	},
+	
+	datDownload: function(){
+		var httpChannel = this._ioService.newChannelFromURI(this.datURL)
+					.QueryInterface(Components.interfaces.nsIHttpChannel);
+		httpChannel.requestMethod = "GET";
+		httpChannel.redirectionLimit = 0; // 302 等のリダイレクトを行わない
+		httpChannel.loadFlags = httpChannel.LOAD_BYPASS_CACHE;
+		httpChannel.setRequestHeader("User-Agent", this._bbs2chService.userAgent, false);
+
+			// 差分GET
+		if(this.datFile.exists() && this._lastModified){
+			httpChannel.setRequestHeader("Accept-Encoding", "identity", false);
+			httpChannel.setRequestHeader("If-Modified-Since", this._lastModified, false);
+			httpChannel.setRequestHeader("Range", "bytes=" + this.datFile.fileSize + "-", false);
+		}
+
+		this.wrappedJSObject = this;
+		httpChannel.asyncOpen(this.httpListener, this);
+	},
+
+	httpListener: {
+		onStartRequest: function(aRequest, aContext){
+			aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
+
+			this._bInputStream = Components.classes["@mozilla.org/binaryinputstream;1"]
+						.createInstance(Components.interfaces.nsIBinaryInputStream);
+			this._data = new Array();
+
+			aContext.wrappedJSObject.onStartRequest(aRequest);
+		},
+
+		onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount){
+			aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
+
+			this._bInputStream.setInputStream(aInputStream);
+			var availableData = this._bInputStream.readBytes(aCount);
+				// NULL 文字
+			availableData = availableData.replace(/\x00/g, "*");
+				// 変換前の DAT を保存しておく
+			this._data.push(availableData);
+
+			aContext.wrappedJSObject.onDataAvailable(aRequest,
+							availableData, aRequest.responseStatus);
+		},
+
+		onStopRequest: function(aRequest, aContext, aStatus){
+			aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
+			aContext.wrappedJSObject.onStopRequest(aRequest,
+							this._data.join(""), aRequest.responseStatus);
+			this._data = null;
+		}
+	},
+
+	onStartRequest: function(aHttpChannel){
+		this._datBuffer = "";
+	},
+	onDataAvailable: function(aHttpChannel, aAvailableData, aHttpStatus){
+		if(!(aHttpStatus==200 || aHttpStatus==206)) return;
+		
+		var availableData = this._datBuffer + aAvailableData;
+			// 改行を含まないならバッファに追加して終了
+		if(!availableData.match(/\n/)){
+			this._datBuffer = availableData;
+			return;
+		}
+
+			// 取得した DAT を行ごとに配列にし、最後の行をバッファに追加
+		var datLines = availableData.split("\n");
+		this._datBuffer = (datLines.length>1) ? datLines.pop() : "";
+
+			// DAT を 変換して書き出す
+		for(var i=0; i<datLines.length; i++){
+			this._lineCount++;
+			datLines[i] = this.lineCount +"\t:"+ datLines[i];
+		}
+		this.requestRespond(datLines.join("\n"));
+
+	},
+
+	onStopRequest: function(aHttpChannel, aResponseText, aHttpStatus){
+		try{
+			this._lastModified = aHttpChannel.getResponseHeader("Last-Modified");
+			this._eTag = aHttpChannel.getResponseHeader("Etag");
+		}catch(ex){}
+
+		switch(aHttpStatus){
+			case 200: //通常GET OK
+			case 206: //差分GET OK
+				break;
+			case 304: //未更新
+				this.requestRespond("NOT MODIFIED");
+				this.requestEnd();
+				return;
+			default: // HTTP エラー
+				this.requestRespond("ERROR HTTP STATUS : " + aHttpStatus);
+				this.requestEnd();
+				return;
+		}
+
+		if(this._datBuffer){
+			this._lineCount++;
+			this._datBuffer = this.lineCount +"\t: "+ this._datBuffer;
+			this.requestRespond(this._datBuffer);
+		}
+
 		this.requestEnd();
-	}
 
+		if(aHttpStatus == 200 || aHttpStatus == 206) this.datSave(aResponseText);
+	},
+
+	datSave: function(aDatContent){
+				// 書き込みのバッティングを避ける
+		var tmpLineCount = 0;
+		if(this.idxFile.exists()){
+			var idxContent = this._bbs2chService.readFile(this.idxFile.path);
+			tmpLineCount = idxContent.match(/^lineCount=(.+)/m) ? parseInt(RegExp.$1) : 0;
+		}
+		if(this.lineCount > tmpLineCount){
+				// .dat の書き込み
+			this._bbs2chService.writeFile(this.datFile.path, aDatContent, true);
+
+				// .idx の書き込み
+			var idxContent = new Array();
+			if(this.title) idxContent.push("title=" + this.title);
+			if(this._lineCount) idxContent.push("lineCount=" + this._lineCount);
+			if(this._lastModified) idxContent.push("lastModified=" + this._lastModified);
+			if(this._eTag) idxContent.push("etag=" + this._eTag);
+			idxContent = idxContent.join("\n");
+			this._bbs2chService.writeFile(this.idxFile.path, idxContent, false);
+		}
+	}
 }
 b2r2chThread.prototype.__proto__ = b2rThread.prototype;
 
 
 
 
+
+
 function b2rJbbsThread(){
 }
 

From flyson ＠ users.sourceforge.jp  Thu Oct 27 00:16:00 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 27 Oct 2005 00:16:00 +0900
Subject: [Bbs2ch-cvs 33] CVS update: bbs2chreader
Message-ID: <20051026151600.110472AC012@users.sourceforge.jp>

Index: bbs2chreader/install.rdf
diff -u bbs2chreader/install.rdf:1.12 bbs2chreader/install.rdf:1.13
--- bbs2chreader/install.rdf:1.12	Sun Oct  9 03:39:43 2005
+++ bbs2chreader/install.rdf	Thu Oct 27 00:15:59 2005
@@ -17,7 +17,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>1.0</em:minVersion>
-				<em:maxVersion>1.4.1</em:maxVersion>
+				<em:maxVersion>1.5.0.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 

From flyson ＠ users.sourceforge.jp  Thu Oct 27 22:54:52 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 27 Oct 2005 22:54:52 +0900
Subject: [Bbs2ch-cvs 34] CVS update: bbs2chreader/content/bbs2chreader/test
Message-ID: <20051027135452.E0F382AC00E@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/test/dat-test.js
diff -u /dev/null bbs2chreader/content/bbs2chreader/test/dat-test.js:1.1
--- /dev/null	Thu Oct 27 22:54:52 2005
+++ bbs2chreader/content/bbs2chreader/test/dat-test.js	Thu Oct 27 22:54:52 2005
@@ -0,0 +1,160 @@
+/* ***** ??? IDL *****
+
+#include "nsISupports.idl"
+
+interface nsIURL;
+interface nsILocalFile;
+
+[scriptable, uuid(f4da0efe-dc42-48ae-8980-28a67896a780)]
+interface b2rIDat : nsISupports
+{
+	readonly attribute nsIURL threadURL;
+	readonly attribute nsIURL boardURL;
+	readonly attribute nsIURL datURL;
+	readonly attribute unsigned long type;
+	readonly attribute nsILocalFile datFile;
+	readonly attribute nsILocalFile idxFile;
+	readonly attribute unsigned long id;
+	attribute AString title;
+	attribute unsigned long lineCount;
+	attribute ACString lastModified;
+	
+	void init(in nsIURL aThreadURL, in nsIURL aBoardURL, in unsigned long aType);
+	boolean flushIdx();
+	AString readContent();
+	boolean writeContent(in AString aContent);
+	boolean appendContent(in AString aContent);
+	boolean remove();
+}
+
+
+[scriptable, uuid(25baecb4-ed4e-48c6-bfdb-e612d21a3af9)]
+interface b2rI2chDat : b2rIDat
+{
+	readonly attribute nsIURL datURL;
+	readonly attribute unsigned long id;
+}
+
+***** IDL ***** */
+
+
+
+
+function b2rDat(){
+}
+
+b2rDat.prototype = {
+	get threadURL(){
+		return this._threadURL;
+	},
+
+	get boardURL(){
+		return this._boardURL;
+	},
+
+	get datURL(){
+		if(!this._datURL){
+			var datURLSpec = this.boardURL.resolve("dat/" + this.id + ".dat");
+			this._datURL = this._ioService.newURI(datURLSpec, null, null)
+						.QueryInterface(Components.interfaces.nsIURL);
+		}
+		return this._datURL;
+	},
+
+	get type(){
+		return this._type;
+	},
+
+	get datFile(){
+		return this._datFile;
+	},
+
+	get idxFile(){
+		return this._idxFile;
+	},
+
+	get id(){
+		if(!this._id)
+			this._id = this.threadURL.directory.match(/\/(\d{9,10})/) ? RegExp.$1 : null;
+		return this._id;
+	},
+
+	get title(){
+		return this._title;
+	},
+	set title(aValue){
+		return this._title = aValue;
+	},
+
+	get lineCount(){
+		return this._lineCount;
+	},
+	set lineCount(aValue){
+		return this._lineCount = aValue;
+	},
+
+	get lastModified(){
+		return this._lastModified;
+	},
+	set lastModified(aValue){
+		return this._lastModified = aValue;
+	},
+
+
+	init: function(aThreadURL, aBoardURL, aType){
+		this._bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
+				.getService(Components.interfaces.nsIBbs2chService);
+		this._ioService = Components.classes["@mozilla.org/network/io-service;1"]
+					.getService(Components.interfaces.nsIIOService);
+
+		this._threadURL = aThreadURL;
+
+		this._boardURL = (!aBoardURL) ?
+				this._bbs2chService.getBoardURL(this.threadURL.spec) : aBoardURL;
+		this._type = (isNaN(aType)) ?
+				this._bbs2chService.getBoardType(this.threadURL.spec) : aType;
+
+		this._datFile = this._bbs2chService.getLogFileAtURL(
+								this.boardURL.resolve(this.id + ".dat"));
+		this._idxFile = this._bbs2chService.getLogFileAtURL(
+								this.boardURL.resolve(this.id + ".idx"));
+
+			// idx ??????????????
+		if(this.idxFile.exists()){
+			var idxContent =  this._bbs2chService.readFile(this.idxFile.path);
+
+			this._title = idxContent.match(/^title=(.+)/m) ? RegExp.$1 : "";
+			this._lineCount = idxContent.match(/^lineCount=(.+)/m) ? Number(RegExp.$1) : 0;
+			this._lastModified = idxContent.match(/^lastModified=(.+)/m) ? RegExp.$1 : "";
+		}else{
+			this._title = "";
+			this._lineCount = 0;
+			this._lastModified = "";
+		}
+	},
+
+
+	flushIdx: function(){
+		var idxContent = new Array();
+		if(this.title) idxContent.push("title=" + this.title);
+		if(!isNaN(this.lineCount)) idxContent.push("lineCount=" + this.lineCount);
+		if(this.lastModified) idxContent.push("lastModified=" + this.lastModified);
+		idxContent = idxContent.join("\n");
+		this._bbs2chService.writeFile(this.idxFile.path, idxContent, false);	
+	},
+
+
+	readContent: function(){
+		return this._bbs2chService.readFile(this.datFile.path);	
+	},
+
+	writeContent: function(aContent){
+		this._bbs2chService.writeFile(this.datFile.path, aContent, false);
+	},
+
+	appendContent: function(aContent){
+		this._bbs2chService.writeFile(this.datFile.path, aContent, true);
+	},
+
+	remove: function(){}
+};

From flyson ＠ users.sourceforge.jp  Thu Oct 27 22:56:17 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 27 Oct 2005 22:56:17 +0900
Subject: [Bbs2ch-cvs 35] CVS update: bbs2chreader/content/bbs2chreader/test
Message-ID: <20051027135617.81AF42AC00E@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/test/thread-test.js
diff -u bbs2chreader/content/bbs2chreader/test/thread-test.js:1.2 bbs2chreader/content/bbs2chreader/test/thread-test.js:1.3
--- bbs2chreader/content/bbs2chreader/test/thread-test.js:1.2	Sun Oct 23 21:14:10 2005
+++ bbs2chreader/content/bbs2chreader/test/thread-test.js	Thu Oct 27 22:56:17 2005
@@ -96,33 +96,6 @@
 		return this._type;
 	},
 
-	get datURL(){
-		if(!this._datURL){
-			var datURLSpec = this.boardURL.resolve("dat/" + this.datID + ".dat");
-			this._datURL = this._ioService.newURI(datURLSpec, null, null)
-						.QueryInterface(Components.interfaces.nsIURL);
-		}
-		return this._datURL;
-	},
-
-	get datFile(){
-		return this._datFile;
-	},
-
-	get idxFile(){
-		return this._idxFile;
-	},
-
-	get datID(){
-		if(!this._datID)
-			this._datID = this.threadURL.directory.match(/\/(\d{9,10})/) ? RegExp.$1 : null;
-		return this._datID;
-	},
-
-	get title(){
-		return this._title;
-	},
-
 	get optionsStart(){
 	  return (this.threadURL.fileName.match(/(\d+)\-/)) ? RegExp.$1 : null;
 	},
@@ -152,38 +125,22 @@
 						.QueryInterface(Components.interfaces.nsIURL);
 		this._boardURL = this._bbs2chService.getBoardURL(this.threadURL.spec);
 		this._type = this._bbs2chService.getBoardType(this.threadURL.spec);
-		this._datFile = this._bbs2chService.getLogFileAtURL(
-								this.boardURL.resolve(this.datID + ".dat"));
-		this._idxFile = this._bbs2chService.getLogFileAtURL(
-								this.boardURL.resolve(this.datID + ".idx"));
-
-			// idx ファイルからタイトル等を取得
-		if(this.idxFile.exists()){
-			var idxContent =  this._bbs2chService.readFile(this.idxFile.path);
-
-			this._title = idxContent.match(/^title=(.+)/m) ? RegExp.$1 : "";
-			this._lineCount = idxContent.match(/^lineCount=(.+)/m) ? Number(RegExp.$1) : 0;
-			this._lastModified = idxContent.match(/^lastModified=(.+)/m) ? RegExp.$1 : "";
-			this._eTag = idxContent.match(/^etag=(.+)/m) ? RegExp.$1 : "";
-		}else{
-			this._title = "";
-			this._lineCount = 0;
-			this._lastModified = "";
-			this._eTag = "";
-		}
+		
+		this.dat = new b2rDat();
+		this.dat.init(this.threadURL, this.boardURL, this._type);
+		
 
 		this.requestRespond("Thread URL    : " + this.threadURL.spec + "\n");
 		this.requestRespond("Board URL     : " + this.boardURL.spec + "\n");
-		this.requestRespond("DAT URL       : " + this.datURL.spec + "\n");
 		this.requestRespond("Type          : " + this.type + "\n");
-		this.requestRespond("DAT ID        : " + this.datID + "\n");
-		this.requestRespond("DAT File      : " + this.datFile.path + "\n");
-		this.requestRespond("IDX File      : " + this.idxFile.path + "\n");
+		this.requestRespond("DAT URL       : " + this.dat.datURL.spec + "\n");
+		this.requestRespond("DAT ID        : " + this.dat.id + "\n");
+		this.requestRespond("DAT File      : " + this.dat.datFile.path + "\n");
+		this.requestRespond("IDX File      : " + this.dat.idxFile.path + "\n");
 		this.requestRespond("----- ----- -----\n");
-		this.requestRespond("Title         : " + this.title + "\n");
-		this.requestRespond("LineCount     : " + this._lineCount + "\n");
-		this.requestRespond("LastModified  : " + this._lastModified + "\n");
-		this.requestRespond("ETag          : " + this._eTag + "\n");
+		this.requestRespond("Title         : " + this.dat.title + "\n");
+		this.requestRespond("LineCount     : " + this.dat.lineCount + "\n");
+		this.requestRespond("LastModified  : " + this.dat.lastModified + "\n");
 		this.requestRespond("----- ----- -----\n");
 		this.requestRespond("URL Options \n");
 		this.requestRespond("  Start       : " + this.optionsStart + "\n");
@@ -191,11 +148,13 @@
 		this.requestRespond("  End         : " + this.optionsEnd + "\n");
 		this.requestRespond("  NoFirst     : " + this.optionsNoFirst + "\n");
 		this.requestRespond("----- ----- -----\n\n");
+
+		// this.requestEnd();
 		this.datDownload();
 	},
 	
 	datDownload: function(){
-		var httpChannel = this._ioService.newChannelFromURI(this.datURL)
+		var httpChannel = this._ioService.newChannelFromURI(this.dat.datURL)
 					.QueryInterface(Components.interfaces.nsIHttpChannel);
 		httpChannel.requestMethod = "GET";
 		httpChannel.redirectionLimit = 0; // 302 等のリダイレクトを行わない
@@ -203,10 +162,10 @@
 		httpChannel.setRequestHeader("User-Agent", this._bbs2chService.userAgent, false);
 
 			// 差分GET
-		if(this.datFile.exists() && this._lastModified){
+		if(this.dat.datFile.exists() && this.dat.lastModified){
 			httpChannel.setRequestHeader("Accept-Encoding", "identity", false);
-			httpChannel.setRequestHeader("If-Modified-Since", this._lastModified, false);
-			httpChannel.setRequestHeader("Range", "bytes=" + this.datFile.fileSize + "-", false);
+			httpChannel.setRequestHeader("If-Modified-Since", this.dat.lastModified, false);
+			httpChannel.setRequestHeader("Range", "bytes=" + this.dat.datFile.fileSize + "-", false);
 		}
 
 		this.wrappedJSObject = this;
@@ -265,8 +224,8 @@
 
 			// DAT を 変換して書き出す
 		for(var i=0; i<datLines.length; i++){
-			this._lineCount++;
-			datLines[i] = this.lineCount +"\t:"+ datLines[i];
+			this.dat.lineCount++;
+			datLines[i] = this.dat.lineCount +"\t:"+ datLines[i];
 		}
 		this.requestRespond(datLines.join("\n"));
 
@@ -274,8 +233,7 @@
 
 	onStopRequest: function(aHttpChannel, aResponseText, aHttpStatus){
 		try{
-			this._lastModified = aHttpChannel.getResponseHeader("Last-Modified");
-			this._eTag = aHttpChannel.getResponseHeader("Etag");
+			this.dat.lastModified = aHttpChannel.getResponseHeader("Last-Modified");
 		}catch(ex){}
 
 		switch(aHttpStatus){
@@ -293,8 +251,8 @@
 		}
 
 		if(this._datBuffer){
-			this._lineCount++;
-			this._datBuffer = this.lineCount +"\t: "+ this._datBuffer;
+			this.dat.lineCount++;
+			this._datBuffer = this.dat.lineCount +"\t: "+ this._datBuffer;
 			this.requestRespond(this._datBuffer);
 		}
 
@@ -306,22 +264,16 @@
 	datSave: function(aDatContent){
 				// 書き込みのバッティングを避ける
 		var tmpLineCount = 0;
-		if(this.idxFile.exists()){
-			var idxContent = this._bbs2chService.readFile(this.idxFile.path);
+		if(this.dat.idxFile.exists()){
+			var idxContent = this._bbs2chService.readFile(this.dat.idxFile.path);
 			tmpLineCount = idxContent.match(/^lineCount=(.+)/m) ? parseInt(RegExp.$1) : 0;
 		}
-		if(this.lineCount > tmpLineCount){
-				// .dat の書き込み
-			this._bbs2chService.writeFile(this.datFile.path, aDatContent, true);
+		if(this.dat.lineCount > tmpLineCount){
+				// .dat の追記書き込み
+			this.dat.appendContent(aDatContent);
 
 				// .idx の書き込み
-			var idxContent = new Array();
-			if(this.title) idxContent.push("title=" + this.title);
-			if(this._lineCount) idxContent.push("lineCount=" + this._lineCount);
-			if(this._lastModified) idxContent.push("lastModified=" + this._lastModified);
-			if(this._eTag) idxContent.push("etag=" + this._eTag);
-			idxContent = idxContent.join("\n");
-			this._bbs2chService.writeFile(this.idxFile.path, idxContent, false);
+			this.dat.flushIdx();
 		}
 	}
 }
@@ -337,14 +289,6 @@
 
 b2rJbbsThread.prototype = {
 
-	get datURL(){
-		if(!this._datURL){
-			var datURLSpec = this.threadURL.resolve("./").replace("read.cgi", "rawmode.cgi");
-			this._datURL = this._ioService.newURI(datURLSpec, null, null)
-						.QueryInterface(Components.interfaces.nsIURL);
-		}
-		return this._datURL;
-	},
 
 }
 b2rJbbsThread.prototype.__proto__ = b2r2chThread.prototype;

From flyson ＠ users.sourceforge.jp  Thu Oct 27 22:56:17 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 27 Oct 2005 22:56:17 +0900
Subject: [Bbs2ch-cvs 36] CVS update: bbs2chreader/components
Message-ID: <20051027135617.A15792AC026@users.sourceforge.jp>

Index: bbs2chreader/components/nsBbs2chProtocolHandler.js
diff -u bbs2chreader/components/nsBbs2chProtocolHandler.js:1.5 bbs2chreader/components/nsBbs2chProtocolHandler.js:1.6
--- bbs2chreader/components/nsBbs2chProtocolHandler.js:1.5	Sun Oct 16 11:05:25 2005
+++ bbs2chreader/components/nsBbs2chProtocolHandler.js	Thu Oct 27 22:56:17 2005
@@ -96,6 +96,7 @@
 				tmpChannel.init(aURI, "text/html", "Shift_JIS", new Bbs2chThread());
 				break;
 			case "thread-test:" :
+				this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/test/dat-test.js");
 				this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/test/thread-test.js");
 				var threadFactory = new b2rThreadFactory();
 				tmpChannel = Components.classes["@mozilla.org/bbs2ch-channel;1"]

From flyson ＠ users.sourceforge.jp  Fri Oct 28 00:26:21 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Fri, 28 Oct 2005 00:26:21 +0900
Subject: [Bbs2ch-cvs 37] CVS update: bbs2chreader/components
Message-ID: <20051027152621.240AB2AC00E@users.sourceforge.jp>

Index: bbs2chreader/components/nsBbs2chChannel.js
diff -u bbs2chreader/components/nsBbs2chChannel.js:1.4 bbs2chreader/components/nsBbs2chChannel.js:1.5
--- bbs2chreader/components/nsBbs2chChannel.js:1.4	Sat Oct  8 02:26:27 2005
+++ bbs2chreader/components/nsBbs2chChannel.js	Fri Oct 28 00:26:21 2005
@@ -99,6 +99,14 @@
 	},
 
 	cancel: function(aStatus){
+			// キャッシュエントリがあるときは閉じる
+		if(this._cacheOutputStream){
+			this._cacheOutputStream.close();
+		}
+		if(this._cacheEntry){
+			this._cacheEntry.close();
+		}
+		
 		if(this._isPending){
 			this._isPending = false;
 
@@ -115,7 +123,7 @@
 
 	onCacheEntryAvailable: function(aDescriptor, aAccessGranted, aStatus){
 		this.requestStart();
-		
+
 		if(this._cacheMode){
 			try{
 					// キャッシュからデータを取得して書き出す
@@ -180,10 +188,12 @@
 	requestEnd: function(){
 		if(!this._cacheMode){
 			this._cacheOutputStream.close();
+			this._cacheOutputStream = null;
 			this._cacheEntry.setMetaDataElement("request-method", "GET");
 			this._cacheEntry.setMetaDataElement("response-head", "HTTP/1.1 200 OK\r\n");
 			this._cacheEntry.markValid();
 			this._cacheEntry.close();
+			this._cacheEntry = null;
 		}
 
 		this._streamListener.onStopRequest(this, this._context, Components.results.NS_OK);

From flyson ＠ users.sourceforge.jp  Sun Oct 30 04:09:37 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 30 Oct 2005 04:09:37 +0900
Subject: [Bbs2ch-cvs 38] CVS update: bbs2chreader
Message-ID: <20051029190937.C5E962AC00F@users.sourceforge.jp>

Index: bbs2chreader/install.rdf
diff -u bbs2chreader/install.rdf:1.13 bbs2chreader/install.rdf:1.14
--- bbs2chreader/install.rdf:1.13	Thu Oct 27 00:15:59 2005
+++ bbs2chreader/install.rdf	Sun Oct 30 04:09:37 2005
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:name>bbs2chreader</em:name>
 		<em:id>{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}</em:id>
-		<em:version>0.2.6+</em:version>
+		<em:version>0.2.7</em:version>
 		<em:description>2ch(Japanese Web Forum) Reader</em:description>
 		<em:optionsURL>chrome://bbs2chreader/content/settings/settings.xul</em:optionsURL>
 		<em:homepageURL>http://bbs2ch.sourceforge.jp/</em:homepageURL>

From flyson ＠ users.sourceforge.jp  Sun Oct 30 06:47:48 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 30 Oct 2005 06:47:48 +0900
Subject: [Bbs2ch-cvs 39] CVS update: bbs2chreader/content/bbs2chreader/test
Message-ID: <20051029214748.98C192AC020@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/test/thread-test.js
diff -u bbs2chreader/content/bbs2chreader/test/thread-test.js:1.3 bbs2chreader/content/bbs2chreader/test/thread-test.js:1.4
--- bbs2chreader/content/bbs2chreader/test/thread-test.js:1.3	Thu Oct 27 22:56:17 2005
+++ bbs2chreader/content/bbs2chreader/test/thread-test.js	Sun Oct 30 06:47:48 2005
@@ -33,8 +33,6 @@
 		switch(threadType){
 			case bbs2chService.BOARD_TYPE_2CH:
 				return new b2r2chThread();
-			case bbs2chService.BOARD_TYPE_JBBS:
-				return new b2rJbbsThread();
 		}
 		return new b2rThread();
 	}
@@ -169,49 +167,30 @@
 		}
 
 		this.wrappedJSObject = this;
-		httpChannel.asyncOpen(this.httpListener, this);
+		httpChannel.asyncOpen(this, null);
 	},
 
-	httpListener: {
-		onStartRequest: function(aRequest, aContext){
-			aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
-
-			this._bInputStream = Components.classes["@mozilla.org/binaryinputstream;1"]
-						.createInstance(Components.interfaces.nsIBinaryInputStream);
-			this._data = new Array();
-
-			aContext.wrappedJSObject.onStartRequest(aRequest);
-		},
-
-		onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount){
-			aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
-
-			this._bInputStream.setInputStream(aInputStream);
-			var availableData = this._bInputStream.readBytes(aCount);
-				// NULL 文字
-			availableData = availableData.replace(/\x00/g, "*");
-				// 変換前の DAT を保存しておく
-			this._data.push(availableData);
-
-			aContext.wrappedJSObject.onDataAvailable(aRequest,
-							availableData, aRequest.responseStatus);
-		},
-
-		onStopRequest: function(aRequest, aContext, aStatus){
-			aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
-			aContext.wrappedJSObject.onStopRequest(aRequest,
-							this._data.join(""), aRequest.responseStatus);
-			this._data = null;
-		}
-	},
-
-	onStartRequest: function(aHttpChannel){
+	onStartRequest: function(aRequest, aContext){
+		this._bInputStream = Components.classes["@mozilla.org/binaryinputstream;1"]
+					.createInstance(Components.interfaces.nsIBinaryInputStream);
+		this._data = new Array();
 		this._datBuffer = "";
 	},
-	onDataAvailable: function(aHttpChannel, aAvailableData, aHttpStatus){
-		if(!(aHttpStatus==200 || aHttpStatus==206)) return;
-		
-		var availableData = this._datBuffer + aAvailableData;
+
+	onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount){
+		aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
+		var httpStatus = aRequest.responseStatus;
+			// 必要な情報がないなら終了
+		if(!(httpStatus==200 || httpStatus==206)) return;
+
+		this._bInputStream.setInputStream(aInputStream);
+		var availableData = this._bInputStream.readBytes(aCount);
+			// NULL 文字
+		availableData = availableData.replace(/\x00/g, "*");
+			// 変換前の DAT を保存しておく
+		this._data.push(availableData);
+
+		var availableData = this._datBuffer + availableData;
 			// 改行を含まないならバッファに追加して終了
 		if(!availableData.match(/\n/)){
 			this._datBuffer = availableData;
@@ -225,40 +204,48 @@
 			// DAT を 変換して書き出す
 		for(var i=0; i<datLines.length; i++){
 			this.dat.lineCount++;
-			datLines[i] = this.dat.lineCount +"\t:"+ datLines[i];
+			datLines[i] = this.dat.lineCount +"\t: "+ datLines[i];
 		}
 		this.requestRespond(datLines.join("\n"));
-
 	},
 
-	onStopRequest: function(aHttpChannel, aResponseText, aHttpStatus){
+	onStopRequest: function(aRequest, aContext, aStatus){
+		aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
+		var httpStatus = aRequest.responseStatus;
+
 		try{
-			this.dat.lastModified = aHttpChannel.getResponseHeader("Last-Modified");
+			this.dat.lastModified = aRequest.getResponseHeader("Last-Modified");
 		}catch(ex){}
 
-		switch(aHttpStatus){
-			case 200: //通常GET OK
-			case 206: //差分GET OK
+		switch(httpStatus){
+			case 200: // 通常GET OK
+			case 206: // 差分GET OK
 				break;
-			case 304: //未更新
+			case 302: // DAT落ち
+				this.requestRespond("DAT DOWNED");
+				this.requestEnd();
+				return;
+			case 304: // 未更新
 				this.requestRespond("NOT MODIFIED");
 				this.requestEnd();
 				return;
 			default: // HTTP エラー
-				this.requestRespond("ERROR HTTP STATUS : " + aHttpStatus);
+				this.requestRespond("ERROR HTTP STATUS : " + httpStatus);
 				this.requestEnd();
 				return;
 		}
-
+		
 		if(this._datBuffer){
 			this.dat.lineCount++;
 			this._datBuffer = this.dat.lineCount +"\t: "+ this._datBuffer;
 			this.requestRespond(this._datBuffer);
+			this._datBuffer = "";
 		}
+		this._bInputStream.close();
 
 		this.requestEnd();
-
-		if(aHttpStatus == 200 || aHttpStatus == 206) this.datSave(aResponseText);
+		if(httpStatus == 200 || httpStatus == 206) this.datSave(this._data.join(""));
+		this._data = null;
 	},
 
 	datSave: function(aDatContent){
@@ -271,7 +258,6 @@
 		if(this.dat.lineCount > tmpLineCount){
 				// .dat の追記書き込み
 			this.dat.appendContent(aDatContent);
-
 				// .idx の書き込み
 			this.dat.flushIdx();
 		}
@@ -280,16 +266,3 @@
 b2r2chThread.prototype.__proto__ = b2rThread.prototype;
 
 
-
-
-
-
-function b2rJbbsThread(){
-}
-
-b2rJbbsThread.prototype = {
-
-
-}
-b2rJbbsThread.prototype.__proto__ = b2r2chThread.prototype;
-

From flyson ＠ users.sourceforge.jp  Tue Nov  1 00:31:11 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Tue, 1 Nov 2005 00:31:11 +0900
Subject: [Bbs2ch-cvs 40] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051031153111.B3E512AC01D@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/bbsmenu-page.js
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.26 bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.27
--- bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.26	Sun Sep 25 22:50:14 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-page.js	Tue Nov  1 00:31:11 2005
@@ -275,20 +275,24 @@
 
 	if(!gBbs2chService.pref.getBoolPref("fls.bbs2chreader.bbsmenu_toggle_open_container")) return;
 
-		// 開いているすべてのコンテナを列挙
-	var openedContainers = gTreeBbsMenu.database.GetSources(
-				gBbsmenuDS.rdf.getResource("http://home.netscape.com/NC-rdf#open"),
-				gBbsmenuDS.rdf.getLiteral("true"), true);
-
 		// 閉じないコンテナのリソースを取得しておく
 	var exceptResource = gTreeBbsMenu.builder.getResourceAtIndex(aExceptIndex);
 
-	while(openedContainers.hasMoreElements()){
-		var container = openedContainers.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
-		if(container.Value.indexOf("urn:bbs2ch:") == -1) continue;
+	var rootContainer = Components.classes["@mozilla.org/rdf/container;1"]
+				.createInstance(Components.interfaces.nsIRDFContainer);
+	rootContainer.Init(gTreeBbsMenu.database,
+			gBbsmenuDS.rdf.getResource("urn:bbs2ch:bbsmenu:root"));
+	var containers = rootContainer.GetElements();
+	while(containers.hasMoreElements()){
+		var container = containers.getNext()
+							.QueryInterface(Components.interfaces.nsIRDFResource);
 		var index = gTreeBbsMenu.builder.getIndexOfResource(container);
-		if(index != aExceptIndex && index != -1) gTreeBbsMenu.view.toggleOpenState(index);
-	}
+		if(exceptResource == container) continue;
+		if(container.Value.indexOf("urn:bbs2ch:") == -1) continue;
+		if(!gTreeBbsMenu.view.isContainerOpen(index)) continue;
+
+		if(index != -1) gTreeBbsMenu.view.toggleOpenState(index);
+	}	
 
 		// 閉じないコンテナが表示されるようにスクロール
 	aExceptIndex = gTreeBbsMenu.builder.getIndexOfResource(exceptResource);

From flyson ＠ users.sourceforge.jp  Tue Nov  1 00:47:05 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Tue, 1 Nov 2005 00:47:05 +0900
Subject: [Bbs2ch-cvs 41] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051031154705.0A6882AC016@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/bbsmenu-page.js
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.27 bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.28
--- bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.27	Tue Nov  1 00:31:11 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-page.js	Tue Nov  1 00:47:04 2005
@@ -43,6 +43,7 @@
 var gBbsmenuDS;
 var gHistoryRDF;
 
+
 function startup(){
 	gBbsmenuDS = new Bbs2chBbsMenuDS();
 

From flyson_moz ＠ ybb.ne.jp  Thu Nov  3 22:44:01 2005
From: flyson_moz ＠ ybb.ne.jp (flyson)
Date: Thu, 3 Nov 2005 22:44:01 +0900 (JST)
Subject: [Bbs2ch-cvs 42] RELEASE_0_2_7
Message-ID: <20051103134401.19448.qmail@web3202.mail.bbt.yahoo.co.jp>

RELEASE_0_2_7


From flyson ＠ users.sourceforge.jp  Thu Nov  3 22:49:55 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 3 Nov 2005 22:49:55 +0900
Subject: [Bbs2ch-cvs 43] CVS update: bbs2chreader
Message-ID: <20051103134955.6E0782AC047@users.sourceforge.jp>

Index: bbs2chreader/mkxpi.bat
diff -u bbs2chreader/mkxpi.bat:1.8 bbs2chreader/mkxpi.bat:1.9
--- bbs2chreader/mkxpi.bat:1.8	Fri Sep  9 20:49:21 2005
+++ bbs2chreader/mkxpi.bat	Thu Nov  3 22:49:55 2005
@@ -1,7 +1,7 @@
 @ECHO OFF
 
 SET EXT_NAME=bbs2chreader
-SET EXT_VER=026
+SET EXT_VER=027
 
 MKDIR chrome
 ZIP -r chrome\%EXT_NAME%.jar content skin locale
Index: bbs2chreader/history.txt
diff -u bbs2chreader/history.txt:1.7 bbs2chreader/history.txt:1.8
--- bbs2chreader/history.txt:1.7	Fri Sep  9 20:55:09 2005
+++ bbs2chreader/history.txt	Thu Nov  3 22:49:55 2005
@@ -1,3 +1,17 @@
+0.2.7
+	  1.5RC1 ??
+	 ?????ｦ??????????
+	 ???????????????????????????+	 ????E????? sage ??????????????
+	 ?????????E???????N??????????
+	 ????E??????ｦ????????????????
+	 Be2ch ??ｯ?????????+	 ??????????????????????????????+	 ?????????????????????????????????+	 NG ?????????????????????????????+	 [?????????????????]? Firefox1.5 ??????????????+
+
 0.2.6
 	Firefox 1.5b1 ?????????s????? 	???????????????????????ｦ??????????bug:6623]

From flyson ＠ users.sourceforge.jp  Sat Nov  5 01:18:04 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sat, 5 Nov 2005 01:18:04 +0900
Subject: [Bbs2ch-cvs 44] CVS update: bbs2chreader/content/bbs2chreader/lib
Message-ID: <20051104161804.48D392AC055@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/lib/rdf.js
diff -u bbs2chreader/content/bbs2chreader/lib/rdf.js:1.2 bbs2chreader/content/bbs2chreader/lib/rdf.js:1.3
--- bbs2chreader/content/bbs2chreader/lib/rdf.js:1.2	Sat Sep 17 04:11:11 2005
+++ bbs2chreader/content/bbs2chreader/lib/rdf.js	Sat Nov  5 01:18:04 2005
@@ -127,8 +127,25 @@
 	 * RDF URL を使って初期化
 	 * @param {string} aURL RDF データソース URL
 	 */
-	initWithRDFURL: function(aDataSource){
-		this._ds = this._rdfService.GetDataSource(aDataSource);
+	initWithRDFURL: function(aURL){
+		if(aURL.substring(0,4) == "rdf:"){
+			this._ds = this._rdfService.GetDataSource(aURL);
+			return;
+		}
+			// RDF の同期読み込み
+		this._ds = Components.classes["@mozilla.org/rdf/datasource;1?name=in-memory-datasource"]
+					.createInstance(Components.interfaces.nsIRDFDataSource);
+		var httpReq = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"]
+				.createInstance(Components.interfaces.nsIXMLHttpRequest);
+		var rdfParser = Components.classes["@mozilla.org/rdf/xml-parser;1"]
+				.createInstance(Components.interfaces.nsIRDFXMLParser);
+		try{
+			httpReq.open("GET", aURL, false);
+			httpReq.send(null);
+			rdfParser.parseString(this._ds, httpReq.channel.URI, httpReq.responseText);
+		}catch(ex){
+			this._ds = this._rdfService.GetDataSource(aURL);
+		}
 	},
 
 

From flyson ＠ users.sourceforge.jp  Sat Nov  5 01:20:01 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sat, 5 Nov 2005 01:20:01 +0900
Subject: [Bbs2ch-cvs 45] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051104162001.7B23F2AC055@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/bbsmenu-ds.js
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.12 bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.13
--- bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.12	Sat Oct 22 13:14:14 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-ds.js	Sat Nov  5 01:20:01 2005
@@ -74,6 +74,14 @@
 
 
 	/**
+	 * データフォルダ内の bbsmenu.rdf
+	 * @return nsILocalFile
+	 */
+	get bbsMenuRDFFile(){
+		return this._bbsMenuRDFFile;
+	},
+
+	/**
 	 * データフォルダ内の outside.txt
 	 * @return nsILocalFile
 	 */
@@ -88,10 +96,14 @@
 		this._rdf = new Bbs2chRDF();
 
 		this._bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-						.getService(Components.interfaces.nsIBbs2chService);
+					.getService(Components.interfaces.nsIBbs2chService);
+		this._ioService = Components.classes["@mozilla.org/network/io-service;1"]
+					.getService(Components.interfaces.nsIIOService);
 
 		this._bbsMenuFile = this._bbs2chService.getDataDir();
 		this._bbsMenuFile.appendRelativePath("bbsmenu.html");
+		this._bbsMenuRDFFile = this._bbs2chService.getDataDir();
+		this._bbsMenuRDFFile.appendRelativePath("bbsmenu.rdf");
 		this._outsideFile = this._bbs2chService.getDataDir();
 		this._outsideFile.appendRelativePath("outside.txt");
 	},
@@ -106,6 +118,17 @@
 			// bbsmenu.html が無いときは終了
 		if(!this.bbsMenuFile.exists()) return;
 
+		if(this.bbsMenuRDFFile.exists() && this.outsideFile.exists()){
+			var rdfLMTime = this.bbsMenuRDFFile.lastModifiedTime;
+			var bbsmenuLMTime = this.bbsMenuFile.lastModifiedTime;
+			var outsideLMTime = this.outsideFile.lastModifiedTime;
+			
+			if((rdfLMTime > bbsmenuLMTime) && (rdfLMTime > outsideLMTime)){
+				var rdfURL = this._ioService.newFileURI(this.bbsMenuRDFFile);
+				this.rdf.initWithRDFURL(rdfURL.spec);
+				return;
+			}
+		}
 
 			// ルートコンテナの作成
 		var rootContainer = this.rdf.makeSeqContainer("urn:bbs2ch:bbsmenu:root");
@@ -173,6 +196,10 @@
 											this._bbs2chService.getBoardType(RegExp.$1));
 			}
 		}
+
+			// RDF をキャッシュとして保存		
+		var rdfSource = this.rdf.getXmlSource("bbs2ch", NS_BBS2CH);
+		this._bbs2chService.writeFile(this.bbsMenuRDFFile.path, rdfSource, false);
 	},
 
 

From flyson ＠ users.sourceforge.jp  Sat Nov  5 02:01:12 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sat, 5 Nov 2005 02:01:12 +0900
Subject: [Bbs2ch-cvs 46] CVS update: bbs2chreader/components
Message-ID: <20051104170112.8E5722AC04C@users.sourceforge.jp>

Index: bbs2chreader/components/nsBbs2chChannel.js
diff -u bbs2chreader/components/nsBbs2chChannel.js:1.5 bbs2chreader/components/nsBbs2chChannel.js:1.6
--- bbs2chreader/components/nsBbs2chChannel.js:1.5	Fri Oct 28 00:26:21 2005
+++ bbs2chreader/components/nsBbs2chChannel.js	Sat Nov  5 02:01:12 2005
@@ -82,31 +82,20 @@
 		this._context = aContext;
 		if(this.loadGroup) this.loadGroup.addRequest(this, this._context);
 
-			// HTTP キャッシュ
-		var cacheService = Components.classes["@mozilla.org/network/cache-service;1"]
-								.getService(Components.interfaces.nsICacheService);
-		var cacheSession = cacheService.createSession("HTTP", 
-								Components.interfaces.nsICache.STORE_ANYWHERE, true);
-		cacheSession.doomEntriesIfExpired = false;
-
-		this._cacheMode = false;
-			// キャッシュモード
-		if(this.loadFlags & 4096) this._cacheMode = true;
-
-			// this.onCacheEntryAvailable を実行
-		cacheSession.asyncOpenCacheEntry(this.URI.spec,
-						Components.interfaces.nsICache.ACCESS_READ_WRITE, this);
+			// 呼び出し元のスレッド処理後にスタート
+		var timer = Components.classes["@mozilla.org/timer;1"]
+						.createInstance(Components.interfaces.nsITimer);
+		var timerCallback = {};
+		timerCallback._context = this;
+		timerCallback.observe = function(aTimer){
+			var context = this._context;
+			context.requestStart();
+			context._observer.init(context);
+		}
+		timer.init(timerCallback, 0, timer.TYPE_ONE_SHOT);
 	},
 
 	cancel: function(aStatus){
-			// キャッシュエントリがあるときは閉じる
-		if(this._cacheOutputStream){
-			this._cacheOutputStream.close();
-		}
-		if(this._cacheEntry){
-			this._cacheEntry.close();
-		}
-		
 		if(this._isPending){
 			this._isPending = false;
 
@@ -121,34 +110,6 @@
 		this.status = aStatus;
 	},
 
-	onCacheEntryAvailable: function(aDescriptor, aAccessGranted, aStatus){
-		this.requestStart();
-
-		if(this._cacheMode){
-			try{
-					// キャッシュからデータを取得して書き出す
-				var inputStream = aDescriptor.openInputStream(0, -1, 0);
-				var scriptableInputStream = Components.classes["@mozilla.org/scriptableinputstream;1"]
-							.createInstance(Components.interfaces.nsIScriptableInputStream);
-				scriptableInputStream.init(inputStream);
-				var cacheContent = scriptableInputStream.read(scriptableInputStream.available());
-				this.requestRespond(cacheContent, cacheContent.length);
-				scriptableInputStream.close();
-				inputStream.close();
-				aDescriptor.close();
-				this.requestEnd();
-				return;
-			}catch(ex){
-					// キャッシュからデータを取得できない場合は通常モード
-				this._cacheMode = false;
-			}
-		}
-
-		this._cacheEntry = aDescriptor;
-		this._cacheOutputStream = aDescriptor.openOutputStream(0, -1, 0);
-		this._observer.init(this);
-	},
-
 	init: function(aURI, aContentType, aContentCharset, aObserver){
 		this.URI = aURI;
 		this.originalURI = aURI;
@@ -168,16 +129,6 @@
 	},
 
 	requestRespond: function(aData, aDataLength){
-		if(!this._cacheMode){
-			try{
-				this._cacheOutputStream.write(aData, aDataLength);
-			}catch(ex){
-				this._cacheOutputStream.close();
-				this._cacheEntry.close();
-				this._cacheMode = true;
-			}
-		}
-
 		this._stringStream.setData(aData, aDataLength);
 		this._streamListener.onDataAvailable(this, this._context,
 					this._stringStream, this._dataSize, aDataLength);
@@ -186,16 +137,6 @@
 	},
 
 	requestEnd: function(){
-		if(!this._cacheMode){
-			this._cacheOutputStream.close();
-			this._cacheOutputStream = null;
-			this._cacheEntry.setMetaDataElement("request-method", "GET");
-			this._cacheEntry.setMetaDataElement("response-head", "HTTP/1.1 200 OK\r\n");
-			this._cacheEntry.markValid();
-			this._cacheEntry.close();
-			this._cacheEntry = null;
-		}
-
 		this._streamListener.onStopRequest(this, this._context, Components.results.NS_OK);
 		if(this.loadGroup){
 			try{

From flyson ＠ users.sourceforge.jp  Sun Nov  6 21:18:29 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 6 Nov 2005 21:18:29 +0900
Subject: [Bbs2ch-cvs 47] CVS update: bbs2chreader/components
Message-ID: <20051106121829.0FB082AC017@users.sourceforge.jp>

Index: bbs2chreader/components/nsBbs2chProtocolHandler.js
diff -u bbs2chreader/components/nsBbs2chProtocolHandler.js:1.6 bbs2chreader/components/nsBbs2chProtocolHandler.js:1.7
--- bbs2chreader/components/nsBbs2chProtocolHandler.js:1.6	Thu Oct 27 22:56:17 2005
+++ bbs2chreader/components/nsBbs2chProtocolHandler.js	Sun Nov  6 21:18:28 2005
@@ -127,7 +127,6 @@
 		this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/httprequest.js");
 		this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/abone.js");
 			// use Bbs2chBoardRss
-		this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/lib/downloader.js");
 		this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/board-items.js");
 
 		this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/thread.js");

From flyson ＠ users.sourceforge.jp  Sun Nov  6 21:18:29 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 6 Nov 2005 21:18:29 +0900
Subject: [Bbs2ch-cvs 48] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051106121829.309F12AC053@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-rss.js
diff -u bbs2chreader/content/bbs2chreader/board-rss.js:1.9 bbs2chreader/content/bbs2chreader/board-rss.js:1.10
--- bbs2chreader/content/bbs2chreader/board-rss.js:1.9	Sat Sep 17 04:36:51 2005
+++ bbs2chreader/content/bbs2chreader/board-rss.js	Sun Nov  6 21:18:29 2005
@@ -100,7 +100,6 @@
 			return;
 		}
 
-
 			// ???????????
 		if(this.boardItems.subjectFile.exists()){
 			var interval = new Date().getTime()
@@ -116,20 +115,67 @@
 			}
 		}
 
+		var httpChannel = this._ioService.newChannelFromURI(this.boardItems.subjectURL)
+					.QueryInterface(Components.interfaces.nsIHttpChannel);
+		httpChannel.requestMethod = "GET";
+		httpChannel.redirectionLimit = 0; // 302 ?????????????
+		httpChannel.loadFlags = httpChannel.LOAD_BYPASS_CACHE;
+		httpChannel.setRequestHeader("User-Agent", this._bbs2chService.userAgent, false);
+
+		this.wrappedJSObject = this;
+		httpChannel.asyncOpen(this, null);
+
+	},
+
+	onStartRequest: function(aRequest, aContext){
+		aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
+
+		this._bInputStream = Components.classes["@mozilla.org/binaryinputstream;1"]
+					.createInstance(Components.interfaces.nsIBinaryInputStream);
+		this._data = new Array();
+	},
+
+	onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount){
+		aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
+		var httpStatus = aRequest.responseStatus;
+		
+			// ??????????I?
+		if(!(httpStatus==200 || httpStatus==206)) return;
 
-		this._subjectDownloader = new Bbs2chDownloader(this.boardItems.subjectURL.spec,
-									this.boardItems.subjectFile.path);
-		this._subjectDownloader._context = this;
-
-		this._subjectDownloader.onStart = function(aDownloader){};
-		this._subjectDownloader.onStop = function(aDownloader, aStatus){
-			this._context.RespondRSS();
-		};
-		this._subjectDownloader.onProgressChange = function(aDownloader, aPercentage){};
-		this._subjectDownloader.onError = function(aDownloader, aErrorCode){
-			this._context.requestErrorEnd();
-		};
-		this._subjectDownloader.download();
+		this._bInputStream.setInputStream(aInputStream);
+		var availableData = this._bInputStream.readBytes(aCount);
+		this._data.push(availableData);
+	},
+
+	onStopRequest: function(aRequest, aContext, aStatus){
+		aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
+		var httpStatus = aRequest.responseStatus;
+		this._bInputStream.close();
+
+		switch(httpStatus){
+			case 200: // ??ET OK
+			case 206: // ??GET OK
+				break;
+			case 302: // DAT??
+				this.requestRespond("DAT DOWNED");
+				this.requestEnd();
+				return;
+			case 304: // ???
+				this.requestRespond("NOT MODIFIED");
+				this.requestEnd();
+				return;
+			default: // HTTP ???
+				this.requestRespond("ERROR HTTP STATUS : " + httpStatus);
+				this.requestEnd();
+				return;
+		}
+
+		var availableData = this._data.join();
+		this._data = null;
+		if(availableData){
+			this._bbs2chService.writeFile(this.boardItems.subjectFile.path, availableData, false);
+		}
+		this.RespondRSS();
 	},
 
 
@@ -170,7 +216,8 @@
 		}
 
 		if(this._bbs2chService.pref.getBoolPref("fls.bbs2chreader.livebookmarks_append_board_link")){
-			var boardTemplate = "<item>\n\t<title>%BOARDTITLE%</title>\n\t<link>bbs2ch:board:%BOARDURL%</link>\n</item>\n\n";
+			var boardTemplate = "<item>\n\t<title>%BOARDTITLE%</title>\n\t" +
+									"<link>bbs2ch:board:%BOARDURL%</link>\n</item>\n\n";
 			var boardSource = boardTemplate
 							.replace("%BOARDTITLE%", this.boardItems.title)
 							.replace("%BOARDURL%", this.boardItems.url.spec);

From flyson ＠ users.sourceforge.jp  Sun Nov  6 21:23:20 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 6 Nov 2005 21:23:20 +0900
Subject: [Bbs2ch-cvs 49] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051106122320.DCEEA2AC017@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-rss.js
diff -u bbs2chreader/content/bbs2chreader/board-rss.js:1.10 bbs2chreader/content/bbs2chreader/board-rss.js:1.11
--- bbs2chreader/content/bbs2chreader/board-rss.js:1.10	Sun Nov  6 21:18:29 2005
+++ bbs2chreader/content/bbs2chreader/board-rss.js	Sun Nov  6 21:23:20 2005
@@ -152,27 +152,9 @@
 		var httpStatus = aRequest.responseStatus;
 		this._bInputStream.close();
 
-		switch(httpStatus){
-			case 200: // ??ET OK
-			case 206: // ??GET OK
-				break;
-			case 302: // DAT??
-				this.requestRespond("DAT DOWNED");
-				this.requestEnd();
-				return;
-			case 304: // ???
-				this.requestRespond("NOT MODIFIED");
-				this.requestEnd();
-				return;
-			default: // HTTP ???
-				this.requestRespond("ERROR HTTP STATUS : " + httpStatus);
-				this.requestEnd();
-				return;
-		}
-
 		var availableData = this._data.join();
 		this._data = null;
-		if(availableData){
+		if(availableData && httpStatus == 200){
 			this._bbs2chService.writeFile(this.boardItems.subjectFile.path, availableData, false);
 		}
 		this.RespondRSS();

From flyson ＠ users.sourceforge.jp  Sun Nov  6 21:29:51 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 6 Nov 2005 21:29:51 +0900
Subject: [Bbs2ch-cvs 50] CVS update: bbs2chreader
Message-ID: <20051106122951.D52142AC017@users.sourceforge.jp>

Index: bbs2chreader/mkxpi.bat
diff -u bbs2chreader/mkxpi.bat:1.9 bbs2chreader/mkxpi.bat:1.10
--- bbs2chreader/mkxpi.bat:1.9	Thu Nov  3 22:49:55 2005
+++ bbs2chreader/mkxpi.bat	Sun Nov  6 21:29:51 2005
@@ -1,7 +1,7 @@
 @ECHO OFF
 
 SET EXT_NAME=bbs2chreader
-SET EXT_VER=027
+SET EXT_VER=028
 
 MKDIR chrome
 ZIP -r chrome\%EXT_NAME%.jar content skin locale
Index: bbs2chreader/install.rdf
diff -u bbs2chreader/install.rdf:1.14 bbs2chreader/install.rdf:1.15
--- bbs2chreader/install.rdf:1.14	Sun Oct 30 04:09:37 2005
+++ bbs2chreader/install.rdf	Sun Nov  6 21:29:51 2005
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:name>bbs2chreader</em:name>
 		<em:id>{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}</em:id>
-		<em:version>0.2.7</em:version>
+		<em:version>0.2.8</em:version>
 		<em:description>2ch(Japanese Web Forum) Reader</em:description>
 		<em:optionsURL>chrome://bbs2chreader/content/settings/settings.xul</em:optionsURL>
 		<em:homepageURL>http://bbs2ch.sourceforge.jp/</em:homepageURL>
@@ -16,7 +16,7 @@
 		<em:targetApplication>
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-				<em:minVersion>1.0</em:minVersion>
+				<em:minVersion>1.5.0.*</em:minVersion>
 				<em:maxVersion>1.5.0.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
Index: bbs2chreader/history.txt
diff -u bbs2chreader/history.txt:1.8 bbs2chreader/history.txt:1.9
--- bbs2chreader/history.txt:1.8	Thu Nov  3 22:49:55 2005
+++ bbs2chreader/history.txt	Sun Nov  6 21:29:51 2005
@@ -1,3 +1,8 @@
+0.2.8
+	1.0.x ???????+	?????ｦ???????????+	?????????????????????????+
 0.2.7
 	  1.5RC1 ??
 	 ?????ｦ??????????

From flyson_moz ＠ ybb.ne.jp  Sun Nov  6 21:33:19 2005
From: flyson_moz ＠ ybb.ne.jp (flyson)
Date: Sun, 6 Nov 2005 21:33:19 +0900 (JST)
Subject: [Bbs2ch-cvs 51] RELEASE_0_2_8
Message-ID: <20051106123319.46848.qmail@web3213.mail.bbt.yahoo.co.jp>

RELEASE_0_2_8


From flyson ＠ users.sourceforge.jp  Wed Nov  9 00:23:22 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Wed, 9 Nov 2005 00:23:22 +0900
Subject: [Bbs2ch-cvs 52] CVS update: bbs2chreader
Message-ID: <20051108152322.3060C2AC012@users.sourceforge.jp>

Index: bbs2chreader/install.rdf
diff -u bbs2chreader/install.rdf:1.15 bbs2chreader/install.rdf:1.16
--- bbs2chreader/install.rdf:1.15	Sun Nov  6 21:29:51 2005
+++ bbs2chreader/install.rdf	Wed Nov  9 00:23:22 2005
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:name>bbs2chreader</em:name>
 		<em:id>{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}</em:id>
-		<em:version>0.2.8</em:version>
+		<em:version>0.2.8+</em:version>
 		<em:description>2ch(Japanese Web Forum) Reader</em:description>
 		<em:optionsURL>chrome://bbs2chreader/content/settings/settings.xul</em:optionsURL>
 		<em:homepageURL>http://bbs2ch.sourceforge.jp/</em:homepageURL>
@@ -16,7 +16,7 @@
 		<em:targetApplication>
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-				<em:minVersion>1.5.0.*</em:minVersion>
+				<em:minVersion>1.5</em:minVersion>
 				<em:maxVersion>1.5.0.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>

From flyson ＠ users.sourceforge.jp  Sun Nov 13 04:13:16 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 13 Nov 2005 04:13:16 +0900
Subject: [Bbs2ch-cvs 53] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051112191316.36B9C2AC05B@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-items.js
diff -u bbs2chreader/content/bbs2chreader/board-items.js:1.11 bbs2chreader/content/bbs2chreader/board-items.js:1.12
--- bbs2chreader/content/bbs2chreader/board-items.js:1.11	Tue Oct 11 22:17:31 2005
+++ bbs2chreader/content/bbs2chreader/board-items.js	Sun Nov 13 04:13:16 2005
@@ -162,6 +162,7 @@
 	},
 
 	refresh: function(aFilterLimit, aShowDownedLogs){
+		var startTime = new Date().getTime();
 		const NS_BBS2CH = this._bbs2chService.nameSpace;
 
 		const STATUS_NEW       = 5;
@@ -183,7 +184,8 @@
 
 			// ???????????
 		var regLine;
-		if(this.type==this._bbs2chService.BOARD_TYPE_2CH || this.type==this._bbs2chService.BOARD_TYPE_BE2CH){ // 2ch
+		if(this.type==this._bbs2chService.BOARD_TYPE_2CH ||
+						this.type==this._bbs2chService.BOARD_TYPE_BE2CH){ // 2ch
 			regLine = /^(\d{9,10})\.dat<>(.+) ?\((\d{1,4})\)/;
 		}else if(this.type==this._bbs2chService.BOARD_TYPE_JBBS){ // JBBS
 			regLine = /^(\d{9,10})\.cgi,(.+) ?\((\d{1,4})\)/;
@@ -256,7 +258,7 @@
 				this._items.push(logItemHash[i]);
 			}
 		}
-			
+		dump("Bbs2chBoardItems.refresh : "+ (new Date().getTime() - startTime) +"ms\n");
 	},
 
 
@@ -265,6 +267,23 @@
 	 */
 	getLogItemHash: function(aThreadUrlSpec){
 		var resultHash = new Array();
+		var cacheFile = this._bbs2chService.getLogFileAtURL(
+								this.url.resolve("cache.txt"));
+		var cacheUpdated = false;
+		var cacheContents = this._bbs2chService.readFileLine(cacheFile.path, {});
+		var cacheItemHash = new Array();
+		for(var i=0; i<cacheContents.length; i++){
+			var cacheLine = this._bbs2chService.fromType(cacheContents[i], this.type)
+			cacheLine = cacheLine.split("<>");
+			var cacheItem = {};
+			cacheItem.datID = cacheLine[0];
+			cacheItem.lastModified = cacheLine[1];
+			cacheItem.count = cacheLine[2];
+			cacheItem.title = cacheLine[3];
+			cacheItem.id = "item-" + cacheItem.datID;
+			cacheItemHash[cacheItem.id] = cacheItem;
+		}
+		cacheContents = new Array();
 
 		var regIndexName = /(\d{9,10})\.idx$/i;
 		var regTitle = /^title=(.+)/m;
@@ -276,24 +295,41 @@
 			var file = entries.getNext().QueryInterface(Components.interfaces.nsILocalFile);
 			if(!regIndexName.test(file.leafName)) continue;
 			var datID = RegExp.$1;
+			var lastModified = file.lastModifiedTime;
 			
-			var indexContent = this._bbs2chService.readFile(file.path);
-			indexContent = this._bbs2chService.fromType(indexContent, this.type);
-
 			var logItem = {};
 				logItem.datID = datID;
 				logItem.id = "item-" + datID;
 				logItem.number = -1;
-				logItem.title = regTitle.test(indexContent) ? "X" + RegExp.$1 : "";
-				logItem.count = regLineCount.test(indexContent) ? RegExp.$1 : "";
-				logItem.read  = logItem.count;
 				logItem.unread = 0;
 				logItem.force = 0;
 				logItem.makeDate = logItem.datID * 1000;
 				logItem.url = aThreadUrlSpec + logItem.datID + "/";
-			
+
+			if(logItem.id in cacheItemHash &&
+								cacheItemHash[logItem.id].lastModified == lastModified){
+				logItem.title = cacheItemHash[logItem.id].title;
+				logItem.count = cacheItemHash[logItem.id].count;
+				logItem.read  = logItem.count;			
+			}else{
+					// ??or?? idx ??????????????
+				cacheUpdated = true;
+				var indexContent = this._bbs2chService.readFile(file.path);
+				indexContent = this._bbs2chService.fromType(indexContent, this.type);
+				logItem.title = regTitle.test(indexContent) ? "X" + RegExp.$1 : "";
+				logItem.count = regLineCount.test(indexContent) ? RegExp.$1 : "";
+				logItem.read  = logItem.count;
+			}
+
+			cacheContents.push(datID +"<>"+ lastModified +"<>"+ logItem.count +"<>"+ logItem.title);
 			resultHash[logItem.id] = logItem;
 		}
+
+		if(cacheUpdated){
+			cacheContents = cacheContents.join("\n");
+			cacheContents = this._bbs2chService.toType(cacheContents, this.type);
+			this._bbs2chService.writeFile(cacheFile.path, cacheContents, false);
+		}
 		return resultHash;
 	},
 

From flyson ＠ users.sourceforge.jp  Sun Nov 20 14:33:14 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 20 Nov 2005 14:33:14 +0900
Subject: [Bbs2ch-cvs 54] CVS update: bbs2chreader/content/bbs2chreader/settings
Message-ID: <20051120053314.3F3CE2AC04C@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/settings/settings.xul
diff -u bbs2chreader/content/bbs2chreader/settings/settings.xul:1.12 bbs2chreader/content/bbs2chreader/settings/settings.xul:1.13
--- bbs2chreader/content/bbs2chreader/settings/settings.xul:1.12	Fri Apr 22 23:48:13 2005
+++ bbs2chreader/content/bbs2chreader/settings/settings.xul	Sun Nov 20 14:33:14 2005
@@ -47,11 +47,6 @@
 				prefstring="fls.bbs2chreader.data_dir"/>
 		</hbox>
 
-		<checkbox label="ツリーの偶数行に色をつける"
-			prefelement="true"
-			prefattribute="checked"
-			prefstring="fls.bbs2chreader.enable_tree_stripe"/>
-
 	</expander>
 
 

From flyson ＠ users.sourceforge.jp  Sun Nov 20 14:33:14 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 20 Nov 2005 14:33:14 +0900
Subject: [Bbs2ch-cvs 55] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051120053314.62D7A2AC08C@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-page.js
diff -u bbs2chreader/content/bbs2chreader/board-page.js:1.23 bbs2chreader/content/bbs2chreader/board-page.js:1.24
--- bbs2chreader/content/bbs2chreader/board-page.js:1.23	Thu Oct 20 22:53:36 2005
+++ bbs2chreader/content/bbs2chreader/board-page.js	Sun Nov 20 14:33:14 2005
@@ -71,10 +71,6 @@
 
 	gTreeSubject = document.getElementById("treeSubject");
 
-		// ツリーの偶数行に色をつける
-	if(gBbs2chService.pref.getBoolPref("fls.bbs2chreader.enable_tree_stripe"))
-			gTreeSubject.setAttribute("stripe", "true");
-
 	if(gBbs2chService.pref.getBoolPref("fls.bbs2chreader.board_auto_update")){
 		subjectUpdate();
 	}else if(!gBoardItems.subjectFile.exists() || gBoardItems.subjectFile.fileSize==0){
Index: bbs2chreader/content/bbs2chreader/bbsmenu-page.js
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.28 bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.29
--- bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.28	Tue Nov  1 00:47:04 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-page.js	Sun Nov 20 14:33:14 2005
@@ -55,9 +55,6 @@
 
 
 	gTreeBbsMenu = document.getElementById("treeBbsMenu");
-		// ツリーの偶数行に色をつける
-	if(gBbs2chService.pref.getBoolPref("fls.bbs2chreader.enable_tree_stripe"))
-		gTreeBbsMenu.setAttribute("stripe", "true");
 
 	if(gBbsmenuDS.bbsMenuFile.exists()){
 		initTreeBbsMenu();

From flyson ＠ users.sourceforge.jp  Sun Nov 20 14:33:14 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 20 Nov 2005 14:33:14 +0900
Subject: [Bbs2ch-cvs 56] CVS update: bbs2chreader/skin/classic/bbs2chreader
Message-ID: <20051120053314.87EF72AC04C@users.sourceforge.jp>

Index: bbs2chreader/skin/classic/bbs2chreader/board-page.css
diff -u bbs2chreader/skin/classic/bbs2chreader/board-page.css:1.4 bbs2chreader/skin/classic/bbs2chreader/board-page.css:1.5
--- bbs2chreader/skin/classic/bbs2chreader/board-page.css:1.4	Sat Aug  6 01:55:06 2005
+++ bbs2chreader/skin/classic/bbs2chreader/board-page.css	Sun Nov 20 14:33:14 2005
@@ -48,11 +48,6 @@
   color: #BBB;
 }
 
-#treeSubject[stripe="true"] treechildren:-moz-tree-row(odd){
-  background-image: url("chrome://bbs2chreader/skin/tree-row-odd.png");
-}
-
-
 #treeSubject treechildren::-moz-tree-image(icon){
   margin-left: 2px;
   list-style-image: url("chrome://bbs2chreader/skin/board-status.gif") !important;
Index: bbs2chreader/skin/classic/bbs2chreader/bbsmenu-page.css
diff -u bbs2chreader/skin/classic/bbs2chreader/bbsmenu-page.css:1.4 bbs2chreader/skin/classic/bbs2chreader/bbsmenu-page.css:1.5
--- bbs2chreader/skin/classic/bbs2chreader/bbsmenu-page.css:1.4	Sun Jul 24 03:46:27 2005
+++ bbs2chreader/skin/classic/bbs2chreader/bbsmenu-page.css	Sun Nov 20 14:33:14 2005
@@ -1,10 +1,6 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 
-#treeBbsMenu[stripe="true"] treechildren:-moz-tree-row(odd){
-  background-image: url("chrome://bbs2chreader/skin/tree-row-odd.png");
-}
-
 /* 2ch */
 #treeBbsMenu treechildren::-moz-tree-image(type-0) {
   margin: 0px 2px;

From flyson ＠ users.sourceforge.jp  Sun Nov 20 14:33:14 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 20 Nov 2005 14:33:14 +0900
Subject: [Bbs2ch-cvs 57] CVS update: bbs2chreader/defaults/preferences
Message-ID: <20051120053314.B38D12AC08C@users.sourceforge.jp>

Index: bbs2chreader/defaults/preferences/bbs2chreader-pref.js
diff -u bbs2chreader/defaults/preferences/bbs2chreader-pref.js:1.2 bbs2chreader/defaults/preferences/bbs2chreader-pref.js:1.3
--- bbs2chreader/defaults/preferences/bbs2chreader-pref.js:1.2	Sun Jul 24 03:51:41 2005
+++ bbs2chreader/defaults/preferences/bbs2chreader-pref.js	Sun Nov 20 14:33:14 2005
@@ -3,7 +3,6 @@
 pref("fls.bbs2chreader.tab_load_in_foreground" ,false);
 pref("fls.bbs2chreader.appoint_data_dir" ,false);
 pref("fls.bbs2chreader.data_dir" ,"");
-pref("fls.bbs2chreader.enable_tree_stripe" ,true);
 
 pref("fls.bbs2chreader.bbsmenu_load_url" ,"http://menu.2ch.net/bbsmenu.html");
 pref("fls.bbs2chreader.bbsmenu_toggle_open_container" ,false);

From flyson ＠ users.sourceforge.jp  Sun Nov 20 14:34:35 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 20 Nov 2005 14:34:35 +0900
Subject: [Bbs2ch-cvs 58] CVS update: bbs2chreader/content/bbs2chreader/test
Message-ID: <20051120053435.0D80E2AC04C@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/test/thread-test.js
diff -u bbs2chreader/content/bbs2chreader/test/thread-test.js:1.4 bbs2chreader/content/bbs2chreader/test/thread-test.js:1.5
--- bbs2chreader/content/bbs2chreader/test/thread-test.js:1.4	Sun Oct 30 06:47:48 2005
+++ bbs2chreader/content/bbs2chreader/test/thread-test.js	Sun Nov 20 14:34:34 2005
@@ -58,7 +58,12 @@
 
 	startThread: function(){
 		var threadURLSpec = this._channel.URI.spec.replace(/^bbs2ch:thread-test:/, "");
-		this.requestRespond("BAD URL :\t" + threadURLSpec);
+
+		var template = this._bbs2chService.readLocalURI(
+							"chrome://bbs2chreader/content/res/thread-error.txt");
+		template = template.replace(/%URL%/g, threadURLSpec)
+								.replace(/%STATUS%/g, "BAD URL");
+		this.requestRespond(template);
 		this.requestEnd();
 	},
 

From flyson ＠ users.sourceforge.jp  Wed Nov 23 08:10:27 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Wed, 23 Nov 2005 08:10:27 +0900
Subject: [Bbs2ch-cvs 59] CVS update: bbs2chreader/content/bbs2chreader/test
Message-ID: <20051122231027.D748A2AC08B@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/test/thread-test.js
diff -u bbs2chreader/content/bbs2chreader/test/thread-test.js:1.5 bbs2chreader/content/bbs2chreader/test/thread-test.js:1.6
--- bbs2chreader/content/bbs2chreader/test/thread-test.js:1.5	Sun Nov 20 14:34:34 2005
+++ bbs2chreader/content/bbs2chreader/test/thread-test.js	Wed Nov 23 08:10:27 2005
@@ -100,13 +100,13 @@
 	},
 
 	get optionsStart(){
-	  return (this.threadURL.fileName.match(/(\d+)\-/)) ? RegExp.$1 : null;
+	  return (this.threadURL.fileName.match(/(\d+)\-/)) ? parseInt(RegExp.$1) : null;
 	},
 	get optionsLast(){
-	  return (this.threadURL.fileName.match(/l(\d+)/)) ? RegExp.$1 : null;
+	  return (this.threadURL.fileName.match(/l(\d+)/)) ? parseInt(RegExp.$1) : null;
 	},
 	get optionsEnd(){
-	  return (this.threadURL.fileName.match(/\-(\d+)/)) ? RegExp.$1 : null;
+	  return (this.threadURL.fileName.match(/\-(\d+)/)) ? parseInt(RegExp.$1) : null;
 	},
 	get optionsNoFirst(){
 	  return (this.threadURL.fileName.indexOf("n") != -1);
@@ -152,8 +152,56 @@
 		this.requestRespond("  NoFirst     : " + this.optionsNoFirst + "\n");
 		this.requestRespond("----- ----- -----\n\n");
 
-		// this.requestEnd();
-		this.datDownload();
+			// 取得済みログの送信
+		if(this.dat.datFile.exists()){
+			var datLines = this._bbs2chService.readFileLine(this.dat.datFile.path, {});
+
+			if(this.optionsEnd){ // LOG PICKUP MODE
+				var start = this.optionsStart ? this.optionsStart : 1;
+				if(start < 1) start = 1;
+				var end = this.optionsEnd;
+				if(end > datLines.length) end = datLines.length;
+				if(start > end) start = end;
+
+				var content = new Array();
+				for(var i=start-1; i<end; i++){
+					content.push((i+1) +"\t: "+ datLines[i]);
+				}
+				this.requestRespond(content.join("\n"));
+
+				this.requestRespond("\n\nLOG PICKUP MODE\n\n");
+				this.requestEnd();
+				return;
+
+			}else{
+				if(!this.optionsNoFirst){
+					var firstContent = 1 +"\t: "+ datLines[0] + "\n";
+					this.requestRespond(firstContent);
+				}
+
+				var start = 1;
+				var end = datLines.length;
+				if(this.optionsLast){
+					start = end - this.optionsLast;
+					if(start < 1) start = 1;
+				}
+
+				var content = new Array();
+				for(var i=start; i<end; i++){
+					content.push((i+1) +"\t: "+ datLines[i]);
+				}
+				this.requestRespond(content.join("\n"));
+			}
+		}
+		this.requestRespond("\n\n----- ----- -----\n\n");
+
+			// オフラインなら終了
+		if(this._ioService.offline){
+			this.requestRespond("OFFLINE MODE");
+			this.requestEnd();
+		}else{
+			this.datDownload();
+		}
 	},
 	
 	datDownload: function(){

From flyson ＠ users.sourceforge.jp  Fri Nov 25 00:01:47 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Fri, 25 Nov 2005 00:01:47 +0900
Subject: [Bbs2ch-cvs 60] CVS update: bbs2chreader/content/bbs2chreader/test
Message-ID: <20051124150147.348942AC012@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/test/thread-test.js
diff -u bbs2chreader/content/bbs2chreader/test/thread-test.js:1.6 bbs2chreader/content/bbs2chreader/test/thread-test.js:1.7
--- bbs2chreader/content/bbs2chreader/test/thread-test.js:1.6	Wed Nov 23 08:10:27 2005
+++ bbs2chreader/content/bbs2chreader/test/thread-test.js	Fri Nov 25 00:01:47 2005
@@ -117,6 +117,8 @@
 
 
 	startThread: function(){
+			// HTML ヘッダを送信したら true になる
+		this._headerResponded = false;
 
 			// threadURL
 		var threadURLSpec = this._channel.URI.spec.replace(/^bbs2ch:thread-test:/, "");
@@ -130,9 +132,12 @@
 		this._type = this._bbs2chService.getBoardType(this.threadURL.spec);
 		
 		this.dat = new b2rDat();
-		this.dat.init(this.threadURL, this.boardURL, this._type);
+		this.dat.init(this.threadURL, this.boardURL, this.type);
 		
+		this.converter = new b2rThreadConverter();
+		this.converter.init(this.threadURL, this.boardURL, this.type);
 
+		this.requestRespond("<!-- \n");
 		this.requestRespond("Thread URL    : " + this.threadURL.spec + "\n");
 		this.requestRespond("Board URL     : " + this.boardURL.spec + "\n");
 		this.requestRespond("Type          : " + this.type + "\n");
@@ -150,7 +155,7 @@
 		this.requestRespond("  Last        : " + this.optionsLast + "\n");
 		this.requestRespond("  End         : " + this.optionsEnd + "\n");
 		this.requestRespond("  NoFirst     : " + this.optionsNoFirst + "\n");
-		this.requestRespond("----- ----- -----\n\n");
+		this.requestRespond("-->\n\n");
 
 			// 取得済みログの送信
 		if(this.dat.datFile.exists()){
@@ -175,35 +180,112 @@
 
 			}else{
 				if(!this.optionsNoFirst){
-					var firstContent = 1 +"\t: "+ datLines[0] + "\n";
-					this.requestRespond(firstContent);
+					this.requestRespond(this.datLineParse(datLines[0], 1, false) +"\n");
+				}else if(this.dat.title){
+					this._headerResponded = true;
+					var header = this.converter.getHeader(this.dat.title);
+					this.requestRespond(header);
+				}else{
+					this.requestRespond(this.datLineParse(datLines[0], 1, false) +"\n");
 				}
 
 				var start = 1;
 				var end = datLines.length;
-				if(this.optionsLast){
+				if(this.optionsLast || this.optionsLast == 0){
 					start = end - this.optionsLast;
 					if(start < 1) start = 1;
 				}
-
 				var content = new Array();
 				for(var i=start; i<end; i++){
-					content.push((i+1) +"\t: "+ datLines[i]);
+					content.push(this.datLineParse(datLines[i], i+1, false));
+
 				}
+				
 				this.requestRespond(content.join("\n"));
 			}
 		}
-		this.requestRespond("\n\n----- ----- -----\n\n");
 
 			// オフラインなら終了
 		if(this._ioService.offline){
 			this.requestRespond("OFFLINE MODE");
 			this.requestEnd();
 		}else{
+			var newMark = this.converter.getNewMark() +"\n";
+			this.requestRespond(newMark);
 			this.datDownload();
 		}
 	},
-	
+
+	datLineParse: function(aLine, aNumber, aNew){
+		if(!aLine) return "";
+		
+		var resArray = aLine.split("<>");
+		var resNumber = aNumber;
+		var resName = "BLOKEN";
+		var resMail = "";
+		var resDate = "BLOKEN";
+		var resID = "";
+		var resBeID = "";
+		var resMes	= "";
+
+		if(resArray.length > 3){
+			resName = resArray[0].replace(/<\/?b>|/g, "");
+			resMail = resArray[1];			
+			resDate = resArray[2];
+			resMes = resArray[3];
+		}
+
+			// BE:*******-* 形式 を <BE:*******:*> に変換
+		var regBeID = /BE: ?(\d+)\-(#{0,5})/;
+		if(resDate.match(regBeID)){
+			resDate = resDate.replace(regBeID, "<BE:$1:" + RegExp.$2.length +">");
+		}
+
+			// resDate を DATE、BeID、BeLevel に分割
+		if(resDate.match(/(.+)(<BE:\d+:\d+>)/)){
+			resDate = RegExp.$1;
+			resBeID = RegExp.$2;
+		}
+			// resDate を DATE と ID に分割
+		if(resDate.match(/(.+)ID:(.+)/)){
+			resDate = RegExp.$1;
+			resID = RegExp.$2;
+		}
+
+		if(resBeID){
+			var regBeID2 = /<BE:(\d+):(\d+)>/;
+			if(resBeID.match(regBeID2)){
+				idInfoUrl = "http://be.2ch.net/test/p.php?i=" + RegExp.$1 +
+						"&u=d:" + this.threadURL.resolve("./") + aNumber;
+				resBeID = resBeID.replace(regBeID2, String("$1 Lv.$2").link(idInfoUrl));
+			}
+		}
+
+			// JSでは "\" が特殊な意味を持つため、数値文字参照に変換
+		resName = resName.replace(/([^\x81-\xfc]|^)\x5C/g,"$1&#x5C;");
+		resMail = resMail.replace(/([^\x81-\xfc]|^)\x5C/g,"$1&#x5C;");
+			// レス番リンク処理
+		var regResPointer = /(<a .*?>)?(&gt;&gt;|&gt;)([0-9]{1,4})(\-[0-9]{1,4})?(<\/a>)?/g;
+		resMes = resMes.replace(regResPointer, '<a href="#res$3" class="resPointer">$2$3$4</a>'); 
+
+			// 通常リンク処理 
+		var regUrlLink = /(h?ttp)(s)?\:([\-_\.\!\~\*\'\(\)a-zA-Z0-9\;\/\?\:\@\&\=\+\$\,\%\#]+)/g;
+		resMes = resMes.replace(regUrlLink, '<a href="http$2:$3" class="outLink">$1$2:$3</a>');
+
+
+			// スレッドのタイトルが見つかったときは HTML ヘッダを追加して送る
+		if(!this._headerResponded && resArray[4]){
+			this._headerResponded = true;
+			this.dat.title = resArray[4];
+			
+			var header = this.converter.getHeader(this.dat.title);
+			this.requestRespond(header);
+		}
+		var response = this.converter.getResponse(aNew, aNumber, resName, resMail, resDate,
+								resID, resBeID, resMes);
+		return response;
+	},
+
 	datDownload: function(){
 		var httpChannel = this._ioService.newChannelFromURI(this.dat.datURL)
 					.QueryInterface(Components.interfaces.nsIHttpChannel);
@@ -257,7 +339,7 @@
 			// DAT を 変換して書き出す
 		for(var i=0; i<datLines.length; i++){
 			this.dat.lineCount++;
-			datLines[i] = this.dat.lineCount +"\t: "+ datLines[i];
+			datLines[i] = this.datLineParse(datLines[i], this.dat.lineCount, true);
 		}
 		this.requestRespond(datLines.join("\n"));
 	},
@@ -296,6 +378,7 @@
 		}
 		this._bInputStream.close();
 
+		this.requestRespond("OK");
 		this.requestEnd();
 		if(httpStatus == 200 || httpStatus == 206) this.datSave(this._data.join(""));
 		this._data = null;
@@ -319,3 +402,69 @@
 b2r2chThread.prototype.__proto__ = b2rThread.prototype;
 
 
+
+
+
+function b2rThreadConverter(){
+
+}
+
+b2rThreadConverter.prototype = {
+
+	init: function(aThreadURL, aBoardURL, aType){
+		this._threadURL = aThreadURL;
+		this._boardURL = aBoardURL;
+		this._type = aType;
+
+		this._bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
+					.getService(Components.interfaces.nsIBbs2chService);
+
+
+		this._skinURISpec = this._bbs2chService.prefDefault.getCharPref(
+										"fls.bbs2chreader.thread_skin_uri");
+		this._tmpHeader   = this._bbs2chService.readLocalURI(this._skinURISpec + "Header.html");
+		this._tmpFooter   = this._bbs2chService.readLocalURI(this._skinURISpec + "Footer.html");
+		this._tmpRes	  = this._bbs2chService.readLocalURI(this._skinURISpec + "Res.html");
+		this._tmpNewRes	  = this._bbs2chService.readLocalURI(this._skinURISpec + "NewRes.html");
+		this._tmpNewMark  = this._bbs2chService.readLocalURI(this._skinURISpec + "NewMark.html");
+
+			// 基本スキンタグの置換
+		this._tmpHeader = this._replaceBaseTag(this._tmpHeader);
+		this._tmpFooter = this._replaceBaseTag(this._tmpFooter);
+		this._tmpRes = this._replaceBaseTag(this._tmpRes);		
+		this._tmpNewRes = this._replaceBaseTag(this._tmpNewRes);
+		this._tmpNewMark = this._replaceBaseTag(this._tmpNewMark);
+	},
+
+	/**
+	 * 基本スキンタグの置換
+	 * @param aString string 置換される文字列
+	 */
+	_replaceBaseTag: function(aString){
+		return aString.replace(/<SKINPATH\/>/g, this._skinURISpec)
+							.replace(/<THREADURL\/>/g, this._threadURL.resolve("./"))
+							.replace(/<BOARDURL\/>/g, this._boardURL.spec);
+	},
+
+	getHeader: function(aTitle){
+		return this._tmpHeader.replace(/<THREADNAME\/>/g, aTitle);
+	},
+	
+	getNewMark: function(){
+		return this._tmpNewMark;
+	},
+	
+	getResponse: function(aNew, aNumber, aName, aMail, aDate, aID, aBeID, aMessage){
+		var template = aNew ? this._tmpNewRes : this._tmpRes;
+		var result = template.replace(/<PLAINNUMBER\/>/g, aNumber)
+							.replace(/<NUMBER\/>/g, aNumber)
+							.replace(/<NAME\/>/g, aName)
+							.replace(/<MAIL\/>/g, aMail)
+							.replace(/<MAILNAME\/>/g, "")
+							.replace(/<DATE\/>/g, aDate)
+							.replace(/<ID\/>/g, aID)
+							.replace(/<BEID\/>/g, aBeID)
+							.replace(/<MESSAGE\/>/g, aMessage);
+		return result;
+	}
+}
\ No newline at end of file

From flyson ＠ users.sourceforge.jp  Wed Nov 30 01:06:44 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Wed, 30 Nov 2005 01:06:44 +0900
Subject: [Bbs2ch-cvs 61] CVS update: bbs2chreader/content/bbs2chreader/test
Message-ID: <20051129160644.8EC792AC040@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/test/thread-test.js
diff -u bbs2chreader/content/bbs2chreader/test/thread-test.js:1.7 bbs2chreader/content/bbs2chreader/test/thread-test.js:1.8
--- bbs2chreader/content/bbs2chreader/test/thread-test.js:1.7	Fri Nov 25 00:01:47 2005
+++ bbs2chreader/content/bbs2chreader/test/thread-test.js	Wed Nov 30 01:06:44 2005
@@ -162,6 +162,10 @@
 			var datLines = this._bbs2chService.readFileLine(this.dat.datFile.path, {});
 
 			if(this.optionsEnd){ // LOG PICKUP MODE
+				this._headerResponded = true;
+				var header = this.converter.getHeader(this.dat.title);
+				this.requestRespond(header);
+
 				var start = this.optionsStart ? this.optionsStart : 1;
 				if(start < 1) start = 1;
 				var end = this.optionsEnd;
@@ -170,7 +174,7 @@
 
 				var content = new Array();
 				for(var i=start-1; i<end; i++){
-					content.push((i+1) +"\t: "+ datLines[i]);
+					content.push(this.datLineParse(datLines[i], i+1, false));
 				}
 				this.requestRespond(content.join("\n"));
 
@@ -198,7 +202,6 @@
 				var content = new Array();
 				for(var i=start; i<end; i++){
 					content.push(this.datLineParse(datLines[i], i+1, false));
-
 				}
 				
 				this.requestRespond(content.join("\n"));

From flyson ＠ users.sourceforge.jp  Sat Dec  3 00:10:46 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sat,  3 Dec 2005 00:10:46 +0900
Subject: [Bbs2ch-cvs 62] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051202151046.D89E42AC034@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/channel.js
diff -u bbs2chreader/content/bbs2chreader/channel.js:1.6 bbs2chreader/content/bbs2chreader/channel.js:removed
--- bbs2chreader/content/bbs2chreader/channel.js:1.6	Fri Jun 17 00:11:22 2005
+++ bbs2chreader/content/bbs2chreader/channel.js	Sat Dec  3 00:10:46 2005
@@ -1,253 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is bbs2chreader.
- *
- * The Initial Developer of the Original Code is
- * flyson.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *    flyson <flyson at users.sourceforge.jp>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-
-
-/**
- *	Channel の雛形
- */
-function Bbs2chChannel(aURI, aContentType, aContentCharset, aObserver){
-	this.URI = aURI;
-	this.originalURI = aURI;
-	this.contentType = aContentType;
-	this.contentCharset = aContentCharset;
-
-	this._properties = new Array();
-	this._observer = aObserver;
-
-	this._isPending = true;
-	this._dataSize = 0;
-	this._stringStream = Components.classes["@mozilla.org/io/string-input-stream;1"]
-							.createInstance(Components.interfaces.nsIStringInputStream);
-}
-
-Bbs2chChannel.prototype = {
-
-	QueryInterface: function(aIID){
-		if(aIID.equals(Components.interfaces.nsIChannel))  return this;
-		if(aIID.equals(Components.interfaces.nsIProperties))  return this;
-		if(aIID.equals(Components.interfaces.nsIRequest))  return this;
-		if(aIID.equals(Components.interfaces.nsISupports)) return this;
-
-		throw Components.results.NS_ERROR_NO_INTERFACE;
-	},
-
-
-// ********** ********* implements nsIProperties ********** **********
-
-
-	get: function(aProperty, aIID){
-		if(this.has(aProperty)){
-			return this._properties[aProperty];
-		}
-		throw Components.results.NS_ERROR_FAILURE;
-	},
-
-
-	set: function(aProperty, aValue){
-		this._properties[aProperty] = aValue;
-		return Components.results.NS_OK;
-	},
-
-
-	has: function(aProperty){
-		return this._properties.hasOwnProperty(aProperty);
-	},
-
-
-	undefine: function(aProperty){
-		if(this.has(aProperty)){
-			delete this._properties[aProperty];
-			return Components.results.NS_OK;
-		}
-		throw Components.results.NS_ERROR_FAILURE;
-	},
-
-	getKeys :function(aCount){
-		var resultArray = new Array();
-		for(var i in this._properties) resultArray.push(i);
-		aCount.value = resultArray.length;
-		return resultArray;
-	},
-
-
-// ********** ********* implements nsIChannel ********** **********
-
-
-	owner: null,
-	notificationCallbacks: null,
-	securityInfo: null,
-	contentLength: -1,
-	status: Components.results.NS_OK,
-	loadGroup: null,
-	loadAttributes: null,
-
-	open: function(){
-		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
-	},
-	
-	asyncOpen: function(aStreamListener, aContext){
-		var cacheService = Components.classes["@mozilla.org/network/cache-service;1"]
-								.getService(Components.interfaces.nsICacheService);
-		var session = cacheService.createSession("HTTP", 
-								Components.interfaces.nsICache.STORE_ON_DISK, true);
-		session.doomEntriesIfExpired = false;
-
-		this._streamListener = aStreamListener;
-		this._context = aContext;
-		if(this.loadGroup) this.loadGroup.addRequest(this, this._context);
-
-		this._cacheMode = false;
-		if(this.loadFlags & 4096){
-			this._cacheMode = true;
-			session.asyncOpenCacheEntry(this.URI.spec, 
-								Components.interfaces.nsICache.ACCESS_READ_WRITE, this);
-			return;
-		};
-
-		this._cacheEntry = session.openCacheEntry(this.URI.spec, 
-								Components.interfaces.nsICache.ACCESS_READ_WRITE, true);
-		this._cacheOutputStream = this._cacheEntry.openOutputStream(0, -1, 0);
-
-
-			// 呼び出し元のスレッド処理後にスタート
-		var timer = Components.classes["@mozilla.org/timer;1"]
-						.createInstance(Components.interfaces.nsITimer);
-		var timerCallback = {};
-		timerCallback._context = this;
-		timerCallback.observe = function(aTimer){
-			this._context.asyncOpenDelay();
-		}
-		timer.init(timerCallback, 0, timer.TYPE_ONE_SHOT);
-	},
-
-	onCacheEntryAvailable: function(aDescriptor, aAccessGranted, aStatus){
-		this._streamListener.onStartRequest(this, this._context);
-		
-		var inputStream = aDescriptor.openInputStream(0, -1, 0);
-		var scriptableInputStream = Components.classes["@mozilla.org/scriptableinputstream;1"]
-					.createInstance(Components.interfaces.nsIScriptableInputStream);
-		scriptableInputStream.init(inputStream);
-		var cacheContent = scriptableInputStream.read(scriptableInputStream.available());
-		this.requestRespond(cacheContent);
-		scriptableInputStream.close();
-		inputStream.close();
-		aDescriptor.close();
-		this.requestEnd();
-	},
-
-	isPending: function(){
-		return this._isPending;
-	},
-
-	cancel: function(aStatus){
-		if(this._isPending){
-			this._isPending = false;
-			
-			this._streamListener.onStopRequest(this, this._context, aStatus);
-			if(this.loadGroup){
-				try{
-					this.loadGroup.removeRequest(this, null, aStatus);
-				}catch(ex){}
-			}
-		}
-		this.status = aStatus;
-	},
-
-	resume: function(){
-		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
-	},
-	
-	suspend: function(){
-		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
-	},
-
-
-// ********** ********* implements Bbs2chChannel ********** **********
-
-	
-	/**
-	 * リクエストのスタート
-	 */
-	asyncOpenDelay: function(){
-		this._streamListener.onStartRequest(this, this._context);
-			// observer は、Bbs2chThread 等の Channel を操作するオブジェクト
-		var observer = new this._observer(this);
-	},
-
-
-	/**
-	 * リクエストにデータを送る
-	 * @param aString string データ
-	 */
-	requestRespond: function(aString){
-		aString = aString.toString();
-		var strLength = aString.length;
-
-		if(!this._cacheMode){
-			this._cacheOutputStream.write(aString, strLength);
-		}
-		
-		this._stringStream.setData(aString, strLength);
-		this._streamListener.onDataAvailable(this, this._context,
-					this._stringStream, this._dataSize, strLength);
-		this._dataSize += strLength;
-	},
-
-
-	/**
-	 * リクエストを終了する
-	 */
-	requestEnd: function(){
-		if(!this._cacheMode){
-			this._cacheOutputStream.close();
-			this._cacheEntry.setMetaDataElement("request-method", "GET");
-			this._cacheEntry.setMetaDataElement("response-head", "HTTP/1.1 200 OK\r\n");
-			this._cacheEntry.markValid();
-			this._cacheEntry.close();
-		}
-		
-		this._streamListener.onStopRequest(this, this._context, Components.results.NS_OK);
-		if(this.loadGroup){
-			try{
-				this.loadGroup.removeRequest(this, null, Components.results.NS_OK);
-			}catch(ex){}
-		}
-		this._isPending = false;
-	}
-}
\ No newline at end of file

From flyson ＠ users.sourceforge.jp  Sat Dec  3 23:20:34 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sat,  3 Dec 2005 23:20:34 +0900
Subject: [Bbs2ch-cvs 63] CVS update: bbs2chreader/components
Message-ID: <20051203142034.1875A2AC062@users.sourceforge.jp>

Index: bbs2chreader/components/nsBbs2chProtocolHandler.js
diff -u bbs2chreader/components/nsBbs2chProtocolHandler.js:1.7 bbs2chreader/components/nsBbs2chProtocolHandler.js:1.8
--- bbs2chreader/components/nsBbs2chProtocolHandler.js:1.7	Sun Nov  6 21:18:28 2005
+++ bbs2chreader/components/nsBbs2chProtocolHandler.js	Sat Dec  3 23:20:33 2005
@@ -84,10 +84,10 @@
 
 		var tmpChannel;
 		switch(mode){
-			case "bbsmenu":
+			case "bbsmenu" :
 				tmpChannel = this._redirectChannel("chrome://bbs2chreader/content/bbsmenu-page.xul");
 				break;
-			case "board:":
+			case "board:" :
 				tmpChannel = this._redirectChannel("chrome://bbs2chreader/content/board-page.xul");
 				break;
 			case "thread:" :
@@ -101,7 +101,7 @@
 				var threadFactory = new b2rThreadFactory();
 				tmpChannel = Components.classes["@mozilla.org/bbs2ch-channel;1"]
 									.createInstance(Components.interfaces.nsIBbs2chChannel);
-				tmpChannel.init(aURI, "text/plain", "Shift_JIS", threadFactory.create(aURI));
+				tmpChannel.init(aURI, "text/html", "Shift_JIS", threadFactory.create(aURI));
 				break;
 			case "board-rss:" :
 				tmpChannel = Components.classes["@mozilla.org/bbs2ch-channel;1"]
@@ -122,7 +122,6 @@
 
 	_init: function(){
 		this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/global.js");
-		this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/channel.js");
 			// use Bbs2chThread
 		this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/httprequest.js");
 		this._subScrLoader.loadSubScript("chrome://bbs2chreader/content/abone.js");
@@ -137,9 +136,7 @@
 
 
 	_redirectChannel: function(aURISpec){
-		var channelURI = Components.classes["@mozilla.org/network/standard-url;1"]
-							.createInstance(Components.interfaces.nsIURI);
-		channelURI.spec = aURISpec;
+		var channelURI = this._ioService.newURI(aURISpec, null, null);
 		return this._ioService.newChannelFromURI(channelURI);
 	},
 

From flyson ＠ users.sourceforge.jp  Sun Dec  4 01:00:31 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun,  4 Dec 2005 01:00:31 +0900
Subject: [Bbs2ch-cvs 64] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051203160031.B06462AC04C@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-items.js
diff -u bbs2chreader/content/bbs2chreader/board-items.js:1.12 bbs2chreader/content/bbs2chreader/board-items.js:1.13
--- bbs2chreader/content/bbs2chreader/board-items.js:1.12	Sun Nov 13 04:13:16 2005
+++ bbs2chreader/content/bbs2chreader/board-items.js	Sun Dec  4 01:00:31 2005
@@ -258,7 +258,6 @@
 				this._items.push(logItemHash[i]);
 			}
 		}
-		dump("Bbs2chBoardItems.refresh : "+ (new Date().getTime() - startTime) +"ms\n");
 	},
 
 
@@ -356,12 +355,21 @@
 
 	search: function(aSearchString){
 		if(!this._lastItems) this._lastItems = this.items.concat();
-		aSearchString = aSearchString.toLowerCase();
-		
+
+		var unicodeNormalizer  = Components.classes["@mozilla.org/intl/unicodenormalizer;1"]
+				.createInstance(Components.interfaces.nsIUnicodeNormalizer);
+		var normalizedStr = {};
+								
+		var searchString = aSearchString.toLowerCase();
+		unicodeNormalizer.NormalizeUnicodeNFKC(searchString, normalizedStr);
+		searchString = normalizedStr.value;
+
 		var resultItems = new Array();
 		for(var i=0; i<this._lastItems.length; i++){
-			var title = this._lastItems[i].title.toLowerCase();;
-			if(title.indexOf(aSearchString) != -1)
+			var title = this._lastItems[i].title.toLowerCase();
+			unicodeNormalizer.NormalizeUnicodeNFKC(title, normalizedStr);
+			title = normalizedStr.value;
+			if(title.indexOf(searchString) != -1)
 					resultItems.push(this._lastItems[i]);
 		}
 		return this._items = resultItems;

From flyson ＠ users.sourceforge.jp  Sun Dec  4 01:37:45 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun,  4 Dec 2005 01:37:45 +0900
Subject: [Bbs2ch-cvs 65] CVS update: bbs2chreader/skin/classic/bbs2chreader
Message-ID: <20051203163745.B8E042AC10D@users.sourceforge.jp>

Index: bbs2chreader/skin/classic/bbs2chreader/type-be2ch.gif

From flyson ＠ users.sourceforge.jp  Sun Dec  4 01:51:14 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun,  4 Dec 2005 01:51:14 +0900
Subject: [Bbs2ch-cvs 66] CVS update: bbs2chreader/skin/classic/bbs2chreader
Message-ID: <20051203165114.DAEC82AC11D@users.sourceforge.jp>

Index: bbs2chreader/skin/classic/bbs2chreader/type-jbbs.gif
Index: bbs2chreader/skin/classic/bbs2chreader/bbsmenu-page.css
diff -u bbs2chreader/skin/classic/bbs2chreader/bbsmenu-page.css:1.5 bbs2chreader/skin/classic/bbs2chreader/bbsmenu-page.css:1.6
--- bbs2chreader/skin/classic/bbs2chreader/bbsmenu-page.css:1.5	Sun Nov 20 14:33:14 2005
+++ bbs2chreader/skin/classic/bbs2chreader/bbsmenu-page.css	Sun Dec  4 01:51:14 2005
@@ -15,6 +15,14 @@
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
+/* JBBS */
+#treeBbsMenu treechildren::-moz-tree-image(type-3) {
+  margin: 0px 2px;
+  list-style-image: url("chrome://bbs2chreader/skin/type-jbbs.gif") !important;
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+
 /* Machi BBS */
 #treeBbsMenu treechildren::-moz-tree-image(type-4) {
   margin: 0px 2px;

From flyson ＠ users.sourceforge.jp  Sun Dec 11 01:52:40 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 11 Dec 2005 01:52:40 +0900
Subject: [Bbs2ch-cvs 67] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051210165240.E4EC32AC0A3@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/post.js
diff -u bbs2chreader/content/bbs2chreader/post.js:1.1 bbs2chreader/content/bbs2chreader/post.js:1.2
--- bbs2chreader/content/bbs2chreader/post.js:1.1	Tue Sep 13 22:41:22 2005
+++ bbs2chreader/content/bbs2chreader/post.js	Sun Dec 11 01:52:40 2005
@@ -180,7 +180,8 @@
 
 			//本文の長さチェック
 		var checkMessage=this._escape(this.message).replace(/%[0-9a-fA-F]{2}/g,"x");
-		if(checkMessage.length > this.board.getSetting("BBS_MESSAGE_COUNT")){
+		var bbsMessageCount = this.board.getSetting("BBS_MESSAGE_COUNT");
+		if(bbsMessageCount && checkMessage.length > bbsMessageCount){
 			flag |= this.ERROR_MESSAGE_TOO_LONG;
 		}
 
@@ -191,13 +192,15 @@
 
 			//名前の長さチェック
 		var checkName=this._escape(this.name).replace(/%[0-9a-fA-F]{2}/g,"x");
-		if(checkName.length > this.board.getSetting("BBS_NAME_COUNT")){
+		var bbsNameCount = this.board.getSetting("BBS_NAME_COUNT");
+		if(bbsNameCount && checkName.length > bbsNameCount){
 			flag |= this.ERROR_NAME_TOO_LONG;
 		}
 
 			//メールの長さチェック
 		var checkMail = this._escape(this.mail).replace(/%[0-9a-fA-F]{2}/g,"x");
-		if(checkMail.length > this.board.getSetting("BBS_MAIL_COUNT")){
+		var bbsMailCount = this.board.getSetting("BBS_MAIL_COUNT");
+		if(bbsMailCount && checkMail.length > bbsMailCount){
 			flag |= this.ERROR_MAIL_TOO_LONG;
 		}
 

From flyson ＠ users.sourceforge.jp  Mon Dec 12 02:19:11 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Mon, 12 Dec 2005 02:19:11 +0900
Subject: [Bbs2ch-cvs 68] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051211171911.9DEA62AC011@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-page.xul
diff -u bbs2chreader/content/bbs2chreader/board-page.xul:1.13 bbs2chreader/content/bbs2chreader/board-page.xul:1.14
--- bbs2chreader/content/bbs2chreader/board-page.xul:1.13	Sat Aug  6 01:55:06 2005
+++ bbs2chreader/content/bbs2chreader/board-page.xul	Mon Dec 12 02:19:11 2005
@@ -7,7 +7,7 @@
 	%board-page-dtd;
 ]>
 <page id="pageMain" onload="startup()" onunload="shutdown()"
-	onmousedown="event.preventBubble()" onkeypress="event.preventBubble()"
+	onmousedown="eventBubbleCheck(event)" onkeypress="eventBubbleCheck(event)"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<script type="application/x-javascript" src="chrome://bbs2chreader/content/lib/clipboard.js"/>
Index: bbs2chreader/content/bbs2chreader/board-page.js
diff -u bbs2chreader/content/bbs2chreader/board-page.js:1.24 bbs2chreader/content/bbs2chreader/board-page.js:1.25
--- bbs2chreader/content/bbs2chreader/board-page.js:1.24	Sun Nov 20 14:33:14 2005
+++ bbs2chreader/content/bbs2chreader/board-page.js	Mon Dec 12 02:19:11 2005
@@ -103,6 +103,16 @@
 
 
 /**
+ * ブラウザへのイベントフロー抑制
+ */
+function eventBubbleCheck(aEvent){
+	// オートスクロールや Find As You Type を抑制しつつキーボードショートカットを許可
+	if(!(aEvent.ctrlKey || aEvent.shiftKey || aEvent.altKey || aEvent.metaKey))
+		aEvent.preventBubble();
+}
+
+
+/**
  * TreeSubject の初期化
  */
 function initTreeSubject(){

From flyson ＠ users.sourceforge.jp  Mon Dec 12 02:59:10 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Mon, 12 Dec 2005 02:59:10 +0900
Subject: [Bbs2ch-cvs 69] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051211175910.6A0C22AC011@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/statusbar.xml
diff -u bbs2chreader/content/bbs2chreader/statusbar.xml:1.1 bbs2chreader/content/bbs2chreader/statusbar.xml:1.2
--- bbs2chreader/content/bbs2chreader/statusbar.xml:1.1	Mon Aug 22 21:42:29 2005
+++ bbs2chreader/content/bbs2chreader/statusbar.xml	Mon Dec 12 02:59:10 2005
@@ -14,6 +14,8 @@
 				label="Write" tooltiptext="Write this thread"/>
 		<xul:toolbarbutton anonid="btnDeleteLog" class="b2rstatusbar-button"
 				label="Delete Log" tooltiptext="Delete this thread Log Files"/>
+		<xul:toolbarbutton anonid="btnViewBrowser" class="b2rstatusbar-button"
+				label="View Browser" tooltiptext="View this thread For Browser"/>
 	</content>
 
 	<resources>
@@ -54,6 +56,9 @@
 					case "btnDeleteLog":
 						this._deleteLog();
 						break;
+					case "btnViewBrowser":
+						this._viewBrowser(false);
+						break;
 				}
 			]]></body>
 		</method>
@@ -67,6 +72,9 @@
 					case "btnGoToBoard":
 						this._goToBoard(true);
 						break;
+					case "btnViewBrowser":
+						this._viewBrowser(true);
+						break;
 				}
 			]]></body>
 		</method>
@@ -120,6 +128,17 @@
 				}catch(ex){}
 			]]></body>
 		</method>
+
+		<method name ="_viewBrowser">
+			<parameter name="aAddTab"/>
+			<body><![CDATA[
+				var currentURLSpec = this._getCurrentThreadURLSpec();
+				if(!currentURLSpec) return;
+				var bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
+						.getService(Components.interfaces.nsIBbs2chService);
+				bbs2chService.openURL(currentURLSpec, null, aAddTab);
+			]]></body>
+		</method>
 	</implementation>
 
 	<handlers>

From flyson ＠ users.sourceforge.jp  Mon Dec 12 02:59:10 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Mon, 12 Dec 2005 02:59:10 +0900
Subject: [Bbs2ch-cvs 70] CVS update: bbs2chreader/skin/classic/bbs2chreader
Message-ID: <20051211175910.8E3D82AC0B3@users.sourceforge.jp>

Index: bbs2chreader/skin/classic/bbs2chreader/ff-statusbar.gif
Index: bbs2chreader/skin/classic/bbs2chreader/ff-statusbar.css
diff -u bbs2chreader/skin/classic/bbs2chreader/ff-statusbar.css:1.1 bbs2chreader/skin/classic/bbs2chreader/ff-statusbar.css:1.2
--- bbs2chreader/skin/classic/bbs2chreader/ff-statusbar.css:1.1	Mon Aug 22 21:43:34 2005
+++ bbs2chreader/skin/classic/bbs2chreader/ff-statusbar.css	Mon Dec 12 02:59:10 2005
@@ -24,4 +24,8 @@
 
 .b2rstatusbar-button[anonid="btnDeleteLog"] {
   -moz-image-region: rect(0px, 36px, 12px, 24px);
+}
+
+.b2rstatusbar-button[anonid="btnViewBrowser"] {
+  -moz-image-region: rect(0px, 48px, 12px, 36px);
 }
\ No newline at end of file

From flyson ＠ users.sourceforge.jp  Wed Dec 14 00:37:02 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Wed, 14 Dec 2005 00:37:02 +0900
Subject: [Bbs2ch-cvs 71] CVS update: bbs2chreader/content/bbs2chreader/res
Message-ID: <20051213153702.479A22AC0BB@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/res/outside.xml
diff -u /dev/null bbs2chreader/content/bbs2chreader/res/outside.xml:1.1
--- /dev/null	Wed Dec 14 00:37:02 2005
+++ bbs2chreader/content/bbs2chreader/res/outside.xml	Wed Dec 14 00:37:02 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="SHIFT_JIS"?>
+<!--
+	type ?
+	0 = 2ch ? BBS
+	1 = ? 2ch ? BBS (???)
+	2 = Be ＠ 2ch BBS
+	3 = livedoor ???? BBS
+	4 = ??BBS (???)
+	5 = ??y??
+-->
+<bbsmenu>
+<category title="???">
+	<board title="bbs2ch ?ｮ???" url="http://bbs2ch.sourceforge.jp/" type="5"/>
+	<board title="bbs2ch ????" url="http://yy22.kakiko.com/bbs2ch/" type="0"/>
+	<category title="2ch Browser">
+		<board title="Monazilla ＠ JBBS" url="http://jbbs.livedoor.jp/computer/351/" type="3"/>
+		<board title="??????? url="http://dtao.cside.com/distrust/stdskin/" type="0"/>
+		<board title="Moz2ch???" url="http://baniisan.s12.xrea.com/x/moz2ch/" type="0"/>
+		<board title="Jane???ｦ?" url="http://jane.s28.xrea.com/bbs/" type="1"/>
+		<board title="??ｮ?????" url="http://flounder.s27.xrea.com/bbs/giko/" type="1"/>
+		<board title="??ｮ??????" url="http://zonutan.hacca.jp/bbs/zonu/" type="0"/>
+		<board title="?????" url="http://tmhkym.net/maka/bbs/maka/" type="0"/>
+	</category>
+</category>
+
+</bbsmenu>
\ No newline at end of file

From flyson ＠ users.sourceforge.jp  Wed Dec 14 00:37:43 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Wed, 14 Dec 2005 00:37:43 +0900
Subject: [Bbs2ch-cvs 72] CVS update: bbs2chreader/content/bbs2chreader/bbsmenu
Message-ID: <20051213153743.3B56B2AC0BB@users.sourceforge.jp>



From flyson ＠ users.sourceforge.jp  Wed Dec 14 00:39:03 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Wed, 14 Dec 2005 00:39:03 +0900
Subject: [Bbs2ch-cvs 73] CVS update: bbs2chreader/content/bbs2chreader/bbsmenu
Message-ID: <20051213153903.2767E2AC0DF@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/bbsmenu/updater.xml
diff -u /dev/null bbs2chreader/content/bbs2chreader/bbsmenu/updater.xml:1.1
--- /dev/null	Wed Dec 14 00:39:03 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu/updater.xml	Wed Dec 14 00:39:03 2005
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+
+<bindings id="bbsmenuUpdaterBindings"
+		xmlns="http://www.mozilla.org/xbl"
+		xmlns:xbl="http://www.mozilla.org/xbl"
+		xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+
+<binding id="bbsmenuUpdater">
+	<content>
+		<xul:hbox flex="1">
+			<xul:progressmeter anonid="prgrsMeter" flex="1" style="min-width:50px"/>
+			<xul:toolbarbutton anonid="btnCancel" label="X"/>
+			<xul:spacer class="small-margin"/>
+		</xul:hbox>
+	</content>
+
+	<resources>
+		<stylesheet src="chrome://bbs2chreader/skin/ff-statusbar.css"/>
+	</resources>
+
+	<implementation>
+		<field name="_bbs2chService"/>
+		<field name="_bbsMenuFile"/>
+		<field name="_downloader"/>
+		<field name="_prgrsMeter"/>
+		<property name="bbsMenuFile" onget="return this._bbsMenuFile" readonly="true"/>
+
+		<constructor><![CDATA[
+			this._bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
+						.getService(Components.interfaces.nsIBbs2chService);
+			this._bbsMenuFile = this._bbs2chService.getDataDir();
+			this._bbsMenuFile.appendRelativePath("bbsmenu.html");
+
+			this._downloader = null;
+			this._prgrsMeter = document.getAnonymousElementByAttribute(
+						this, "anonid", "prgrsMeter");
+			this._prgrsMeter.value = 0;
+		]]></constructor>
+
+		<destructor>this.cancel()</destructor>
+
+
+		<method name="_fireEvent">
+			<parameter name="aEventType"/>
+			<body><![CDATA[
+				var event = document.createEvent("Events");
+				event.initEvent(aEventType, false, true);
+
+				var noCancel = this.dispatchEvent(event);
+				var handler = this.getAttribute("on" + aEventType);
+				if(handler){
+					var fn = new Function("event", handler);
+					var returned = fn(event);
+					if (returned == false) noCancel = false;
+				}
+				return noCancel;
+			]]></body>
+		</method>
+
+		<method name ="update">
+			<body><![CDATA[
+				var urlSpec = this._bbs2chService.pref.getCharPref(
+								"fls.bbs2chreader.bbsmenu_load_url");
+				var filePath = this._bbsMenuFile.path;
+				this._downloader = new Bbs2chDownloader(urlSpec, filePath);
+				this._downloader._context = this;
+				this._downloader.onStart = function(aDownloader){
+					var context = this._context;
+					context._prgrsMeter.mode = "undetermined";
+				};
+
+				this._downloader.onStop = function(aDownloader, aStatus){
+					var context = this._context;
+					context._prgrsMeter.mode = "determined";
+					context._prgrsMeter.value = 0;
+					context._downloader = null;
+					context._fireEvent("updated");
+				};
+
+				this._downloader.onProgressChange = function(aDownloader, aPercentage){
+					var context = this._context;
+					context._prgrsMeter.mode = "determined";
+					context._prgrsMeter.value = aPercentage;
+				};
+				this._downloader.onError = function(aDownloader, aErrorCode){
+					var context = this._context;
+					context._prgrsMeter.mode = "determined";
+					context._prgrsMeter.value = 0;
+					context._fireEvent("upddateerror");
+				};
+				this._downloader.download();
+			]]></body>
+		</method>
+
+		<method name ="cancel">
+			<body><![CDATA[
+				if(this._downloader && this._downloader.loading)
+						this._downloader.abort(true);
+			]]></body>
+		</method>
+
+		<method name ="_doCommand">
+			<parameter name="aEvent"/>
+			<body><![CDATA[
+				var targetElement = aEvent.originalTarget;
+				var anonymousID = targetElement.getAttribute("anonid");
+				switch(anonymousID){
+					case "btnCancel":
+						this.cancel();
+						break;
+				}
+			]]></body>
+		</method>
+	</implementation>
+
+	<handlers>
+		<handler event="command" action="this._doCommand(event)"/>
+	</handlers>
+</binding>
+
+
+</bindings>
\ No newline at end of file
Index: bbs2chreader/content/bbs2chreader/bbsmenu/treeview.js
diff -u /dev/null bbs2chreader/content/bbs2chreader/bbsmenu/treeview.js:1.1
--- /dev/null	Wed Dec 14 00:39:03 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu/treeview.js	Wed Dec 14 00:39:03 2005
@@ -0,0 +1,210 @@
+function b2rBbsmenuTreeView(){
+	this._items = new Array();
+	this._viewItems = new Array();
+}
+
+b2rBbsmenuTreeView.prototype = {
+
+	get items(){
+		return this._items;
+	},
+
+	get viewItems(){
+		return this._viewItems;
+	},
+
+	get searchString(){
+		return this._searchString;
+	},
+	set searchString(aValue){
+		this._searchString = aValue;
+		this._searchMode = (aValue != "");
+
+		this._treeBox.rowCountChanged(0, - this.rowCount);
+		this._refreshItems();
+		this._treeBox.rowCountChanged(0, this.rowCount);
+		
+		return aValue;
+	},
+
+	get searchMode(){
+		return this._searchMode;
+	},
+	
+	init: function(){
+		this._atomService = Components.classes["@mozilla.org/atom-service;1"]
+				.getService(Components.interfaces.nsIAtomService);
+		this._searchMode = false;
+		this._items = new Array();
+
+		var openedCategories = gTreeBbsMenu.getAttribute("openedCategories");
+		openedCategories = openedCategories.split(" ");
+		openedCategories = openedCategories.map(function(aElement, aIndex, aArray){
+			return decodeURI(aElement);
+		});
+		for(var i=0; i<arguments.length; i++){
+			var doc = arguments[i];
+			if(doc.documentElement.localName != "bbsmenu") continue;
+			doc.documentElement._item = null;
+			var allElements = doc.documentElement.getElementsByTagName("*");
+			for(var j=0; j<allElements.length; j++){
+				var element = allElements[j];
+				var item = {};
+				item.title = element.getAttribute("title");
+				item.url = element.getAttribute("url");
+				item.type = element.getAttribute("type");
+				item.isSeparator = (element.localName == "separator");
+				item.isContainer = (element.localName == "category");
+				item.isOpen = ((item.isContainer) && (openedCategories.indexOf(item.title) != -1));
+				element._item = item;
+				item.parent = (element.parentNode._item) ? element.parentNode._item : null;
+				item.level = (item.parent) ? item.parent.level + 1 : 0;
+				this._items.push(item);
+			}
+		}
+		this._refreshItems();
+	},
+	
+	_refreshItems: function(){
+		this._viewItems = new Array();
+
+		if(this.searchMode){
+			var unicodeNormalizer  = Components.classes["@mozilla.org/intl/unicodenormalizer;1"]
+					.createInstance(Components.interfaces.nsIUnicodeNormalizer);
+			var normalizedStr = {};
+
+			var searchString = this.searchString.toLowerCase();
+			unicodeNormalizer.NormalizeUnicodeNFKC(searchString, normalizedStr);
+			searchString = normalizedStr.value;
+
+			var items = this.items;
+			for(var i=0; i<items.length; i++){
+				var item = items[i];
+				if(item.isContainer) continue;
+				var title = item.title.toLowerCase();
+				unicodeNormalizer.NormalizeUnicodeNFKC(title, normalizedStr);				
+				title = normalizedStr.value;
+				if(title.indexOf(searchString) != -1)
+					this._viewItems.push(item);
+			}
+			return;
+		}
+		
+		for(var i=0; i<this.items.length; i++){
+			var item = this.items[i];
+			var view = true;
+			var parent = item.parent;
+			
+			for(var parent=item.parent; parent!=null; parent=parent.parent){
+				if(!parent.isOpen) view = false;
+			}
+			if(view) this._viewItems.push(item);
+		}
+	},
+
+	persistOpenedCategories: function(){
+		var openedCategories = new Array();
+		this.viewItems.forEach(function(aElement, aIndex, aArray){
+			if(aElement.isOpen) this.push(encodeURI(aElement.title));
+		}, openedCategories);
+		gTreeBbsMenu.setAttribute("openedCategories", openedCategories.join(" "));
+	},
+
+
+// ********** ********* implements nsITreeView ********** **********
+
+	get rowCount(){
+		return this.viewItems.length;
+	},
+	
+	selection: null,
+
+	getCellText : function(aRow, aCol){
+		if(this.viewItems[aRow].isSeparator) return "";
+		return this.viewItems[aRow][aCol.id];
+	},
+
+	setTree: function(aTree){
+		this._treeBox = aTree;
+	},
+
+	cycleHeader: function(aCol, aElement){
+	},
+
+	getRowProperties: function(aIndex, aProperties){},
+	getCellProperties: function(aRow, aCol, aProperties){
+		if(this.viewItems[aRow].isSeparator) return;
+		if(aCol.primary){
+			aProperties.AppendElement(this._atomService.getAtom("Name"));
+			var type = this.viewItems[aRow].type;
+			if(type)
+				aProperties.AppendElement(this._atomService.getAtom("type-" + type));
+		}
+	},
+	getColumnProperties: function(aCol, aColElement, aProperties){},
+	isContainer: function(aRow){
+		return this.viewItems[aRow].isContainer;
+	},
+	isContainerOpen: function(aRow){
+		if(this.viewItems[aRow].isContainer){
+			return this.viewItems[aRow].isOpen;
+		}
+		return false;
+	},
+	isContainerEmpty: function(aRow){
+		return false;
+	},
+	isSeparator: function(aRow){
+		return this.viewItems[aRow].isSeparator;	
+	},
+	isSorted: function(aRow){},
+	canDropOn: function(aIndex){},
+	canDropBeforeAfter: function(aIndex, aBefore){},
+	drop: function(aIndex, aOrientation){},
+	getParentIndex: function getParentIndex(aIndex){
+		if(this.searchMode) return -1;
+		if(this.viewItems[aIndex].isContainer) return -1;
+
+		var parent = this.viewItems[aIndex].parent;
+		if(!parent) return -1;
+		return this.viewItems.indexOf(parent);
+	},
+	hasNextSibling: function(aIndex, aAfterIndex){
+		if(this.searchMode) return false;
+		if(aIndex + 1 == this.viewItems.length) return false;
+
+		var item = this.viewItems[aIndex];
+		if(item.isContainer){
+			for(var i=aIndex+1; i<this.viewItems.length; i++){
+				if(item.parent == this.viewItems[i].parent) return true;
+			}
+			return false;
+		}else if(item.level == this.viewItems[aIndex+1].level){
+			return true;
+		}
+		return false;
+	},
+ 	getLevel: function(aIndex){
+		if(this.searchMode) return 0;
+		return this.viewItems[aIndex].level;
+	},
+	getImageSrc: function(aRow, aCol){},
+	getProgressMode: function(aRow, aCol){},
+	getCellValue: function(aRow, aCol){},
+	selectionChanged: function(){},
+	cycleCell: function(aRow, aCol){},
+	isEditable: function(aRow, aCol){},
+	setCellText: function(aRow, aCol, aValue){},
+	toggleOpenState: function(aIndex){
+		var category = this.viewItems[aIndex];
+		category.isOpen = !category.isOpen;
+		var lastCount = this.rowCount;
+		this._refreshItems();
+		var delta = this.rowCount - lastCount;
+		this._treeBox.rowCountChanged(aIndex + 1, delta);
+		this._treeBox.invalidateRow(aIndex);		
+	},
+	performAction: function(aAction){},
+	performActionOnRow: function(aAction, aRow){},
+	performActionOnCell: function(aAction, aRow, aCol){}
+}
\ No newline at end of file
Index: bbs2chreader/content/bbs2chreader/bbsmenu/page.xul
diff -u /dev/null bbs2chreader/content/bbs2chreader/bbsmenu/page.xul:1.1
--- /dev/null	Wed Dec 14 00:39:03 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu/page.xul	Wed Dec 14 00:39:03 2005
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="EUC-JP"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://bbs2chreader/skin/bbsmenu-page.css" type="text/css"?>
+
+<!DOCTYPE page [
+	<!ENTITY % bbsmenu-page-dtd SYSTEM "chrome://bbs2chreader/locale/bbsmenu-page.dtd">
+	%bbsmenu-page-dtd;
+]>
+<page id="pageMain" title="BBSMENU [bbs2chreader]"
+	onload="startup()" onunload="shutdown()"
+	onmousedown="event.preventBubble()" onkeypress="event.preventBubble()"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+<script type="application/x-javascript" src="chrome://bbs2chreader/content/lib/downloader.js"/>
+<script type="application/x-javascript" src="chrome://bbs2chreader/content/lib/clipboard.js"/>
+<script type="application/x-javascript" src="chrome://bbs2chreader/content/lib/rdf.js"/>
+<script type="application/x-javascript" src="chrome://bbs2chreader/content/bbsmenu/treeview.js"/>
+<script type="application/x-javascript" src="chrome://bbs2chreader/content/bbsmenu/page.js"/>
+
+<popupset>
+	<popup id="popBbsMenuContext"
+				onpopupshowing="return showBbsMenuContext(event)">
+		<menuitem label="&ctxtOpen.label;" oncommand="openBoard(false)"/>
+		<menuitem label="&ctxtOpenInNewTab.label;" oncommand="openBoard(true)"/>
+		<menuseparator/>
+		<menuitem label="&ctxtCopuURL.label;" oncommand="copyURL(false)"/>
+		<menuitem label="&ctxtCopuURLnTitle.label;" oncommand="copyURL(true)"/>
+	</popup>
+</popupset>
+
+<hbox align="center">
+	<textbox id="search-box" value="" flex="1" type="autocomplete"
+			autocompletesearch="form-history"
+			autocompletesearchparam="bbs2ch-bbsmenu-history"
+			ontextentered="searchTitle(this.value)"/>
+	<toolbarbutton id="btnHistory" label="&history.label;" type="menu">
+		<menupopup id="popHistory" onpopupshowing="updateHistoryMenu()"
+				onclick="popHistoryClick(event)"/>
+	</toolbarbutton>
+	<toolbarbutton label="&tools.label;" type="menu">
+		<menupopup>
+			<menuitem label="&bbsmenuUpdate.label;" oncommand="bbsmenuUpdate()"/>
+			<menuseparator/>
+			<menuitem label="&openLogsDirectory.label;" oncommand="openLogsDir()"/>
+			<menuitem label="&options.label;" oncommand="openSettings()"/>
+			<menuitem label="&about.label;" oncommand="openAbout()"/>
+		</menupopup>
+	</toolbarbutton>
+	<spacer class="small-margin"/>
+</hbox>
+
+<hbox id="bbsmenuUpdater" collapsed="true"
+	onupdated="onBbsmenuUpdated()" onupddateerror="alert('UPDATE ERROR')"
+	style="-moz-binding:url(chrome://bbs2chreader/content/bbsmenu/updater.xml#bbsmenuUpdater)"/>
+
+<tree id="treeBbsMenu" onclick="treeBbsMenuClick(event)" hidecolumnpicker="true"
+		context="popBbsMenuContext"
+		persist="openedCategories" flags="dont-build-content" class="plain" flex="1">
+	<treecols>
+		<treecol id="title" flex="1" hideheader="true" primary="true"/>
+	</treecols>
+	<treechildren/>
+</tree>
+
+<!-- History Menu -->
+<tree flex="1" id="treeHiddenHistory" hidden="true" collapsed="true"
+	datasources="rdf:null" flags="dont-build-content" hidecolumnpicker="true">
+	<template>
+		<rule>
+			<treechildren>
+				<treeitem uri="rdf:*" rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
+					<treerow>
+						<treecell label="rdf:http://home.netscape.com/NC-rdf#Date"/>
+					</treerow>
+				</treeitem>
+			</treechildren>
+		</rule>
+	</template>
+	<treecols>
+		<treecol flex="1" id="ColHiddenHistoryTreeDate" hideheader="true"
+				primary="true" sort="rdf:http://home.netscape.com/NC-rdf#Date"
+				sortActive="true" sortDirection="descending"/>
+	</treecols>
+</tree>
+
+</page>
\ No newline at end of file
Index: bbs2chreader/content/bbs2chreader/bbsmenu/page.js
diff -u /dev/null bbs2chreader/content/bbs2chreader/bbsmenu/page.js:1.1
--- /dev/null	Wed Dec 14 00:39:03 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu/page.js	Wed Dec 14 00:39:03 2005
@@ -0,0 +1,412 @@
+var gBbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
+			.getService(Components.interfaces.nsIBbs2chService);
+
+var gBbsmenuUpdater
+var gTreeBbsMenu;
+var gTreeBbsMenuView;
+var gBbsMenuFile;
+var gBbsMenuXMLFile;
+var gHistoryRDF;
+
+function startup(){
+	gBbsmenuUpdater = document.getElementById("bbsmenuUpdater");
+	gTreeBbsMenu = document.getElementById("treeBbsMenu");
+	gBbsMenuFile = gBbs2chService.getDataDir();
+	gBbsMenuFile.appendRelativePath("bbsmenu.html");
+	gBbsMenuXMLFile = gBbs2chService.getDataDir();
+	gBbsMenuXMLFile.appendRelativePath("bbsmenu.xml");
+
+
+	gHistoryRDF = new Bbs2chRDF();
+	gHistoryRDF.initWithRDFURL("rdf:history");
+	var btnHistory = document.getElementById("btnHistory");
+	btnHistory.hidden = !gBbs2chService.pref.getBoolPref(
+								"fls.bbs2chreader.bbsmenu_historymenu_show");
+
+	if(gBbsMenuXMLFile.exists()){
+		initTreeBbsMenu();
+	}else{	// bbsmenu.html ??????ｩ????
+		bbsmenuUpdate();
+	}
+}
+
+function shutdown(){
+	if(gTreeBbsMenuView) gTreeBbsMenuView.persistOpenedCategories();
+	gTreeBbsMenu.view = null;
+}
+
+
+function initTreeBbsMenu(){
+	if(!gBbsMenuXMLFile.exists()){
+		createBbsmenuXML();
+	}else if(gBbsMenuFile.exists() && 
+					(gBbsMenuXMLFile.lastModifiedTime < gBbsMenuFile.lastModifiedTime)){
+		createBbsmenuXML();	
+	}
+
+	var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+				.getService(Components.interfaces.nsIIOService);
+	var bbsMenuXMLURL = ioService.newFileURI(gBbsMenuXMLFile);
+	var bbsmenuDoc = document.implementation.createDocument("", "", null);
+	bbsmenuDoc.async = false;
+	bbsmenuDoc.load(bbsMenuXMLURL.spec);
+
+		// ???
+	var	outsidexmlFile = gBbs2chService.getDataDir();
+	outsidexmlFile.appendRelativePath("outside.xml");
+	if(!outsidexmlFile.exists()){
+		var outsideContent = gBbs2chService.readLocalURI(
+				"chrome://bbs2chreader/content/res/outside.xml");
+		gBbs2chService.writeFile(outsidexmlFile.path, outsideContent, false);
+	}
+	var outsideXMLURL = ioService.newFileURI(outsidexmlFile);
+	var outsideDoc = document.implementation.createDocument("", "", null);
+	outsideDoc.async = false;
+	outsideDoc.load(outsideXMLURL.spec);
+
+	// outsideDoc.documentElement.appendChild(outsideDoc.createElement("separator"));
+
+	gTreeBbsMenu.view = null;
+	gTreeBbsMenuView = new b2rBbsmenuTreeView();
+	gTreeBbsMenuView.init(outsideDoc, bbsmenuDoc);
+	gTreeBbsMenu.view = gTreeBbsMenuView;
+}
+
+
+function createBbsmenuXML(){
+		// bbsmenu.html ??????????????
+	var contentLines = gBbs2chService.readFile(gBbsMenuFile.path);
+	contentLines = gBbs2chService.fromSJIS(contentLines);
+		// ??????????????+	contentLines = contentLines.replace(/<\/B><BR><A HREF/igm, "</B><BR>\n<A HREF");
+	contentLines = contentLines.split("\n");
+
+	var categoryReg = /<BR><B>([^<]+)<\/B><BR>/i;
+	var threadReg	= /^<A HREF=([^> ]+)>([^<]+)<\/A>/i;
+	var threadReg2	= /^<A HREF=([^> ]+) TARGET=_blank>([^<]+)<\/A>/i;
+
+	var currentCategory = null;
+	var doc = new DOMParser().parseFromString("<bbsmenu/>", "text/xml");
+	for(var i=0; i<contentLines.length; i++){
+		var line = contentLines[i];
+		if(categoryReg.test(line)){
+			currentCategory = doc.createElement("category");
+			currentCategory.setAttribute("title", RegExp.$1);
+			doc.documentElement.appendChild(currentCategory);
+		}else if((threadReg.test(line) || threadReg2.test(line)) && currentCategory){
+			var board = doc.createElement("board");
+			board.setAttribute("title", RegExp.$2);
+			var url = RegExp.$1;
+			url = url.replace(/"/g, "");
+			board.setAttribute("url", url);
+			try{
+				board.setAttribute("type", gBbs2chService.getBoardType(url));
+				currentCategory.appendChild(board);
+			}catch(ex){
+				dump(RegExp.$1 +"\n");
+			}
+		}
+	}
+	var xmlSource = new XMLSerializer().serializeToString(doc);
+	xmlSource = gBbs2chService.toSJIS(xmlSource);
+	xmlSource = xmlSource.replace(/></gm, ">\n<");
+	xmlSource = xmlSource.replace(/<board/gm, "\t<board");
+	xmlSource = '<?xml version="1.0" encoding="SHIFT_JIS"?>\n' + xmlSource;
+	gBbs2chService.writeFile(gBbsMenuXMLFile.path, xmlSource, false);
+}
+
+
+/**
+ * ?????? History ?????????
+ */
+function updateHistoryMenu(){
+	const NS_NC_NAME = "http://home.netscape.com/NC-rdf#Name";
+
+	var popHistory = document.getElementById("popHistory");
+	while(popHistory.hasChildNodes()){
+		popHistory.removeChild(popHistory.firstChild);
+	}
+
+	var treeHiddenHistory = document.getElementById("treeHiddenHistory");
+	if(treeHiddenHistory.hidden){
+		treeHiddenHistory.hidden = false;
+		treeHiddenHistory.database.AddDataSource(gHistoryRDF.ds);
+	}
+	
+	treeHiddenHistory.ref = "find:datasource=history&match=URL&method=startswith&text=bbs2ch:board:";
+	var boardCount = treeHiddenHistory.treeBoxObject.view.rowCount;
+	var boardMax = gBbs2chService.pref.getIntPref("fls.bbs2chreader.bbsmenu_historymenu_board_max");
+	if(boardMax > 15) boardMax = 15;
+	if(boardCount > boardMax) boardCount = boardMax;
+	if(boardCount > 0){
+		for(var i=0; i<boardCount; i++){
+			try{
+				var url = treeHiddenHistory.builder.getResourceAtIndex(i).Value;
+				var title = gHistoryRDF.getLiteralProperty(url, NS_NC_NAME);
+				title = title.replace(" [bbs2chreader]", "");
+				var menuNode = document.createElement("menuitem");
+				menuNode.setAttribute("label", title);
+				menuNode.setAttribute("value", url);
+				menuNode.setAttribute("tooltiptext", url);
+				popHistory.appendChild(menuNode);
+			}catch(ex){}
+		}
+	}
+
+	treeHiddenHistory.ref = "find:datasource=history&match=URL&method=startswith&text=bbs2ch:thread:";
+	var threadCount = treeHiddenHistory.treeBoxObject.view.rowCount;
+	var threadMax = gBbs2chService.pref.getIntPref("fls.bbs2chreader.bbsmenu_historymenu_thread_max");
+	if(threadMax > 15) threadMax = 15;
+	if(threadCount > threadMax) threadCount = threadMax;
+	if(threadCount > 0){
+		if(boardCount > 0) popHistory.appendChild(document.createElement("menuseparator"));
+		
+		for(i=0; i<threadCount; i++){
+			try{
+				url = treeHiddenHistory.builder.getResourceAtIndex(i).Value;
+				title = gHistoryRDF.getLiteralProperty(url, NS_NC_NAME);
+				title = title.replace(" [bbs2chreader]", "");
+				menuNode = document.createElement("menuitem");
+				menuNode.setAttribute("label", title);
+				menuNode.setAttribute("value", url);
+				menuNode.setAttribute("tooltiptext", url);
+				popHistory.appendChild(menuNode);
+			}catch(ex){}
+		}
+	}
+}
+
+
+/**
+ * History ????????????????????+ * @param aEvent event ??????????
+ */
+function popHistoryClick(aEvent){
+	var target = aEvent.originalTarget;
+	if(target.localName != "menuitem" || !(target.value)) return;
+	if(aEvent.button == 0){
+		gBbs2chService.openURL(target.value, null, false);
+	}else if(aEvent.button == 1){
+		target.parentNode.hidePopup();
+		gBbs2chService.openURL(target.value, null, true);	
+	}
+}
+
+
+/**
+ * bbsmenu.html ?????????????????
+ */
+function bbsmenuUpdate(){
+	gBbsmenuUpdater.collapsed = false;
+	gBbsmenuUpdater.update();
+}
+
+function onBbsmenuUpdated(){
+	gBbsmenuUpdater.collapsed = true;
+	gBbsMenuFile.initWithFile(gBbsMenuFile);
+	initTreeBbsMenu();
+}
+
+
+/**
+ * ?????????
+ */
+function openLogsDir(){
+	var logDir = gBbs2chService.getDataDir();
+
+	try{
+		logDir.reveal();
+	}catch(ex){
+			// for Unix
+		var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+				.getService(Components.interfaces.nsIIOService);
+	    var protocolService = Components.classes
+	    		["@mozilla.org/uriloader/external-protocol-service;1"]
+    				.getService(Components.interfaces.nsIExternalProtocolService);
+		var logDirURI = ioService.newFileURI(logDir);
+		protocolService.loadUrl(logDirURI);
+	}
+}
+
+
+/**
+ * ??????????
+ */
+function openSettings(){
+	var settingDialogURL = "chrome://bbs2chreader/content/settings/settings.xul";
+	window.openDialog(settingDialogURL, "_blank", "chrome, modal, resizable");
+}
+
+
+/**
+ * ????????????????? About ??ｦ
+ */
+function openAbout(){
+	var ExtensionManager = Components.classes["@mozilla.org/extensions/manager;1"]
+								.getService(Components.interfaces.nsIExtensionManager);
+	var emDS = ExtensionManager.datasource;
+	var ExtensionID = "urn:mozilla:item:{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}";
+	window.openDialog("chrome://mozapps/content/extensions/about.xul", "",
+				"chrome, modal", ExtensionID, emDS);
+}
+/**
+ * About ?????????????????????????
+ */
+function openURL(aURLSpec){
+	gBbs2chService.openURL(aURLSpec, null, true);
+}
+
+/**
+ * ?????????????
+ * @param {boolean} aAddTab true ??????????
+ */
+function openBoard(aAddTab){
+	if(gTreeBbsMenu.currentIndex == -1) return;
+	
+	var item = gTreeBbsMenuView.viewItems[gTreeBbsMenu.currentIndex];
+	var boardURL = item.url;
+	if(boardURL.indexOf("http://") != 0) return;
+
+	var boardType = item.type;
+	switch(parseInt(boardType)){
+		case gBbs2chService.BOARD_TYPE_2CH:
+		case gBbs2chService.BOARD_TYPE_BE2CH:
+		case gBbs2chService.BOARD_TYPE_JBBS:
+			boardURL = "bbs2ch:board:" + boardURL;
+			break;
+	}		
+	gBbs2chService.openURL(boardURL, null, aAddTab);
+}
+
+
+/**
+ * ?????????????????
+ * @param {event} aEvent 
+ */
+function treeBbsMenuClick(aEvent){
+	var row = {}
+	var obj = {};
+	gTreeBbsMenu.treeBoxObject.getCellAt(aEvent.clientX, aEvent.clientY, row, {}, obj);
+	if(row.value == -1) return;	// ???????????????
+
+	var eButton = aEvent.button;
+	var eDetail = aEvent.detail;
+	var isSeparator = gTreeBbsMenu.view.isSeparator(row.value);
+	var isContainer = gTreeBbsMenu.view.isContainer(row.value);
+
+	if(isSeparator) return;
+
+	if(eButton==0 && eDetail==1 && obj.value=="twisty"){
+			// twisty ????????????????
+		closeAllOpendContainers(row.value);
+		return;
+	}else if(eDetail==2 && obj.value!="twisty" && isContainer){
+			// ???????????????????
+		closeAllOpendContainers(row.value);
+		return;
+	}
+
+	var openAction = gBbs2chService.pref.getIntPref("fls.bbs2chreader.bbsmenu_open_action");
+	if(eButton==0 && eDetail==1 && !isContainer){
+			// ????
+	}else if(eButton==0 && eDetail==2 && !isContainer){
+			// ???????
+			openBoard(openAction == 1);
+	}else if(eButton==1 && eDetail==1 && !isContainer){
+			// ???????
+			openBoard(openAction == 0);
+	}
+}
+
+
+/**
+ * ????????????????????
+ * @param aExceptIndex number ???????????????
+ */
+function closeAllOpendContainers(aExceptIndex){
+	// XXX TODO b2rBbsmenuTreeView ??????
+	if(!gTreeBbsMenu.view.isContainerOpen(aExceptIndex)) return;
+
+	if(!gBbs2chService.pref.getBoolPref(
+					"fls.bbs2chreader.bbsmenu_toggle_open_container")) return;
+
+	var exceptItemTitle = gTreeBbsMenuView.viewItems[aExceptIndex].title;
+	var exceptItem;
+
+	for(var i=0; i<gTreeBbsMenuView.items.length; i++){
+		var item = gTreeBbsMenuView.items[i];
+		if(!item.isContainer) continue;
+		if(item.title == exceptItemTitle){
+			item.isOpen = true;
+			exceptItem = item;
+		}else{
+			item.isOpen = false;
+		}
+	}
+	for(i=exceptItem.parent; i!=null; i=i.parent){
+		i.isOpen = true;
+	}
+	
+	gTreeBbsMenu.treeBoxObject.rowCountChanged(0, - gTreeBbsMenuView.rowCount);
+	gTreeBbsMenuView._refreshItems();
+	gTreeBbsMenu.treeBoxObject.rowCountChanged(0, gTreeBbsMenuView.rowCount);
+
+	for(i=0; i<gTreeBbsMenuView.viewItems.length; i++){
+		item = gTreeBbsMenuView.viewItems[i];
+		if(item.title == exceptItemTitle){
+			gTreeBbsMenu.boxObject.ensureRowIsVisible(i);
+			return;
+		}
+	}
+}
+
+
+/**
+ * ????????????????ｦ??????????
+ * @param {event} aEvent
+ */
+function showBbsMenuContext(aEvent){
+	var row = {}
+	var obj = {};
+	gTreeBbsMenu.treeBoxObject.getCellAt(aEvent.clientX, aEvent.clientY, row, {}, obj);
+
+		// ???????????????
+	if(row.value == -1) return false;
+		// ?????????R??????????????+	if(gTreeBbsMenu.view.isSeparator(row.value)) return false;
+		// ????????R??????????????+	if(gTreeBbsMenu.view.isContainer(row.value)) return false;
+	return true;
+}
+
+
+function searchTitle(aSearchString){
+	if(aSearchString){
+				// ???????????????
+		var formHistory = Components.classes["@mozilla.org/satchel/form-history;1"]
+					.getService(Components.interfaces.nsIFormHistory);
+		formHistory.addEntry("bbs2ch-bbsmenu-history", aSearchString);
+		gTreeBbsMenuView.searchString = aSearchString;
+	}else{
+		gTreeBbsMenuView.searchString = "";
+	}
+}
+
+
+/**
+ * ?????? URL ????????????
+ * @param {boolean} aAddTitle ?????????????
+ */
+function copyURL(aAddTitle){
+	if(gTreeBbsMenu.currentIndex == -1) return;
+	var item = gTreeBbsMenuView.viewItems[gTreeBbsMenu.currentIndex];
+
+	var boardURL = item.url;
+	if(boardURL.indexOf("http://")!=0) return;
+	var boardTitle = item.title;
+	if(aAddTitle){
+		Bbs2chClipboard.setString(boardTitle +"\n"+ boardURL);
+	}else{
+		Bbs2chClipboard.setString(boardURL);
+	}
+}

From flyson ＠ users.sourceforge.jp  Wed Dec 14 00:45:28 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Wed, 14 Dec 2005 00:45:28 +0900
Subject: [Bbs2ch-cvs 74] CVS update: bbs2chreader/components
Message-ID: <20051213154528.40DEE2AC0BB@users.sourceforge.jp>

Index: bbs2chreader/components/nsBbs2chProtocolHandler.js
diff -u bbs2chreader/components/nsBbs2chProtocolHandler.js:1.8 bbs2chreader/components/nsBbs2chProtocolHandler.js:1.9
--- bbs2chreader/components/nsBbs2chProtocolHandler.js:1.8	Sat Dec  3 23:20:33 2005
+++ bbs2chreader/components/nsBbs2chProtocolHandler.js	Wed Dec 14 00:45:28 2005
@@ -85,7 +85,7 @@
 		var tmpChannel;
 		switch(mode){
 			case "bbsmenu" :
-				tmpChannel = this._redirectChannel("chrome://bbs2chreader/content/bbsmenu-page.xul");
+				tmpChannel = this._redirectChannel("chrome://bbs2chreader/content/bbsmenu/page.xul");
 				break;
 			case "board:" :
 				tmpChannel = this._redirectChannel("chrome://bbs2chreader/content/board-page.xul");

From flyson ＠ users.sourceforge.jp  Wed Dec 14 00:45:28 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Wed, 14 Dec 2005 00:45:28 +0900
Subject: [Bbs2ch-cvs 75] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051213154528.655212AC0E0@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/ff-overlay.xul
diff -u bbs2chreader/content/bbs2chreader/ff-overlay.xul:1.3 bbs2chreader/content/bbs2chreader/ff-overlay.xul:1.4
--- bbs2chreader/content/bbs2chreader/ff-overlay.xul:1.3	Mon Aug 22 21:43:15 2005
+++ bbs2chreader/content/bbs2chreader/ff-overlay.xul	Wed Dec 14 00:45:28 2005
@@ -28,7 +28,7 @@
 			autoCheck="false"
 			label="bbs2chreader"
 			type="checkbox" group="sidebar"
-			sidebarurl="chrome://bbs2chreader/content/bbsmenu-page.xul"
+			sidebarurl="chrome://bbs2chreader/content/bbsmenu/page.xul"
 			sidebartitle="bbs2chreader"
 			oncommand="toggleSidebar('viewBbs2chSidebar');"/>
 	</broadcasterset>

From flyson ＠ users.sourceforge.jp  Wed Dec 14 00:47:09 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Wed, 14 Dec 2005 00:47:09 +0900
Subject: [Bbs2ch-cvs 76] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051213154709.6D2C92AC0BB@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/bbsmenu-update.xul
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-update.xul:1.3 bbs2chreader/content/bbs2chreader/bbsmenu-update.xul:removed
--- bbs2chreader/content/bbs2chreader/bbsmenu-update.xul:1.3	Sat Sep 17 04:27:14 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-update.xul	Wed Dec 14 00:47:09 2005
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<window id="winMain" title="BBSMENU UPDATE [bbs2chreader]"
-	onload="startup()" onunload="shutdown()" width="450" height="300"
-	persist="width, height, screenX, screenY"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<script type="application/x-javascript" src="chrome://bbs2chreader/content/global.js"/>
-<script type="application/x-javascript" src="chrome://bbs2chreader/content/lib/downloader.js"/>
-<script type="application/x-javascript" src="chrome://bbs2chreader/content/bbsmenu-update.js"/>
-
-
-<deck id="dckTop">
-	<hbox align="center" class="box-padded">
-		<label value="BBSMENU URL :"/>
-		<textbox id="txtBbsmenuURL" flex="1"/>
-		<button label="Update" oncommand="bbsmenuUpdate()"/>
-	</hbox>
-	<hbox align="center" class="box-padded">
-		<progressmeter id="prgrsMeter" flex="1"/>
-		<button label="Cancel" oncommand="bbsmenuUpdate()"/>
-	</hbox>
-</deck>
-
-
-<vbox id="boxOutputBox" collapsed="false" class="box-padded" flex="1">
-	<textbox id="txtOutput" multiline="true" flex="1"/>
-</vbox>
-
-
-
-</window>
\ No newline at end of file
Index: bbs2chreader/content/bbs2chreader/bbsmenu-update.js
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-update.js:1.5 bbs2chreader/content/bbs2chreader/bbsmenu-update.js:removed
--- bbs2chreader/content/bbs2chreader/bbsmenu-update.js:1.5	Sat Sep 17 04:27:14 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-update.js	Wed Dec 14 00:47:09 2005
@@ -1,127 +0,0 @@
-
-var bbsMenuFile;
-var bbsMenuDownloader;
-var oldBoardList;
-var newBoardList;
-
-var txtBbsmenuURL;
-
-
-function startup(){
-	txtBbsmenuURL = document.getElementById("txtBbsmenuURL");
-
-	bbsMenuFile = Bbs2chGlobal.getDataDir();
-	bbsMenuFile.appendRelativePath("bbsmenu.html");
-
-	oldBoardList = getBoardList();
-
-	txtBbsmenuURL.value = Bbs2chGlobal.getPrefValue("fls.bbs2chreader.bbsmenu_load_url");
-}
-
-
-function shutdown(){
-	if(bbsMenuDownloader && bbsMenuDownloader.loading)
-		bbsMenuDownloader.abort(true);
-
-		// 更新しないで終了
-	if(!window.arguments[0].value) window.arguments[0].value = false;
-}
-
-
-function output(aString){
-	document.getElementById("txtOutput").value += aString + "\n";
-}
-
-
-/**
- * bbsmenu.html をダウンロードして板一覧を更新する
- */
-function bbsmenuUpdate(){
-	document.getElementById("boxOutputBox").collapsed = false;
-
-	var bbsmenuURL = txtBbsmenuURL.value;
-	var bbsmenuFilePath = bbsMenuFile.path;	
-	bbsMenuDownloader = new Bbs2chDownloader(bbsmenuURL, bbsmenuFilePath);
-
-	bbsMenuDownloader.onStart = function(aDownloader){
-		document.getElementById("dckTop").selectedIndex = 1;		
-		output("start: " + aDownloader.urlSpec);
-	};
-	bbsMenuDownloader.onStop = function(aDownloader, aStatus){
-		document.getElementById("dckTop").selectedIndex = 0;
-		output("Update Succeed.");
-		window.setTimeout("serverMovedCheck()", 0);
-	};
-	bbsMenuDownloader.onProgressChange = function(aDownloader, aPercentage){
-		document.getElementById("prgrsMeter").value = aPercentage;
-	};
-	bbsMenuDownloader.onError = function(aDownloader, aErrorCode){
-		alert("Download Error: " + aErrorCode + "\n" + aDownloader.urlSpec);
-	};
-
-	bbsMenuDownloader.download();
-}
-
-
-function getBoardList(){
-	var result = new Array();
-	if(!bbsMenuFile.exists()) return result;
-
-	var threadReg	= /^<A HREF=([^> ]+)>([^<]+)<\/A>/i;
-	var threadReg2	= /^<A HREF=([^> ]+) TARGET=_blank>([^<]+)<\/A>/i;
-
-	var contentLines = Bbs2chGlobal.readFile(bbsMenuFile.path);
-	contentLines = Bbs2chGlobal.fromSJIS(contentLines).split("\n");
-
-		// ぐるぐる
-	for(var i=0; i<contentLines.length; i++){
-		var line = contentLines[i];
-		if(threadReg.test(line) || threadReg2.test(line)){
-			var title = RegExp.$2;
-			var url = RegExp.$1;
-			var type = Bbs2chGlobal.getBoardType(url);
-			
-			if(type != Bbs2chGlobal.TYPE_PAGE) result[title] = url;
-		}
-	}
-
-	return result;
-}
-
-
-/**
- * 更新前と後の板リストを比較してサーバ移転があったらログを移動するメソッド
- */
-function serverMovedCheck(){
-	var serverMoved = false;
-	output("\nMoved Check.");
-
-	newBoardList = getBoardList();
-
-	for(var i in newBoardList){
-		if(oldBoardList.hasOwnProperty(i) && (oldBoardList[i] == newBoardList[i])){
-			delete oldBoardList[i];
-		}
-	}
-
-	for(i in oldBoardList){
-		var title = i;
-		var oldURL = oldBoardList[i];
-		var newURL = newBoardList[i];
-		var oldDir = Bbs2chGlobal.createLogFile(oldURL);
-		var newDir = Bbs2chGlobal.createLogFile(newURL);
-		
-		if(oldDir.exists()){
-			try{
-				oldDir.moveTo(newDir.parent, "");
-			}catch(ex){}
-			serverMoved = true;
-			output(title +"\n    "+ oldURL +"  >  "+ newURL);
-		}
-	}	
-
-		// 更新して終了
-	output("OK");
-	window.arguments[0].value = true;
-	if(!serverMoved) window.setTimeout("window.close()", 500);
-}
\ No newline at end of file
Index: bbs2chreader/content/bbs2chreader/bbsmenu-page.xul
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-page.xul:1.14 bbs2chreader/content/bbs2chreader/bbsmenu-page.xul:removed
--- bbs2chreader/content/bbs2chreader/bbsmenu-page.xul:1.14	Sun Sep 25 22:50:14 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-page.xul	Wed Dec 14 00:47:09 2005
@@ -1,114 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://bbs2chreader/skin/bbsmenu-page.css" type="text/css"?>
-
-
-<!DOCTYPE page [
-	<!ENTITY % bbsmenu-page-dtd SYSTEM "chrome://bbs2chreader/locale/bbsmenu-page.dtd">
-	%bbsmenu-page-dtd;
-]>
-<page id="pageMain" onload="startup()" onunload="shutdown()"
-	onmousedown="event.preventBubble()" onkeypress="event.preventBubble()"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-
-	<script type="application/x-javascript" src="chrome://bbs2chreader/content/lib/clipboard.js"/>
-	<script type="application/x-javascript" src="chrome://bbs2chreader/content/lib/rdf.js"/>
-	<script type="application/x-javascript" src="chrome://bbs2chreader/content/bbsmenu-ds.js"/>
-	<script type="application/x-javascript" src="chrome://bbs2chreader/content/bbsmenu-page.js"/>
-
-
-<popupset>
-	<popup id="popBbsMenuContext"
-				onpopupshowing="return showBbsMenuContext(event)">
-		<menuitem label="&ctxtOpen.label;" oncommand="openBoard(false)"/>
-		<menuitem label="&ctxtOpenInNewTab.label;" oncommand="openBoard(true)"/>
-		<menuseparator/>
-		<menuitem label="&ctxtCopuURL.label;" oncommand="copyURL()"/>
-		<menuitem label="&ctxtCopuURLnTitle.label;" oncommand="copyTitleAndURL()"/>
-	</popup>
-</popupset>
-
-
-<hbox align="center">
-	<textbox id="search-box" value="" flex="1" type="autocomplete"
-			autocompletesearch="form-history"
-			autocompletesearchparam="bbs2ch-bbsmenu-history"
-			onkeypress="searchTitle(event, this.value)"/>
-	<toolbarbutton id="btnHistory" label="&history.label;" type="menu">
-		<menupopup id="popHistory" onpopupshowing="updateHistoryMenu()"
-				onclick="popHistoryClick(event)"/>
-	</toolbarbutton>
-	<toolbarbutton label="&tools.label;" type="menu">
-		<menupopup>
-			<menuitem label="&bbsmenuUpdate.label;" oncommand="bbsmenuUpdate()"/>
-			<menuseparator/>
-			<menuitem label="&openLogsDirectory.label;" oncommand="openLogsDir()"/>
-			<menuitem label="&options.label;" oncommand="openSettings()"/>
-			<menuitem label="&about.label;" oncommand="openAbout()"/>
-
-			<menuseparator/>
-			<menu label="Tests">
-				<menupopup ref="urn:bbs2ch-test-menu:root"
-						datasources="chrome://bbs2chreader/content/test/test-menu.rdf"
-						oncommand="testMenuClick(event)">
-					<template>
-						<rule>
-							<menuitem uri="rdf:*" value="rdf:*"
-								opentype="rdf:http://bbs2ch.sourceforge.jp/#opentype"
-								label="rdf:http://bbs2ch.sourceforge.jp/#title"/>
-						</rule>
-					</template>
-				</menupopup>
-			</menu>
-
-		</menupopup>
-	</toolbarbutton>
-	<spacer class="small-margin"/>
-</hbox>
-
-
-<tree id="treeBbsMenu" class="plain" flex="1"  context="popBbsMenuContext"
-		flags="dont-build-content" hidecolumnpicker="true"
-		onclick="treeBbsMenuClick(event)"
-		datasources="rdf:null" ref="urn:bbs2ch:bbsmenu:root">
-	<treecols>
-		<treecol id="colTitle" hideheader="true" flex="1" primary="true"/>
-	</treecols>
-	<template>
-		<rule>
-			<treechildren>
-				<treeitem uri="rdf:*">
-					<treerow>
-						<treecell label="rdf:http://bbs2ch.sourceforge.jp/#title"
-							properties="Name type-rdf:http://bbs2ch.sourceforge.jp/#type"/>
-					</treerow>
-				</treeitem>
-			</treechildren>
-		</rule>
-	</template>
-</tree>
-
-
-<!-- History Menu -->
-<tree flex="1" id="treeHiddenHistory" hidden="true" collapsed="true"
-	datasources="rdf:null" flags="dont-build-content" hidecolumnpicker="true">
-	<template>
-		<rule>
-			<treechildren>
-				<treeitem uri="rdf:*" rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
-					<treerow>
-						<treecell label="rdf:http://home.netscape.com/NC-rdf#Date"/>
-					</treerow>
-				</treeitem>
-			</treechildren>
-		</rule>
-	</template>
-	<treecols>
-		<treecol flex="1" id="ColHiddenHistoryTreeDate" hideheader="true" primary="true"
-			sort="rdf:http://home.netscape.com/NC-rdf#Date" sortActive="true" sortDirection="descending"/>
-	</treecols>
-</tree>
-
-
-</page>
\ No newline at end of file
Index: bbs2chreader/content/bbs2chreader/bbsmenu-page.js
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.29 bbs2chreader/content/bbs2chreader/bbsmenu-page.js:removed
--- bbs2chreader/content/bbs2chreader/bbsmenu-page.js:1.29	Sun Nov 20 14:33:14 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-page.js	Wed Dec 14 00:47:09 2005
@@ -1,431 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is bbs2chreader.
- *
- * The Initial Developer of the Original Code is
- * flyson.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *    flyson <flyson at users.sourceforge.jp>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-var gBbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-			.getService(Components.interfaces.nsIBbs2chService);
-
-var gTreeBbsMenu;
-var gBbsmenuDS;
-var gHistoryRDF;
-
-
-function startup(){
-	gBbsmenuDS = new Bbs2chBbsMenuDS();
-
-	gHistoryRDF = new Bbs2chRDF();
-	gHistoryRDF.initWithRDFURL("rdf:history");
-
-	var btnHistory = document.getElementById("btnHistory");
-	btnHistory.hidden = !gBbs2chService.pref.getBoolPref("fls.bbs2chreader.bbsmenu_historymenu_show");
-
-
-	gTreeBbsMenu = document.getElementById("treeBbsMenu");
-
-	if(gBbsmenuDS.bbsMenuFile.exists()){
-		initTreeBbsMenu();
-	}else{	// bbsmenu.html が無いときは自動で取得
-		bbsmenuUpdate();
-	}
-}
-
-function shutdown(){
-
-}
-
-
-function initTreeBbsMenu(){
-		// 古いデータソースが存在するときは削除
-	var databases = gTreeBbsMenu.database.GetDataSources();
-	while(databases.hasMoreElements()){
-		try{
-			var ds = databases.getNext()
-						.QueryInterface(Components.interfaces.nsIRDFDataSource);
-			if(ds.URI != "rdf:localstore")
-				gTreeBbsMenu.database.RemoveDataSource(ds);
-		}catch(ex){};
-	}
-
-	gTreeBbsMenu.hidden = true;
-	gBbsmenuDS.initDS();
-	gTreeBbsMenu.database.AddDataSource(gBbsmenuDS.ds);
-	gTreeBbsMenu.builder.rebuild();
-	gTreeBbsMenu.hidden = false;
-
-		// フォーカス
-	if(gTreeBbsMenu.treeBoxObject.view.selection){
-		gTreeBbsMenu.focus();
-		gTreeBbsMenu.treeBoxObject.view.selection.select(0);
-	}
-}
-
-
-/**
- * 選択中の板をブラウザで開く
- * @param aAddTab boolean true なら新しいタブで開く
- */
-function openBoard(aAddTab){
-	if(gTreeBbsMenu.currentIndex == -1) return;
-	var resource = gTreeBbsMenu.view.getResourceAtIndex(gTreeBbsMenu.currentIndex);
-
-	var boardURL = resource.Value;
-	if(boardURL.indexOf("http://")!=0) return;
-
-	var boardType = gBbsmenuDS.rdf.getLiteralProperty(resource.Value, 
-									gBbs2chService.nameSpace + "type");
-
-	switch(parseInt(boardType)){
-		case gBbs2chService.BOARD_TYPE_2CH:
-		case gBbs2chService.BOARD_TYPE_BE2CH:
-		case gBbs2chService.BOARD_TYPE_JBBS:
-			boardURL = "bbs2ch:board:" + boardURL;
-			break;
-	}		
-
-	gBbs2chService.openURL(boardURL, null, aAddTab);
-}
-
-
-/**
- * ツリーをクリックしたときに呼ばれる
- *
- * @param aEvent event
- */
-function treeBbsMenuClick(aEvent){
-	var row = {}
-	var obj = {};
-	gTreeBbsMenu.treeBoxObject.getCellAt(aEvent.clientX, aEvent.clientY, row, {}, obj);
-	if(row.value == -1) return;	// ツリーのアイテム以外をクリック
-
-	var eButton = aEvent.button;
-	var eDetail = aEvent.detail;
-	var objName = obj.value;
-	var isContainer = gTreeBbsMenu.view.isContainer(row.value);
-	
-	if(eButton==0 && eDetail==1 && objName=="twisty"){
-			// twisty ボタンを使ったコンテナのオープン
-		closeAllOpendContainers(row.value);
-		return;
-	}else if(eDetail==2 && objName!="twisty" && isContainer){
-			// ダブルクリックによるコンテナのオープン
-		closeAllOpendContainers(row.value);
-		return;
-	}
-	
-	var openAction = gBbs2chService.pref.getIntPref("fls.bbs2chreader.bbsmenu_open_action");
-
-	if(eButton==0 && eDetail==1 && !isContainer){
-			// クリック
-	}else if(eButton==0 && eDetail==2 && !isContainer){
-			// ダブルクリック
-			openBoard(openAction == 1);
-	}else if(eButton==1 && eDetail==1 && !isContainer){
-			// ミドルクリック
-			openBoard(openAction == 0);
-	}
-	
-
-}
-
-
-/**
- * ツリーのコンテキストメニューが表示されるときに呼ばれる
- */
-function showBbsMenuContext(aEvent){
-	var row = {}
-	var obj = {};
-	gTreeBbsMenu.treeBoxObject.getCellAt(aEvent.clientX, aEvent.clientY, row, {}, obj);
-
-		// ツリーのアイテム以外をクリック
-	if(row.value == -1) return false;
-
-		// コンテナの場合はコンテキストメニューを出さない
-	return !gTreeBbsMenu.view.isContainer(row.value);
-}
-
-
-/**
- * 選択中の板の URL をクリップボードにコピー
- */
-function copyURL(){
-	if(gTreeBbsMenu.currentIndex == -1) return;
-	var resource = gTreeBbsMenu.view.getResourceAtIndex(gTreeBbsMenu.currentIndex);
-
-	var boardURL = resource.Value;
-	if(boardURL.indexOf("http://")!=0) return;
-
-	Bbs2chClipboard.setString(boardURL);
-}
-
-
-/**
- * 選択中の板の URL とタイトルをクリップボードにコピー
- */
-function copyTitleAndURL(){
-	if(gTreeBbsMenu.currentIndex == -1) return;
-	var resource = gTreeBbsMenu.view.getResourceAtIndex(gTreeBbsMenu.currentIndex);
-
-	var title = gBbsmenuDS.rdf.getLiteralProperty(resource.Value, 
-						gBbs2chService.nameSpace + "title");
-
-	var boardURL = resource.Value;
-	if(boardURL.indexOf("http://")!=0) return;
-
-	Bbs2chClipboard.setString(title +"\n"+ boardURL);
-}
-
-
-/**
- * ログフォルダを開く
- */
-function openLogsDir(){
-	var logDir = gBbs2chService.getDataDir();
-
-	try{
-		logDir.reveal();
-	}catch(ex){
-			// for Unix
-		var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-				.getService(Components.interfaces.nsIIOService);
-	    var protocolService = Components.classes
-	    		["@mozilla.org/uriloader/external-protocol-service;1"]
-    				.getService(Components.interfaces.nsIExternalProtocolService);
-		var logDirURI = ioService.newFileURI(logDir);
-		protocolService.loadUrl(logDirURI);
-	}
-}
-
-
-/**
- * 設定ダイアログを開く
- */
-function openSettings(){
-	var settingDialogURL = "chrome://bbs2chreader/content/settings/settings.xul";
-	window.openDialog(settingDialogURL, "_blank", "chrome, modal, resizable");
-}
-
-
-/**
- * エクステンションマネージャを使った About の表示
- */
-function openAbout(){
-	var ExtensionManager = Components.classes["@mozilla.org/extensions/manager;1"]
-								.getService(Components.interfaces.nsIExtensionManager);
-	var emDS = ExtensionManager.datasource;
-	var ExtensionID = "";
-	if(gBbs2chService.geckoVersionCompare("1.8") <= 0){
-		ExtensionID = "urn:mozilla:item:{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}";
-	}else{
-		ExtensionID = "urn:mozilla:extension:{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}";
-	}
-
-	window.openDialog("chrome://mozapps/content/extensions/about.xul", "",
-				"chrome, modal", ExtensionID, emDS);
-}
-/**
- * About ダイアログがホームページを開く時に利用するメソッド
- */
-function openURL(aURLSpec){
-	gBbs2chService.openURL(aURLSpec, null, true);
-}
-
-
-/**
- * 開いているすべてのツリーコンテナを閉じる
- * @param aExceptIndex number 閉じないコンテナのインデックス
- */
-function closeAllOpendContainers(aExceptIndex){
-	if(!gTreeBbsMenu.view.isContainerOpen(aExceptIndex)) return;
-
-	if(!gBbs2chService.pref.getBoolPref("fls.bbs2chreader.bbsmenu_toggle_open_container")) return;
-
-		// 閉じないコンテナのリソースを取得しておく
-	var exceptResource = gTreeBbsMenu.builder.getResourceAtIndex(aExceptIndex);
-
-	var rootContainer = Components.classes["@mozilla.org/rdf/container;1"]
-				.createInstance(Components.interfaces.nsIRDFContainer);
-	rootContainer.Init(gTreeBbsMenu.database,
-			gBbsmenuDS.rdf.getResource("urn:bbs2ch:bbsmenu:root"));
-	var containers = rootContainer.GetElements();
-	while(containers.hasMoreElements()){
-		var container = containers.getNext()
-							.QueryInterface(Components.interfaces.nsIRDFResource);
-		var index = gTreeBbsMenu.builder.getIndexOfResource(container);
-		if(exceptResource == container) continue;
-		if(container.Value.indexOf("urn:bbs2ch:") == -1) continue;
-		if(!gTreeBbsMenu.view.isContainerOpen(index)) continue;
-
-		if(index != -1) gTreeBbsMenu.view.toggleOpenState(index);
-	}	
-
-		// 閉じないコンテナが表示されるようにスクロール
-	aExceptIndex = gTreeBbsMenu.builder.getIndexOfResource(exceptResource);
-	gTreeBbsMenu.boxObject.ensureRowIsVisible(aExceptIndex);
-}
-
-
-/**
- * 履歴を読んで History メニューを更新する
- */
-function updateHistoryMenu(){
-	const NS_NC_NAME = "http://home.netscape.com/NC-rdf#Name";
-
-	var popHistory = document.getElementById("popHistory");
-	while(popHistory.hasChildNodes()){
-		popHistory.removeChild(popHistory.firstChild);
-	}
-
-	var treeHiddenHistory = document.getElementById("treeHiddenHistory");
-	if(treeHiddenHistory.hidden){
-		treeHiddenHistory.hidden = false;
-		treeHiddenHistory.database.AddDataSource(gHistoryRDF.ds);
-	}
-	
-	treeHiddenHistory.ref = "find:datasource=history&match=URL&method=startswith&text=bbs2ch:board:";
-	var boardCount = treeHiddenHistory.treeBoxObject.view.rowCount;
-	var boardMax = gBbs2chService.pref.getIntPref("fls.bbs2chreader.bbsmenu_historymenu_board_max");
-	if(boardMax > 15) boardMax = 15;
-	if(boardCount > boardMax) boardCount = boardMax;
-	if(boardCount > 0){
-		for(var i=0; i<boardCount; i++){
-			try{
-				var url = treeHiddenHistory.builder.getResourceAtIndex(i).Value;
-				var title = gHistoryRDF.getLiteralProperty(url, NS_NC_NAME);
-				title = title.replace(" [bbs2chreader]", "");
-				var menuNode = document.createElement("menuitem");
-				menuNode.setAttribute("label", title);
-				menuNode.setAttribute("value", url);
-				menuNode.setAttribute("tooltiptext", url);
-				popHistory.appendChild(menuNode);
-			}catch(ex){}
-		}
-	}
-
-	treeHiddenHistory.ref = "find:datasource=history&match=URL&method=startswith&text=bbs2ch:thread:";
-	var threadCount = treeHiddenHistory.treeBoxObject.view.rowCount;
-	var threadMax = gBbs2chService.pref.getIntPref("fls.bbs2chreader.bbsmenu_historymenu_thread_max");
-	if(threadMax > 15) threadMax = 15;
-	if(threadCount > threadMax) threadCount = threadMax;
-	if(threadCount > 0){
-		if(boardCount > 0) popHistory.appendChild(document.createElement("menuseparator"));
-		
-		for(i=0; i<threadCount; i++){
-			try{
-				url = treeHiddenHistory.builder.getResourceAtIndex(i).Value;
-				title = gHistoryRDF.getLiteralProperty(url, NS_NC_NAME);
-				title = title.replace(" [bbs2chreader]", "");
-				menuNode = document.createElement("menuitem");
-				menuNode.setAttribute("label", title);
-				menuNode.setAttribute("value", url);
-				menuNode.setAttribute("tooltiptext", url);
-				popHistory.appendChild(menuNode);
-			}catch(ex){}
-		}
-	}
-}
-
-
-/**
- * History メニューアイテムをクリックしたときの処理
- * @param aEvent event イベントオブジェクト
- */
-function popHistoryClick(aEvent){
-	var target = aEvent.originalTarget;
-	if(target.localName != "menuitem" || !(target.value)) return;
-	if(aEvent.button == 0){
-		gBbs2chService.openURL(target.value, null, false);
-	}else if(aEvent.button == 1){
-		target.parentNode.hidePopup();
-		gBbs2chService.openURL(target.value, null, true);	
-	}
-}
-
-
-/**
- * Tests メニューアイテムをクリックしたときの処理
- * @param aEvent event イベントオブジェクト
- */
-function testMenuClick(aEvent){
-	var target = aEvent.originalTarget;
-	var url = target.getAttribute("value");
-	var openType = target.getAttribute("opentype");
-
-	if(openType == "dialog"){
-		window.openDialog(url, "", "chrome,resizable");
-	}else{
-		gBbs2chService.openURL(url, null, true);
-	}
-}
-
-
-/**
- * 板タイトルを検索して、結果をツリーに表示
- * aSearchString が空ならツリーを元に戻す
- * @param aEvent event イベントオブジェクト
- * @param aSearchString string 検索文字列
- */
-function searchTitle(aEvent, aSearchString){
-		// keypress イベント時にエンター以外が押された
-	if((aEvent.type == "keypress") &&
-		((aEvent.keyCode != KeyEvent.DOM_VK_ENTER) &&
-			(aEvent.keyCode != KeyEvent.DOM_VK_RETURN)))
-				return;
-	
-	if(aSearchString){
-			// フォーム履歴に検索文字列を追加		
-		var formHistory = Components.classes["@mozilla.org/satchel/form-history;1"]
-							.getService(Components.interfaces.nsIFormHistory);
-		formHistory.addEntry("bbs2ch-bbsmenu-history", aSearchString);
-		
-		gBbsmenuDS.searchTitle(aSearchString);
-		gTreeBbsMenu.ref = "urn:bbs2ch:bbsmenu:search";
-	}else{
-		gTreeBbsMenu.ref = "urn:bbs2ch:bbsmenu:root";
-	}
-}
-
-
-/**
- * bbsmenu.html をダウンロードして板一覧を更新する
- */
-function bbsmenuUpdate(){
-	var updateDialogURL = "chrome://bbs2chreader/content/bbsmenu-update.xul";
-	var updated = {};
-	window.openDialog(updateDialogURL, "", "chrome, modal", updated);
-	
-	if(updated.value) initTreeBbsMenu();
-}
Index: bbs2chreader/content/bbs2chreader/bbsmenu-ds.js
diff -u bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.13 bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:removed
--- bbs2chreader/content/bbs2chreader/bbsmenu-ds.js:1.13	Sat Nov  5 01:20:01 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu-ds.js	Wed Dec 14 00:47:09 2005
@@ -1,224 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is bbs2chreader.
- *
- * The Initial Developer of the Original Code is
- * flyson.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *    flyson <flyson at users.sourceforge.jp>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-function Bbs2chBbsMenuDS(){
-	this.init();
-}
-
-Bbs2chBbsMenuDS.prototype = {
-
-
-// ********** ********* プロパティ ********** **********
-
-
-	/**
-	 * 板一覧用の RDF
-	 * @return Bbs2chRDF
-	 */
-	get rdf(){
-		return this._rdf;
-	},
-
-
-	/**
-	 * 板一覧の RDF データソース
-	 * @return nsIRDFDataSource
-	 */
-	get ds(){
-		return this.rdf.ds;
-	},
-
-
-	/**
-	 * データフォルダ内の bbsmenu.html
-	 * @return nsILocalFile
-	 */
-	get bbsMenuFile(){
-		return this._bbsMenuFile;
-	},
-
-
-	/**
-	 * データフォルダ内の bbsmenu.rdf
-	 * @return nsILocalFile
-	 */
-	get bbsMenuRDFFile(){
-		return this._bbsMenuRDFFile;
-	},
-
-	/**
-	 * データフォルダ内の outside.txt
-	 * @return nsILocalFile
-	 */
-	get outsideFile(){
-		return this._outsideFile;
-	},
-
-// ********** ********* メソッド ********** **********
-
-
-	init: function(){
-		this._rdf = new Bbs2chRDF();
-
-		this._bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-					.getService(Components.interfaces.nsIBbs2chService);
-		this._ioService = Components.classes["@mozilla.org/network/io-service;1"]
-					.getService(Components.interfaces.nsIIOService);
-
-		this._bbsMenuFile = this._bbs2chService.getDataDir();
-		this._bbsMenuFile.appendRelativePath("bbsmenu.html");
-		this._bbsMenuRDFFile = this._bbs2chService.getDataDir();
-		this._bbsMenuRDFFile.appendRelativePath("bbsmenu.rdf");
-		this._outsideFile = this._bbs2chService.getDataDir();
-		this._outsideFile.appendRelativePath("outside.txt");
-	},
-
-	initDS: function(){
-		const NS_BBS2CH = this._bbs2chService.nameSpace;
-
-		var categoryReg = /<BR><B>([^<]+)<\/B><BR>/i;
-		var threadReg	= /^<A HREF=([^> ]+)>([^<]+)<\/A>/i;
-		var threadReg2	= /^<A HREF=([^> ]+) TARGET=_blank>([^<]+)<\/A>/i;
-
-			// bbsmenu.html が無いときは終了
-		if(!this.bbsMenuFile.exists()) return;
-
-		if(this.bbsMenuRDFFile.exists() && this.outsideFile.exists()){
-			var rdfLMTime = this.bbsMenuRDFFile.lastModifiedTime;
-			var bbsmenuLMTime = this.bbsMenuFile.lastModifiedTime;
-			var outsideLMTime = this.outsideFile.lastModifiedTime;
-			
-			if((rdfLMTime > bbsmenuLMTime) && (rdfLMTime > outsideLMTime)){
-				var rdfURL = this._ioService.newFileURI(this.bbsMenuRDFFile);
-				this.rdf.initWithRDFURL(rdfURL.spec);
-				return;
-			}
-		}
-
-			// ルートコンテナの作成
-		var rootContainer = this.rdf.makeSeqContainer("urn:bbs2ch:bbsmenu:root");
-
-			// 外部板コンテナの作成
-		var outsideContainer = this.rdf.makeSeqContainer("urn:bbs2ch:bbsmenu:outside-board");
-		this.rdf.setLiteralProperty(outsideContainer.Resource, NS_BBS2CH + "title", "OUTSIDE");
-
-			// 外部板リストが存在しないときはテンプレートから作る
-		if(!this.outsideFile.exists()){
-			var templateContent = this._bbs2chService.readLocalURI(
-						"chrome://bbs2chreader/content/res/outside.txt");
-			this._bbs2chService.writeFile(this.outsideFile.path, templateContent, false);
-		}
-		var outsideLines = this._bbs2chService.readFile(this.outsideFile.path);
-		outsideLines = this._bbs2chService.fromSJIS(outsideLines).split("\n");
-
-		var regOutsideLine = /^(http:\/\/.*)\t(.+)\t(type-.+)/;
-		var typeHash = new Array();
-		typeHash["type-2ch"]    = 0;
-		typeHash["type-old2ch"] = 1;
-		typeHash["type-be2ch"]  = 2;
-		typeHash["type-jbbs"]   = 3;
-		typeHash["type-machi"]  = 4;
-		typeHash["type-page"]   = 5;
-		for(var i=0; i<outsideLines.length; i++){
-			var line = outsideLines[i];
-			if(regOutsideLine.test(line)){
-				if(RegExp.$3 in typeHash){
-					var board = this.rdf.appendResource(RegExp.$1, outsideContainer);
-					var type = typeHash[RegExp.$3];
-					this.rdf.setLiteralProperty(board, NS_BBS2CH + "title", RegExp.$2);
-					this.rdf.setLiteralProperty(board, NS_BBS2CH + "type", type);
-				}
-			}
-		}
-		rootContainer.AppendElement(outsideContainer.Resource);
-
-
-			// bbsmenu.html を読み込んで、行を配列に格納
-		var content = this._bbs2chService.readFile(this.bbsMenuFile.path);
-		content = this._bbs2chService.fromSJIS(content);
-			// 改行位置がおかしい部分の修正
-		content = content.replace(/<\/B><BR><A HREF/igm, "</B><BR>\n<A HREF")
-		var contentLines = content.split("\n");
-		content = null;
-		
-		var currentCategory;
-			// ぐるぐる
-		for(i=0; i<contentLines.length; i++){
-			line = contentLines[i];
-
-			if(categoryReg.test(line)){
-					// カテゴリのコンテナを作成
-				currentCategory = this.rdf.makeSeqContainer("urn:bbs2ch:bbsmenu:category:" + RegExp.$1);
-				this.rdf.setLiteralProperty(currentCategory.Resource, 
-											NS_BBS2CH + "title", RegExp.$1);
-				rootContainer.AppendElement(currentCategory.Resource);
-			}else if((threadReg.test(line) || threadReg2.test(line)) && currentCategory){
-					// 板一覧のリソース作成
-				board = this.rdf.appendResource(RegExp.$1, currentCategory);
-
-				this.rdf.setLiteralProperty(board, NS_BBS2CH + "title", RegExp.$2);
-				this.rdf.setLiteralProperty(board, NS_BBS2CH + "type",
-											this._bbs2chService.getBoardType(RegExp.$1));
-			}
-		}
-
-			// RDF をキャッシュとして保存		
-		var rdfSource = this.rdf.getXmlSource("bbs2ch", NS_BBS2CH);
-		this._bbs2chService.writeFile(this.bbsMenuRDFFile.path, rdfSource, false);
-	},
-
-
-	/**
-	 * aSearchString とマッチするタイトルをもつリソースを
-	 * コンテナ urn:bbs2ch:bbsmenu:search 以下に追加する
-	 * @param aSearchString string 検索する文字列
-	 */
-	searchTitle: function(aSearchString){
-			// サーチコンテナの作成
-		this.rdf.clearContainer("urn:bbs2ch:bbsmenu:search");
-		var searchContainer = this.rdf.getContainer("urn:bbs2ch:bbsmenu:search");
-		
-		var resources = this.ds.GetAllResources();
-		while(resources.hasMoreElements()){
-			var resource = resources.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
-			var title = this.rdf.getLiteralProperty(resource, this._bbs2chService.nameSpace + "title");
-			if(title && (title.toUpperCase().indexOf(aSearchString.toUpperCase()) != -1))
-				searchContainer.AppendElement(resource);
-		}
-	}
-}
\ No newline at end of file

From flyson ＠ users.sourceforge.jp  Fri Dec 23 10:03:20 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Fri, 23 Dec 2005 10:03:20 +0900
Subject: [Bbs2ch-cvs 77] CVS update: bbs2chreader/content/bbs2chreader/lib
Message-ID: <20051223010320.5178C2AC077@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/lib/rdf.js
diff -u bbs2chreader/content/bbs2chreader/lib/rdf.js:1.3 bbs2chreader/content/bbs2chreader/lib/rdf.js:1.4
--- bbs2chreader/content/bbs2chreader/lib/rdf.js:1.3	Sat Nov  5 01:18:04 2005
+++ bbs2chreader/content/bbs2chreader/lib/rdf.js	Fri Dec 23 10:03:20 2005
@@ -231,12 +231,12 @@
 
 	/**
 	 * nsIRDFDate 型のプロパティ値を取得する
-	 * @param {variable} aSourceOrID リソースまたはリソースID
+	 * @param {variable} aResourceOrID リソースまたはリソースID
 	 * @param {string} aProperty プロパティの名前
 	 * @type number
 	 * @return プロパティ値
 	 */
-	getDateProperty: function(aSourceOrID, aProperty){
+	getDateProperty: function(aResourceOrID, aProperty){
 		var source = (typeof(aResourceOrID)=="string") ?
 							this.getResource(aResourceOrID) : aResourceOrID;
 		var target = this.ds.GetTarget(source, this.getResource(aProperty), true);

From flyson ＠ users.sourceforge.jp  Fri Dec 23 13:54:13 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Fri, 23 Dec 2005 13:54:13 +0900
Subject: [Bbs2ch-cvs 78] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051223045413.736E72AC067@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-page.js
diff -u bbs2chreader/content/bbs2chreader/board-page.js:1.25 bbs2chreader/content/bbs2chreader/board-page.js:1.26
--- bbs2chreader/content/bbs2chreader/board-page.js:1.25	Mon Dec 12 02:19:11 2005
+++ bbs2chreader/content/bbs2chreader/board-page.js	Fri Dec 23 13:54:13 2005
@@ -557,12 +557,10 @@
 	
 	selection: null,
 
-	getCellText : function(aRow, aColID){
-		if(aColID.id) aColID = aColID.id; // Gecko 1.7/1.8 互換
-
-		if(document.getElementById(aColID).getAttribute("notext") == "true") return "";
-		var property = document.getElementById(aColID).getAttribute("property");
-		var isDate = document.getElementById(aColID).getAttribute("isdate") == "true";
+	getCellText : function(aRow, aCol){
+		if(aCol.element.getAttribute("notext") == "true") return "";
+		var property = aCol.element.getAttribute("property");
+		var isDate = aCol.element.getAttribute("isdate") == "true";
 		if(isDate) return this.getFormatedDate(new Date(this._items[aRow][property]));
 
 		return this._items[aRow][property];
@@ -572,13 +570,13 @@
 		this._treeBox = aTree;
 	},
 
-	cycleHeader: function(aColID, aElement){
-		if(!aElement) aElement = aColID.element; // XXX Gecko 1.7/1.8 互換
+	cycleHeader: function(aCol){
+		var colElement = aCol.element;
 
-		var sortActive	  = aElement.getAttribute("sortActive");
-		var sortDirection = aElement.getAttribute("sortDirection");
-		var property  = aElement.getAttribute("property");
-		var treeNode = aElement.parentNode.parentNode;
+		var sortActive	  = colElement.getAttribute("sortActive");
+		var sortDirection = colElement.getAttribute("sortDirection");
+		var property  = colElement.getAttribute("property");
+		var treeNode = colElement.parentNode.parentNode;
 
 		switch(sortDirection){
 			case "ascending":
@@ -595,12 +593,12 @@
 				break;
 		}
 
-		aElement.setAttribute("sortDirection", sortDirection);
-		aElement.setAttribute("sortActive", sortActive);
+		colElement.setAttribute("sortDirection", sortDirection);
+		colElement.setAttribute("sortActive", sortActive);
 
-		var colNodes = aElement.parentNode.getElementsByTagName("treecol");
+		var colNodes = colElement.parentNode.getElementsByTagName("treecol");
 		for(var i=0; i<colNodes.length; i++){
-			if(colNodes[i] == aElement) continue;
+			if(colNodes[i] == colElement) continue;
 			colNodes[i].setAttribute("sortDirection", "natural");
 			colNodes[i].setAttribute("sortActive", "false");
 		}
@@ -626,15 +624,15 @@
 		var status = "s" + this._items[aIndex].status;
 		aProperties.AppendElement(this._atomService.getAtom(status));
 	},
-	getCellProperties: function(aRow, aColID, aProperties){
-		if(typeof(aColID) != "string") aColID = aColID.id; // XXX Gecko 1.7/1.8 互換
+
+	getCellProperties: function(aRow, aCol, aProperties){
 		var status = "s" + this._items[aRow].status;
 		aProperties.AppendElement(this._atomService.getAtom(status));
-		if(aColID =="colStatus"){
+		if(aCol.id =="colStatus"){
 			aProperties.AppendElement(this._atomService.getAtom("icon"));
 		}
 	},
-	getColumnProperties: function(aColID, aColElement, aProperties){},
+	getColumnProperties: function(aCol, aProperties){},
 	isContainer: function(aRow){},
 	isContainerOpen: function(aRow){},
 	isContainerEmpty: function(aRow){},
@@ -646,15 +644,15 @@
 	getParentIndex: function getParentIndex(aIndex){},
 	hasNextSibling: function(aIndex, aAfterIndex){},
  	getLevel: function(aIndex){},
-	getImageSrc: function(aRow, aColID){},
-	getProgressMode: function(aRow, aColID){},
-	getCellValue: function(aRow, aColID){},
+	getImageSrc: function(aRow, aCol){},
+	getProgressMode: function(aRow, aCol){},
+	getCellValue: function(aRow, aCol){},
 	selectionChanged: function(){},
-	cycleCell: function(aRow, aColID){},
-	isEditable: function(aRow, aColID){},
-	setCellText: function(aRow, aColID, aValue){},
+	cycleCell: function(aRow, aCol){},
+	isEditable: function(aRow, aCol){},
+	setCellText: function(aRow, aCol, aValue){},
 	toggleOpenState: function(aIndex){},
 	performAction: function(aAction){},
 	performActionOnRow: function(aAction, aRow){},
-	performActionOnCell: function(aAction, aRow, aColID){}
+	performActionOnCell: function(aAction, aRow, aCol){}
 }

From flyson ＠ users.sourceforge.jp  Fri Dec 23 13:56:40 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Fri, 23 Dec 2005 13:56:40 +0900
Subject: [Bbs2ch-cvs 79] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051223045640.B5ACE2AC04D@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/board-page.js
diff -u bbs2chreader/content/bbs2chreader/board-page.js:1.26 bbs2chreader/content/bbs2chreader/board-page.js:1.27
--- bbs2chreader/content/bbs2chreader/board-page.js:1.26	Fri Dec 23 13:54:13 2005
+++ bbs2chreader/content/bbs2chreader/board-page.js	Fri Dec 23 13:56:40 2005
@@ -489,14 +489,8 @@
 	var feedURL = aLiveBookmark ? "bbs2ch:board-rss:" + gBoardItems.url.spec : null;
 
 
-		// XXX see [bug:5494]
-	if(gBbs2chService.geckoVersionCompare("1.8") <= 0){
-		var arg = { name:name, url:url, feedURL: feedURL};
-		openDialog(ADD_BOOKMARK_URL, "", ADD_BOOKMARK_FLAG, arg);
-	}else{
-		openDialog(ADD_BOOKMARK_URL, "", ADD_BOOKMARK_FLAG , 
-				name, url, null, null, null, null, false, null, null, null, feedURL);
-	}
+	var arg = { name:name, url:url, feedURL: feedURL};
+	openDialog(ADD_BOOKMARK_URL, "", ADD_BOOKMARK_FLAG, arg);
 }
 
 

From flyson ＠ users.sourceforge.jp  Fri Dec 23 17:55:02 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Fri, 23 Dec 2005 17:55:02 +0900
Subject: [Bbs2ch-cvs 80] CVS update: bbs2chreader/content/bbs2chreader/bbsmenu
Message-ID: <20051223085503.0FEDB2AC011@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/bbsmenu/page.js
diff -u bbs2chreader/content/bbs2chreader/bbsmenu/page.js:1.1 bbs2chreader/content/bbs2chreader/bbsmenu/page.js:1.2
--- bbs2chreader/content/bbs2chreader/bbsmenu/page.js:1.1	Wed Dec 14 00:39:03 2005
+++ bbs2chreader/content/bbs2chreader/bbsmenu/page.js	Fri Dec 23 17:55:02 2005
@@ -298,11 +298,11 @@
 
 	if(eButton==0 && eDetail==1 && obj.value=="twisty"){
 			// twisty ????????????????
-		closeAllOpendContainers(row.value);
+		closeAllOpendContainers(aEvent, row.value);
 		return;
 	}else if(eDetail==2 && obj.value!="twisty" && isContainer){
 			// ???????????????????
-		closeAllOpendContainers(row.value);
+		closeAllOpendContainers(aEvent, row.value);
 		return;
 	}
 
@@ -321,9 +321,10 @@
 
 /**
  * ????????????????????
+ * @param aEvent event ???????
  * @param aExceptIndex number ???????????????
  */
-function closeAllOpendContainers(aExceptIndex){
+function closeAllOpendContainers(aEvent, aExceptIndex){
 	// XXX TODO b2rBbsmenuTreeView ??????
 	if(!gTreeBbsMenu.view.isContainerOpen(aExceptIndex)) return;
 
@@ -346,15 +347,17 @@
 	for(i=exceptItem.parent; i!=null; i=i.parent){
 		i.isOpen = true;
 	}
-	
 	gTreeBbsMenu.treeBoxObject.rowCountChanged(0, - gTreeBbsMenuView.rowCount);
 	gTreeBbsMenuView._refreshItems();
 	gTreeBbsMenu.treeBoxObject.rowCountChanged(0, gTreeBbsMenuView.rowCount);
-
+	
+		// ????????????????????????
+	var mouseOverRowIndex = gTreeBbsMenu.boxObject.getRowAt(aEvent.clientX, aEvent.clientY);
 	for(i=0; i<gTreeBbsMenuView.viewItems.length; i++){
 		item = gTreeBbsMenuView.viewItems[i];
 		if(item.title == exceptItemTitle){
-			gTreeBbsMenu.boxObject.ensureRowIsVisible(i);
+			var difference = i - mouseOverRowIndex;
+			if(difference > 0) gTreeBbsMenu.boxObject.scrollToRow(difference);
 			return;
 		}
 	}

From flyson ＠ users.sourceforge.jp  Sun Dec 25 19:19:42 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Sun, 25 Dec 2005 19:19:42 +0900
Subject: [Bbs2ch-cvs 81] CVS update: bbs2chreader/content/bbs2chreader/test
Message-ID: <20051225101942.6DA572AC01B@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/test/http-server-test.xul
diff -u bbs2chreader/content/bbs2chreader/test/http-server-test.xul:1.1 bbs2chreader/content/bbs2chreader/test/http-server-test.xul:1.2
--- bbs2chreader/content/bbs2chreader/test/http-server-test.xul:1.1	Fri Apr 29 07:13:33 2005
+++ bbs2chreader/content/bbs2chreader/test/http-server-test.xul	Sun Dec 25 19:19:42 2005
@@ -5,7 +5,6 @@
 <window id="winMain" title="Http Server Test" onload="startup()" onunload="shutdown()"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/x-javascript" src="chrome://bbs2chreader/content/global.js"/>
 <script type="application/x-javascript">
 <![CDATA[
 
@@ -20,6 +19,12 @@
 	HttpServer.stop();
 }
 
+function openLocalHost(){
+	var bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
+					.getService(Components.interfaces.nsIBbs2chService);
+	bbs2chService.openURL("http://localhost:4444/", null, true);
+}
+
 
 var HttpServer = {
 
@@ -109,7 +114,7 @@
 		var availableData = this._bInputStream.readBytes(aCount);
 
 		this._data += availableData;
-			// CRLFCRLF でリクエスト終了
+
 		if(this._data.match(/\r\n\r\n/m)){
 			dump("ReqestEnd\n");
 			this.sendResponse();
@@ -124,6 +129,6 @@
 
 <box class="box-padded">
 	<label class="text-link" value="http://localhost:4444/"
-		onclick="Bbs2chGlobal.openURI('http://localhost:4444/', null, true)"/>
+		onclick="openLocalHost()"/>
 </box>
 </window>
\ No newline at end of file

From flyson ＠ users.sourceforge.jp  Tue Dec 27 19:47:47 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Tue, 27 Dec 2005 19:47:47 +0900
Subject: [Bbs2ch-cvs 82] CVS update: bbs2chreader/components
Message-ID: <20051227104747.8961D2AC019@users.sourceforge.jp>

Index: bbs2chreader/components/nsBbs2chChannel.js
diff -u bbs2chreader/components/nsBbs2chChannel.js:1.6 bbs2chreader/components/nsBbs2chChannel.js:1.7
--- bbs2chreader/components/nsBbs2chChannel.js:1.6	Sat Nov  5 02:01:12 2005
+++ bbs2chreader/components/nsBbs2chChannel.js	Tue Dec 27 19:47:47 2005
@@ -118,22 +118,20 @@
 
 		this._observer = aObserver;
 		this._isPending = true;
-		this._dataSize = 0;
 	},
 
 	requestStart: function(){
 		this._stringStream = Components.classes["@mozilla.org/io/string-input-stream;1"]
 					.createInstance(Components.interfaces.nsIStringInputStream);
-		this._dataSize = 0;
+		this._currentSize = 0;
 		this._streamListener.onStartRequest(this, this._context);
 	},
 
 	requestRespond: function(aData, aDataLength){
 		this._stringStream.setData(aData, aDataLength);
 		this._streamListener.onDataAvailable(this, this._context,
-					this._stringStream, this._dataSize, aDataLength);
-
-		this._dataSize += aDataLength;
+					this._stringStream, this._currentSize, aDataLength);
+		this._currentSize += aDataLength;
 	},
 
 	requestEnd: function(){
@@ -143,6 +141,12 @@
 				this.loadGroup.removeRequest(this, null, Components.results.NS_OK);
 			}catch(ex){}
 		}
+		this._stringStream.close();
+		this._stringStream = null;
+		this._streamListener = null;
+		this._context = null;
+		this._observer = null;
+		this.notificationCallbacks = null;
 		this._isPending = false;
 	}
 

From flyson ＠ users.sourceforge.jp  Tue Dec 27 19:48:35 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Tue, 27 Dec 2005 19:48:35 +0900
Subject: [Bbs2ch-cvs 83] CVS update: bbs2chreader/content/bbs2chreader
Message-ID: <20051227104835.C66912AC019@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/thread.js
diff -u bbs2chreader/content/bbs2chreader/thread.js:1.30 bbs2chreader/content/bbs2chreader/thread.js:1.31
--- bbs2chreader/content/bbs2chreader/thread.js:1.30	Sun Jul 31 03:22:02 2005
+++ bbs2chreader/content/bbs2chreader/thread.js	Tue Dec 27 19:48:35 2005
@@ -264,12 +264,12 @@
 			if(startLine < 0) startLine = 0;
 			
 			if(startLine != 0)// 一番は必ず送信
-					this.requestRespond(this.datLineParse(logLines[0], 1, false) + "\n\n\n");
-			
+					this.requestRespond(this.datLineParse(logLines[0], 1, false) + "\n\n");
+			var logContent = new Array();
 			for(i=startLine; i<logLines.length; i++){
-				this.requestRespond(this.datLineParse(logLines[i], i+1, false) + "\n\n\n");
+				logContent.push(this.datLineParse(logLines[i], i+1, false));
 			}
-			
+			this.requestRespond(logContent.join("\n\n"));
 			this.requestRespond(this._tmpNewMark);
 		}
 		

From flyson ＠ users.sourceforge.jp  Thu Dec 29 22:20:56 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 29 Dec 2005 22:20:56 +0900
Subject: [Bbs2ch-cvs 84] CVS update: bbs2chreader/components
Message-ID: <20051229132056.DC6EC2AC032@users.sourceforge.jp>

Index: bbs2chreader/components/b2rThreadRedirector.js
diff -u /dev/null bbs2chreader/components/b2rThreadRedirector.js:1.1
--- /dev/null	Thu Dec 29 22:20:56 2005
+++ bbs2chreader/components/b2rThreadRedirector.js	Thu Dec 29 22:20:56 2005
@@ -0,0 +1,229 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is bbs2chreader.
+ *
+ * The Initial Developer of the Original Code is
+ * flyson.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *    flyson <flyson at users.sourceforge.jp>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+// ********** ********* b2rThreadRedirector ********** **********
+
+
+function b2rThreadRedirector(){
+	this._init();
+}
+
+
+b2rThreadRedirector.prototype = {
+
+	/**
+	 * Iitialize b2rThreadRedirector
+	 */
+	_init: function(){
+		this._PREF_ENABLED = "fls.bbs2chreader.thread_redirector.enabled";
+		this._PREF_ASK = "fls.bbs2chreader.thread_redirector.ask";
+
+		this._observerService = Components.classes["@mozilla.org/observer-service;1"]
+					.getService(Components.interfaces.nsIObserverService);
+		this._pref = Components.classes["@mozilla.org/preferences-service;1"]
+						.getService(Components.interfaces.nsIPrefBranch2);
+
+		this._enabled = this._pref.getBoolPref(this._PREF_ENABLED);
+		this._pref.addObserver(this._PREF_ENABLED, this, false);
+		this._observerService.addObserver(this, "xpcom-shutdown", false);
+	},
+
+
+	// ********** ********* implements nsIObserver ********** **********
+
+	observe: function(aSubject, aTopic, aData){
+		if(aTopic == "xpcom-shutdown"){
+			this._pref.removeObserver(this._PREF_ENABLED, this);
+			this._observerService.removeObserver(this, "xpcom-shutdown");
+
+		}else if(aTopic == "nsPref:changed"){
+			if(aData == this._PREF_ENABLED){
+				this._enabled = this._pref.getBoolPref(this._PREF_ENABLED);
+			}
+		}
+	},
+
+
+	// ********** ********* implements nsIContentPolicy ********** **********
+
+	TYPE_OTHER			: Components.interfaces.nsIContentPolicy.TYPE_OTHER,
+	TYPE_SCRIPT			: Components.interfaces.nsIContentPolicy.TYPE_SCRIPT,
+	TYPE_IMAGE			: Components.interfaces.nsIContentPolicy.TYPE_IMAGE,
+	TYPE_STYLESHEET		: Components.interfaces.nsIContentPolicy.TYPE_STYLESHEET,
+	TYPE_OBJECT			: Components.interfaces.nsIContentPolicy.TYPE_OBJECT,
+	TYPE_DOCUMENT		: Components.interfaces.nsIContentPolicy.TYPE_DOCUMENT,
+	TYPE_SUBDOCUMENT	: Components.interfaces.nsIContentPolicy.TYPE_SUBDOCUMENT,
+	TYPE_REFRESH		: Components.interfaces.nsIContentPolicy.TYPE_REFRESH,
+	ACCEPT				: Components.interfaces.nsIContentPolicy.ACCEPT,
+	REJECT_REQUEST		: Components.interfaces.nsIContentPolicy.REJECT_REQUEST,
+	REJECT_TYPE			: Components.interfaces.nsIContentPolicy.REJECT_TYPE,
+	REJECT_SERVER		: Components.interfaces.nsIContentPolicy.REJECT_SERVER,
+	REJECT_OTHER		: Components.interfaces.nsIContentPolicy.REJECT_OTHER,
+
+
+	shouldLoad: function(aContentType, aContentLocation, aRequestOrigin,
+											aContext, aMimeTypeGuess, aExtra){
+
+		if(!this._enabled) return this.ACCEPT;
+		if(aContentLocation.scheme.substring(0, 4) != "http") return this.ACCEPT;
+		if(aContentType != this.TYPE_DOCUMENT) return this.ACCEPT;
+		
+		var host = aContentLocation.host;
+		if(host.indexOf(".2ch.net")==-1 && host.indexOf(".bbspink.com")==-1 &&
+				host!="jbbs.livedoor.jp") return this.ACCEPT;
+
+		if(aContentLocation.spec.indexOf("/read.cgi/") != -1){
+			var viewB2r = true;
+			var ask = this._pref.getBoolPref(this._PREF_ASK);
+
+			if(ask){
+				var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+							.getService(Components.interfaces.nsIPromptService);
+				var dialogTitle = "bbs2chreader";
+				var dialogText = "Do you want to view it in bbs2chreader?\n" +
+										aContentLocation.spec +"\n";
+				var checkText = "Don't ask me this again";
+				var notAskCheck = { value: false };
+				viewB2r = (promptService.confirmEx(null, dialogTitle, dialogText, 
+								promptService.STD_YES_NO_BUTTONS, null, null, null,
+								checkText, notAskCheck) == 0);
+				if(notAskCheck.value){
+					this._pref.setBoolPref(this._PREF_ASK, false);
+					this._pref.setBoolPref(this._PREF_ENABLED, viewB2r);
+				}
+			}
+
+			if(viewB2r){
+				aContext.loadURI("bbs2ch:thread:" + aContentLocation.spec, null, null);
+				return this.REJECT_REQUEST;
+			}
+		}
+
+		return this.ACCEPT;
+	},
+
+
+	shouldProcess: function(aContentType, aContentLocation, aRequestOrigin,
+											aContext, aMimeTypeGuess, aExtra){
+		return this.ACCEPT;
+	},
+
+
+	// ********** ********* implements nsISupports ********** **********
+
+	QueryInterface: function(aIID){
+		if(aIID.equals(Components.interfaces.nsIContentPolicy)) return this;
+		if(aIID.equals(Components.interfaces.nsISupportsWeakReference)) return this;
+		if(aIID.equals(Components.interfaces.nsISupports)) return this;
+
+		throw Components.results.NS_ERROR_NO_INTERFACE;
+	}
+
+}
+
+
+
+
+// ********** ********* nsSimpleAdFilter Factory ********** **********
+
+
+var b2rThreadRedirectorFactory = {
+
+	createInstance: function (aOuter, aIID) {
+		if(aOuter != null) throw Components.results.NS_ERROR_NO_AGGREGATION;
+
+		return new b2rThreadRedirector();
+	}
+
+}
+
+
+// ********** ********* Component Registration ********** **********
+
+
+var ComponentModule = {
+
+	CONTRACTID: "@mozilla.org/b2r-thread-redirector;1",
+	CID: Components.ID("{0f937a10-3bbc-468f-8e16-81e6d8caae3e}"),
+	CNAME: "b2rThreadRedirector JS Component",
+
+
+	registerSelf: function(aCompMgr, aFileSpec, aLocation, aType){
+		aCompMgr = aCompMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+		
+		aCompMgr.registerFactoryLocation(this.CID, this.CNAME, this.CONTRACTID,
+											aFileSpec, aLocation, aType);
+
+		var categoryManager = Components.classes["@mozilla.org/categorymanager;1"]
+					.getService(Components.interfaces.nsICategoryManager);
+		categoryManager.addCategoryEntry("content-policy", this.CONTRACTID,
+											this.CONTRACTID, true, true);
+	},
+
+
+	unregisterSelf: function(aCompMgr, aFileSpec, aLocation){
+		aCompMgr = aCompMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+		aCompMgr.unregisterFactoryLocation(this.CID, aFileSpec);
+
+		var categoryManager = Components.classes["@mozilla.org/categorymanager;1"]
+					.getService(Components.interfaces.nsICategoryManager);
+		categoryManager.deleteCategoryEntry("content-policy", this.CONTRACTID, true);
+	},
+
+
+	getClassObject: function(aCompMgr, aCID, aIID){
+		if(aCID.equals(this.CID))
+				return b2rThreadRedirectorFactory;
+
+		if(!aIID.equals(Components.interfaces.nsIFactory))
+				throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+		
+		throw Components.results.NS_ERROR_NO_INTERFACE;
+	},
+
+
+	canUnload: function(aCompMgr){
+		return true;
+	}
+
+}
+
+
+function NSGetModule(aCompMgr, aFileSpec){
+	return ComponentModule;
+}

From flyson ＠ users.sourceforge.jp  Thu Dec 29 22:20:57 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 29 Dec 2005 22:20:57 +0900
Subject: [Bbs2ch-cvs 85] CVS update: bbs2chreader/defaults/preferences
Message-ID: <20051229132057.1F9692AC093@users.sourceforge.jp>

Index: bbs2chreader/defaults/preferences/bbs2chreader-pref.js
diff -u bbs2chreader/defaults/preferences/bbs2chreader-pref.js:1.3 bbs2chreader/defaults/preferences/bbs2chreader-pref.js:1.4
--- bbs2chreader/defaults/preferences/bbs2chreader-pref.js:1.3	Sun Nov 20 14:33:14 2005
+++ bbs2chreader/defaults/preferences/bbs2chreader-pref.js	Thu Dec 29 22:20:56 2005
@@ -1,22 +1,25 @@
 pref("fls.bbs2chreader.enable_browser_contextmenu", true);
-pref("fls.bbs2chreader.bypas_http_proxy" ,false);
-pref("fls.bbs2chreader.tab_load_in_foreground" ,false);
-pref("fls.bbs2chreader.appoint_data_dir" ,false);
-pref("fls.bbs2chreader.data_dir" ,"");
+pref("fls.bbs2chreader.bypas_http_proxy", false);
+pref("fls.bbs2chreader.tab_load_in_foreground", false);
+pref("fls.bbs2chreader.appoint_data_dir", false);
+pref("fls.bbs2chreader.data_dir", "");
 
-pref("fls.bbs2chreader.bbsmenu_load_url" ,"http://menu.2ch.net/bbsmenu.html");
-pref("fls.bbs2chreader.bbsmenu_toggle_open_container" ,false);
-pref("fls.bbs2chreader.bbsmenu_open_action" ,0);
-pref("fls.bbs2chreader.bbsmenu_historymenu_show" ,true);
-pref("fls.bbs2chreader.bbsmenu_historymenu_board_max" ,5);
-pref("fls.bbs2chreader.bbsmenu_historymenu_thread_max" ,5);
+pref("fls.bbs2chreader.thread_redirector.enabled", false);
+pref("fls.bbs2chreader.thread_redirector.ask", true);
 
-pref("fls.bbs2chreader.board_auto_update" ,false);
-pref("fls.bbs2chreader.board_open_action" ,0);
-pref("fls.bbs2chreader.board_update_interval_limit" ,120);
-pref("fls.bbs2chreader.board_thread_view_limit" ,50);
+pref("fls.bbs2chreader.bbsmenu_load_url", "http://menu.2ch.net/bbsmenu.html");
+pref("fls.bbs2chreader.bbsmenu_toggle_open_container", false);
+pref("fls.bbs2chreader.bbsmenu_open_action", 0);
+pref("fls.bbs2chreader.bbsmenu_historymenu_show", true);
+pref("fls.bbs2chreader.bbsmenu_historymenu_board_max", 5);
+pref("fls.bbs2chreader.bbsmenu_historymenu_thread_max", 5);
 
-pref("fls.bbs2chreader.thread_skin_uri" ,"chrome://bbs2chreader/content/res/skin-default/");
+pref("fls.bbs2chreader.board_auto_update", false);
+pref("fls.bbs2chreader.board_open_action", 0);
+pref("fls.bbs2chreader.board_update_interval_limit", 120);
+pref("fls.bbs2chreader.board_thread_view_limit", 50);
 
-pref("fls.bbs2chreader.livebookmarks_append_board_link" ,true);
-pref("fls.bbs2chreader.livebookmarks_min_unread" ,1);
+pref("fls.bbs2chreader.thread_skin_uri", "chrome://bbs2chreader/content/res/skin-default/");
+
+pref("fls.bbs2chreader.livebookmarks_append_board_link", true);
+pref("fls.bbs2chreader.livebookmarks_min_unread", 1);

From flyson ＠ users.sourceforge.jp  Thu Dec 29 22:20:57 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 29 Dec 2005 22:20:57 +0900
Subject: [Bbs2ch-cvs 86] CVS update: bbs2chreader/content/bbs2chreader/settings
Message-ID: <20051229132057.470962AC032@users.sourceforge.jp>

Index: bbs2chreader/content/bbs2chreader/settings/settings.xul
diff -u bbs2chreader/content/bbs2chreader/settings/settings.xul:1.13 bbs2chreader/content/bbs2chreader/settings/settings.xul:1.14
--- bbs2chreader/content/bbs2chreader/settings/settings.xul:1.13	Sun Nov 20 14:33:14 2005
+++ bbs2chreader/content/bbs2chreader/settings/settings.xul	Thu Dec 29 22:20:57 2005
@@ -25,6 +25,15 @@
 			prefattribute="checked"
 			prefstring="fls.bbs2chreader.enable_browser_contextmenu"/>
 
+		<checkbox label="2ch スレッド URL を bbs2chreader で開く"
+			prefelement="true"
+			prefattribute="checked"
+			prefstring="fls.bbs2chreader.thread_redirector.enabled"/>
+		<checkbox label="毎回確認する" style="padding-left:40px;"
+			prefelement="true"
+			prefattribute="checked"
+			prefstring="fls.bbs2chreader.thread_redirector.ask"/>
+
 		<checkbox label="新しいタブを前面に開く"
 			prefelement="true"
 			prefattribute="checked"

From flyson ＠ users.sourceforge.jp  Thu Dec 29 22:42:59 2005
From: flyson ＠ users.sourceforge.jp (flyson)
Date: Thu, 29 Dec 2005 22:42:59 +0900
Subject: [Bbs2ch-cvs 85] CVS update: bbs2chreader
Message-ID: <20051229134259.727372AC093@users.sourceforge.jp>

Index: bbs2chreader/history.txt
diff -u bbs2chreader/history.txt:1.9 bbs2chreader/history.txt:1.10
--- bbs2chreader/history.txt:1.9	Sun Nov  6 21:29:51 2005
+++ bbs2chreader/history.txt	Thu Dec 29 22:42:59 2005
@@ -1,20 +1,38 @@
+0.2.9
+	????????????????????????????bug:6600]
+	??????????????[?????????????]???+	??????????????????????????????????
+	???? JBBS ??????????
+	???????????????????s????bug:7666]
+	?????ｦ???????????????????ｦ????
+	?2ch ???? URL ?bbs2chreader ???????
+	?????????????+	???????????bbsmenu.rdf????bbsmenu.xml????
+	????????outside.txt????outside.xml????
+
+
+0.2.8.1
+	Firefox 1.5 ??
+
+
 0.2.8
-	1.0.x ???????+	Firefox 1.0.x ??????? 	?????ｦ??????????? 	????????????????????????? 
+
 0.2.7
-	  1.5RC1 ??
-	 ?????ｦ??????????
-	 ???????????????????????????-	 ????E????? sage ??????????????
-	 ?????????E???????N??????????
-	 ????E??????ｦ????????????????
-	 Be2ch ??ｯ?????????-	 ??????????????????????????????-	 ?????????????????????????????????-	 NG ?????????????????????????????-	 [?????????????????]? Firefox1.5 ??????????????+	1.5RC1 ??
+	?????ｦ??????????
+	???????????????????????????+	????E????? sage ??????????????
+	?????????E???????N??????????
+	????E??????ｦ????????????????
+	Be2ch ??ｯ?????????+	??????????????????????????????+	?????????????????????????????????+	NG ?????????????????????????????+	[?????????????????]? Firefox1.5 ?????????????? 
 
 0.2.6
@@ -97,6 +115,7 @@
 	???????????????????????????????
 	??????????????????????????
 
+
 0.1.0
 	???????????[?????]???
 	????????v??????????? 
@@ -105,6 +124,7 @@
 		( http://bbs2ch.sourceforge.jp/?p=SkinSpec )
 	??????????????? 
+
 0.0.9
 	????????X????????????????
 	???????????????????
@@ -114,10 +134,12 @@
 	??????????????
 	?????????????????
 
+
 0.0.8
 	??????????? (????[?????????]-[?????????]???????)
 	?????ｦ????
 
+
 0.0.7
 	????????ｦ???????
 	??g?????????????????? XBL ?
Index: bbs2chreader/install.rdf
diff -u bbs2chreader/install.rdf:1.16 bbs2chreader/install.rdf:1.17
--- bbs2chreader/install.rdf:1.16	Wed Nov  9 00:23:22 2005
+++ bbs2chreader/install.rdf	Thu Dec 29 22:42:59 2005
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:name>bbs2chreader</em:name>
 		<em:id>{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}</em:id>
-		<em:version>0.2.8+</em:version>
+		<em:version>0.2.9</em:version>
 		<em:description>2ch(Japanese Web Forum) Reader</em:description>
 		<em:optionsURL>chrome://bbs2chreader/content/settings/settings.xul</em:optionsURL>
 		<em:homepageURL>http://bbs2ch.sourceforge.jp/</em:homepageURL>
Index: bbs2chreader/mkxpi.bat
diff -u bbs2chreader/mkxpi.bat:1.10 bbs2chreader/mkxpi.bat:1.11
--- bbs2chreader/mkxpi.bat:1.10	Sun Nov  6 21:29:51 2005
+++ bbs2chreader/mkxpi.bat	Thu Dec 29 22:42:59 2005
@@ -1,12 +1,12 @@
 @ECHO OFF
 
 SET EXT_NAME=bbs2chreader
-SET EXT_VER=028
+SET EXT_VER=029
 
 MKDIR chrome
 ZIP -r chrome\%EXT_NAME%.jar content skin locale
 ZIP -d chrome\%EXT_NAME%.jar \*/CVS/\*
-REM ZIP -d chrome\%EXT_NAME%.jar \*/test/\*
+ZIP -d chrome\%EXT_NAME%.jar \*/test/\*
 ZIP -d chrome\%EXT_NAME%.jar \*/scrap/\*
 ZIP -r9 %EXT_NAME%_%EXT_VER%.xpi chrome defaults components install.rdf
 ZIP -d %EXT_NAME%_%EXT_VER%.xpi \*/CVS/\*

From flyson.moz ＠ gmail.com  Thu Dec 29 22:46:30 2005
From: flyson.moz ＠ gmail.com (flyson)
Date: Thu, 29 Dec 2005 22:46:30 +0900
Subject: [Bbs2ch-cvs 86] RELEASE_0_2_9
Message-ID: <c604af9a0512290546w2f03ec0cm@mail.gmail.com>

RELEASE_0_2_9