From svnnotify ＠ sourceforge.jp  Tue Oct  9 21:12:12 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 09 Oct 2007 21:12:12 +0900
Subject: [Bbs2ch-cvs 243]
 =?utf-8?b?WzIyNV0gIOOCueODrOOCv+OCpOODiOODq+OBruaWh+Wtl+WPgg==?=
 =?utf-8?b?54Wn44KS5bGV6ZaL?=
Message-ID: <1191931932.076789.8933.nullmailer@users.sourceforge.jp>

Revision: 225
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=225
Author:   flyson
Date:     2007-10-09 21:12:11 +0900 (Tue, 09 Oct 2007)

Log Message:
-----------
スレタイトルの文字参照を展開

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-09-28 18:33:48 UTC (rev 224)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-10-09 12:12:11 UTC (rev 225)
@@ -237,7 +237,7 @@
 			item.datID = RegExp.$1;
 			item.id = "item-" + item.datID;
 			item.number = i + 1;
-			item.title = RegExp.$2;
+			item.title = this.htmlToText(RegExp.$2);
 			item.count = Number(RegExp.$3);
 			item.read = 0;
 			item.unread = 0;
@@ -280,6 +280,27 @@
 	},
 
 
+	htmlToText: function(aStr){
+		if(aStr.indexOf("&") == -1) return aStr;
+		var fromStr = Components.classes["@mozilla.org/supports-string;1"]
+									.createInstance(Components.interfaces.nsISupportsString);
+		fromStr.data = aStr;
+		try{
+			var toStr = { value: null };
+			var	formatConverter = Components.classes["@mozilla.org/widget/htmlformatconverter;1"]
+									.createInstance(Components.interfaces.nsIFormatConverter);
+			formatConverter.convert("text/html", fromStr, fromStr.toString().length,
+										"text/unicode", toStr, {});
+		}catch(e){
+			return aStr;
+		}
+		if(toStr.value){
+			toStr = toStr.value.QueryInterface(Components.interfaces.nsISupportsString);
+			return toStr.toString();
+		}
+		return aStr;
+	},
+
 	/**
 	 * ログディレクトリ内の .idx を読み込んでログアイテムハッシュを作る
 	 */
@@ -297,7 +318,7 @@
 			cacheItem.datID = cacheLine[0];
 			cacheItem.lastModified = cacheLine[1];
 			cacheItem.count = parseInt(cacheLine[2]);
-			cacheItem.title = cacheLine[3];
+			cacheItem.title = this.htmlToText(cacheLine[3]);
 			cacheItem.id = "item-" + cacheItem.datID;
 			cacheItemHash[cacheItem.id] = cacheItem;
 		}

From svnnotify ＠ sourceforge.jp  Thu Oct 18 23:41:55 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 18 Oct 2007 23:41:55 +0900
Subject: [Bbs2ch-cvs 244]
 =?utf-8?b?WzIyNl0gIOabuOOBjei+vOOBv+ODleOCo+ODq+OCvw==?=
Message-ID: <1192718515.316062.18957.nullmailer@users.sourceforge.jp>

Revision: 226
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=226
Author:   flyson
Date:     2007-10-18 23:41:54 +0900 (Thu, 18 Oct 2007)

Log Message:
-----------
?吾?莨若???????

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul

Added Paths:
-----------
    trunk/bbs2chreader/chrome/content/bbs2chreader/post/
    trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/post/textarea.xml
    trunk/bbs2chreader/defaults/postFilters/
    trunk/bbs2chreader/defaults/postFilters/extensionList.xml


-------------- next part --------------
Added: trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js	2007-10-09 12:12:11 UTC (rev 225)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js	2007-10-18 14:41:54 UTC (rev 226)
@@ -0,0 +1,153 @@
+
+
+function b2rPostFilterManager(){
+	this._filters = new Array();
+}
+
+b2rPostFilterManager.prototype = {
+	get filters(){
+		return this._filters;
+	},
+
+	loadScripts: function(){
+		this._filters = new Array();
+		var fileExtensionTest = /\.xml$/i;
+
+		var bbs2chreaderID = "{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}";
+		var extensionManager = Cc["@mozilla.org/extensions/manager;1"].getService(Ci.nsIExtensionManager);
+		var installLocation = extensionManager.getInstallLocation(bbs2chreaderID);
+		var postFiltersFolder = installLocation.getItemFile(bbs2chreaderID, "defaults/postFilters")
+				.clone().QueryInterface(Ci.nsILocalFile);
+		var entries = postFiltersFolder.directoryEntries.QueryInterface(Ci.nsIDirectoryEnumerator);
+		while(true){
+			var entry = entries.nextFile;
+			if(!entry) break;
+			if(!fileExtensionTest.test(entry.leafName)) continue;
+
+			var postFilter = this._createFilter(entry);
+			if(postFilter){
+				this._filters.push(postFilter);
+			}
+		}
+		entries.close();
+
+
+		var postFiltersProfileFolder = gBbs2chService.getDataDir();
+		postFiltersProfileFolder.appendRelativePath("postFilters");
+		if(!postFiltersProfileFolder.exists()){
+			postFiltersProfileFolder.create(Ci.nsIFile.DIRECTORY_TYPE, 0777);
+		}
+		var entries = postFiltersProfileFolder.directoryEntries.QueryInterface(Ci.nsIDirectoryEnumerator);
+		while(true){
+			var entry = entries.nextFile;
+			if(!entry) break;
+			if(!fileExtensionTest.test(entry.leafName)) continue;
+
+			var postFilter = this._createFilter(entry);
+			if(postFilter){
+				this._filters.push(postFilter);
+			}
+		}
+		entries.close();
+	},
+
+	_createFilter: function(aLocalFile){
+		var fileInputStream = Cc["@mozilla.org/network/file-input-stream;1"]
+				.createInstance(Ci.nsIFileInputStream);
+		fileInputStream.init(aLocalFile, 0x01, 0666, Ci.nsIFileInputStream.CLOSE_ON_EOF);
+		var parser = new DOMParser();
+		var doc = parser.parseFromStream(fileInputStream, null, aLocalFile.fileSize , "text/xml");
+		if(doc.firstChild.nodeName!="postFilter") return null;
+		doc.normalize();
+
+		var filter = {};
+		filter.title = this._getNodeText(doc, "postFilter/title/text()");
+		if(!filter.title) filter.title = aLocalFile.leafName.replace(/\.xml$/, "");
+		filter.description = this._getNodeText(doc, "postFilter/description/text()");
+		filter.version = this._getNodeText(doc, "postFilter/version/text()");
+		filter.script = this._getNodeText(doc, "postFilter/script/text()");
+		filter.scriptFile = aLocalFile;
+		filter.scriptDoc = doc;
+		if(!filter.script) return null;
+
+		return filter;
+	},
+
+	_getNodeText: function(aDoc, aXpath){
+		var result = new Array();
+		var xpathResult = aDoc.evaluate(aXpath, aDoc, null,
+				XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+		for(let i=0; i<xpathResult.snapshotLength; i++){
+			var node = xpathResult.snapshotItem(i);
+			result.push(node.nodeValue);
+		}
+		return result.join("");
+	},
+
+	execFilterScript: function(aPostFilter, aTextArea){
+		var safeWindow = new XPCNativeWrapper(window);
+		var sandbox = new Components.utils.Sandbox(safeWindow);
+		sandbox.PostFilter = new b2rPostFilterContext(aPostFilter, aTextArea);
+
+		sandbox.__proto__ = safeWindow;
+		try{
+			var stackLinenumber = Components.stack.lineNumber + 1;
+			Components.utils.evalInSandbox(aPostFilter.script, sandbox);
+		}catch(ex){
+			this.logErrorMessage(ex.message, aPostFilter.scriptFile.path, ex.lineNumber - stackLinenumber);
+			return aTextArea.value;
+		}
+		return sandbox.PostFilter.result;
+	},
+
+	logErrorMessage: function(aMessage, aSourceName, aLineNumber){
+		var consoleService = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
+		var scriptError = Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError);
+		scriptError.init(aMessage, aSourceName, null, aLineNumber, null, null, null);
+		consoleService.logMessage(scriptError);
+	}
+
+}
+
+
+function b2rPostFilterContext(aPostFilter, aTextArea){
+	this._filter = aPostFilter;
+	this._textArea = aTextArea;
+	this._value = aTextArea.value;
+	this._result = aTextArea.value;
+}
+
+b2rPostFilterContext.prototype = {
+
+	get scriptFile(){
+		return this._filter.scriptFile;
+	},
+	get scriptDoc(){
+		return this._filter.scriptDoc;
+	},
+
+	get value(){
+		return this._value;
+	},
+
+	get result(){
+		return String(this._result);
+	},
+	set result(aValue){
+		return this._result = aValue;
+	},
+
+	get isSelection(){
+		return this._textArea.selectionStart != this._textArea.selectionEnd;
+	},
+
+	get selectionLeft(){
+		return this.value.substring(0, this._textArea.selectionStart);
+	},
+	get selection(){
+		return this.value.substring(this._textArea.selectionStart, this._textArea.selectionEnd);
+	},
+	get selectionRight(){
+		return this.value.substring(this._textArea.selectionEnd);
+	}
+};
\ No newline at end of file

Added: trunk/bbs2chreader/chrome/content/bbs2chreader/post/textarea.xml
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post/textarea.xml	2007-10-09 12:12:11 UTC (rev 225)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post/textarea.xml	2007-10-18 14:41:54 UTC (rev 226)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<bindings xmlns="http://www.mozilla.org/xbl" xmlns:xbl="http://www.mozilla.org/xbl">
+	<binding id="postwizard-textbox" extends="chrome://global/content/bindings/textbox.xml#textarea">
+		<implementation>
+			<constructor><![CDATA[
+			]]></constructor>
+			<method name="buildContextMenu">
+			<body><![CDATA[
+				const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	      		var input = document.getAnonymousElementByAttribute(this, "anonid", "input");
+	      		var ctx = document.getAnonymousElementByAttribute(input.parentNode, "anonid", 
+	      						"input-box-contextmenu");
+	      		var firstChild = ctx.firstChild;
+	      		for (var i = 0; i < this.childNodes.length; i++){
+	      			var node = this.childNodes[i].cloneNode(true);
+	      			ctx.insertBefore(node, firstChild);
+      			}      			
+			]]></body>
+			</method>
+		</implementation>
+	</binding>
+</bindings>
\ No newline at end of file

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.js	2007-10-09 12:12:11 UTC (rev 225)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.js	2007-10-18 14:41:54 UTC (rev 226)
@@ -38,6 +38,7 @@
 
 var gThreadURL;
 var gPost;
+var gFilterManager;
 var gBbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
 						.getService(Components.interfaces.nsIBbs2chService);
 var gIoService = Components.classes["@mozilla.org/network/io-service;1"]
@@ -96,8 +97,9 @@
 	wizPostWizard.title = "POST: " + gPost.title + " [bbs2chreader]";
 	document.getElementById("lblThreadTitle").value = gPost.title;
 
+
 	mailDisabled();
-
+	initPostFilter();
 	checkBeLogin();
 }
 
@@ -116,6 +118,27 @@
 	document.getElementById("txtMail").disabled = document.getElementById("chkSage").checked;
 }
 
+function initPostFilter(){
+	gFilterManager = new b2rPostFilterManager();
+	gFilterManager.loadScripts();
+	var filterPopup = document.getElementById("filterPopup");
+
+	for(let[key, value] in Iterator(gFilterManager.filters)){
+		var menuitem = document.createElement("menuitem");
+		menuitem.setAttribute("label", value.title);
+		menuitem.setAttribute("value", key);
+		filterPopup.appendChild(menuitem);
+	}
+	filterPopup.parentNode.parentNode.buildContextMenu();
+}
+
+function execPostFilter(aScriptIndex){
+	var postFilter = gFilterManager.filters[aScriptIndex];
+	var messageText = document.getElementById("txtMsg");
+
+	messageText.value = gFilterManager.execFilterScript(postFilter, messageText);
+}
+
 /**
  * ハードコーティングな文字列をスクリプト内部で利用可能な文字列に変換
  * @param aString string 文字列

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul	2007-10-09 12:12:11 UTC (rev 225)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul	2007-10-18 14:41:54 UTC (rev 226)
@@ -12,13 +12,17 @@
 	persist="screenX screenY width height"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+	<script type="application/javascript;version=1.7">
+		const Ci = Components.interfaces;
+		const Cc = Components.classes;
+	</script>
 	<script type="application/x-javascript" src="chrome://bbs2chreader/content/belogin/belogin.js"/>
 	<script type="application/x-javascript" src="chrome://bbs2chreader/content/httprequest.js"/>
 	<script type="application/x-javascript" src="chrome://bbs2chreader/content/post.js"/>
-	<script type="application/x-javascript" src="chrome://bbs2chreader/content/post-wizard.js"/>
+	<script type="application/x-javascript;version=1.7" src="chrome://bbs2chreader/content/post-wizard.js"/>
 	<script type="application/x-javascript" src="chrome://bbs2chreader/content/board/items.js"/>
+	<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/post/filter.js"/>
 
-
 	<wizardpage pageid="wpgForm" id="wpgForm" onpageadvanced="return formCheck()"
 			label="&wpgForm.label;" description="&wpgForm.desc;">
 
@@ -31,8 +35,13 @@
 			<textbox id="txtMail" value="" flex="1"/>
 			<checkbox id="chkSage" label="sage" persist="checked" oncommand="mailDisabled()"/>
 		</hbox>
-		<textbox id="txtMsg" value="" multiline="true" flex="1"
-			onkeypress="event.stopPropagation()"/>
+		<textbox id="txtMsg" value="" multiline="true" flex="1" onkeypress="event.stopPropagation()"
+				style="-moz-binding:url(chrome://bbs2chreader/content/post/textarea.xml#postwizard-textbox)">
+			<menu label="フィルタ">
+				<menupopup id="filterPopup" oncommand="execPostFilter(parseInt(event.target.getAttribute('value')))"/>
+			</menu>
+			<menuseparator/>
+		</textbox>
 
 		<hbox align="center" pack="end">
 			<!--<button id="btnRePost" label="この板のディフォルトに設定"/>

Added: trunk/bbs2chreader/defaults/postFilters/extensionList.xml
===================================================================
--- trunk/bbs2chreader/defaults/postFilters/extensionList.xml	2007-10-09 12:12:11 UTC (rev 225)
+++ trunk/bbs2chreader/defaults/postFilters/extensionList.xml	2007-10-18 14:41:54 UTC (rev 226)
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<postFilter>
+	<title>?≦宍罘???????/title>
+	<description>?ゃ??鴻??若????????≦宍罘??????ャ???/description>
+	<version>1.0.0</version>
+	<creator>flyson</creator>
+	<script><![CDATA[
+		const Ci = Components.interfaces;
+		const Cc = Components.classes;
+
+		var gRDFS = Cc["@mozilla.org/rdf/rdf-service;1"].getService(Ci.nsIRDFService);
+		var gExtensionManager = Cc["@mozilla.org/extensions/manager;1"].getService(Ci.nsIExtensionManager);
+
+		function getExtensionList(){
+			var result = new Array();
+			var itemList = gExtensionManager.getItemList(Ci.nsIUpdateItem.TYPE_EXTENSION, {});
+
+			for(var [key, value] in Iterator(itemList)){
+				var line = value.name + " : " + value.version;
+				if(itemIsDisabled(value.id)){
+					line += " (?≦?)";
+				}
+				result.push(line);
+			}
+			return result.join("\n");
+		}
+
+		function itemIsDisabled(aID){
+			const PREFIX_NS_EM = "http://www.mozilla.org/2004/em-rdf#";
+			const PREFIX_ITEM_URI = "urn:mozilla:item:";	
+
+			var item = gRDFS.GetResource(PREFIX_ITEM_URI + aID);
+			var property = gRDFS.GetResource(PREFIX_NS_EM + "isDisabled")
+			var target = gExtensionManager.datasource.GetTarget(item, property, true)
+							.QueryInterface(Ci.nsIRDFLiteral);
+			return target.Value == "true";
+		}
+
+		PostFilter.result += "\n" + getExtensionList();
+
+	]]></script>
+</postFilter>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Fri Oct 19 23:03:47 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 19 Oct 2007 23:03:47 +0900
Subject: [Bbs2ch-cvs 245]
 =?utf-8?b?WzIyN10gIOWGheWuueODhuOCreOCueODiOOBruWPluW+l+OCklhQ?=
 =?utf-8?b?YXRo44Gu5Luj44KP44KK44GrdGV4dENvbnRlbnTjgpLkvb/jgYbjgojjgYY=?=
 =?utf-8?b?44Gr44GX44Gf44CC?=
Message-ID: <1192802627.714695.23151.nullmailer@users.sourceforge.jp>

Revision: 227
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=227
Author:   flyson
Date:     2007-10-19 23:03:47 +0900 (Fri, 19 Oct 2007)

Log Message:
-----------
内容テキストの取得をXPathの代わりにtextContentを使うようにした。

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js	2007-10-18 14:41:54 UTC (rev 226)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js	2007-10-19 14:03:47 UTC (rev 227)
@@ -61,11 +61,11 @@
 		doc.normalize();
 
 		var filter = {};
-		filter.title = this._getNodeText(doc, "postFilter/title/text()");
+		filter.title = this._getTextContent(doc, "title");
 		if(!filter.title) filter.title = aLocalFile.leafName.replace(/\.xml$/, "");
-		filter.description = this._getNodeText(doc, "postFilter/description/text()");
-		filter.version = this._getNodeText(doc, "postFilter/version/text()");
-		filter.script = this._getNodeText(doc, "postFilter/script/text()");
+		filter.description = this._getTextContent(doc, "description");
+		filter.version = this._getTextContent(doc, "version");
+		filter.script = this._getTextContent(doc, "script");
 		filter.scriptFile = aLocalFile;
 		filter.scriptDoc = doc;
 		if(!filter.script) return null;
@@ -73,15 +73,10 @@
 		return filter;
 	},
 
-	_getNodeText: function(aDoc, aXpath){
-		var result = new Array();
-		var xpathResult = aDoc.evaluate(aXpath, aDoc, null,
-				XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-		for(let i=0; i<xpathResult.snapshotLength; i++){
-			var node = xpathResult.snapshotItem(i);
-			result.push(node.nodeValue);
-		}
-		return result.join("");
+	_getTextContent: function(aDoc, aTagName){
+		var nodes = aDoc.getElementsByTagName(aTagName);
+		if(nodes.length>0) return nodes[0].textContent;
+		return null;
 	},
 
 	execFilterScript: function(aPostFilter, aTextArea){

From svnnotify ＠ sourceforge.jp  Sun Oct 21 18:16:32 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 21 Oct 2007 18:16:32 +0900
Subject: [Bbs2ch-cvs 246]  [228] ver.0.4.7
Message-ID: <1192958192.892013.27833.nullmailer@users.sourceforge.jp>

Revision: 228
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=228
Author:   flyson
Date:     2007-10-21 18:16:32 +0900 (Sun, 21 Oct 2007)

Log Message:
-----------
ver.0.4.7

Modified Paths:
--------------
    trunk/bbs2chreader/install.rdf


-------------- next part --------------
Modified: trunk/bbs2chreader/install.rdf
===================================================================
--- trunk/bbs2chreader/install.rdf	2007-10-19 14:03:47 UTC (rev 227)
+++ trunk/bbs2chreader/install.rdf	2007-10-21 09:16:32 UTC (rev 228)
@@ -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.4.6</em:version>
+		<em:version>0.4.7</em:version>
 		<em:description>2ch.net(Japanese Web Forums) Browser</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><!-- Firefox -->
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>2.0</em:minVersion>
-				<em:maxVersion>3.0a7</em:maxVersion>
+				<em:maxVersion>3.0a8</em:maxVersion>
 			</Description>
 			<!-- Seamonkey
 			<Description>

From svnnotify ＠ sourceforge.jp  Sun Oct 21 18:17:25 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 21 Oct 2007 18:17:25 +0900
Subject: [Bbs2ch-cvs 247]  [229] made a copy
Message-ID: <1192958245.150885.28057.nullmailer@users.sourceforge.jp>

Revision: 229
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=229
Author:   flyson
Date:     2007-10-21 18:17:25 +0900 (Sun, 21 Oct 2007)

Log Message:
-----------
made a copy

Added Paths:
-----------
    tags/RELEASE_0_4_7/


-------------- next part --------------
Copied: tags/RELEASE_0_4_7 (from rev 228, trunk/bbs2chreader)

From svnnotify ＠ sourceforge.jp  Sun Oct 21 18:19:28 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 21 Oct 2007 18:19:28 +0900
Subject: [Bbs2ch-cvs 248]  [230] ver.0.4.7
Message-ID: <1192958368.295711.29204.nullmailer@users.sourceforge.jp>

Revision: 230
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=230
Author:   flyson
Date:     2007-10-21 18:19:28 +0900 (Sun, 21 Oct 2007)

Log Message:
-----------
ver.0.4.7

Modified Paths:
--------------
    trunk/bbs2chreader/history.txt


-------------- next part --------------
Modified: trunk/bbs2chreader/history.txt
===================================================================
--- trunk/bbs2chreader/history.txt	2007-10-21 09:17:25 UTC (rev 229)
+++ trunk/bbs2chreader/history.txt	2007-10-21 09:19:28 UTC (rev 230)
@@ -1,3 +1,9 @@
+0.4.7
+	連鎖あぼーん実装
+	スレッド一覧で文字参照を展開するようにした
+	書き込みフィルタの試験実装
+	
+
 0.4.6
 	「履歴メニューを表示する」がオフでもメニューが表示されていたのを修正
 	Mac でステータスバーからあぼーんマネージャを開いたときに閉じられなくなっていたのを修正

From svnnotify ＠ sourceforge.jp  Thu Oct 25 20:03:45 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 25 Oct 2007 20:03:45 +0900
Subject: [Bbs2ch-cvs 249]
 =?utf-8?b?WzIzMV0gIGpiYnMg562J44Gn44Kt44Oj44OD44K344Ol44GM5paH?=
 =?utf-8?b?5a2X5YyW44GR44GZ44KL44Gu44KS5L+u5q2j?=
Message-ID: <1193310225.469105.22380.nullmailer@users.sourceforge.jp>

Revision: 231
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=231
Author:   flyson
Date:     2007-10-25 20:03:45 +0900 (Thu, 25 Oct 2007)

Log Message:
-----------
jbbs 等でキャッシュが文字化けするのを修正

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-10-21 09:19:28 UTC (rev 230)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-10-25 11:03:45 UTC (rev 231)
@@ -357,7 +357,7 @@
 					// 新規or更新 idx ファイルがあるときは読み込む
 				cacheUpdated = true;
 				var indexContent = this._bbs2chService.readFile(file.path);
-				indexContent = this._bbs2chService.fromType(indexContent, this.type);
+				indexContent = this._bbs2chService.fromSJIS(indexContent, this.type);
 				logItem.title = regTitle.test(indexContent) ? RegExp.$1 : "";
 				logItem.count = regLineCount.test(indexContent) ? parseInt(RegExp.$1) : 0;
 				logItem.read  = logItem.count;
@@ -369,7 +369,7 @@
 
 		if(cacheUpdated){
 			cacheContents = cacheContents.join("\n");
-			cacheContents = this._bbs2chService.toType(cacheContents, this.type);
+			cacheContents = this._bbs2chService.toSJIS(cacheContents, this.type);
 			this._bbs2chService.writeFile(cacheFile.path, cacheContents, false);
 		}
 		return resultHash;

From svnnotify ＠ sourceforge.jp  Thu Oct 25 22:44:42 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 25 Oct 2007 22:44:42 +0900
Subject: [Bbs2ch-cvs 250]
 =?utf-8?b?WzIzMl0gIOS9nOaIkOaXpeOCkuacgOWIneOBi+OCieaVtOW9og==?=
 =?utf-8?b?44GZ44KL44GT44Go44Gr44GX44Gf?=
Message-ID: <1193319882.297729.3908.nullmailer@users.sourceforge.jp>

Revision: 232
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=232
Author:   flyson
Date:     2007-10-25 22:44:41 +0900 (Thu, 25 Oct 2007)

Log Message:
-----------
作成日を最初から整形することにした

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-10-25 11:03:45 UTC (rev 231)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-10-25 13:44:41 UTC (rev 232)
@@ -121,6 +121,8 @@
 				.getService(Components.interfaces.nsIBbs2chService);
 		this._ioService = Components.classes["@mozilla.org/network/io-service;1"]
 				.getService(Components.interfaces.nsIIOService);
+		this._dateFormat = Components.classes["@mozilla.org/intl/scriptabledateformat;1"]
+				.getService(Components.interfaces.nsIScriptableDateFormat);
 
 		this._validURL = false;
 		try{
@@ -165,6 +167,17 @@
 		return this._settings[aSettingName] || null;
 	},
 
+	/**
+	 * Date オブジェクトからフォーマットされた日付文字列(短い形式)を返す
+	 */
+	_getFormatedDate: function(aDate){
+		return this._dateFormat.FormatDate("", this._dateFormat.dateFormatShort,
+						aDate.getFullYear(),
+						aDate.getMonth() + 1,
+						aDate.getDate());
+	},
+
+
 	refresh: function(aFilterLimit, aShowDownedLogs){
 		var startTime = new Date().getTime();
 		const NS_BBS2CH = this._bbs2chService.nameSpace;
@@ -242,7 +255,7 @@
 			item.read = 0;
 			item.unread = 0;
 			item.force = this.getThreadForce(item.datID, item.count);
-			item.makeDate = item.datID * 1000;
+			item.makeDate = this._getFormatedDate(new Date(item.datID * 1000));
 			item.url = threadUrlSpec + item.datID + "/";
 			if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){
 				item.url = threadUrlSpec + "&KEY=" + item.datID;
@@ -342,7 +355,7 @@
 				logItem.number = -1;
 				logItem.unread = 0;
 				logItem.force = 0;
-				logItem.makeDate = logItem.datID * 1000;
+				logItem.makeDate = this._getFormatedDate(new Date(logItem.datID * 1000));
 				logItem.url = aThreadUrlSpec + logItem.datID + "/";
 				if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){
 					logItem.url = aThreadUrlSpec + "&KEY=" + logItem.datID;

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-10-25 11:03:45 UTC (rev 231)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-10-25 13:44:41 UTC (rev 232)
@@ -790,8 +790,6 @@
 function Bbs2chBoardTreeView(aItems){
 	this._items = aItems;
 	this._rowCount = aItems.length;
-	this._dateFormat = Components.classes["@mozilla.org/intl/scriptabledateformat;1"]
-							.getService(Components.interfaces.nsIScriptableDateFormat);
 	this._atomService = Components.classes["@mozilla.org/atom-service;1"]
 							.getService(Components.interfaces.nsIAtomService);
 }
@@ -800,19 +798,6 @@
 Bbs2chBoardTreeView.prototype = {
 
 
-	/**
-	 * Date オブジェクトからフォーマットされた日付文字列(短い形式)を返す
-	 * @param {date} aDate Date オブジェクト
-	 * @type string
-	 */
-	getFormatedDate: function(aDate){
-		return this._dateFormat.FormatDate("", this._dateFormat.dateFormatShort,
-						aDate.getFullYear(),
-						aDate.getMonth() + 1,
-						aDate.getDate());
-	},
-
-
 // ********** ********* implements nsITreeView ********** **********
 
 
@@ -837,9 +822,6 @@
 			case "int":
 				cellText = String(this._items[aRow][property]);
 				break;
-			case "date":
-				cellText = this.getFormatedDate(new Date(this._items[aRow][property]));
-				break;
 		}
 		return cellText;
 	},

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-10-25 11:03:45 UTC (rev 231)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-10-25 13:44:41 UTC (rev 232)
@@ -139,7 +139,7 @@
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
 		<treecol id="colMakeDate" label="&colMakeDate.label;" flex="1"
-				property="makeDate" cellType="date"
+				property="makeDate" cellType="str"
 				persist2="hidden width sortActive sortDirection"/>
 	</treecols>
 	<treechildren/>

From svnnotify ＠ sourceforge.jp  Thu Oct 25 22:51:09 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 25 Oct 2007 22:51:09 +0900
Subject: [Bbs2ch-cvs 251]
 =?utf-8?b?WzIzM10gIOODhOODquODvOOBuOOBruODieODreODg+ODl+OCkg==?=
 =?utf-8?b?6KGM44GI44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1193320269.793710.7599.nullmailer@users.sourceforge.jp>

Revision: 233
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=233
Author:   flyson
Date:     2007-10-25 22:51:09 +0900 (Thu, 25 Oct 2007)

Log Message:
-----------
ツリーへのドロップを行えるようにした

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-10-25 13:44:41 UTC (rev 232)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-10-25 13:51:09 UTC (rev 233)
@@ -134,18 +134,6 @@
 }
 
 
-/**
- * ツリーオブジェクトへのドロップを禁止
- */
-function treeDropCheck(aEvent){
-	if(aEvent.originalTarget.localName.indexOf("tree") == 0){
-		aEvent.stopPropagation();
-		return false;
-	}
-	return true;
-}
-
-
 function loadPersist(){
 	var persistPref = Components.classes["@mozilla.org/preferences-service;1"]
 						.getService(Components.interfaces.nsIPrefService)
@@ -899,24 +887,24 @@
 		}
 	},
 	getColumnProperties: function(aCol, aProperties){},
-	isContainer: function(aRow){},
-	isContainerOpen: function(aRow){},
-	isContainerEmpty: function(aRow){},
-	isSeparator: function(aRow){},
-	isSorted: function(aRow){},
-	canDrop: function(aIndex){},
+	isContainer: function(aRow){ return false; },
+	isContainerOpen: function(aRow){ return false; },
+	isContainerEmpty: function(aRow){ return false; },
+	isSeparator: function(aRow){ return false; },
+	isSorted: function(aRow){ return false; },
+	canDrop: function(aIndex){ return false; },
 	canDropOn: function(aIndex){},
 	canDropBeforeAfter: function(aIndex, aBefore){},
 	drop: function(aIndex, aOrientation){},
-	getParentIndex: function getParentIndex(aIndex){},
-	hasNextSibling: function(aIndex, aAfterIndex){},
- 	getLevel: function(aIndex){},
+	getParentIndex: function getParentIndex(aIndex){ return -1; },
+	hasNextSibling: function(aIndex, aAfterIndex){ return false; },
+ 	getLevel: function(aIndex){ return 0; },
 	getImageSrc: function(aRow, aCol){},
 	getProgressMode: function(aRow, aCol){},
 	getCellValue: function(aRow, aCol){},
 	selectionChanged: function(){},
 	cycleCell: function(aRow, aCol){},
-	isEditable: function(aRow, aCol){},
+	isEditable: function(aRow, aCol){ return false; },
 	setCellText: function(aRow, aCol, aValue){},
 	toggleOpenState: function(aIndex){},
 	performAction: function(aAction){},

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-10-25 13:44:41 UTC (rev 232)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-10-25 13:51:09 UTC (rev 233)
@@ -8,7 +8,6 @@
 ]>
 <page id="pageMain" onload="startup()" onunload="shutdown()"
 	onmousedown="eventBubbleCheck(event)" onkeypress="eventBubbleCheck(event)"
-	ondragover="return treeDropCheck(event)"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/lib/clipboard.js"/>

From svnnotify ＠ sourceforge.jp  Fri Oct 26 22:29:27 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 26 Oct 2007 22:29:27 +0900
Subject: [Bbs2ch-cvs 252]  [234]
Message-ID: <1193405367.153534.26534.nullmailer@users.sourceforge.jp>

Revision: 234
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=234
Author:   flyson
Date:     2007-10-26 22:29:26 +0900 (Fri, 26 Oct 2007)

Log Message:
-----------


Added Paths:
-----------
    trunk/bbs2chreader/chrome/content/bbs2chreader/lib/xpc.js


-------------- next part --------------
Added: trunk/bbs2chreader/chrome/content/bbs2chreader/lib/xpc.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/lib/xpc.js	2007-10-25 13:51:09 UTC (rev 233)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/lib/xpc.js	2007-10-26 13:29:26 UTC (rev 234)
@@ -0,0 +1,3 @@
+const Ci = Components.interfaces;
+const Cc = Components.classes;
+const Cr = Components.results;

From svnnotify ＠ sourceforge.jp  Fri Oct 26 22:30:48 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 26 Oct 2007 22:30:48 +0900
Subject: [Bbs2ch-cvs 253]
 =?utf-8?b?WzIzNV0gQ29tcG9uZW50cy4gaW50ZXJmYWNlcyDnrYnjga7lrpo=?=
 =?utf-8?b?5pWw5YyW?=
Message-ID: <1193405448.063769.27788.nullmailer@users.sourceforge.jp>

Revision: 235
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=235
Author:   flyson
Date:     2007-10-26 22:30:47 +0900 (Fri, 26 Oct 2007)

Log Message:
-----------
Components.interfaces 等の定数化
ツリービューの高速化

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/logMove.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-10-26 13:29:26 UTC (rev 234)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-10-26 13:30:47 UTC (rev 235)
@@ -117,24 +117,21 @@
 
 
 	init: function(aURLSpec){
-		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._dateFormat = Components.classes["@mozilla.org/intl/scriptabledateformat;1"]
-				.getService(Components.interfaces.nsIScriptableDateFormat);
+		this._bbs2chService = Cc["@mozilla.org/bbs2ch-service;1"].getService(Ci.nsIBbs2chService);
+		this._ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+		this._dateFormat = Cc["@mozilla.org/intl/scriptabledateformat;1"]
+				.getService(Ci.nsIScriptableDateFormat);
 
 		this._validURL = false;
 		try{
-			this._url = this._ioService.newURI(aURLSpec, null, null)
-								.QueryInterface(Components.interfaces.nsIURL);
+			this._url = this._ioService.newURI(aURLSpec, null, null).QueryInterface(Ci.nsIURL);
 
 			this._subjectURL = this._ioService.newURI("subject.txt", null, this.url)
-									.QueryInterface(Components.interfaces.nsIURL);
+					.QueryInterface(Ci.nsIURL);
 			this._subjectFile = this._bbs2chService.getLogFileAtURL(this.subjectURL.spec);
 
 			this._settingURL = this._ioService.newURI("SETTING.TXT", null, this.url)
-									.QueryInterface(Components.interfaces.nsIURL);
+					.QueryInterface(Ci.nsIURL);
 			this._settingFile = this._bbs2chService.getLogFileAtURL(this.settingURL.spec);
 		}catch(ex){
 			dump("Bbs2chBoardItems.init: " + ex + "\n");
@@ -295,20 +292,19 @@
 
 	htmlToText: function(aStr){
 		if(aStr.indexOf("&") == -1) return aStr;
-		var fromStr = Components.classes["@mozilla.org/supports-string;1"]
-									.createInstance(Components.interfaces.nsISupportsString);
+		var fromStr = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString);
 		fromStr.data = aStr;
 		try{
 			var toStr = { value: null };
-			var	formatConverter = Components.classes["@mozilla.org/widget/htmlformatconverter;1"]
-									.createInstance(Components.interfaces.nsIFormatConverter);
+			var	formatConverter = Cc["@mozilla.org/widget/htmlformatconverter;1"]
+						.createInstance(Ci.nsIFormatConverter);
 			formatConverter.convert("text/html", fromStr, fromStr.toString().length,
 										"text/unicode", toStr, {});
 		}catch(e){
 			return aStr;
 		}
 		if(toStr.value){
-			toStr = toStr.value.QueryInterface(Components.interfaces.nsISupportsString);
+			toStr = toStr.value.QueryInterface(Ci.nsISupportsString);
 			return toStr.toString();
 		}
 		return aStr;
@@ -344,7 +340,7 @@
 		var logDir = this._bbs2chService.getLogFileAtURL(this.url.spec);
 		var entries = logDir.directoryEntries;
 		while(entries.hasMoreElements()){
-			var file = entries.getNext().QueryInterface(Components.interfaces.nsILocalFile);
+			var file = entries.getNext().QueryInterface(Ci.nsILocalFile);
 			if(!regIndexName.test(file.leafName)) continue;
 			var datID = RegExp.$1;
 			var lastModified = file.lastModifiedTime;
@@ -398,7 +394,7 @@
 	 */
 	getThreadForce: function(aDatID, aCount){
 			// スレッド作成日から現在までのミリ数
-		var progress = new Date().getTime() - aDatID * 1000;
+		var progress = Date.now() - aDatID * 1000;
 			// 86400000 = 一日/ミリ秒 (24 * 60 * 60 * 1000)
 		progress = progress / 86400000;
 
@@ -412,8 +408,8 @@
 	search: function(aSearchString){
 		if(!this._lastItems) this._lastItems = this.items.concat();
 
-		var unicodeNormalizer  = Components.classes["@mozilla.org/intl/unicodenormalizer;1"]
-				.createInstance(Components.interfaces.nsIUnicodeNormalizer);
+		var unicodeNormalizer  = Cc["@mozilla.org/intl/unicodenormalizer;1"]
+				.createInstance(Ci.nsIUnicodeNormalizer);
 		var normalizedStr = {};
 
 		var searchString = aSearchString.toLowerCase();

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/logMove.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/logMove.xul	2007-10-26 13:29:26 UTC (rev 234)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/logMove.xul	2007-10-26 13:30:47 UTC (rev 235)
@@ -4,10 +4,9 @@
 <dialog id="winMain" class="plain" buttons="cancel" defaultButton="cancel"
 	title="ログファイルの移動 [bbs2chreader]" onload="startup()"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/lib/xpc.js"/>
+<script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/board/logMove.js"/>
 
-<script type="application/javascript; version=1.7"
-			src="chrome://bbs2chreader/content/board/logMove.js"/>
-
 <hbox class="wizard-header" id="hdrDialog" label="" description=""/>
 <vbox width="420" class="spaced">
 	<hbox class="spaced" flex="1">

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-10-26 13:29:26 UTC (rev 234)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-10-26 13:30:47 UTC (rev 235)
@@ -36,9 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 
-var gBbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-			.getService(Components.interfaces.nsIBbs2chService);
-
+var gBbs2chService = Cc["@mozilla.org/bbs2ch-service;1"].getService(Ci.nsIBbs2chService);
 var gTreeSubject;
 var gBoardItems;
 var gSubjectDownloader;
@@ -135,9 +133,8 @@
 
 
 function loadPersist(){
-	var persistPref = Components.classes["@mozilla.org/preferences-service;1"]
-						.getService(Components.interfaces.nsIPrefService)
-						.getBranch("extensions.bbs2chreader.board_persist.");
+	var persistPref = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService)
+			.getBranch("extensions.bbs2chreader.board_persist.");
 	var prefList = persistPref.getChildList("", {});
 	for(var i=0; i<prefList.length; i++){
 		var prefName = prefList[i];
@@ -154,9 +151,8 @@
 
 
 function savePersist(){
-	var persistPref = Components.classes["@mozilla.org/preferences-service;1"]
-						.getService(Components.interfaces.nsIPrefService)
-						.getBranch("extensions.bbs2chreader.board_persist.");
+	var persistPref = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService)
+			.getBranch("extensions.bbs2chreader.board_persist.");
 
 	var xpathResult = document.evaluate("descendant::*[@id][@persist2]", document, null,
 						XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
@@ -449,10 +445,10 @@
 		return;
 	}
 
-	if(Components.interfaces.nsIFormHistory2){
+	if(Ci.nsIFormHistory2){
 			// フォーム履歴に検索文字列を追加
-		var formHistory	= Components.classes["@mozilla.org/satchel/form-history;1"]
-				.getService(Components.interfaces.nsIFormHistory2);
+		var formHistory	= Cc["@mozilla.org/satchel/form-history;1"]
+				.getService(Ci.nsIFormHistory2);
 		formHistory.addEntry("bbs2ch-board-history", aSearchString);
 	}
 
@@ -571,8 +567,8 @@
 
 function createSettingFile(){
 		// 板名記入ダイアログ表示
-	var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-							.getService(Components.interfaces.nsIPromptService);
+	var promptService = Cc["@mozilla.org/embedcomp/prompt-service;1"]
+							.getService(Ci.nsIPromptService);
 	var promptTitle = gBoardItems.url.spec + " [bbs2chreader]";
 	var promptMsg = "Entry This Board Title";
 	var promptValue = { value: "" };
@@ -595,17 +591,14 @@
 }
 
 function openLogsDir(){
-	var logDir = gBoardItems.subjectFile.parent
-					.QueryInterface(Components.interfaces.nsILocalFile);
+	var logDir = gBoardItems.subjectFile.parent.QueryInterface(Ci.nsILocalFile);
 	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 ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+	    var protocolService = Cc["@mozilla.org/uriloader/external-protocol-service;1"]
+    				.getService(Ci.nsIExternalProtocolService);
 		var logDirURI = ioService.newFileURI(logDir);
 		protocolService.loadUrl(logDirURI);
 	}
@@ -778,8 +771,15 @@
 function Bbs2chBoardTreeView(aItems){
 	this._items = aItems;
 	this._rowCount = aItems.length;
-	this._atomService = Components.classes["@mozilla.org/atom-service;1"]
-							.getService(Components.interfaces.nsIAtomService);
+
+	var atomService = Cc["@mozilla.org/atom-service;1"].getService(Ci.nsIAtomService);
+	this._atom = new Array();
+	this._atom["s5"] = atomService.getAtom("s5");
+	this._atom["s4"] = atomService.getAtom("s4");
+	this._atom["s3"] = atomService.getAtom("s3");
+	this._atom["s2"] = atomService.getAtom("s2");
+	this._atom["s1"] = atomService.getAtom("s1");
+	this._atom["icon"] = atomService.getAtom("icon");
 }
 
 
@@ -875,15 +875,15 @@
 	},
 
 	getRowProperties: function(aIndex, aProperties){
-		// var status = "s" + this._items[aIndex].status;
-		// aProperties.AppendElement(this._atomService.getAtom(status));
+		var status = "s" + this._items[aRow].status;
+		aProperties.AppendElement(this._atom[status]);
 	},
 
 	getCellProperties: function(aRow, aCol, aProperties){
 		if(aCol.element._cellType == "icon"){
 			var status = "s" + this._items[aRow].status;
-			aProperties.AppendElement(this._atomService.getAtom(status));
-			aProperties.AppendElement(this._atomService.getAtom("icon"));
+			aProperties.AppendElement(this._atom[status]);
+			aProperties.AppendElement(this._atom["icon"]);
 		}
 	},
 	getColumnProperties: function(aCol, aProperties){},

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-10-26 13:29:26 UTC (rev 234)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-10-26 13:30:47 UTC (rev 235)
@@ -10,6 +10,7 @@
 	onmousedown="eventBubbleCheck(event)" onkeypress="eventBubbleCheck(event)"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+<script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/lib/xpc.js"/>
 <script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/lib/clipboard.js"/>
 <script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/lib/downloader.js"/>
 <script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/board/items.js"/>

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.js	2007-10-26 13:29:26 UTC (rev 234)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.js	2007-10-26 13:30:47 UTC (rev 235)
@@ -1,10 +1,7 @@
 
-var gBbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-			.getService(Components.interfaces.nsIBbs2chService);
-var gRDFS = Components.classes["@mozilla.org/rdf/rdf-service;1"]
-			.getService(Components.interfaces.nsIRDFService);
-var gRDFCU = Components.classes["@mozilla.org/rdf/container-utils;1"]
-					.getService(Components.interfaces.nsIRDFContainerUtils);
+var gBbs2chService = Cc["@mozilla.org/bbs2ch-service;1"].getService(Ci.nsIBbs2chService);
+var gRDFS = Cc["@mozilla.org/rdf/rdf-service;1"].getService(Ci.nsIRDFService);
+var gRDFCU = Cc["@mozilla.org/rdf/container-utils;1"].getService(Ci.nsIRDFContainerUtils);
 var gTreeSubscribe;
 var gDatasource;
 
@@ -77,7 +74,7 @@
 		// ツリーデータベースの初期化
 	var dsEnu = gTreeSubscribe.database.GetDataSources();
 	while(dsEnu.hasMoreElements()){
-		var ds = dsEnu.getNext().QueryInterface(Components.interfaces.nsIRDFDataSource);
+		var ds = dsEnu.getNext().QueryInterface(Ci.nsIRDFDataSource);
 		if(ds.URI == null){
 			gTreeSubscribe.database.RemoveDataSource(ds);
 		}
@@ -90,8 +87,8 @@
 		return;
 	}
 
-	gDatasource = Components.classes["@mozilla.org/rdf/datasource;1?name=in-memory-datasource"]
-						.createInstance(Components.interfaces.nsIRDFDataSource);
+	gDatasource = Cc["@mozilla.org/rdf/datasource;1?name=in-memory-datasource"]
+						.createInstance(Ci.nsIRDFDataSource);
 
 	var rootContainer = gRDFCU.MakeSeq(gDatasource, gRDFS.GetResource("urn:b2rSubscribe:root"));
 
@@ -156,12 +153,12 @@
 		var newUnread = gRDFS.GetIntLiteral(item.unread);
 		var oldUnread = gDatasource.GetTarget(itemRes, resUnread, true);
 		if(oldUnread){
-			oldUnread.QueryInterface(Components.interfaces.nsIRDFInt);
+			oldUnread.QueryInterface(Ci.nsIRDFInt);
 			if(newUnread.Value != oldUnread.Value){
 				gDatasource.Change(itemRes, resUnread, oldUnread, newUnread);
 			}
 			var oldState = gDatasource.GetTarget(itemRes, resState, true)
-					.QueryInterface(Components.interfaces.nsIRDFLiteral);
+					.QueryInterface(Ci.nsIRDFLiteral);
 			if(newState.Value != oldState.Value){
 				gDatasource.Change(itemRes, resState, oldState, newState);
 			}
@@ -257,7 +254,7 @@
 
 	if(gTreeSubscribe.builderView.isContainer(index)){
 		var boardURL = gDatasource.GetTarget(itemRes, gRDFS.GetResource(B2R_NS + "url"), true)
-			.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+			.QueryInterface(Ci.nsIRDFLiteral).Value;
 		boardURL = "bbs2ch:board:" + boardURL;
 		gBbs2chService.openURL(boardURL, null, aAddTab);
 		return;
@@ -266,7 +263,7 @@
 	var parentIndex = gTreeSubscribe.builderView.getParentIndex(index);
 	var parentRes = gTreeSubscribe.builderView.getResourceAtIndex(parentIndex);
 	var boardURL = gDatasource.GetTarget(parentRes, gRDFS.GetResource(B2R_NS + "url"), true)
-			.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+			.QueryInterface(Ci.nsIRDFLiteral).Value;
 	var boardItems = gBoardItemsHash[boardURL];
 
 		// スレッド表示数の制限
@@ -283,7 +280,7 @@
 	}
 
 	var threadURL = gDatasource.GetTarget(itemRes, gRDFS.GetResource(B2R_NS + "url"), true)
-			.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+			.QueryInterface(Ci.nsIRDFLiteral).Value;
 	threadURL = "/thread/" + threadURL + threadViewLimit;
 	threadURL = gBbs2chService.serverURL.resolve(threadURL);
 	gBbs2chService.openURL(threadURL, null, aAddTab);
@@ -292,14 +289,14 @@
 	var resUnread = gRDFS.GetResource(B2R_NS + "unread");
 	var newUnread = gRDFS.GetIntLiteral(0);
 	var oldUnread = gDatasource.GetTarget(itemRes, resUnread, true)
-						.QueryInterface(Components.interfaces.nsIRDFInt);
+						.QueryInterface(Ci.nsIRDFInt);
 	if(newUnread.Value != oldUnread.Value){
 			gDatasource.Change(itemRes, resUnread, oldUnread, newUnread);
 	}
 	var resState = gRDFS.GetResource(B2R_NS + "state");
 	var newState = gRDFS.GetLiteral("noUpdateItem");
 	var oldState = gDatasource.GetTarget(itemRes, resState, true)
-					.QueryInterface(Components.interfaces.nsIRDFLiteral);
+					.QueryInterface(Ci.nsIRDFLiteral);
 	if(newState.Value != oldState.Value){
 		gDatasource.Change(itemRes, resState, oldState, newState);
 	}
@@ -307,8 +304,7 @@
 
 
 function removeTreeItem(aParentResource, aResource, aIndex){
-	var container = Components.classes["@mozilla.org/rdf/container;1"]
-						.createInstance(Components.interfaces.nsIRDFContainer);
+	var container = Cc["@mozilla.org/rdf/container;1"].createInstance(Ci.nsIRDFContainer);
 	container.Init(gDatasource, aParentResource);
 	container.RemoveElement(aResource, true);
 }
@@ -387,8 +383,8 @@
 
 		gTreeSubscribe.treeBoxObject.beginUpdateBatch();
 
-		var boardContainer = Components.classes["@mozilla.org/rdf/container;1"]
-					.createInstance(Components.interfaces.nsIRDFContainer);
+		var boardContainer = Cc["@mozilla.org/rdf/container;1"]
+					.createInstance(Ci.nsIRDFContainer);
 		boardContainer.Init(gDatasource, gRDFS.GetResource("urn:b2rSubscribe:board:" + gDownloadQueue[0].url.spec));
 		while(boardContainer.GetCount()){
 			boardContainer.RemoveElementAt(1, true);
@@ -439,7 +435,7 @@
 	var newValue = gRDFS.GetLiteral(aStete);
 	var oldValue = gDatasource.GetTarget(boardRes, stateRes, true);
 	if(oldValue){
-		oldValue.QueryInterface(Components.interfaces.nsIRDFLiteral);
+		oldValue.QueryInterface(Ci.nsIRDFLiteral);
 		if(newValue.Value != oldValue.Value){
 			gDatasource.Change(boardRes, stateRes, oldValue, newValue);
 		}
@@ -481,12 +477,12 @@
 		var parentIndex = gTreeSubscribe.builderView.getParentIndex(index);
 		var parentRes = gTreeSubscribe.builderView.getResourceAtIndex(parentIndex);
 		var boardURL = gDatasource.GetTarget(parentRes, gRDFS.GetResource(B2R_NS + "url"), true)
-				.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+				.QueryInterface(Ci.nsIRDFLiteral).Value;
 		var boardItems = gBoardItemsHash[boardURL];
 
 		var itemRes = gTreeSubscribe.builderView.getResourceAtIndex(index);
 		var datID = gDatasource.GetTarget(itemRes, gRDFS.GetResource(B2R_NS + "datID"), true)
-				.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+				.QueryInterface(Ci.nsIRDFLiteral).Value;
 
 					// ログディレクトリ内の .dat ファイル
 		var datFile = gBbs2chService.getLogFileAtURL(boardItems.url.resolve(datID + ".dat"));

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul	2007-10-26 13:29:26 UTC (rev 234)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul	2007-10-26 13:30:47 UTC (rev 235)
@@ -11,10 +11,11 @@
 		onmousedown="eventBubbleCheck(event)" onkeypress="eventBubbleCheck(event)"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/lib/rdf.js"/>
-<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/lib/downloader.js"/>
-<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/board/items.js"/>
-<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/board/subscribe.js"/>
+<script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/lib/xpc.js"/>
+<script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/lib/rdf.js"/>
+<script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/lib/downloader.js"/>
+<script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/board/items.js"/>
+<script type="application/javascript; version=1.7" src="chrome://bbs2chreader/content/board/subscribe.js"/>
 
 <popupset>
 	<popup id="treeSubscribeContext"

From svnnotify ＠ sourceforge.jp  Fri Oct 26 22:40:27 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 26 Oct 2007 22:40:27 +0900
Subject: [Bbs2ch-cvs 254]
 =?utf-8?b?WzIzNl0gIOODhOODquODvOODk+ODpeODvOOBrumrmOmAn+WMlg==?=
 =?utf-8?b?5pmC44Gu44K/44Kk44Od5L+u5q2j?=
Message-ID: <1193406027.609974.1575.nullmailer@users.sourceforge.jp>

Revision: 236
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=236
Author:   flyson
Date:     2007-10-26 22:40:27 +0900 (Fri, 26 Oct 2007)

Log Message:
-----------
ツリービューの高速化時のタイポ修正

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-10-26 13:30:47 UTC (rev 235)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-10-26 13:40:27 UTC (rev 236)
@@ -875,7 +875,7 @@
 	},
 
 	getRowProperties: function(aIndex, aProperties){
-		var status = "s" + this._items[aRow].status;
+		var status = "s" + this._items[aIndex].status;
 		aProperties.AppendElement(this._atom[status]);
 	},
 

From svnnotify ＠ sourceforge.jp  Sun Oct 28 19:55:21 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 28 Oct 2007 19:55:21 +0900
Subject: [Bbs2ch-cvs 255]
 =?utf-8?b?WzIzN10gYmJzLm5pY292aWRlby4ganAg44Gn44Gu5paH5a2X5YyW?=
 =?utf-8?b?44GR44KS5L+u5q2j?=
Message-ID: <1193568921.731788.4426.nullmailer@users.sourceforge.jp>

Revision: 237
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=237
Author:   flyson
Date:     2007-10-28 19:55:21 +0900 (Sun, 28 Oct 2007)

Log Message:
-----------
bbs.nicovideo.jp ?с?????????信罩?
Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/post.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/post.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post.js	2007-10-26 13:40:27 UTC (rev 236)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post.js	2007-10-28 10:55:21 UTC (rev 237)
@@ -249,8 +249,11 @@
 		var textToSubURI = Components.classes["@mozilla.org/intl/texttosuburi;1"]
 					.getService(Components.interfaces.nsITextToSubURI);
 
-		aString = entityConverter.ConvertToEntities(aString,
+			// XXX TODO 参照化しないホストをリスト化する
+		if(this.boardURI.host != "bbs.nicovideo.jp"){
+			aString = entityConverter.ConvertToEntities(aString,
 						Components.interfaces.nsIEntityConverter.html40);
+		}
 
 		var charset = "";
 		switch(this.type){

From svnnotify ＠ sourceforge.jp  Tue Oct 30 21:23:05 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 30 Oct 2007 21:23:05 +0900
Subject: [Bbs2ch-cvs 256]
 =?utf-8?b?WzIzOF0gU0VUVElORy4gVFhUIOOBruiqreOBv+i+vOOBv+OBqyBu?=
 =?utf-8?b?c0lDb252ZXJ0ZXJJbnB1dFN0cmVhbSDjgpLkvb/jgYbjgojjgYbjgavjgZc=?=
 =?utf-8?b?44Gf?=
Message-ID: <1193746985.450817.27764.nullmailer@users.sourceforge.jp>

Revision: 238
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=238
Author:   flyson
Date:     2007-10-30 21:23:05 +0900 (Tue, 30 Oct 2007)

Log Message:
-----------
SETTING.TXT の読み込みに nsIConverterInputStream を使うようにした

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-10-28 10:55:21 UTC (rev 237)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-10-30 12:23:05 UTC (rev 238)
@@ -148,22 +148,62 @@
 		this._validURL = true;
 	},
 
+
 	getSetting: function(aSettingName){
 		if(!this._settings){
 			this._settings = new Array();
 			if(this.settingFile.exists()){
-				var settingLines = this._bbs2chService.readFile(this.settingFile.path);
-				settingLines = this._bbs2chService.fromType(settingLines, this.type);
-				var regLine = /^(.+)=(.+)$/gm;
-				while(regLine.exec(settingLines)){
-					this._settings[RegExp.$1] = RegExp.$2;
+				var fileLineIterator = this._getFileLineIterator(this.settingFile, this._getCharset());
+				var regLine = /^(.+)=(.+)$/;
+				for(let[i, line] in fileLineIterator){
+					if(regLine.test(line)) this._settings[RegExp.$1] = RegExp.$2;
 				}
 			}
 		}
-
 		return this._settings[aSettingName] || null;
 	},
 
+
+	_getFileLineIterator: function(aLocaFile, aCharset){
+		const REPLACEMENT_CHARACTER = Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER;
+		var fileInputStream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(Ci.nsIFileInputStream);
+		var converterInputStream = Cc["@mozilla.org/intl/converter-input-stream;1"]
+				.createInstance(Ci.nsIConverterInputStream).QueryInterface(Ci.nsIUnicharLineInputStream);
+		fileInputStream.init(aLocaFile, 0x01, 0666, 0);
+		converterInputStream.init(fileInputStream, aCharset, 1024, REPLACEMENT_CHARACTER);
+		var i=0;
+		try{
+			while(true){
+				var line = {};
+				if(converterInputStream.readLine(line)){
+					yield [i, line.value];
+					i++;
+				}else{
+					yield [i, line.value];
+					break;
+				}
+			}
+		}finally{
+			converterInputStream.close();
+			fileInputStream.close();
+		}
+	},
+
+	_getCharset: function(){
+		var charset = "Shift_JIS";
+		switch(this.type){
+			case this._bbs2chService.BOARD_TYPE_2CH:
+				charset = "Shift_JIS";
+				break;
+			case this._bbs2chService.BOARD_TYPE_BE2CH:
+			case this._bbs2chService.BOARD_TYPE_JBBS:
+			case this._bbs2chService.BOARD_TYPE_MACHI:
+				charset = "euc-jp";
+				break;
+		}
+		return charset;
+	},
+
 	/**
 	 * Date オブジェクトからフォーマットされた日付文字列(短い形式)を返す
 	 */

From svnnotify ＠ sourceforge.jp  Wed Oct 31 20:17:23 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 31 Oct 2007 20:17:23 +0900
Subject: [Bbs2ch-cvs 257]
 =?utf-8?b?WzIzOV0gIHBvcnQg55Wq5Y+344KSIG5zSUJiczJjaFNlcnZpY2Ug?=
 =?utf-8?b?LiBzZXJ2ZXJVUkwg44GL44KJ5Y+W5b6X44GZ44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1193829443.187086.5556.nullmailer@users.sourceforge.jp>

Revision: 239
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=239
Author:   flyson
Date:     2007-10-31 20:17:22 +0900 (Wed, 31 Oct 2007)

Log Message:
-----------
port 番号を nsIBbs2chService.serverURL から取得するようにした

Modified Paths:
--------------
    trunk/bbs2chreader/components/b2rServer.js


-------------- next part --------------
Modified: trunk/bbs2chreader/components/b2rServer.js
===================================================================
--- trunk/bbs2chreader/components/b2rServer.js	2007-10-30 12:23:05 UTC (rev 238)
+++ trunk/bbs2chreader/components/b2rServer.js	2007-10-31 11:17:22 UTC (rev 239)
@@ -79,21 +79,7 @@
 					.getService(Ci.nsIEventQueueService);
 		this._eventQueue = eventQueueService.createFromIThread(this.currentThread, false);
 
-		var pref = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-		var port = 0;
-		try{
-			var appInfo = Cc["@mozilla.org/xre/app-info;1"].createInstance(Ci.nsIXULAppInfo);
-    	    if(appInfo.name == "Firefox"){
-				port = pref.getIntPref("extensions.bbs2chreader.server_port");
-			}else if(appInfo.name == "SeaMonkey"){
-				port = pref.getIntPref("extensions.bbs2chreader.server_port.seamonkey");
-			}else{
-				port = pref.getIntPref("extensions.bbs2chreader.server_port.other");
-			}
-		}catch(ex){
-			port = pref.getIntPref("extensions.bbs2chreader.server_port.other");
-		}
-
+		var port = Cc["@mozilla.org/bbs2ch-service;1"].getService(Ci.nsIBbs2chService).serverURL.port;
 		var serverSocket = Cc["@mozilla.org/network/server-socket;1"]
 				.createInstance(Ci.nsIServerSocket);
 		serverSocket.init(port, true, 10);
@@ -215,22 +201,7 @@
   	// ********** ********* implements nsIRunnable ********** **********
 
 	run: function (){
-		var pref = Cc["@mozilla.org/preferences-service;1"]
-						.getService(Ci.nsIPrefBranch);
-		var port = 0;
-		try{
-			var appInfo = Cc["@mozilla.org/xre/app-info;1"].createInstance(Ci.nsIXULAppInfo);
-    	    if(appInfo.name == "Firefox"){
-				port = pref.getIntPref("extensions.bbs2chreader.server_port");
-			}else if(appInfo.name == "SeaMonkey"){
-				port = pref.getIntPref("extensions.bbs2chreader.server_port.seamonkey");
-			}else{
-				port = pref.getIntPref("extensions.bbs2chreader.server_port.other");
-			}
-		}catch(ex){
-			port = pref.getIntPref("extensions.bbs2chreader.server_port.other");
-		}
-
+		var port = Cc["@mozilla.org/bbs2ch-service;1"].getService(Ci.nsIBbs2chService).serverURL.port;
 		var serverSocket = Cc["@mozilla.org/network/server-socket;1"]
 					.createInstance(Ci.nsIServerSocket);
 		serverSocket.init(port, true, 10);
@@ -268,8 +239,7 @@
 	// ********** ********* implements nsIObserver ********** **********
 
 	observe: function(aSubject, aTopic, aData){
-		var os = Cc["@mozilla.org/observer-service;1"]
-					.getService(Ci.nsIObserverService);
+		var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
 
 		switch(aTopic){
 			case "app-startup":

From svnnotify ＠ sourceforge.jp  Fri Nov  2 19:51:46 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 02 Nov 2007 19:51:46 +0900
Subject: [Bbs2ch-cvs 258]
 =?utf-8?b?WzI0MF0gIFRvZG8g44Kz44Oh44Oz44OI44Gu5L+u5q2j?=
Message-ID: <1194000706.015647.28316.nullmailer@users.sourceforge.jp>

Revision: 240
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=240
Author:   flyson
Date:     2007-11-02 19:51:45 +0900 (Fri, 02 Nov 2007)

Log Message:
-----------
Todo ?潟??潟???信罩?
Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js	2007-10-31 11:17:22 UTC (rev 239)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js	2007-11-02 10:51:45 UTC (rev 240)
@@ -33,8 +33,8 @@
 }
 
 function shutdown(){
-		// XXX ???????潟?????????????????鴻?????若??鴻?????倶???-		// ???????＜?????若???儀??????????若?????若??鴻?腱祉?
+		// XXX TODO ???????潟?????????????????鴻?????若??鴻?????倶???+		// XXX TODO ???????＜?????若???儀??????????若?????若??鴻?腱祉?
 	gTreeBbsMenu.focus();
 	if(gTreeBbsMenuView) gTreeBbsMenuView.persistOpenedCategories();
 	gTreeBbsMenu.view = null;

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-10-31 11:17:22 UTC (rev 239)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-11-02 10:51:45 UTC (rev 240)
@@ -548,7 +548,7 @@
 			return;
 		}
 
-			// XXX ????????????????? 206 ?????????
+			// XXX TODO ????????????????? 206 ?????????
 		var newResLength = this.dat.lineCount - this._logLineCount;
 		if(newResLength == 0){
 			this.write(this.converter.getFooter("not_modified"));

From svnnotify ＠ sourceforge.jp  Fri Nov  2 19:57:59 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 02 Nov 2007 19:57:59 +0900
Subject: [Bbs2ch-cvs 259]  [241] ver.0.4.8
Message-ID: <1194001079.195567.32373.nullmailer@users.sourceforge.jp>

Revision: 241
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=241
Author:   flyson
Date:     2007-11-02 19:57:59 +0900 (Fri, 02 Nov 2007)

Log Message:
-----------
ver.0.4.8

Modified Paths:
--------------
    trunk/bbs2chreader/history.txt
    trunk/bbs2chreader/install.rdf


-------------- next part --------------
Modified: trunk/bbs2chreader/history.txt
===================================================================
--- trunk/bbs2chreader/history.txt	2007-11-02 10:51:45 UTC (rev 240)
+++ trunk/bbs2chreader/history.txt	2007-11-02 10:57:59 UTC (rev 241)
@@ -1,3 +1,9 @@
+0.4.8
+	スレッド一覧で JBBS の過去ログが文字化けするのを修正 (ログフォルダの cache.txt の削除が必要)
+	スレッド一覧のスクロール高速化
+	bbs.nicovideo.jp への書き込みで文字化けするのを修正
+
+
 0.4.7
 	連鎖あぼーん実装
 	スレッド一覧で文字参照を展開するようにした

Modified: trunk/bbs2chreader/install.rdf
===================================================================
--- trunk/bbs2chreader/install.rdf	2007-11-02 10:51:45 UTC (rev 240)
+++ trunk/bbs2chreader/install.rdf	2007-11-02 10:57:59 UTC (rev 241)
@@ -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.4.7</em:version>
+		<em:version>0.4.8</em:version>
 		<em:description>2ch.net(Japanese Web Forums) Browser</em:description>
 		<em:optionsURL>chrome://bbs2chreader/content/settings/settings.xul</em:optionsURL>
 		<em:homepageURL>http://bbs2ch.sourceforge.jp/</em:homepageURL>

From svnnotify ＠ sourceforge.jp  Fri Nov  2 19:58:20 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 02 Nov 2007 19:58:20 +0900
Subject: [Bbs2ch-cvs 260]  [242] made a copy
Message-ID: <1194001100.102937.753.nullmailer@users.sourceforge.jp>

Revision: 242
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=242
Author:   flyson
Date:     2007-11-02 19:58:19 +0900 (Fri, 02 Nov 2007)

Log Message:
-----------
made a copy

Added Paths:
-----------
    tags/RELEASE_0_4_8/


-------------- next part --------------
Copied: tags/RELEASE_0_4_8 (from rev 241, trunk/bbs2chreader)

From svnnotify ＠ sourceforge.jp  Fri Nov  2 21:42:11 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 02 Nov 2007 21:42:11 +0900
Subject: [Bbs2ch-cvs 261]
 =?utf-8?b?WzI0M10gIEphdmFTY3JpcHQg44Gu44OQ44O844K444On44Oz6YGV?=
 =?utf-8?b?44GE44Gn5YuV5L2c5LiN6Imv44Go44Gq44Gj44Gm44GE44Gf44Gu44KS5L+u?=
 =?utf-8?b?5q2j?=
Message-ID: <1194007331.339074.12834.nullmailer@users.sourceforge.jp>

Revision: 243
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=243
Author:   flyson
Date:     2007-11-02 21:42:11 +0900 (Fri, 02 Nov 2007)

Log Message:
-----------
JavaScript のバージョン違いで動作不良となっていたのを修正

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul	2007-11-02 10:58:19 UTC (rev 242)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul	2007-11-02 12:42:11 UTC (rev 243)
@@ -12,15 +12,12 @@
 	persist="screenX screenY width height"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script type="application/javascript;version=1.7">
-		const Ci = Components.interfaces;
-		const Cc = Components.classes;
-	</script>
-	<script type="application/x-javascript" src="chrome://bbs2chreader/content/belogin/belogin.js"/>
-	<script type="application/x-javascript" src="chrome://bbs2chreader/content/httprequest.js"/>
-	<script type="application/x-javascript" src="chrome://bbs2chreader/content/post.js"/>
-	<script type="application/x-javascript;version=1.7" src="chrome://bbs2chreader/content/post-wizard.js"/>
-	<script type="application/x-javascript" src="chrome://bbs2chreader/content/board/items.js"/>
+	<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/lib/xpc.js"/>
+	<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/belogin/belogin.js"/>
+	<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/httprequest.js"/>
+	<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/post.js"/>
+	<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/post-wizard.js"/>
+	<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/board/items.js"/>
 	<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/post/filter.js"/>
 
 	<wizardpage pageid="wpgForm" id="wpgForm" onpageadvanced="return formCheck()"

From svnnotify ＠ sourceforge.jp  Fri Nov  2 21:45:58 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 02 Nov 2007 21:45:58 +0900
Subject: [Bbs2ch-cvs 262]  [244] ver.0.4.9
Message-ID: <1194007558.616012.14724.nullmailer@users.sourceforge.jp>

Revision: 244
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=244
Author:   flyson
Date:     2007-11-02 21:45:58 +0900 (Fri, 02 Nov 2007)

Log Message:
-----------
ver.0.4.9

Modified Paths:
--------------
    trunk/bbs2chreader/history.txt
    trunk/bbs2chreader/install.rdf


-------------- next part --------------
Modified: trunk/bbs2chreader/history.txt
===================================================================
--- trunk/bbs2chreader/history.txt	2007-11-02 12:42:11 UTC (rev 243)
+++ trunk/bbs2chreader/history.txt	2007-11-02 12:45:58 UTC (rev 244)
@@ -1,3 +1,7 @@
+0.4.9
+	書き込みウィザードが正しく動作していなかったのを修正
+
+
 0.4.8
 	スレッド一覧で JBBS の過去ログが文字化けするのを修正 (ログフォルダの cache.txt の削除が必要)
 	スレッド一覧のスクロール高速化

Modified: trunk/bbs2chreader/install.rdf
===================================================================
--- trunk/bbs2chreader/install.rdf	2007-11-02 12:42:11 UTC (rev 243)
+++ trunk/bbs2chreader/install.rdf	2007-11-02 12:45:58 UTC (rev 244)
@@ -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.4.8</em:version>
+		<em:version>0.4.9</em:version>
 		<em:description>2ch.net(Japanese Web Forums) Browser</em:description>
 		<em:optionsURL>chrome://bbs2chreader/content/settings/settings.xul</em:optionsURL>
 		<em:homepageURL>http://bbs2ch.sourceforge.jp/</em:homepageURL>

From svnnotify ＠ sourceforge.jp  Fri Nov  2 21:47:25 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 02 Nov 2007 21:47:25 +0900
Subject: [Bbs2ch-cvs 263]  [245] made a copy
Message-ID: <1194007645.087455.16041.nullmailer@users.sourceforge.jp>

Revision: 245
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=245
Author:   flyson
Date:     2007-11-02 21:47:24 +0900 (Fri, 02 Nov 2007)

Log Message:
-----------
made a copy

Added Paths:
-----------
    tags/RELEASE_0_4_9/


-------------- next part --------------
Copied: tags/RELEASE_0_4_9 (from rev 244, trunk/bbs2chreader)

From svnnotify ＠ sourceforge.jp  Sat Nov  3 21:53:58 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 03 Nov 2007 21:53:58 +0900
Subject: [Bbs2ch-cvs 264]  [246] b2rGlobalService
Message-ID: <1194094438.738019.28169.nullmailer@users.sourceforge.jp>

Revision: 246
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=246
Author:   flyson
Date:     2007-11-03 21:53:58 +0900 (Sat, 03 Nov 2007)

Log Message:
-----------
b2rGlobalService

Added Paths:
-----------
    trunk/bbs2chreader/components/b2rGlobalService.js
    trunk/bbs2chreader/components/b2rIGlobalService.xpt
    trunk/bbs2chreader/components/idl/b2rIGlobalService.idl


-------------- next part --------------
Added: trunk/bbs2chreader/components/b2rGlobalService.js
===================================================================
--- trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-02 12:47:24 UTC (rev 245)
+++ trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-03 12:53:58 UTC (rev 246)
@@ -0,0 +1,649 @@
+/* ***** 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) 2007
+ * 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 ***** */
+
+const Ci = Components.interfaces;
+const Cc = Components.classes;
+const XPC = {
+	createInstance: function(aContractId, aInterface){
+		return Components.classes[aContractId].createInstance(Components.interfaces[aInterface]);
+	},
+	getService: function(aContractId, aInterface){
+	    return Components.classes[aContractId].getService(Components.interfaces[aInterface]);
+	}
+}
+
+
+
+
+const B2R_GLOBAL_SERVICE_CONTRACTID = "@bbs2ch.sourceforge.jp/b2r-global-service;1";
+const B2R_GLOBAL_SERVICE_CID = Components.ID("{e3c8ad09-ff53-40cf-9942-26c8d7a96fe7}");
+const B2R_GLOBAL_SERVICE_CNAME = "b2rGlobalService js component";
+
+
+
+
+	// ********** ********* b2rGlobalIO ********** **********
+
+function b2rGlobalIO(){
+}
+
+b2rGlobalIO.prototype = {
+
+	getDataDir: function(){
+		const DATA_DIR_NAME = "bbs2chreader";
+
+		if(!this._dataDir){
+			var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+
+				// ログファイルの位置を指定
+			if(pref.getBoolPref("extensions.bbs2chreader.appoint_data_dir")){
+				try{
+					var dataDirPath = pref.getComplexValue("extensions.bbs2chreader.data_dir",
+												Ci.nsISupportsString).data;
+					this._dataDir = XPC.createInstance("@mozilla.org/file/local;1", "nsILocalFile");
+					this._dataDir.initWithPath(dataDirPath);
+					if(this._dataDir.leafName != DATA_DIR_NAME){
+						this._dataDir.appendRelativePath(DATA_DIR_NAME);
+					}
+				}catch(ex){
+					dump("b2rGlobalIO.getDataDir() :" + ex +"\n");
+					this._dataDir = null;
+				}
+			}
+			if(!this._dataDir){
+					// 指定していないときはプロファイルディレクトリ
+				var dirService = XPC.getService("@mozilla.org/file/directory_service;1", "nsIProperties");
+				this._dataDir = dirService.get("ProfD", Ci.nsILocalFile);
+				this._dataDir.appendRelativePath(DATA_DIR_NAME);
+			}
+		}
+
+		var dataDir = this._dataDir.clone().QueryInterface(Ci.nsILocalFile);
+		if(!dataDir.exists()){
+			dataDir.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0666);
+		}
+		return dataDir;
+	},
+
+
+	getLogFileAtURL: function(aURLSpec){
+		const LOGS_DIR_NAME = "logs";
+
+		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
+		var fromURL = ioService.newURI(aURLSpec, null, null).QueryInterface(Ci.nsIURL);
+
+		var logFile = this.getDataDir();
+		logFile.appendRelativePath(LOGS_DIR_NAME);
+		logFile.appendRelativePath(fromURL.host);
+
+		var pathArray = fromURL.path.split("/");
+		for(let [i, name] in Iterator(pathArray)){
+			if(name) logFile.appendRelativePath(name);
+		}
+
+		return logFile;
+	},
+
+
+	getFileInputStream: function(aLocalFile, aCharset){
+		const PR_RDONLY = 0x01;
+		var charset = aCharset || "UTF-8";
+
+		var fileInputStream = XPC.createInstance(
+				"@mozilla.org/network/file-input-stream;1", "nsIFileInputStream");
+		var converterInputStream = XPC.createInstance(
+				"@mozilla.org/intl/converter-input-stream;1", "nsIConverterInputStream");
+
+		try{
+			fileInputStream.init(aLocaFile, PR_RDONLY, 0666, Ci.nsIFileInputStream.CLOSE_ON_EOF);
+			converterInputStream.init(fileInputStream, charset, 1024*8,
+					Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
+		}catch(ex){
+			throw ex;
+		}
+		return converterInputStream;
+	},
+
+
+	getFileOutputStream: function(aLocalFile, aCharset, aAppend){
+		const PR_WRONLY = 0x02;
+		const PR_CREATE_FILE = 0x08;
+		const PR_APPEND = 0x10;
+		const PR_TRUNCATE = 0x20;
+
+		var charset = aCharset || "UTF-8";
+		var ioFlags = (aAppend==true) ? PR_WRONLY|PR_CREATE_FILE|PR_APPEND : PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE;
+
+		var fileOutputStream = XPC.createInstance(
+				"@mozilla.org/network/file-output-stream;1", "nsIFileOutputStream");
+		var converterOutputStream = XPC.createInstance(
+				"@mozilla.org/intl/converter-output-stream;1", "nsIConverterOutputStream");
+
+		try{
+			fileOutputStream.init(aLocaFile, ioFlags, 0666, 0);
+			converterOutputStream.init(fileOutputStream, charset, 1024*8,
+					Ci.nsIConverterOutputStream.DEFAULT_REPLACEMENT_CHARACTER);
+		}catch(ex){
+			throw ex;
+		}
+
+
+		return converterOutputStream;
+	}
+
+
+};
+
+
+
+
+	// ********** ********* b2rGlobalThreadUtils ********** **********
+
+function b2rGlobalThreadUtils(){
+		// getBoardType で利用する例外的な URL のリスト( 2ch だけど板じゃない URL)
+	this._exHosts = new Array(
+		"find.2ch.net",
+		"info.2ch.net",
+		"epg.2ch.net",
+		"headline.2ch.net",
+		"newsnavi.2ch.net",
+		"headline.bbspink.com"
+	);
+
+}
+
+b2rGlobalThreadUtils.prototype = {
+
+	getBoardType: function(aThreadURL){
+			// HTTP 以外
+		if(aThreadURL.scheme != "http") return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
+			// HOST だけの URL
+		if(aThreadURL.directory.length == 1) return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
+
+		if(this._exHosts.indexOf(aThreadURL.host) != -1) return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
+
+			// Be ＠ 2ch.net
+		if(aThreadURL.host == "be.2ch.net") return Ci.b2rIGlobalService.BOARD_TYPE_BE2CH;
+			// 2ch.net
+		if(aThreadURL.host.indexOf(".2ch.net") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
+			// bbspink.com
+		if(aThreadURL.host.indexOf(".bbspink.com") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
+			// まちBBS
+		if(aThreadURL.host.indexOf(".machi.to") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
+			// JBBS
+		if(aThreadURL.host == "jbbs.livedoor.jp") return Ci.b2rIGlobalService.BOARD_TYPE_JBBS;
+
+			// スレッド URL
+		if(aThreadURL.directory.indexOf("/test/read.cgi/") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
+		if((aThreadURL.fileName == "read.cgi") && (aThreadURL.query.indexOf("key=") != -1))
+				return Ci.b2rIGlobalService.BOARD_TYPE_OLD2CH;
+
+		return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
+	},
+
+
+	getBoardURL: function(aURL){
+		var boardURLSpec = aURL.resolve("../");
+
+		switch(this.getBoardType(aURL)){
+			case Ci.b2rIGlobalService.BOARD_TYPE_2CH:
+			case Ci.b2rIGlobalService.BOARD_TYPE_BE2CH:
+				boardURLSpec = boardURLSpec.replace("/test/read.cgi/", "/");
+				break;
+			case Ci.b2rIGlobalService.BOARD_TYPE_JBBS:
+				boardURLSpec = boardURLSpec.replace("/bbs/read.cgi/", "/");
+				break;
+			case Ci.b2rIGlobalService.BOARD_TYPE_OLD2CH:
+			case Ci.b2rIGlobalService.BOARD_TYPE_MACHI:
+				boardURLSpec += aURL.query.match(/bbs=(\w+)/i) ? RegExp.$1 + "/" : null;
+				break;
+			case Ci.b2rIGlobalService.BOARD_TYPE_PAGE:
+				throw Components.results.NS_ERROR_INVALID_ARG;
+				break;
+		}
+
+		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
+		return ioService.newURI(boardURLSpec, null, null).QueryInterface(Ci.nsIURL);
+	}
+
+};
+
+
+	// ********** ********* b2rGlobalHistory ********** **********
+
+function b2rGlobalHistory(aGlobalService){
+	this._init(aGlobalService);
+}
+
+b2rGlobalHistory.prototype = {
+
+	get historyDB(){
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+	},
+
+
+	_init: function(aGlobalService){
+	},
+
+
+	visitPage: function(aBoardURL, aTitle, aType){
+	},
+
+
+	clearAll: function(){
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+	}
+
+};
+
+
+
+
+	// ********** ********* b2rGlobalViewer ********** **********
+
+function b2rGlobalViewer(aGlobalService){
+	this._init(aGlobalService);
+}
+
+b2rGlobalViewer.prototype = {
+
+	get logined(){
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+	},
+
+
+	get sessionID(){
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+	},
+
+
+	_init: function(aGlobalService){
+	},
+
+
+	auth: function(){
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+	}
+
+};
+
+
+
+
+	// ********** ********* b2rGlobalService ********** **********
+
+function b2rGlobalService(){
+	this._io = null;
+	this._threadUtils = null;
+	this._history = null;
+	this._viewer = null;
+
+	this._initialized = false;
+}
+
+b2rGlobalService.prototype = {
+
+	BOARD_TYPE_2CH:    Ci.b2rIGlobalService.BOARD_TYPE_2CH,
+	BOARD_TYPE_OLD2CH: Ci.b2rIGlobalService.BOARD_TYPE_OLD2CH,
+	BOARD_TYPE_BE2CH:  Ci.b2rIGlobalService.BOARD_TYPE_BE2CH,
+	BOARD_TYPE_JBBS:   Ci.b2rIGlobalService.BOARD_TYPE_JBBS,
+	BOARD_TYPE_MACHI:  Ci.b2rIGlobalService.BOARD_TYPE_MACHI,
+	BOARD_TYPE_PAGE:   Ci.b2rIGlobalService.BOARD_TYPE_PAGE,
+
+	get userAgent(){
+		if(!this._initialized) throw Components.results.NS_ERROR_NOT_INITIALIZED;
+		if(!this._userAgent){
+			try{
+				var extensionManager = XPC.getService("@mozilla.org/extensions/manager;1", "nsIExtensionManager");
+				var appInfo = XPC.getService("@mozilla.org/xre/app-info;1", "nsIXULAppInfo");
+				var bbs2chID = "{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}";
+				var item = extensionManager.getItemForID(bbs2chID);
+				this._userAgent = new Array(
+							"Monazilla/1.00 (", item.name, "/", item.version, "; ",
+							appInfo.name, "/", appInfo.version, ")").join("");
+			}catch(ex){
+				this._userAgent = "Monazilla/1.00 (bbs2chreader/0.5.0)"
+			}
+		}
+
+		return this._userAgent;
+	},
+
+
+	get serverURL(){
+		if(!this._initialized) throw Components.results.NS_ERROR_NOT_INITIALIZED;
+		if(!this._serverURL){
+			var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+			var port = 0;
+			try{
+				var appInfo = XPC.createInstance("@mozilla.org/xre/app-info;1", "nsIXULAppInfo");
+	    	    if(appInfo.name == "Firefox"){
+					port = pref.getIntPref("extensions.bbs2chreader.server_port");
+				}else if(appInfo.name == "SeaMonkey"){
+					port = pref.getIntPref("extensions.bbs2chreader.server_port.seamonkey");
+				}else{
+					port = pref.getIntPref("extensions.bbs2chreader.server_port.other");
+				}
+			}catch(ex){
+				port = pref.getIntPref("extensions.bbs2chreader.server_port.other");
+			}
+
+			var spec = "http://127.0.0.1:" + port;
+			var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
+			this._serverURL = ioService.newURI(spec, null, null).QueryInterface(Ci.nsIURL);
+		}
+		return this._serverURL.clone();
+	},
+
+
+	get io(){
+		if(!this._initialized) throw Components.results.NS_ERROR_NOT_INITIALIZED;
+		return this._io;
+	},
+	get threadUtils(){
+		if(!this._initialized) throw Components.results.NS_ERROR_NOT_INITIALIZED;
+		return this._threadUtils;
+	},
+	get history(){
+		if(!this._initialized) throw Components.results.NS_ERROR_NOT_INITIALIZED;
+		return this._history;
+	},
+	get viewer(){
+		if(!this._initialized) throw Components.results.NS_ERROR_NOT_INITIALIZED;
+		return this._viewer;
+	},
+
+
+	getHttpChannel: function(aURL){
+		if(!this._initialized) throw Components.results.NS_ERROR_NOT_INITIALIZED;
+		var httpChannel;
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
+
+			// 0=ブラウザの設定に従う  1=直接接続する  2=独自に設定する
+		var proxyMode = pref.getIntPref("extensions.bbs2chreader.http_proxy_mode");
+		if(proxyMode != 0){
+			var httpPHandler = ioService.getProtocolHandler("http").QueryInterface(Ci.nsIHttpProtocolHandler);
+			var pps = XPC.getService("@mozilla.org/network/protocol-proxy-service;1", "nsIProtocolProxyService");
+
+			if(proxyMode == 1){
+				var proxyInfo = pps.newProxyInfo("direct", "", -1, 0, 0, null);
+				httpChannel = httpPHandler.newProxiedChannel(aURL, proxyInfo).QueryInterface(Ci.nsIHttpChannel);
+			}else if(proxyMode == 2){
+				var httpProxyValue = pref.getComplexValue("extensions.bbs2chreader.http_proxy_value",
+							Ci.nsISupportsString).data;
+				httpProxyValue = httpProxyValue.replace(/\s/g, "");
+				if(httpProxyValue.match(/([^:]+):(\d+)/)){
+					var host = RegExp.$1;
+					var port = parseInt(RegExp.$2);
+					try{
+						var proxyInfoDirect = pps.newProxyInfo("direct", "", -1, 0, 0, null);
+						var proxyInfo = pps.newProxyInfo("http", host, port, 0, 10, proxyInfoDirect);
+						httpChannel = httpPHandler.newProxiedChannel(aURL, proxyInfo)
+							.QueryInterface(Ci.nsIHttpChannel);
+					}catch(ex){
+						dump("b2rGlobalIO.getHttpChannel() : " + ex +"\n");
+					}
+				}
+			}
+		}
+
+		if(!httpChannel){
+			httpChannel = ioService.newChannelFromURI(aURL).QueryInterface(Ci.nsIHttpChannel);
+		}
+
+		httpChannel.setRequestHeader("User-Agent", this.userAgent, false);
+		httpChannel.notificationCallbacks = {
+		    getInterface: function(aIID, aInstance) {
+	    	    Components.returnCode = Components.results.NS_ERROR_NO_INTERFACE;
+	        	return null;
+		    }
+		};
+		return httpChannel;
+	},
+
+	openURL: function(aURLSpec, aReferrer, aAddTab){
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+		var windowMediator = XPC.getService("@mozilla.org/appshell/window-mediator;1", "nsIWindowMediator");
+		var browserWindow = windowMediator.getMostRecentWindow("navigator:browser");
+		if(browserWindow){
+			var contentBrowser = browserWindow.document.getElementById("content");
+			if(aAddTab){
+				var newTab = contentBrowser.addTab(aURLSpec, aReferrer);
+				if(pref.getBoolPref("extensions.bbs2chreader.tab_load_in_foreground"))
+					contentBrowser.selectedTab = newTab;
+			}else{
+				contentBrowser.loadURI(aURLSpec, aReferrer);
+			}
+			return;
+		}
+
+		// Firefox/Seamonkey 以外のブラウザでの処理はここに書く
+
+		this.openNewWindow(aURLSpec);
+	},
+
+
+	openNewWindow: function(aURLSpec){
+		var argString = XPC.createInstance("@mozilla.org/supports-string;1", "nsISupportsString");
+		argString.data = aURLSpec || "about:blank";
+
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+		var browserURL = pref.getCharPref("browser.chromeURL");
+		var winWatcher = XPC.getService("@mozilla.org/embedcomp/window-watcher;1", "nsIWindowWatcher");
+		winWatcher.openWindow(null, browserURL, "_blank", "chrome,all,dialog=no", argString);
+	},
+
+
+	_startup: function(){
+		this._io = new b2rGlobalIO();
+		this._threadUtils = new b2rGlobalThreadUtils();
+		this._history = new b2rGlobalHistory(this);
+		this._viewer = new b2rGlobalViewer(this);
+
+		this._initialized = true;
+		dump("b2rGlobalService._startup()\n");
+	},
+
+
+	_shutdown: function(){
+		this._io = null;
+		this._threadUtils = null;
+		this._history = null;
+		this._viewer = null;
+
+		this._initialized = false;
+		dump("b2rGlobalService._shutdown()\n");
+	},
+
+
+	// ********** ********* implements nsIObserver ********** **********
+
+	observe: function(aSubject, aTopic, aData){
+		var observerService = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
+
+		switch(aTopic){
+			case "app-startup":
+				observerService.addObserver(this, "profile-do-change", false);
+				observerService.addObserver(this, "xpcom-shutdown", false);
+				break;
+			case "profile-do-change":
+				this._startup();
+				observerService.removeObserver(this, "profile-do-change");
+				break;
+			case "xpcom-shutdown":
+				this._shutdown();
+				observerService.removeObserver(this, "xpcom-shutdown");
+				break;
+		}
+	},
+
+
+	// ********** ********* implements nsIClassInfo ********** **********
+
+	get classDescription() {
+		return B2R_GLOBAL_SERVICE_CNAME;
+	},
+
+
+	get classID() {
+		return B2R_GLOBAL_SERVICE_CID;
+	},
+
+
+	get implementationLanguage() {
+		return Ci.nsIProgrammingLanguage.JAVASCRIPT;
+	},
+
+
+	get flags() {
+		return Ci.nsIClassInfo.SINGLETON;
+	},
+
+
+	get contractID() {
+    	return B2R_GLOBAL_SERVICE_CONTRACTID;
+	},
+
+
+	getInterfaces: function(aCount) {
+	    var interfaces = [
+			Ci.b2rIGlobalService,
+			Ci.nsIClassInfo,
+			Ci.nsIObserver,
+			Ci.nsISupports
+		];
+	    aCount.value = interfaces.length;
+    	return interfaces;
+	},
+
+
+ 	getHelperForLanguage: function(aLanguage) {
+    	return null;
+	},
+
+
+	// ********** ********* implements nsISupports ********** **********
+
+	QueryInterface: function(aIID){
+		if(aIID.equals(Ci.b2rIGlobalService)) return this;
+		if(aIID.equals(Ci.nsIClassInfo)) return this;
+		if(aIID.equals(Ci.nsIObserver)) return this;
+		if(aIID.equals(Ci.nsISupports)) return this;
+	}
+
+};
+
+
+
+
+// ********** ********* Component Registration ********** **********
+
+
+var b2rGlobalServiceFactory = {
+
+	createInstance: function (aOuter, aIID){
+		if(aOuter != null)
+			throw Components.results.NS_ERROR_NO_AGGREGATION;
+
+		if(aIID.equals(Ci.b2rIGlobalService))
+			return this.getInstance(aIID);
+		if(aIID.equals(Ci.nsIClassInfo))
+			return this.getInstance(aIID);
+		if(aIID.equals(Ci.nsIObserver))
+			return this.getInstance(aIID);
+		if(aIID.equals(Ci.nsISupports))
+			return this.getInstance(aIID);
+	},
+
+
+	getInstance: function(aIID){
+		if(!this._instance){
+			this._instance = new b2rGlobalService();
+		}
+		return this._instance.QueryInterface(aIID);
+	}
+
+};
+
+
+var Module = {
+
+	registerSelf: function(aCompMgr, aFileSpec, aLocation, aType){
+		aCompMgr = aCompMgr.QueryInterface(Ci.nsIComponentRegistrar);
+
+		aCompMgr.registerFactoryLocation(
+						B2R_GLOBAL_SERVICE_CID,
+						B2R_GLOBAL_SERVICE_CNAME,
+						B2R_GLOBAL_SERVICE_CONTRACTID,
+						aFileSpec, aLocation, aType);
+
+		var categoryManager = XPC.getService("@mozilla.org/categorymanager;1", "nsICategoryManager");
+		categoryManager.addCategoryEntry("app-startup", B2R_GLOBAL_SERVICE_CNAME,
+											B2R_GLOBAL_SERVICE_CONTRACTID, true, true);
+	},
+
+
+	unregisterSelf: function(aCompMgr, aFileSpec, aLocation){
+		aCompMgr = aCompMgr.QueryInterface(Ci.nsIComponentRegistrar);
+		aCompMgr.unregisterFactoryLocation(B2R_GLOBAL_SERVICE_CID, aFileSpec);
+
+		var categoryManager = XPC.getService("@mozilla.org/categorymanager;1", "nsICategoryManager");
+		categoryManager.deleteCategoryEntry("app-startup", B2R_GLOBAL_SERVICE_CONTRACTID, true);
+	},
+
+
+	getClassObject: function(aCompMgr, aCID, aIID){
+		if(aCID.equals(B2R_GLOBAL_SERVICE_CID)) return b2rGlobalServiceFactory;
+
+		if(!aIID.equals(Ci.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 Module;
+}
\ No newline at end of file

Added: trunk/bbs2chreader/components/b2rIGlobalService.xpt
===================================================================
(Binary files differ)


Property changes on: trunk/bbs2chreader/components/b2rIGlobalService.xpt
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/bbs2chreader/components/idl/b2rIGlobalService.idl
===================================================================
--- trunk/bbs2chreader/components/idl/b2rIGlobalService.idl	2007-11-02 12:47:24 UTC (rev 245)
+++ trunk/bbs2chreader/components/idl/b2rIGlobalService.idl	2007-11-03 12:53:58 UTC (rev 246)
@@ -0,0 +1,177 @@
+#include "nsISupports.idl"
+
+interface nsILocalFile;
+interface nsIConverterInputStream;
+interface nsIConverterOutputStream;
+interface nsIURL;
+interface nsIHttpChannel;
+interface mozIStorageConnection;
+
+
+[scriptable, uuid(fe8fed8e-6449-4b68-8899-026f806be131)]
+interface b2rIGlobalIO : nsISupports
+{
+
+	/**
+	 * データ保存ディレクトリを nsILocalFile で返す
+	 * @return データ保存ディレクトリ
+	 */
+	nsILocalFile getDataDir();
+
+	/**
+	 * ログ保存ディレクトリ以下に URL のパスを追加して nsILocalFile を返す
+	 * 		(e.g. http://www.example.com/hoge/hage.txt なら 
+	 * 		  ログ保存ディレクトリ\www.example.com\hoge\hage.txt)
+	 * @param aURLSpec ファイルの URL
+	 * @return ログファイル
+	 */
+	nsILocalFile getLogFileAtURL(in AUTF8String aURLSpec);
+
+	/**
+	 * 初期化された nsIConverterInputStream を返す
+	 * @param aLocalFile 読み込むファイルの nsILocalFile
+	 * @param aCharset 読み込むファイルの文字コード
+	 * @return 初期化された nsIConverterInputStream
+	 */
+	nsIConverterInputStream getFileInputStream(in nsILocalFile aLocalFile, in string aCharset);
+
+	/**
+	 * 初期化された nsIConverterOutputStream を返す
+	 * @param aLocalFile 書き込むファイルの nsILocalFile
+	 * @param aCharset 書き込むファイルの文字コード
+	 * @return 初期化された nsIConverterOutputStream
+	 */
+	nsIConverterOutputStream getFileOutputStream(in nsILocalFile aLocalFile, in string aCharset);
+
+};
+
+
+[scriptable, uuid(D2048C64-C76C-46b5-B67F-9640B6BEE09B)]
+interface b2rIGlobalThreadUtils : nsISupports
+{
+
+	/**
+	 * URL から板のタイプを返す
+	 * @param aURL スレッド、又は板の URL
+	 * @return (b2rIGlobalService.BOARD_TYPE_XXX)
+	 */	
+	unsigned long getBoardType(in nsIURL aURL);
+
+	/**
+	 * スレッド URL から板の URL を返す
+	 * @param aThreadURL スレッド URL
+	 * @return 板の nsIURL
+	 */
+	nsIURL getBoardURL(in nsIURL aThreadURL);
+
+};
+
+
+[scriptable, uuid(2E375B4F-8963-41f4-99ED-27251CE96068)]
+interface b2rIGlobalHistory : nsISupports
+{
+
+	/**
+	 * 履歴データベース
+	 */
+	readonly attribute mozIStorageConnection database;
+
+	boolean visitPage(in nsIURL aBoardURL, in AString aTitle, in unsigned long aType);
+
+	void clearAll();
+
+};
+
+
+[scriptable, uuid(E52E3BFC-BFDF-49bd-B524-BBA9D945146D)]
+interface b2rIGlobal2chViewer : nsISupports
+{
+	/**
+	 * 2ch ビューアにログインしているか
+	 */
+	readonly attribute boolean logined;
+
+	/**
+	 * 2ch ビューアのセッションID
+	 */
+	readonly attribute string sessionID;
+
+	/**
+	 * 2ch ビューア認証を行う
+	 */
+	void auth();
+
+};
+
+
+[scriptable, uuid(b7823d3f-eb1c-44a2-b178-b3a8f64fa371)]
+interface b2rIGlobalService : nsISupports
+{
+
+	/**
+	 * 2ch 型 BBS
+	 */
+	const unsigned long BOARD_TYPE_2CH = 0;
+
+	/**
+	 * 旧 2ch 型 BBS
+	 */
+	const unsigned long BOARD_TYPE_OLD2CH = 1;
+
+	/**
+	 * Be ＠ 2ch BBS
+	 */
+	const unsigned long BOARD_TYPE_BE2CH = 2;
+
+	/**
+	 * したらば JBBS
+	 */
+	const unsigned long BOARD_TYPE_JBBS = 3;
+
+	/**
+	 * まちBBS
+	 */
+	const unsigned long BOARD_TYPE_MACHI = 4;
+
+	/**
+	 * 通常ページ
+	 */
+	const unsigned long BOARD_TYPE_PAGE = 5;
+
+	/**
+	 * 2ch サーバに接続する際のユーザエージェント
+	 */
+	readonly attribute string userAgent;
+
+	/**
+	 * b2rServer の URL
+	 */
+	readonly attribute nsIURL serverURL;
+
+	readonly attribute b2rIGlobalIO io;
+	readonly attribute b2rIGlobalThreadUtils threadUtils;
+	readonly attribute b2rIGlobalHistory history;
+	readonly attribute b2rIGlobal2chViewer viewer;
+
+	/**
+	 * プロクシや UserAgent などの設定を施した nsIHttpChannel を返す
+	 * @param aURL nsIHttpChannel を作成する URL 
+	 */
+	nsIHttpChannel getHttpChannel(in nsIURL aURL);
+
+	/**
+	 * ブラウザで指定した URI を開く
+	 * ブラウザウィンドウが無いときは新規ウィンドウで開く
+	 * @param aURLSpec 開くページの URI
+	 * @param aReferrer リファラ 送りたくないときは null
+	 * @param aAddTab タブで開くかどうか
+	 */
+	void openURL(in AUTF8String aURLSpec, in AUTF8String aReferrer, in boolean aAddTab);
+
+	/**
+	 * 新しいブラウザウィンドウで指定した URI を開く
+	 * aURISpec を指定しなかったときは about:blank
+	 * @param aURLSpec 新しいウィンドウで開くページの URI
+	 */
+	void openNewWindow(in AUTF8String aURLSpec);
+};

From svnnotify ＠ sourceforge.jp  Sat Nov  3 22:30:11 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 03 Nov 2007 22:30:11 +0900
Subject: [Bbs2ch-cvs 265]
 =?utf-8?b?WzI0N10gIOWxpeattOmWoumAo+ODoeOCveODg+ODieOCkiBuc0Ji?=
 =?utf-8?b?czJjaFNlcnZpY2Ug44GL44KJIGIyckdsb2JhbFNlcnZpY2Ug44Gr56e75YuV?=
Message-ID: <1194096611.849446.18761.nullmailer@users.sourceforge.jp>

Revision: 247
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=247
Author:   flyson
Date:     2007-11-03 22:30:11 +0900 (Sat, 03 Nov 2007)

Log Message:
-----------
履歴関連メソッドを nsBbs2chService から b2rGlobalService に移動

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
    trunk/bbs2chreader/components/b2rGlobalService.js
    trunk/bbs2chreader/components/nsBbs2chService.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js	2007-11-03 12:53:58 UTC (rev 246)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js	2007-11-03 13:30:11 UTC (rev 247)
@@ -1,6 +1,9 @@
 var gBbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
 			.getService(Components.interfaces.nsIBbs2chService);
+var gB2rService = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+			.getService(Components.interfaces.b2rIGlobalService);
 
+
 var gBbsmenuUpdater
 var gTreeBbsMenu;
 var gTreeBbsMenuView;
@@ -134,10 +137,10 @@
 	if(boardMax > 15) boardMax = 15;
 
 	var sql = "SELECT url, title FROM history WHERE type=0 ORDER BY last_visited DESC LIMIT ?1";
-	var statement = gBbs2chService.historyDB.createStatement(sql);
+	var statement = gB2rService.history.database.createStatement(sql);
 	statement.bindInt32Parameter(0, boardMax);
 
-	gBbs2chService.historyDB.beginTransaction();
+	gB2rService.history.database.beginTransaction();
 	try{
 		while(statement.executeStep()){
 			var url =  "bbs2ch:board:" + statement.getString(0);
@@ -150,7 +153,7 @@
 		}
 		statement.reset();
 	}finally{
-		gBbs2chService.historyDB.commitTransaction();
+		gB2rService.history.database.commitTransaction();
 	}
 
 	if(popHistory.hasChildNodes()){
@@ -161,10 +164,10 @@
 	var threadMax = gBbs2chService.pref.getIntPref("extensions.bbs2chreader.bbsmenu_historymenu_thread_max");
 	if(threadMax > 15) threadMax = 15;
 	sql = sql = "SELECT url, title FROM history WHERE type=1 ORDER BY last_visited DESC LIMIT ?1";
-	statement = gBbs2chService.historyDB.createStatement(sql);
+	statement = gB2rService.history.database.createStatement(sql);
 	statement.bindInt32Parameter(0, threadMax);
 
-	gBbs2chService.historyDB.beginTransaction();
+	gB2rService.history.database.beginTransaction();
 	try{
 		while(statement.executeStep()){
 			var url = statement.getString(0);
@@ -188,7 +191,7 @@
 		}
 		statement.reset();
 	}finally{
-		gBbs2chService.historyDB.commitTransaction();
+		gB2rService.history.database.commitTransaction();
 	}
 
 	if(popHistory.hasChildNodes()){

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-11-03 12:53:58 UTC (rev 246)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-11-03 13:30:11 UTC (rev 247)
@@ -37,6 +37,8 @@
 
 
 var gBbs2chService = Cc["@mozilla.org/bbs2ch-service;1"].getService(Ci.nsIBbs2chService);
+var gB2rService = Cc["@bbs2ch.sourceforge.jp/b2r-global-service;1"].getService(Ci.b2rIGlobalService);
+
 var gTreeSubject;
 var gBoardItems;
 var gSubjectDownloader;
@@ -180,7 +182,7 @@
 	document.getElementById("lblTitle").setAttribute("value", gBoardItems.title);
 
 	if(gFirstInitTreeSubject){
-		gBbs2chService.visitPage(gBoardItems.url, gBoardItems.title, 0);
+		gB2rService.history.visitPage(gBoardItems.url, gBoardItems.title, 0);
 		gFirstInitTreeSubject = false;
 	}
 

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-11-03 12:53:58 UTC (rev 246)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-11-03 13:30:11 UTC (rev 247)
@@ -261,7 +261,9 @@
 	close: function(){
 		if(this._headerResponded && this.dat){
 			var title = this._bbs2chService.fromSJIS(this.dat.title);
-			this._bbs2chService.visitPage(this.dat.threadPlainURL, title, 1);
+			var gB2rService = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+						.getService(Components.interfaces.b2rIGlobalService);
+			gB2rService.history.visitPage(this.dat.threadPlainURL, title, 1);
 		}
 		this._opend = false;
 		this._httpChannel = null;

Modified: trunk/bbs2chreader/components/b2rGlobalService.js
===================================================================
--- trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-03 12:53:58 UTC (rev 246)
+++ trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-03 13:30:11 UTC (rev 247)
@@ -94,7 +94,7 @@
 
 		var dataDir = this._dataDir.clone().QueryInterface(Ci.nsILocalFile);
 		if(!dataDir.exists()){
-			dataDir.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0666);
+			dataDir.create(Ci.nsILocalFile.DIRECTORY_TYPE, 0666);
 		}
 		return dataDir;
 	},
@@ -251,21 +251,93 @@
 
 b2rGlobalHistory.prototype = {
 
-	get historyDB(){
-		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+	get database(){
+		return this._database;
 	},
 
 
 	_init: function(aGlobalService){
+		var storageService = XPC.getService("@mozilla.org/storage/service;1", "mozIStorageService");
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+
+		var dbFile = aGlobalService.io.getDataDir();
+		dbFile.appendRelativePath("history.sqlite");
+		this._database = storageService.openDatabase(dbFile);
+
+		this._database.beginTransaction();
+		try{
+			if(!this._database.tableExists("history")){
+				var sql = <>
+					CREATE TABLE history(
+						id INTEGER PRIMARY KEY,
+						url TEXT NOT NULL,
+						title NOT NULL,
+						last_visited INTEGER NOT NULL DEFAULT 0,
+						visit_count INTEGER NOT NULL DEFAULT 1,
+						type INTEGER NOT NULL DEFAULT 0
+					);
+				</>.toString();
+				this._database.executeSimpleSQL(sql);
+			}
+
+			var historyExpireDays = pref.getIntPref("extensions.bbs2chreader.history_expire_days");
+			if(historyExpireDays > 365) historyExpireDays = 365;
+			var sql = "DELETE FROM history WHERE last_visited < strftime('%s', 'now', '-" + historyExpireDays +  " day')";
+			this._database.executeSimpleSQL(sql);
+
+		}finally{
+			this._database.commitTransaction();
+		}
 	},
 
 
 	visitPage: function(aBoardURL, aTitle, aType){
+		var pageID = null;
+
+		this._database.beginTransaction();
+		try{
+			var sql = "SELECT id FROM history WHERE url=?1";
+			var statement = this._database.createStatement(sql);
+			statement.bindStringParameter(0, aBoardURL.spec);
+			if(statement.executeStep()){
+				pageID = statement.getInt32(0);
+			}
+			statement.reset();
+
+			if(pageID){
+				sql = "UPDATE history SET title=?1, visit_count=visit_count+1, last_visited=?2 WHERE id=?3;";
+				statement = this._database.createStatement(sql);
+				statement.bindStringParameter(0, aTitle);
+				statement.bindInt32Parameter(1, Date.now() / 1000);
+				statement.bindInt32Parameter(2, pageID);
+				statement.execute();
+			}else{
+				sql = "INSERT INTO history(url, title, type, last_visited) VALUES(?1, ?2, ?3, ?4);";
+				statement = this._database.createStatement(sql);
+				statement.bindStringParameter(0, aURL.spec);
+				statement.bindStringParameter(1, aTitle);
+				statement.bindInt32Parameter(2, aType);
+				statement.bindInt32Parameter(3, Date.now() / 1000);
+				statement.execute();
+			}
+		}finally{
+			this._database.commitTransaction();
+		}
+		return true;
 	},
 
 
 	clearAll: function(){
-		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+		this._database.beginTransaction();
+		try{
+			this._database.executeSimpleSQL("DELETE FROM history;");
+		}finally{
+			this._database.commitTransaction();
+		}
+
+		try{
+			this._database.executeSimpleSQL("VACUUM");
+		}catch(ex){}
 	}
 
 };
@@ -470,12 +542,12 @@
 
 
 	_startup: function(){
+		this._initialized = true;
 		this._io = new b2rGlobalIO();
 		this._threadUtils = new b2rGlobalThreadUtils();
 		this._history = new b2rGlobalHistory(this);
 		this._viewer = new b2rGlobalViewer(this);
 
-		this._initialized = true;
 		dump("b2rGlobalService._startup()\n");
 	},
 

Modified: trunk/bbs2chreader/components/nsBbs2chService.js
===================================================================
--- trunk/bbs2chreader/components/nsBbs2chService.js	2007-11-03 12:53:58 UTC (rev 246)
+++ trunk/bbs2chreader/components/nsBbs2chService.js	2007-11-03 13:30:11 UTC (rev 247)
@@ -39,106 +39,8 @@
 const Cc = Components.classes;
 
 
-function b2rGlobalHistory(aBbs2chService){
-	this._init(aBbs2chService);
-}
 
-b2rGlobalHistory.prototype = {
 
-	get historyDB(){
-		return this._historyDB;
-	},
-
-	_init: function(aBbs2chService){
-		var storageService = Cc["@mozilla.org/storage/service;1"]
-				.getService(Ci.mozIStorageService);
-		var dbFile = aBbs2chService.getDataDir();
-		dbFile.appendRelativePath("history.sqlite");
-			// 初回起動でデータディレクトリが存在しない場合にそなえて先に作成
-		if(!dbFile.exists()){
-			dbFile.create(dbFile.NORMAL_FILE_TYPE, 0666);
-		}
-
-		this._historyDB = storageService.openDatabase(dbFile);
-
-		this._historyDB.beginTransaction();
-		try{
-			if(!this._historyDB.tableExists("history")){
-				var sql = <><![CDATA[
-					CREATE TABLE history(
-						id INTEGER PRIMARY KEY,
-						url TEXT NOT NULL,
-						title NOT NULL,
-						last_visited INTEGER NOT NULL DEFAULT 0,
-						visit_count INTEGER NOT NULL DEFAULT 1,
-						type INTEGER NOT NULL DEFAULT 0
-					);
-				]]></>.toString();
-				this._historyDB.executeSimpleSQL(sql);
-			}
-
-			var historyExpireDays = aBbs2chService.pref.getIntPref("extensions.bbs2chreader.history_expire_days");
-			if(historyExpireDays > 365) historyExpireDays = 365;
-			var sql = "DELETE FROM history WHERE last_visited < strftime('%s', 'now', '-" + historyExpireDays +  " day')";
-			this._historyDB.executeSimpleSQL(sql);
-
-		}finally{
-			this.historyDB.commitTransaction();
-		}
-	},
-
-	visitPage: function(aURL, aTitle, aType){
-		var pageID = null;
-
-		this.historyDB.beginTransaction();
-		try{
-			var sql = "SELECT id FROM history WHERE url=?1";
-			var statement = this.historyDB.createStatement(sql);
-			statement.bindStringParameter(0, aURL.spec);
-			if(statement.executeStep()){
-				pageID = statement.getInt32(0);
-			}
-			statement.reset();
-
-			if(pageID){
-				sql = "UPDATE history SET title=?1, visit_count=visit_count+1, last_visited=?2 WHERE id=?3;";
-				statement = this.historyDB.createStatement(sql);
-				statement.bindStringParameter(0, aTitle);
-				statement.bindInt32Parameter(1, Date.now() / 1000);
-				statement.bindInt32Parameter(2, pageID);
-				statement.execute();
-			}else{
-				sql = "INSERT INTO history(url, title, type, last_visited) VALUES(?1, ?2, ?3, ?4);";
-				statement = this.historyDB.createStatement(sql);
-				statement.bindStringParameter(0, aURL.spec);
-				statement.bindStringParameter(1, aTitle);
-				statement.bindInt32Parameter(2, aType);
-				statement.bindInt32Parameter(3, Date.now() / 1000);
-				statement.execute();
-			}
-		}finally{
-			this.historyDB.commitTransaction();
-		}
-		return true;
-	},
-
-	clearHistory: function(){
-		this._historyDB.beginTransaction();
-		try{
-			this._historyDB.executeSimpleSQL("DELETE FROM history;");
-		}finally{
-			this.historyDB.commitTransaction();
-		}
-
-		try{
-			this._historyDB.executeSimpleSQL("VACUUM");
-		}catch(ex){}
-	}
-};
-
-
-
-
 function nsBbs2chService(){
 		// getBoardType で利用する例外的な URL のリスト( 2ch だけど板じゃない URL)
 	this._exURLs = new Array(
@@ -152,7 +54,6 @@
 
 	this.__unicodeConverter = null;
 	this.__ioService = null;
-	this._globalHistory = null;
 	this._pref = null;
 	this._prefDefault = null;
 	this._userAgent = null;
@@ -256,18 +157,16 @@
 	},
 
 	get historyDB(){
-		return this._globalHistory.historyDB;
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
 	},
 
 	_delayInit: function(){
-		this._globalHistory = new b2rGlobalHistory(this);
 		this._maruAutoAuth();
 	},
 
 	_shutdown: function(){
 		this.__unicodeConverter = null;
 		this.__ioService = null;
-		this._globalHistory = null;
 		this._pref = null;
 		this._prefDefault = null;
 		this._userAgent = null;
@@ -729,12 +628,12 @@
 
 
 	visitPage: function(aURL, aTitle, aType){
-		return this._globalHistory.visitPage(aURL, aTitle, aType);
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
 	},
 
 
 	clearHistory :function(){
-		this._globalHistory.clearHistory();
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
 	},
 
 

From svnnotify ＠ sourceforge.jp  Mon Nov  5 23:38:34 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Nov 2007 23:38:34 +0900
Subject: [Bbs2ch-cvs 266]
	=?utf-8?b?WzI0OF0gYjJySUdsb2JhbElPLnJlYWRGaWxlKCkgIOOBrui/vQ==?=
	=?utf-8?b?5Yqg?=
Message-ID: <1194273514.955858.14243.nullmailer@users.sourceforge.jp>

Revision: 248
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=248
Author:   flyson
Date:     2007-11-05 23:38:34 +0900 (Mon, 05 Nov 2007)

Log Message:
-----------
b2rIGlobalIO.readFile() の追加

Modified Paths:
--------------
    trunk/bbs2chreader/components/b2rGlobalService.js
    trunk/bbs2chreader/components/b2rIGlobalService.xpt
    trunk/bbs2chreader/components/idl/b2rIGlobalService.idl


-------------- next part --------------
Modified: trunk/bbs2chreader/components/b2rGlobalService.js
===================================================================
--- trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-03 13:30:11 UTC (rev 247)
+++ trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-05 14:38:34 UTC (rev 248)
@@ -119,6 +119,24 @@
 	},
 
 
+	readFile: function(aLocalFile, aCharset){
+		var inputStream;
+		try{
+			inputStream = this.getFileInputStream(aLocalFile, aCharset);
+		}catch(ex){
+			throw ex;
+		}
+
+		var result = new Array();
+		var str = {};
+		while (inputStream.readString(1024*8, str) != 0) {
+			result.push(str.value);
+		}
+		inputStream.close();
+		return result.join("");
+	},
+
+
 	getFileInputStream: function(aLocalFile, aCharset){
 		const PR_RDONLY = 0x01;
 		var charset = aCharset || "UTF-8";
@@ -129,7 +147,7 @@
 				"@mozilla.org/intl/converter-input-stream;1", "nsIConverterInputStream");
 
 		try{
-			fileInputStream.init(aLocaFile, PR_RDONLY, 0666, Ci.nsIFileInputStream.CLOSE_ON_EOF);
+			fileInputStream.init(aLocalFile, PR_RDONLY, 0666, Ci.nsIFileInputStream.CLOSE_ON_EOF);
 			converterInputStream.init(fileInputStream, charset, 1024*8,
 					Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
 		}catch(ex){
@@ -154,7 +172,7 @@
 				"@mozilla.org/intl/converter-output-stream;1", "nsIConverterOutputStream");
 
 		try{
-			fileOutputStream.init(aLocaFile, ioFlags, 0666, 0);
+			fileOutputStream.init(aLocalFile, ioFlags, 0666, 0);
 			converterOutputStream.init(fileOutputStream, charset, 1024*8,
 					Ci.nsIConverterOutputStream.DEFAULT_REPLACEMENT_CHARACTER);
 		}catch(ex){

Modified: trunk/bbs2chreader/components/b2rIGlobalService.xpt
===================================================================
(Binary files differ)

Modified: trunk/bbs2chreader/components/idl/b2rIGlobalService.idl
===================================================================
--- trunk/bbs2chreader/components/idl/b2rIGlobalService.idl	2007-11-03 13:30:11 UTC (rev 247)
+++ trunk/bbs2chreader/components/idl/b2rIGlobalService.idl	2007-11-05 14:38:34 UTC (rev 248)
@@ -28,6 +28,14 @@
 	nsILocalFile getLogFileAtURL(in AUTF8String aURLSpec);
 
 	/**
+	 * テキストファイルのすべてを読み込んで内容を返す
+	 * @param aLocalFile 読み込むファイルの nsILocalFile
+	 * @param aCharset 読み込むファイルの文字コード
+	 * @return ファイルの内容
+	 */
+	AString readFile(in nsILocalFile aLocalFile, in string aCharset);
+
+	/**
 	 * 初期化された nsIConverterInputStream を返す
 	 * @param aLocalFile 読み込むファイルの nsILocalFile
 	 * @param aCharset 読み込むファイルの文字コード

From svnnotify ＠ sourceforge.jp  Mon Nov  5 23:39:46 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Nov 2007 23:39:46 +0900
Subject: [Bbs2ch-cvs 267]
 =?utf-8?b?WzI0OV0gIG5zQmJzMmNoU2VydmljZSDjgYvjgokgYjJyR2xvYmFs?=
 =?utf-8?b?U2VydmljZSDjgbjjga7ku6XpmY0=?=
Message-ID: <1194273586.122723.14598.nullmailer@users.sourceforge.jp>

Revision: 249
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=249
Author:   flyson
Date:     2007-11-05 23:39:45 +0900 (Mon, 05 Nov 2007)

Log Message:
-----------
nsBbs2chService から b2rGlobalService への以降

Modified Paths:
--------------
    trunk/bbs2chreader/components/b2rServer.js
    trunk/bbs2chreader/components/b2rThreadRedirector.js


-------------- next part --------------
Modified: trunk/bbs2chreader/components/b2rServer.js
===================================================================
--- trunk/bbs2chreader/components/b2rServer.js	2007-11-05 14:38:34 UTC (rev 248)
+++ trunk/bbs2chreader/components/b2rServer.js	2007-11-05 14:39:45 UTC (rev 249)
@@ -79,7 +79,8 @@
 					.getService(Ci.nsIEventQueueService);
 		this._eventQueue = eventQueueService.createFromIThread(this.currentThread, false);
 
-		var port = Cc["@mozilla.org/bbs2ch-service;1"].getService(Ci.nsIBbs2chService).serverURL.port;
+		var port = Cc["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+						.getService(Ci.b2rIGlobalService).serverURL.port;
 		var serverSocket = Cc["@mozilla.org/network/server-socket;1"]
 				.createInstance(Ci.nsIServerSocket);
 		serverSocket.init(port, true, 10);
@@ -201,7 +202,8 @@
   	// ********** ********* implements nsIRunnable ********** **********
 
 	run: function (){
-		var port = Cc["@mozilla.org/bbs2ch-service;1"].getService(Ci.nsIBbs2chService).serverURL.port;
+		var port = Cc["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+						.getService(Ci.b2rIGlobalService).serverURL.port;
 		var serverSocket = Cc["@mozilla.org/network/server-socket;1"]
 					.createInstance(Ci.nsIServerSocket);
 		serverSocket.init(port, true, 10);

Modified: trunk/bbs2chreader/components/b2rThreadRedirector.js
===================================================================
--- trunk/bbs2chreader/components/b2rThreadRedirector.js	2007-11-05 14:38:34 UTC (rev 248)
+++ trunk/bbs2chreader/components/b2rThreadRedirector.js	2007-11-05 14:39:45 UTC (rev 249)
@@ -163,10 +163,10 @@
 			}
 
 			if(viewB2r){
-				var bbs2chService = Cc["@mozilla.org/bbs2ch-service;1"]
-							.getService(Ci.nsIBbs2chService);
+				var b2rService = Cc["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+						.getService(Ci.b2rIGlobalService);
 				var serverURL = "./thread/" + aContentLocation.spec;
-				serverURL = bbs2chService.serverURL.resolve(serverURL);
+				serverURL = b2rService.serverURL.resolve(serverURL);
 				aContentLocation.spec = serverURL;
 			}
 		}

From svnnotify ＠ sourceforge.jp  Thu Nov  8 23:08:12 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 08 Nov 2007 23:08:12 +0900
Subject: [Bbs2ch-cvs 268]
 =?utf-8?q?=5B250=5D_b2rGlobalHistory=2E_visitPage_=E3=81=A7?=
 =?utf-8?b?5paw6KaP44Oa44O844K444GM55m76Yyy44Gn44GN44Gq44GE44OQ44Kw5L+u?=
 =?utf-8?b?5q2j?=
Message-ID: <1194530892.008165.3601.nullmailer@users.sourceforge.jp>

Revision: 250
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=250
Author:   flyson
Date:     2007-11-08 23:08:11 +0900 (Thu, 08 Nov 2007)

Log Message:
-----------
b2rGlobalHistory.visitPage で新規ページが登録できないバグ修正

Modified Paths:
--------------
    trunk/bbs2chreader/components/b2rGlobalService.js


-------------- next part --------------
Modified: trunk/bbs2chreader/components/b2rGlobalService.js
===================================================================
--- trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-05 14:39:45 UTC (rev 249)
+++ trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-08 14:08:11 UTC (rev 250)
@@ -332,7 +332,7 @@
 			}else{
 				sql = "INSERT INTO history(url, title, type, last_visited) VALUES(?1, ?2, ?3, ?4);";
 				statement = this._database.createStatement(sql);
-				statement.bindStringParameter(0, aURL.spec);
+				statement.bindStringParameter(0, aBoardURL.spec);
 				statement.bindStringParameter(1, aTitle);
 				statement.bindInt32Parameter(2, aType);
 				statement.bindInt32Parameter(3, Date.now() / 1000);

From svnnotify ＠ sourceforge.jp  Thu Nov  8 23:13:42 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 08 Nov 2007 23:13:42 +0900
Subject: [Bbs2ch-cvs 269]
 =?utf-8?b?WzI1MV0gIOWxpeattOOBrua2iOWOu+OBjOOBp+OBjeOBquOBjw==?=
 =?utf-8?b?44Gq44Gj44Gm44GE44Gf44Gu44KS5L+u5q2j?=
Message-ID: <1194531222.405258.6363.nullmailer@users.sourceforge.jp>

Revision: 251
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=251
Author:   flyson
Date:     2007-11-08 23:13:42 +0900 (Thu, 08 Nov 2007)

Log Message:
-----------
履歴の消去ができなくなっていたのを修正

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js	2007-11-08 14:08:11 UTC (rev 250)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.js	2007-11-08 14:13:42 UTC (rev 251)
@@ -221,7 +221,7 @@
 }
 
 function clearHistory(){
-	gBbs2chService.clearHistory();
+	gB2rService.history.clearAll();
 }
 
 /**

From svnnotify ＠ sourceforge.jp  Thu Nov  8 23:15:35 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 08 Nov 2007 23:15:35 +0900
Subject: [Bbs2ch-cvs 270]
 =?utf-8?b?WzI1Ml0gIG5zQmJzMmNoU2VydmljZSDjgYvjgokgYjJyR2xvYmFs?=
 =?utf-8?b?U2VydmljZSDjgbjjga7ku6XpmY0=?=
Message-ID: <1194531335.347188.7568.nullmailer@users.sourceforge.jp>

Revision: 252
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=252
Author:   flyson
Date:     2007-11-08 23:15:35 +0900 (Thu, 08 Nov 2007)

Log Message:
-----------
nsBbs2chService から b2rGlobalService への以降

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js	2007-11-08 14:13:42 UTC (rev 251)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post/filter.js	2007-11-08 14:15:35 UTC (rev 252)
@@ -1,148 +1,148 @@
-
-
-function b2rPostFilterManager(){
-	this._filters = new Array();
-}
-
-b2rPostFilterManager.prototype = {
-	get filters(){
-		return this._filters;
-	},
-
-	loadScripts: function(){
-		this._filters = new Array();
-		var fileExtensionTest = /\.xml$/i;
-
-		var bbs2chreaderID = "{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}";
-		var extensionManager = Cc["@mozilla.org/extensions/manager;1"].getService(Ci.nsIExtensionManager);
-		var installLocation = extensionManager.getInstallLocation(bbs2chreaderID);
-		var postFiltersFolder = installLocation.getItemFile(bbs2chreaderID, "defaults/postFilters")
-				.clone().QueryInterface(Ci.nsILocalFile);
-		var entries = postFiltersFolder.directoryEntries.QueryInterface(Ci.nsIDirectoryEnumerator);
-		while(true){
-			var entry = entries.nextFile;
-			if(!entry) break;
-			if(!fileExtensionTest.test(entry.leafName)) continue;
-
-			var postFilter = this._createFilter(entry);
-			if(postFilter){
-				this._filters.push(postFilter);
-			}
-		}
-		entries.close();
-
-
-		var postFiltersProfileFolder = gBbs2chService.getDataDir();
-		postFiltersProfileFolder.appendRelativePath("postFilters");
-		if(!postFiltersProfileFolder.exists()){
-			postFiltersProfileFolder.create(Ci.nsIFile.DIRECTORY_TYPE, 0777);
-		}
-		var entries = postFiltersProfileFolder.directoryEntries.QueryInterface(Ci.nsIDirectoryEnumerator);
-		while(true){
-			var entry = entries.nextFile;
-			if(!entry) break;
-			if(!fileExtensionTest.test(entry.leafName)) continue;
-
-			var postFilter = this._createFilter(entry);
-			if(postFilter){
-				this._filters.push(postFilter);
-			}
-		}
-		entries.close();
-	},
-
-	_createFilter: function(aLocalFile){
-		var fileInputStream = Cc["@mozilla.org/network/file-input-stream;1"]
-				.createInstance(Ci.nsIFileInputStream);
-		fileInputStream.init(aLocalFile, 0x01, 0666, Ci.nsIFileInputStream.CLOSE_ON_EOF);
-		var parser = new DOMParser();
-		var doc = parser.parseFromStream(fileInputStream, null, aLocalFile.fileSize , "text/xml");
-		if(doc.firstChild.nodeName!="postFilter") return null;
-		doc.normalize();
-
-		var filter = {};
-		filter.title = this._getTextContent(doc, "title");
-		if(!filter.title) filter.title = aLocalFile.leafName.replace(/\.xml$/, "");
-		filter.description = this._getTextContent(doc, "description");
-		filter.version = this._getTextContent(doc, "version");
-		filter.script = this._getTextContent(doc, "script");
-		filter.scriptFile = aLocalFile;
-		filter.scriptDoc = doc;
-		if(!filter.script) return null;
-
-		return filter;
-	},
-
-	_getTextContent: function(aDoc, aTagName){
-		var nodes = aDoc.getElementsByTagName(aTagName);
-		if(nodes.length>0) return nodes[0].textContent;
-		return null;
-	},
-
-	execFilterScript: function(aPostFilter, aTextArea){
-		var safeWindow = new XPCNativeWrapper(window);
-		var sandbox = new Components.utils.Sandbox(safeWindow);
-		sandbox.PostFilter = new b2rPostFilterContext(aPostFilter, aTextArea);
-
-		sandbox.__proto__ = safeWindow;
-		try{
-			var stackLinenumber = Components.stack.lineNumber + 1;
-			Components.utils.evalInSandbox(aPostFilter.script, sandbox);
-		}catch(ex){
-			this.logErrorMessage(ex.message, aPostFilter.scriptFile.path, ex.lineNumber - stackLinenumber);
-			return aTextArea.value;
-		}
-		return sandbox.PostFilter.result;
-	},
-
-	logErrorMessage: function(aMessage, aSourceName, aLineNumber){
-		var consoleService = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
-		var scriptError = Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError);
-		scriptError.init(aMessage, aSourceName, null, aLineNumber, null, null, null);
-		consoleService.logMessage(scriptError);
-	}
-
-}
-
-
-function b2rPostFilterContext(aPostFilter, aTextArea){
-	this._filter = aPostFilter;
-	this._textArea = aTextArea;
-	this._value = aTextArea.value;
-	this._result = aTextArea.value;
-}
-
-b2rPostFilterContext.prototype = {
-
-	get scriptFile(){
-		return this._filter.scriptFile;
-	},
-	get scriptDoc(){
-		return this._filter.scriptDoc;
-	},
-
-	get value(){
-		return this._value;
-	},
-
-	get result(){
-		return String(this._result);
-	},
-	set result(aValue){
-		return this._result = aValue;
-	},
-
-	get isSelection(){
-		return this._textArea.selectionStart != this._textArea.selectionEnd;
-	},
-
-	get selectionLeft(){
-		return this.value.substring(0, this._textArea.selectionStart);
-	},
-	get selection(){
-		return this.value.substring(this._textArea.selectionStart, this._textArea.selectionEnd);
-	},
-	get selectionRight(){
-		return this.value.substring(this._textArea.selectionEnd);
-	}
+
+
+function b2rPostFilterManager(){
+	this._filters = new Array();
+}
+
+b2rPostFilterManager.prototype = {
+	get filters(){
+		return this._filters;
+	},
+
+	loadScripts: function(){
+		this._filters = new Array();
+		var fileExtensionTest = /\.xml$/i;
+
+		var bbs2chreaderID = "{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}";
+		var extensionManager = Cc["@mozilla.org/extensions/manager;1"].getService(Ci.nsIExtensionManager);
+		var installLocation = extensionManager.getInstallLocation(bbs2chreaderID);
+		var postFiltersFolder = installLocation.getItemFile(bbs2chreaderID, "defaults/postFilters")
+				.clone().QueryInterface(Ci.nsILocalFile);
+		var entries = postFiltersFolder.directoryEntries.QueryInterface(Ci.nsIDirectoryEnumerator);
+		while(true){
+			var entry = entries.nextFile;
+			if(!entry) break;
+			if(!fileExtensionTest.test(entry.leafName)) continue;
+
+			var postFilter = this._createFilter(entry);
+			if(postFilter){
+				this._filters.push(postFilter);
+			}
+		}
+		entries.close();
+
+		var b2rService = Cc["@bbs2ch.sourceforge.jp/b2r-global-service;1"].getService(Ci.b2rIGlobalService);
+		var postFiltersProfileFolder = b2rService.io.getDataDir();
+		postFiltersProfileFolder.appendRelativePath("postFilters");
+		if(!postFiltersProfileFolder.exists()){
+			postFiltersProfileFolder.create(Ci.nsIFile.DIRECTORY_TYPE, 0777);
+		}
+		var entries = postFiltersProfileFolder.directoryEntries.QueryInterface(Ci.nsIDirectoryEnumerator);
+		while(true){
+			var entry = entries.nextFile;
+			if(!entry) break;
+			if(!fileExtensionTest.test(entry.leafName)) continue;
+
+			var postFilter = this._createFilter(entry);
+			if(postFilter){
+				this._filters.push(postFilter);
+			}
+		}
+		entries.close();
+	},
+
+	_createFilter: function(aLocalFile){
+		var fileInputStream = Cc["@mozilla.org/network/file-input-stream;1"]
+				.createInstance(Ci.nsIFileInputStream);
+		fileInputStream.init(aLocalFile, 0x01, 0666, Ci.nsIFileInputStream.CLOSE_ON_EOF);
+		var parser = new DOMParser();
+		var doc = parser.parseFromStream(fileInputStream, null, aLocalFile.fileSize , "text/xml");
+		if(doc.firstChild.nodeName!="postFilter") return null;
+		doc.normalize();
+
+		var filter = {};
+		filter.title = this._getTextContent(doc, "title");
+		if(!filter.title) filter.title = aLocalFile.leafName.replace(/\.xml$/, "");
+		filter.description = this._getTextContent(doc, "description");
+		filter.version = this._getTextContent(doc, "version");
+		filter.script = this._getTextContent(doc, "script");
+		filter.scriptFile = aLocalFile;
+		filter.scriptDoc = doc;
+		if(!filter.script) return null;
+
+		return filter;
+	},
+
+	_getTextContent: function(aDoc, aTagName){
+		var nodes = aDoc.getElementsByTagName(aTagName);
+		if(nodes.length>0) return nodes[0].textContent;
+		return null;
+	},
+
+	execFilterScript: function(aPostFilter, aTextArea){
+		var safeWindow = new XPCNativeWrapper(window);
+		var sandbox = new Components.utils.Sandbox(safeWindow);
+		sandbox.PostFilter = new b2rPostFilterContext(aPostFilter, aTextArea);
+
+		sandbox.__proto__ = safeWindow;
+		try{
+			var stackLinenumber = Components.stack.lineNumber + 1;
+			Components.utils.evalInSandbox(aPostFilter.script, sandbox);
+		}catch(ex){
+			this.logErrorMessage(ex.message, aPostFilter.scriptFile.path, ex.lineNumber - stackLinenumber);
+			return aTextArea.value;
+		}
+		return sandbox.PostFilter.result;
+	},
+
+	logErrorMessage: function(aMessage, aSourceName, aLineNumber){
+		var consoleService = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
+		var scriptError = Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError);
+		scriptError.init(aMessage, aSourceName, null, aLineNumber, null, null, null);
+		consoleService.logMessage(scriptError);
+	}
+
+}
+
+
+function b2rPostFilterContext(aPostFilter, aTextArea){
+	this._filter = aPostFilter;
+	this._textArea = aTextArea;
+	this._value = aTextArea.value;
+	this._result = aTextArea.value;
+}
+
+b2rPostFilterContext.prototype = {
+
+	get scriptFile(){
+		return this._filter.scriptFile;
+	},
+	get scriptDoc(){
+		return this._filter.scriptDoc;
+	},
+
+	get value(){
+		return this._value;
+	},
+
+	get result(){
+		return String(this._result);
+	},
+	set result(aValue){
+		return this._result = aValue;
+	},
+
+	get isSelection(){
+		return this._textArea.selectionStart != this._textArea.selectionEnd;
+	},
+
+	get selectionLeft(){
+		return this.value.substring(0, this._textArea.selectionStart);
+	},
+	get selection(){
+		return this.value.substring(this._textArea.selectionStart, this._textArea.selectionEnd);
+	},
+	get selectionRight(){
+		return this.value.substring(this._textArea.selectionEnd);
+	}
 };
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Sat Nov 10 01:28:39 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 10 Nov 2007 01:28:39 +0900
Subject: [Bbs2ch-cvs 271]
 =?utf-8?b?WzI1M10gIDJjaCB2aWV3ZXIg6Zai6YCj44Oh44K944OD44OJ44KS?=
 =?utf-8?b?IG5zQmJzMmNoU2VydmljZSDjgYvjgokgYjJyR2xvYmFsU2VydmljZSDjgas=?=
 =?utf-8?b?56e75YuV?=
Message-ID: <1194625719.464833.9423.nullmailer@users.sourceforge.jp>

Revision: 253
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=253
Author:   flyson
Date:     2007-11-10 01:28:39 +0900 (Sat, 10 Nov 2007)

Log Message:
-----------
2ch viewer 関連メソッドを nsBbs2chService から b2rGlobalService に移動

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/post.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/settings/maru.js
    trunk/bbs2chreader/components/b2rGlobalService.js
    trunk/bbs2chreader/components/nsBbs2chService.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/post.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post.js	2007-11-08 14:15:35 UTC (rev 252)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post.js	2007-11-09 16:28:39 UTC (rev 253)
@@ -306,8 +306,10 @@
 		var postData = new Array(postSubmit, postBbs, postKey, postTime,
 									postMsg, postName, postMail, postHana);
 
-		if(this._bbs2chService.maruLogined){
-			var sid = "sid=" + encodeURIComponent(this._bbs2chService.maruSessionID);
+		var b2rService = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+					.getService(Components.interfaces.b2rIGlobalService);
+		if(b2rService.viewer.logined){
+			var sid = "sid=" + encodeURIComponent(b2rService.viewer.sessionID);
 			postData.push(sid);
 		}
 

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-11-08 14:15:35 UTC (rev 252)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-11-09 16:28:39 UTC (rev 253)
@@ -399,8 +399,10 @@
 
 	datDownload: function(aKako){
 		if(aKako){
-			if(this._bbs2chService.maruLogined){
-				var sid = encodeURIComponent(this._bbs2chService.maruSessionID);
+			var b2rService = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+						.getService(Components.interfaces.b2rIGlobalService);
+			if(b2rService.viewer.logined){
+				var sid = encodeURIComponent(b2rService.viewer.sessionID);
 				var datURLSpec = this.dat.threadPlainURL.spec.replace(/\/read\.cgi\//, "/offlaw.cgi/");
 				datURLSpec += "?raw=.0&sid=" + sid;
 				var datKakoURL = this._ioService.newURI(datURLSpec, null, null)

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/settings/maru.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/settings/maru.js	2007-11-08 14:15:35 UTC (rev 252)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/settings/maru.js	2007-11-09 16:28:39 UTC (rev 253)
@@ -1,37 +1,38 @@
-var gMaruPane = {
-
-	startup: function(){
-		setCcontainerDisabled("extensions.bbs2chreader.maru_enabled",
-				"boxMaru", true);
-
-		var os = Components.classes["@mozilla.org/observer-service;1"]
-					.getService(Components.interfaces.nsIObserverService);
-		os.addObserver(this, "b2r-2ch-viewer-auth", false);
-	},
-
-	shutdown: function(){
-		var os = Components.classes["@mozilla.org/observer-service;1"]
-				.getService(Components.interfaces.nsIObserverService);
-		os.removeObserver(this, "b2r-2ch-viewer-auth");
-	},
-
-	maruAuth: function(){
-		document.getElementById("btnAuth").disabled = true;
-
-		var bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-					.getService(Components.interfaces.nsIBbs2chService);
-		bbs2chService.maruAuth(true);
-	},
-
-
-  	// ********** ********* implements nsIObserver ********** **********
-
-	observe: function(aSubject, aTopic, aData){
-		if(aTopic == "b2r-2ch-viewer-auth"){
-			if(aData == "OK"){
-				alert("OK");
-			}
-			document.getElementById("btnAuth").disabled = false;
-		}
-	},
-}
\ No newline at end of file
+var gMaruPane = {
+
+	startup: function(){
+		setCcontainerDisabled("extensions.bbs2chreader.maru_enabled",
+				"boxMaru", true);
+
+		var os = Components.classes["@mozilla.org/observer-service;1"]
+					.getService(Components.interfaces.nsIObserverService);
+		os.addObserver(this, "b2r-2ch-viewer-auth", false);
+	},
+
+	shutdown: function(){
+		var os = Components.classes["@mozilla.org/observer-service;1"]
+				.getService(Components.interfaces.nsIObserverService);
+		os.removeObserver(this, "b2r-2ch-viewer-auth");
+	},
+
+	maruAuth: function(){
+		document.getElementById("btnAuth").disabled = true;
+
+		var b2rService = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+					.getService(Components.interfaces.b2rIGlobalService);
+		b2rService.viewer.auth();
+	},
+
+
+  	// ********** ********* implements nsIObserver ********** **********
+
+	observe: function(aSubject, aTopic, aData){
+		if(aTopic == "b2r-2ch-viewer-auth"){
+			if(aData == "OK"){
+				alert("OK");
+			}
+			document.getElementById("btnAuth").disabled = false;
+		}
+	}
+
+};
\ No newline at end of file

Modified: trunk/bbs2chreader/components/b2rGlobalService.js
===================================================================
--- trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-08 14:15:35 UTC (rev 252)
+++ trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-09 16:28:39 UTC (rev 253)
@@ -365,28 +365,145 @@
 
 	// ********** ********* b2rGlobalViewer ********** **********
 
-function b2rGlobalViewer(aGlobalService){
-	this._init(aGlobalService);
+function b2rGlobalViewer(){
+	this._init();
 }
 
 b2rGlobalViewer.prototype = {
 
 	get logined(){
-		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+		return this._logined;
 	},
 
 
 	get sessionID(){
-		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+		return this._sessionID;
 	},
 
 
-	_init: function(aGlobalService){
+	_init: function(){
+		this._logined = false;
+		this._sessionID = "";
+
+		this._autoAuth();
 	},
 
 
 	auth: function(){
-		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+		this._logined = false;
+		this._sessionID = "";
+
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+		var maruEnabled = pref.getBoolPref("extensions.bbs2chreader.maru_enabled");
+		if(!maruEnabled){ return; }
+		this._authDelay();
+	},
+
+
+	_autoAuth: function(){
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+
+		var maruAutoAuth = pref.getBoolPref("extensions.bbs2chreader.maru_auto_auth");
+		if(!maruAutoAuth){ return; }
+		var maruEnabled = pref.getBoolPref("extensions.bbs2chreader.maru_enabled");
+		if(!maruEnabled){ return; }
+
+			// 6時間以内にログインしている場合は、スキップ
+			// 実際の 2ch viewer のセッション有効期間は 24 時間?
+		var lastAuthTime = pref.getIntPref("extensions.bbs2chreader.maru_last_auth_time");
+		var nowTime = Math.round(Date.now() / 1000);
+		if((nowTime - lastAuthTime) < 21600){
+			this._logined = true;
+			this._sessionID = pref.getCharPref("extensions.bbs2chreader.maru_session_id");
+
+			dump("b2rGlobalViewer: 2ch Viewer Auth SKIP\n");
+			var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
+			os.notifyObservers(null, "b2r-2ch-viewer-auth", "SKIP");
+			return;
+		}
+
+		var timer = XPC.createInstance("@mozilla.org/timer;1", "nsITimer");
+		var timerCallback = {};
+		timerCallback._context = this;
+		timerCallback.observe = function(aTimer){
+			dump("b2rGlobalViewer: 2ch Viewer Auth Start\n");
+			this._context._authDelay();
+		}
+		timer.init(timerCallback, 500, Ci.nsITimer.TYPE_ONE_SHOT);
+
+	},
+
+	_authDelay: function(){
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+
+		var maruAuthURLSpec = pref.getCharPref("extensions.bbs2chreader.maru_auth_url");
+		var maruID = pref.getCharPref("extensions.bbs2chreader.maru_id");
+		var maruPass = pref.getCharPref("extensions.bbs2chreader.maru_password");
+
+		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
+		var maruAuthURL = ioService.newURI(maruAuthURLSpec, null, null).QueryInterface(Ci.nsIURL);
+
+		var b2rService = XPC.getService("@bbs2ch.sourceforge.jp/b2r-global-service;1", "b2rIGlobalService");
+		var httpChannel = b2rService.getHttpChannel(maruAuthURL);
+		httpChannel.setRequestHeader("User-Agent", "DOLIB/1.00", false);
+		httpChannel.setRequestHeader("X-2ch-UA", b2rService.userAgent, false);
+		httpChannel.setRequestHeader("Content-Type", "application/x-www-form-urlencoded", false);
+		httpChannel = httpChannel.QueryInterface(Ci.nsIUploadChannel);
+
+		var strIStream = XPC.createInstance("@mozilla.org/io/string-input-stream;1", "nsIStringInputStream");
+		var postString = String("ID=" + maruID + "&PW=" + maruPass);
+		strIStream.setData(postString, postString.length);
+		httpChannel.setUploadStream(strIStream, "application/x-www-form-urlencoded", -1);
+		httpChannel.requestMethod = "POST";
+
+		var listener = {
+			onStartRequest: function(aRequest, aContext){
+				this._bInputStream = XPC.createInstance("@mozilla.org/binaryinputstream;1", "nsIBinaryInputStream");
+				this._data = new Array();
+			},
+			onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount){
+				this._bInputStream.setInputStream(aInputStream);
+				this._data.push(this._bInputStream.readBytes(aCount));
+			},
+			onStopRequest: function(aRequest, aContext, aStatus){
+				var data = this._data.join("");
+				if(data.indexOf("ERROR:") != -1){
+					aContext.wrappedJSObject._maruLoginNG();
+					return;
+				}
+				aContext.wrappedJSObject._maruLoginOK(data.substring(11, data.length -1));
+			}
+		};
+		this.wrappedJSObject = this;
+		httpChannel.asyncOpen(listener, this);
+
+	},
+
+	_maruLoginOK: function(aSessionID){
+		this._logined = true;
+		this._sessionID = aSessionID;
+
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+		var nowTime = Math.round(Date.now() / 1000);
+		pref.setCharPref("extensions.bbs2chreader.maru_session_id", aSessionID);
+		pref.setIntPref("extensions.bbs2chreader.maru_last_auth_time", nowTime);
+		dump("b2rGlobalViewer: 2ch Viewer Auth OK\n");
+
+		var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
+		os.notifyObservers(null, "b2r-2ch-viewer-auth", "OK");
+	},
+
+	_maruLoginNG: function(aSessionID){
+		this._maruLogined = false;
+		this._maruSessionID = "";
+		dump(this.maruSessionID + "\n");
+		dump("b2rGlobalViewer: 2ch Viewer Auth NG\n");
+
+		var alertsService = XPC.getService("@mozilla.org/alerts-service;1", "nsIAlertsService");
+		alertsService.showAlertNotification("", "bbs2chreader", "Login failed on 2ch Viewer", false, "", null);
+
+		var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
+		os.notifyObservers(null, "b2r-2ch-viewer-auth", "NG");
 	}
 
 };

Modified: trunk/bbs2chreader/components/nsBbs2chService.js
===================================================================
--- trunk/bbs2chreader/components/nsBbs2chService.js	2007-11-08 14:15:35 UTC (rev 252)
+++ trunk/bbs2chreader/components/nsBbs2chService.js	2007-11-09 16:28:39 UTC (rev 253)
@@ -149,11 +149,11 @@
 	},
 
 	get maruLogined(){
-		return this._maruLogined;
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
 	},
 
 	get maruSessionID(){
-		return this._maruSessionID;
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
 	},
 
 	get historyDB(){
@@ -161,7 +161,6 @@
 	},
 
 	_delayInit: function(){
-		this._maruAutoAuth();
 	},
 
 	_shutdown: function(){
@@ -511,122 +510,10 @@
 
 
 	maruAuth: function(){
-		this._maruLogined = false;
-		this._maruSessionID = "";
-
-		var maruEnabled = this.pref.getBoolPref("extensions.bbs2chreader.maru_enabled");
-		if(!maruEnabled){ return; }
-		this._maruAuthDelay();
+		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
 	},
 
-	_maruAutoAuth: function(){
-		this._maruLogined = false;
-		this._maruSessionID = "";
 
-		var maruAutoAuth = this.pref.getBoolPref("extensions.bbs2chreader.maru_auto_auth");
-		if(!maruAutoAuth){ return; }
-
-		var maruEnabled = this.pref.getBoolPref("extensions.bbs2chreader.maru_enabled");
-		if(!maruEnabled){ return; }
-
-		var lastAuthTime = this.pref.getIntPref("extensions.bbs2chreader.maru_last_auth_time");
-		var nowTime = Math.round(Date.now() / 1000);
-		if((nowTime - lastAuthTime) < 21600){
-			this._maruLogined = true;
-			this._maruSessionID = this.pref.getCharPref("extensions.bbs2chreader.maru_session_id");
-
-			dump("nsBbs2chService: 2ch Viewer Auth SKIP\n");
-			var os = Cc["@mozilla.org/observer-service;1"]
-						.getService(Ci.nsIObserverService);
-			os.notifyObservers(null, "b2r-2ch-viewer-auth", "SKIP");
-			return;
-		}
-
-		var timer = Cc["@mozilla.org/timer;1"]
-						.createInstance(Ci.nsITimer);
-		var timerCallback = {};
-		timerCallback._context = this;
-		timerCallback.observe = function(aTimer){
-			dump("nsBbs2chService: 2ch Viewer Auth Start\n");
-			this._context._maruAuthDelay();
-		}
-		timer.init(timerCallback, 500, timer.TYPE_ONE_SHOT);
-	},
-
-	_maruAuthDelay: function(){
-		var maruAuthURLSpec = this.pref.getCharPref("extensions.bbs2chreader.maru_auth_url");
-		var maruID = this.pref.getCharPref("extensions.bbs2chreader.maru_id");
-		var maruPass = this.pref.getCharPref("extensions.bbs2chreader.maru_password");
-
-		var maruAuthURL = this._ioService.newURI(maruAuthURLSpec, null, null)
-				.QueryInterface(Ci.nsIURL);
-		var httpChannel = this.getHttpChannel(maruAuthURL);
-		httpChannel.setRequestHeader("User-Agent", "DOLIB/1.00", false);
-		httpChannel.setRequestHeader("X-2ch-UA", this.userAgent, false);
-		httpChannel.setRequestHeader("Content-Type",
-					"application/x-www-form-urlencoded", false);
-		httpChannel = httpChannel.QueryInterface(Ci.nsIUploadChannel);
-		var strIStream = Cc["@mozilla.org/io/string-input-stream;1"]
-							.createInstance(Ci.nsIStringInputStream)
-		var postString = String("ID=" + maruID + "&PW=" + maruPass);
-		strIStream.setData(postString, postString.length);
-		httpChannel.setUploadStream(strIStream, "application/x-www-form-urlencoded", -1);
-		httpChannel.requestMethod = "POST";
-
-		var listener = {
-			onStartRequest: function(aRequest, aContext){
-				this._bInputStream = Cc["@mozilla.org/binaryinputstream;1"]
-							.createInstance(Ci.nsIBinaryInputStream);
-				this._data = new Array();
-			},
-			onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount){
-				this._bInputStream.setInputStream(aInputStream);
-				this._data.push(this._bInputStream.readBytes(aCount));
-			},
-			onStopRequest: function(aRequest, aContext, aStatus){
-				var data = this._data.join("");
-				if(data.indexOf("ERROR:") != -1){
-					aContext.wrappedJSObject._maruLoginNG();
-					return;
-				}
-				aContext.wrappedJSObject._maruLoginOK(data.substring(11, data.length -1));
-			}
-		};
-		this.wrappedJSObject = this;
-		httpChannel.asyncOpen(listener, this);
-	},
-
-	_maruLoginOK: function(aSessionID){
-		this._maruLogined = true;
-		this._maruSessionID = aSessionID;
-
-		var nowTime = Math.round(Date.now() / 1000);
-		this.pref.setCharPref("extensions.bbs2chreader.maru_session_id", aSessionID);
-		this.pref.setIntPref("extensions.bbs2chreader.maru_last_auth_time", nowTime);
-		dump("nsBbs2chService: 2ch Viewer Auth OK\n");
-
-		var os = Cc["@mozilla.org/observer-service;1"]
-					.getService(Ci.nsIObserverService);
-		os.notifyObservers(null, "b2r-2ch-viewer-auth", "OK");
-	},
-
-	_maruLoginNG: function(aSessionID){
-		this._maruLogined = false;
-		this._maruSessionID = "";
-		dump(this.maruSessionID + "\n");
-		dump("nsBbs2chService: 2ch Viewer Auth NG\n");
-
-		var alertsService = Cc["@mozilla.org/alerts-service;1"]
-	            .getService(Ci.nsIAlertsService);
-		alertsService.showAlertNotification("", "bbs2chreader",
-				"Login failed on 2ch Viewer", false, "", null);
-
-		var os = Cc["@mozilla.org/observer-service;1"]
-					.getService(Ci.nsIObserverService);
-		os.notifyObservers(null, "b2r-2ch-viewer-auth", "NG");
-	},
-
-
 	visitPage: function(aURL, aTitle, aType){
 		throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
 	},

From svnnotify ＠ sourceforge.jp  Thu Nov 22 21:12:07 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 22 Nov 2007 21:12:07 +0900
Subject: [Bbs2ch-cvs 272]
 =?utf-8?b?WzI1NF0gIOODreOCsOOBruODh+OCo+ODrOOCr+ODiOODquaniw==?=
 =?utf-8?b?6YCg44KS5aSJ5pu0?=
Message-ID: <1195733527.760046.29912.nullmailer@users.sourceforge.jp>

Revision: 254
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=254
Author:   flyson
Date:     2007-11-22 21:12:07 +0900 (Thu, 22 Nov 2007)

Log Message:
-----------
ログのディレクトリ構造を変更

Modified Paths:
--------------
    trunk/bbs2chreader/components/b2rGlobalService.js
    trunk/bbs2chreader/components/nsBbs2chService.js


-------------- next part --------------
Modified: trunk/bbs2chreader/components/b2rGlobalService.js
===================================================================
--- trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-09 16:28:39 UTC (rev 253)
+++ trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-22 12:12:07 UTC (rev 254)
@@ -101,18 +101,30 @@
 
 
 	getLogFileAtURL: function(aURLSpec){
-		const LOGS_DIR_NAME = "logs";
+		const LOGS_DIR_NAME = "data";
 
 		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
 		var fromURL = ioService.newURI(aURLSpec, null, null).QueryInterface(Ci.nsIURL);
 
 		var logFile = this.getDataDir();
 		logFile.appendRelativePath(LOGS_DIR_NAME);
-		logFile.appendRelativePath(fromURL.host);
 
+		if(fromURL.host.indexOf(".2ch.net")!=-1){
+			logFile.appendRelativePath("2ch");
+		}else if(fromURL.host.indexOf(".machi.to")!=-1){
+			logFile.appendRelativePath("machi");
+		}else if(fromURL.host.indexOf(".bbspink.com")!=-1){
+			logFile.appendRelativePath("bbspink");
+		}else if(fromURL.host == "jbbs.livedoor.jp"){
+			logFile.appendRelativePath("jbbs");
+		}else{
+			logFile.appendRelativePath("outside");
+			logFile.appendRelativePath(fromURL.host);
+		}
+
 		var pathArray = fromURL.path.split("/");
-		for(let [i, name] in Iterator(pathArray)){
-			if(name) logFile.appendRelativePath(name);
+		for(let i=0; i<pathArray.length; i++){
+			if(pathArray[i]) logFile.appendRelativePath(pathArray[i]);
 		}
 
 		return logFile;

Modified: trunk/bbs2chreader/components/nsBbs2chService.js
===================================================================
--- trunk/bbs2chreader/components/nsBbs2chService.js	2007-11-09 16:28:39 UTC (rev 253)
+++ trunk/bbs2chreader/components/nsBbs2chService.js	2007-11-22 12:12:07 UTC (rev 254)
@@ -340,16 +340,28 @@
 	},
 
 	getLogFileAtURL: function(aURLSpec){
-		const LOGS_DIR_NAME = "logs";
+		const LOGS_DIR_NAME = "data";
 
 		var fromURL = this._ioService.newURI(aURLSpec, null, null).QueryInterface(Ci.nsIURL);
 
 		var logFile = this.getDataDir();
 		logFile.appendRelativePath(LOGS_DIR_NAME);
-		logFile.appendRelativePath(fromURL.host);
 
+		if(fromURL.host.indexOf(".2ch.net")!=-1){
+			logFile.appendRelativePath("2ch");
+		}else if(fromURL.host.indexOf(".machi.to")!=-1){
+			logFile.appendRelativePath("machi");
+		}else if(fromURL.host.indexOf(".bbspink.com")!=-1){
+			logFile.appendRelativePath("bbspink");
+		}else if(fromURL.host == "jbbs.livedoor.jp"){
+			logFile.appendRelativePath("jbbs");
+		}else{
+			logFile.appendRelativePath("outside");
+			logFile.appendRelativePath(fromURL.host);
+		}
+
 		var pathArray = fromURL.path.split("/");
-		for(var i=0; i<pathArray.length; i++){
+		for(let i=0; i<pathArray.length; i++){
 			if(pathArray[i]) logFile.appendRelativePath(pathArray[i]);
 		}
 

From svnnotify ＠ sourceforge.jp  Thu Nov 22 21:38:45 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 22 Nov 2007 21:38:45 +0900
Subject: [Bbs2ch-cvs 273]
 =?utf-8?b?WzI1NV0gIOODreOCsOODleOCoeOCpOODq+OBruenu+WLleOCkg==?=
 =?utf-8?b?5YGc5q2i?=
Message-ID: <1195735125.906802.13622.nullmailer@users.sourceforge.jp>

Revision: 255
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=255
Author:   flyson
Date:     2007-11-22 21:38:45 +0900 (Thu, 22 Nov 2007)

Log Message:
-----------
ログファイルの移動を停止

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-11-22 12:12:07 UTC (rev 254)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-11-22 12:38:45 UTC (rev 255)
@@ -680,6 +680,7 @@
 	if(aEvent.type=="click" && aEvent.button!=0) return;
 
 	if(gNewURL){
+		/*
 		var oldLogDir = gBbs2chService.getLogFileAtURL(gBoardItems.url.spec);
 		try{
 			if(gBoardItems.subjectFile.exists() && gBoardItems.subjectFile.fileSize==0){
@@ -696,6 +697,7 @@
 			window.openDialog(logMoveDialogURL, "", "modal,chrome,centerscreen",
 						gBoardItems.title, gBoardItems.url.spec, gNewURL);
 		}
+		*/
 		setTimeout(function(){
 			window.location.href = "bbs2ch:board:" + gNewURL;
 		}, 0);

From svnnotify ＠ sourceforge.jp  Thu Nov 22 21:44:37 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 22 Nov 2007 21:44:37 +0900
Subject: [Bbs2ch-cvs 274]
 =?utf-8?b?WzI1Nl0gc3ViamVjdC4gdHh0IOOBruabtOaWsOOCkuS4reatog==?=
 =?utf-8?b?44GX44Gf6Zqb44GrIDBLQiDjga7jg5XjgqHjgqTjg6vjgYzjgafjgY3jgaY=?=
 =?utf-8?b?44GX44G+44GE44CB5qyh5Zue5pu05paw44GM5q2j5bi444Gr6KGM44KP44KM?=
 =?utf-8?b?44Gq44GE44Gu44KS5L+u5q2j?=
Message-ID: <1195735477.437809.17248.nullmailer@users.sourceforge.jp>

Revision: 256
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=256
Author:   flyson
Date:     2007-11-22 21:44:37 +0900 (Thu, 22 Nov 2007)

Log Message:
-----------
subject.txt の更新を中止した際に 0KB のファイルができてしまい、次回更新が正常に行われないのを修正

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-11-22 12:38:45 UTC (rev 255)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.js	2007-11-22 12:44:37 UTC (rev 256)
@@ -471,7 +471,7 @@
 	if(aEvent && aEvent.type=="click" && aEvent.button!=0) return;
 
 		// ダウンロード間隔の制限
-	if(gBoardItems.subjectFile.exists()){
+	if(gBoardItems.subjectFile.exists() && gBoardItems.subjectFile.fileSize!=0){
 		var interval = new Date().getTime() - gBoardItems.subjectFile.lastModifiedTime;
 		var updateIntervalLimit =  gBbs2chService.pref.getIntPref(
 					"extensions.bbs2chreader.board_update_interval_limit");

From svnnotify ＠ sourceforge.jp  Sat Nov 24 03:29:11 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 24 Nov 2007 03:29:11 +0900
Subject: [Bbs2ch-cvs 275]
 =?utf-8?b?WzI1N10gIOWklumDqOODquODs+OCr+OBqyBJRCA6ICDjgYzlkKs=?=
 =?utf-8?b?44G+44KM44Gm44GE44KL44GoIEhUTUwg44GM5bSp44KM44KL44Gu44KS5L+u?=
 =?utf-8?b?5q2j?=
Message-ID: <1195842551.680036.15852.nullmailer@users.sourceforge.jp>

Revision: 257
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=257
Author:   flyson
Date:     2007-11-24 03:29:11 +0900 (Sat, 24 Nov 2007)

Log Message:
-----------
紊???????? ID: ????障??????? HTML ??刊??????篆??

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-11-22 12:44:37 UTC (rev 256)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-11-23 18:29:11 UTC (rev 257)
@@ -379,8 +379,8 @@
 		resMes = resMes.replace(regUrlLink, '<a href="http$2:$3" class="outLink">$1$2:$3</a>');
 
 			// ??ID
-		var regResID = /(ID:)([0-9a-z\+\/]+)/ig;
-		resMes = resMes.replace(regResID, '<span class="resMesID"><span class="mesID_$2">$1$2</span></span>');
+		var regResID = / (ID:)([0-9a-z\+\/]+)/ig;
+		resMes = resMes.replace(regResID, ' <span class="resMesID"><span class="mesID_$2">$1$2</span></span>');
 
 			// ?????????????????? HTML ??????????
 		if(!this._headerResponded && resArray[4]){

From svnnotify ＠ sourceforge.jp  Sat Nov 24 03:31:26 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 24 Nov 2007 03:31:26 +0900
Subject: [Bbs2ch-cvs 276]
 =?utf-8?b?WzI1OF0gIGIyckdsb2JhbFNlcnZpY2Ug44KS6KSH5pWw44Gu44K5?=
 =?utf-8?b?44Kv44Oq44OX44OI44Gr5YiG5Ymy?=
Message-ID: <1195842686.629877.16980.nullmailer@users.sourceforge.jp>

Revision: 258
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=258
Author:   flyson
Date:     2007-11-24 03:31:25 +0900 (Sat, 24 Nov 2007)

Log Message:
-----------
b2rGlobalService ????違??鴻??????????

Modified Paths:
--------------
    trunk/bbs2chreader/components/b2rGlobalService.js

Added Paths:
-----------
    trunk/bbs2chreader/chrome/content/bbs2chreader/components/
    trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalHistory.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalIO.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalThreadUtils.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalViewer.js


-------------- next part --------------
Added: trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalHistory.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalHistory.js	2007-11-23 18:29:11 UTC (rev 257)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalHistory.js	2007-11-23 18:31:25 UTC (rev 258)
@@ -0,0 +1,134 @@
+/* ***** 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) 2007
+ * 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 b2rGlobalHistory(){
+	this._init();
+}
+
+b2rGlobalHistory.prototype = {
+
+	get database(){
+		return this._database;
+	},
+
+
+	_init: function(){
+		var storageService = XPC.getService("@mozilla.org/storage/service;1", "mozIStorageService");
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+
+		var dbFile = gGlobalService.io.getDataDir();
+		dbFile.appendRelativePath("history.sqlite");
+		this._database = storageService.openDatabase(dbFile);
+
+		this._database.beginTransaction();
+		try{
+			if(!this._database.tableExists("history")){
+				var sql = <>
+					CREATE TABLE history(
+						id INTEGER PRIMARY KEY,
+						url TEXT NOT NULL,
+						title TEXT NOT NULL,
+						last_visited INTEGER NOT NULL DEFAULT 0,
+						visit_count INTEGER NOT NULL DEFAULT 1,
+						type INTEGER NOT NULL DEFAULT 0
+					);
+				</>.toString();
+				this._database.executeSimpleSQL(sql);
+			}
+
+			var historyExpireDays = pref.getIntPref("extensions.bbs2chreader.history_expire_days");
+			if(historyExpireDays > 365) historyExpireDays = 365;
+			var sql = "DELETE FROM history WHERE last_visited < strftime('%s', 'now', '-" + historyExpireDays +  " day')";
+			this._database.executeSimpleSQL(sql);
+
+		}finally{
+			this._database.commitTransaction();
+		}
+	},
+
+
+	visitPage: function(aBoardURL, aTitle, aType){
+		var pageID = null;
+
+		this._database.beginTransaction();
+		try{
+			var sql = "SELECT id FROM history WHERE url=?1";
+			var statement = this._database.createStatement(sql);
+			statement.bindStringParameter(0, aBoardURL.spec);
+			if(statement.executeStep()){
+				pageID = statement.getInt32(0);
+			}
+			statement.reset();
+
+			if(pageID){
+				sql = "UPDATE history SET title=?1, visit_count=visit_count+1, last_visited=?2 WHERE id=?3;";
+				statement = this._database.createStatement(sql);
+				statement.bindStringParameter(0, aTitle);
+				statement.bindInt32Parameter(1, Date.now() / 1000);
+				statement.bindInt32Parameter(2, pageID);
+				statement.execute();
+			}else{
+				sql = "INSERT INTO history(url, title, type, last_visited) VALUES(?1, ?2, ?3, ?4);";
+				statement = this._database.createStatement(sql);
+				statement.bindStringParameter(0, aBoardURL.spec);
+				statement.bindStringParameter(1, aTitle);
+				statement.bindInt32Parameter(2, aType);
+				statement.bindInt32Parameter(3, Date.now() / 1000);
+				statement.execute();
+			}
+		}finally{
+			this._database.commitTransaction();
+		}
+		return true;
+	},
+
+
+	clearAll: function(){
+		this._database.beginTransaction();
+		try{
+			this._database.executeSimpleSQL("DELETE FROM history;");
+		}finally{
+			this._database.commitTransaction();
+		}
+
+		try{
+			this._database.executeSimpleSQL("VACUUM");
+		}catch(ex){}
+	}
+
+};
\ No newline at end of file

Added: trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalIO.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalIO.js	2007-11-23 18:29:11 UTC (rev 257)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalIO.js	2007-11-23 18:31:25 UTC (rev 258)
@@ -0,0 +1,177 @@
+/* ***** 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) 2007
+ * 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 b2rGlobalIO(){
+}
+
+b2rGlobalIO.prototype = {
+
+	getDataDir: function(){
+		const DATA_DIR_NAME = "bbs2chreader";
+
+		if(!this._dataDir){
+			var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+
+				// ????????????
+			if(pref.getBoolPref("extensions.bbs2chreader.appoint_data_dir")){
+				try{
+					var dataDirPath = pref.getComplexValue("extensions.bbs2chreader.data_dir",
+												Ci.nsISupportsString).data;
+					this._dataDir = XPC.createInstance("@mozilla.org/file/local;1", "nsILocalFile");
+					this._dataDir.initWithPath(dataDirPath);
+					if(this._dataDir.leafName != DATA_DIR_NAME){
+						this._dataDir.appendRelativePath(DATA_DIR_NAME);
+					}
+				}catch(ex){
+					dump("b2rGlobalIO.getDataDir() :" + ex +"\n");
+					this._dataDir = null;
+				}
+			}
+			if(!this._dataDir){
+					// ??????????????????????
+				var dirService = XPC.getService("@mozilla.org/file/directory_service;1", "nsIProperties");
+				this._dataDir = dirService.get("ProfD", Ci.nsILocalFile);
+				this._dataDir.appendRelativePath(DATA_DIR_NAME);
+			}
+		}
+
+		var dataDir = this._dataDir.clone().QueryInterface(Ci.nsILocalFile);
+		if(!dataDir.exists()){
+			dataDir.create(Ci.nsILocalFile.DIRECTORY_TYPE, 0666);
+		}
+		return dataDir;
+	},
+
+
+	getLogFileAtURL: function(aURLSpec){
+		const LOGS_DIR_NAME = "data";
+
+		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
+		var fromURL = ioService.newURI(aURLSpec, null, null).QueryInterface(Ci.nsIURL);
+
+		var logFile = this.getDataDir();
+		logFile.appendRelativePath(LOGS_DIR_NAME);
+
+		if(fromURL.host.indexOf(".2ch.net")!=-1){
+			logFile.appendRelativePath("2ch");
+		}else if(fromURL.host.indexOf(".machi.to")!=-1){
+			logFile.appendRelativePath("machi");
+		}else if(fromURL.host.indexOf(".bbspink.com")!=-1){
+			logFile.appendRelativePath("bbspink");
+		}else if(fromURL.host == "jbbs.livedoor.jp"){
+			logFile.appendRelativePath("jbbs");
+		}else{
+			logFile.appendRelativePath("outside");
+			logFile.appendRelativePath(fromURL.host);
+		}
+
+		var pathArray = fromURL.path.split("/");
+		for(let i=0; i<pathArray.length; i++){
+			if(pathArray[i]) logFile.appendRelativePath(pathArray[i]);
+		}
+
+		return logFile;
+	},
+
+
+	readFile: function(aLocalFile, aCharset){
+		var inputStream;
+		try{
+			inputStream = this.getFileInputStream(aLocalFile, aCharset);
+		}catch(ex){
+			throw ex;
+		}
+
+		var result = new Array();
+		var str = {};
+		while (inputStream.readString(1024*8, str) != 0) {
+			result.push(str.value);
+		}
+		inputStream.close();
+		return result.join("");
+	},
+
+
+	getFileInputStream: function(aLocalFile, aCharset){
+		const PR_RDONLY = 0x01;
+		var charset = aCharset || "UTF-8";
+
+		var fileInputStream = XPC.createInstance(
+				"@mozilla.org/network/file-input-stream;1", "nsIFileInputStream");
+		var converterInputStream = XPC.createInstance(
+				"@mozilla.org/intl/converter-input-stream;1", "nsIConverterInputStream");
+
+		try{
+			fileInputStream.init(aLocalFile, PR_RDONLY, 0666, Ci.nsIFileInputStream.CLOSE_ON_EOF);
+			converterInputStream.init(fileInputStream, charset, 1024*8,
+					Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
+		}catch(ex){
+			throw ex;
+		}
+		return converterInputStream;
+	},
+
+
+	getFileOutputStream: function(aLocalFile, aCharset, aAppend){
+		const PR_WRONLY = 0x02;
+		const PR_CREATE_FILE = 0x08;
+		const PR_APPEND = 0x10;
+		const PR_TRUNCATE = 0x20;
+
+		var charset = aCharset || "UTF-8";
+		var ioFlags = (aAppend==true) ? PR_WRONLY|PR_CREATE_FILE|PR_APPEND : PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE;
+
+		var fileOutputStream = XPC.createInstance(
+				"@mozilla.org/network/file-output-stream;1", "nsIFileOutputStream");
+		var converterOutputStream = XPC.createInstance(
+				"@mozilla.org/intl/converter-output-stream;1", "nsIConverterOutputStream");
+
+		try{
+			fileOutputStream.init(aLocalFile, ioFlags, 0666, 0);
+			converterOutputStream.init(fileOutputStream, charset, 1024*8,
+					Ci.nsIConverterOutputStream.DEFAULT_REPLACEMENT_CHARACTER);
+		}catch(ex){
+			throw ex;
+		}
+
+
+		return converterOutputStream;
+	}
+
+
+};

Added: trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalThreadUtils.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalThreadUtils.js	2007-11-23 18:29:11 UTC (rev 257)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalThreadUtils.js	2007-11-23 18:31:25 UTC (rev 258)
@@ -0,0 +1,106 @@
+/* ***** 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) 2007
+ * 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 b2rGlobalThreadUtils(){
+		// getBoardType ????????? URL ????( 2ch ???????? URL)
+	this._exHosts = new Array(
+		"find.2ch.net",
+		"info.2ch.net",
+		"epg.2ch.net",
+		"headline.2ch.net",
+		"newsnavi.2ch.net",
+		"headline.bbspink.com"
+	);
+
+}
+
+b2rGlobalThreadUtils.prototype = {
+
+	getBoardType: function(aThreadURL){
+			// HTTP ??
+		if(aThreadURL.scheme != "http") return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
+			// HOST ??? URL
+		if(aThreadURL.directory.length == 1) return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
+
+		if(this._exHosts.indexOf(aThreadURL.host) != -1) return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
+
+			// Be ＠ 2ch.net
+		if(aThreadURL.host == "be.2ch.net") return Ci.b2rIGlobalService.BOARD_TYPE_BE2CH;
+			// 2ch.net
+		if(aThreadURL.host.indexOf(".2ch.net") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
+			// bbspink.com
+		if(aThreadURL.host.indexOf(".bbspink.com") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
+			// ??BBS
+		if(aThreadURL.host.indexOf(".machi.to") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
+			// JBBS
+		if(aThreadURL.host == "jbbs.livedoor.jp") return Ci.b2rIGlobalService.BOARD_TYPE_JBBS;
+
+			// ???? URL
+		if(aThreadURL.directory.indexOf("/test/read.cgi/") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
+		if((aThreadURL.fileName == "read.cgi") && (aThreadURL.query.indexOf("key=") != -1))
+				return Ci.b2rIGlobalService.BOARD_TYPE_OLD2CH;
+
+		return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
+	},
+
+
+	getBoardURL: function(aURL){
+		var boardURLSpec = aURL.resolve("../");
+
+		switch(this.getBoardType(aURL)){
+			case Ci.b2rIGlobalService.BOARD_TYPE_2CH:
+			case Ci.b2rIGlobalService.BOARD_TYPE_BE2CH:
+				boardURLSpec = boardURLSpec.replace("/test/read.cgi/", "/");
+				break;
+			case Ci.b2rIGlobalService.BOARD_TYPE_JBBS:
+				boardURLSpec = boardURLSpec.replace("/bbs/read.cgi/", "/");
+				break;
+			case Ci.b2rIGlobalService.BOARD_TYPE_OLD2CH:
+			case Ci.b2rIGlobalService.BOARD_TYPE_MACHI:
+				boardURLSpec += aURL.query.match(/bbs=(\w+)/i) ? RegExp.$1 + "/" : null;
+				break;
+			case Ci.b2rIGlobalService.BOARD_TYPE_PAGE:
+				throw Components.results.NS_ERROR_INVALID_ARG;
+				break;
+		}
+
+		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
+		return ioService.newURI(boardURLSpec, null, null).QueryInterface(Ci.nsIURL);
+	}
+
+};
\ No newline at end of file

Added: trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalViewer.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalViewer.js	2007-11-23 18:29:11 UTC (rev 257)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalViewer.js	2007-11-23 18:31:25 UTC (rev 258)
@@ -0,0 +1,179 @@
+/* ***** 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) 2007
+ * 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 b2rGlobalViewer(){
+	this._init();
+}
+
+b2rGlobalViewer.prototype = {
+
+	get logined(){
+		return this._logined;
+	},
+
+
+	get sessionID(){
+		return this._sessionID;
+	},
+
+
+	_init: function(){
+		this._logined = false;
+		this._sessionID = "";
+
+		this._autoAuth();
+	},
+
+
+	auth: function(){
+		this._logined = false;
+		this._sessionID = "";
+
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+		var maruEnabled = pref.getBoolPref("extensions.bbs2chreader.maru_enabled");
+		if(!maruEnabled){ return; }
+		this._authDelay();
+	},
+
+
+	_autoAuth: function(){
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+
+		var maruAutoAuth = pref.getBoolPref("extensions.bbs2chreader.maru_auto_auth");
+		if(!maruAutoAuth){ return; }
+		var maruEnabled = pref.getBoolPref("extensions.bbs2chreader.maru_enabled");
+		if(!maruEnabled){ return; }
+
+			// 6????????????????A????
+			// ﾀ?? 2ch viewer ??????????? 24 ???
+		var lastAuthTime = pref.getIntPref("extensions.bbs2chreader.maru_last_auth_time");
+		var nowTime = Math.round(Date.now() / 1000);
+		if((nowTime - lastAuthTime) < 21600){
+			this._logined = true;
+			this._sessionID = pref.getCharPref("extensions.bbs2chreader.maru_session_id");
+
+			dump("b2rGlobalViewer: 2ch Viewer Auth SKIP\n");
+			var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
+			os.notifyObservers(null, "b2r-2ch-viewer-auth", "SKIP");
+			return;
+		}
+
+		var timer = XPC.createInstance("@mozilla.org/timer;1", "nsITimer");
+		var timerCallback = {};
+		timerCallback._context = this;
+		timerCallback.observe = function(aTimer){
+			dump("b2rGlobalViewer: 2ch Viewer Auth Start\n");
+			this._context._authDelay();
+		}
+		timer.init(timerCallback, 500, Ci.nsITimer.TYPE_ONE_SHOT);
+
+	},
+
+	_authDelay: function(){
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+
+		var maruAuthURLSpec = pref.getCharPref("extensions.bbs2chreader.maru_auth_url");
+		var maruID = pref.getCharPref("extensions.bbs2chreader.maru_id");
+		var maruPass = pref.getCharPref("extensions.bbs2chreader.maru_password");
+
+		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
+		var maruAuthURL = ioService.newURI(maruAuthURLSpec, null, null).QueryInterface(Ci.nsIURL);
+
+		var httpChannel = gGlobalService.getHttpChannel(maruAuthURL);
+		httpChannel.setRequestHeader("User-Agent", "DOLIB/1.00", false);
+		httpChannel.setRequestHeader("X-2ch-UA", gGlobalService.userAgent, false);
+		httpChannel.setRequestHeader("Content-Type", "application/x-www-form-urlencoded", false);
+		httpChannel = httpChannel.QueryInterface(Ci.nsIUploadChannel);
+
+		var strIStream = XPC.createInstance("@mozilla.org/io/string-input-stream;1", "nsIStringInputStream");
+		var postString = String("ID=" + maruID + "&PW=" + maruPass);
+		strIStream.setData(postString, postString.length);
+		httpChannel.setUploadStream(strIStream, "application/x-www-form-urlencoded", -1);
+		httpChannel.requestMethod = "POST";
+
+		var listener = {
+			onStartRequest: function(aRequest, aContext){
+				this._bInputStream = XPC.createInstance("@mozilla.org/binaryinputstream;1", "nsIBinaryInputStream");
+				this._data = new Array();
+			},
+			onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount){
+				this._bInputStream.setInputStream(aInputStream);
+				this._data.push(this._bInputStream.readBytes(aCount));
+			},
+			onStopRequest: function(aRequest, aContext, aStatus){
+				var data = this._data.join("");
+				if(data.indexOf("ERROR:") != -1){
+					aContext.wrappedJSObject._maruLoginNG();
+					return;
+				}
+				aContext.wrappedJSObject._maruLoginOK(data.substring(11, data.length -1));
+			}
+		};
+		this.wrappedJSObject = this;
+		httpChannel.asyncOpen(listener, this);
+
+	},
+
+	_maruLoginOK: function(aSessionID){
+		this._logined = true;
+		this._sessionID = aSessionID;
+
+		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
+		var nowTime = Math.round(Date.now() / 1000);
+		pref.setCharPref("extensions.bbs2chreader.maru_session_id", aSessionID);
+		pref.setIntPref("extensions.bbs2chreader.maru_last_auth_time", nowTime);
+		dump("b2rGlobalViewer: 2ch Viewer Auth OK\n");
+
+		var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
+		os.notifyObservers(null, "b2r-2ch-viewer-auth", "OK");
+	},
+
+	_maruLoginNG: function(aSessionID){
+		this._maruLogined = false;
+		this._maruSessionID = "";
+		dump(this.maruSessionID + "\n");
+		dump("b2rGlobalViewer: 2ch Viewer Auth NG\n");
+
+		var alertsService = XPC.getService("@mozilla.org/alerts-service;1", "nsIAlertsService");
+		alertsService.showAlertNotification("", "bbs2chreader", "Login failed on 2ch Viewer", false, "", null);
+
+		var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
+		os.notifyObservers(null, "b2r-2ch-viewer-auth", "NG");
+	}
+
+};
\ No newline at end of file

Modified: trunk/bbs2chreader/components/b2rGlobalService.js
===================================================================
--- trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-23 18:29:11 UTC (rev 257)
+++ trunk/bbs2chreader/components/b2rGlobalService.js	2007-11-23 18:31:25 UTC (rev 258)
@@ -47,482 +47,13 @@
 }
 
 
-
-
 const B2R_GLOBAL_SERVICE_CONTRACTID = "@bbs2ch.sourceforge.jp/b2r-global-service;1";
 const B2R_GLOBAL_SERVICE_CID = Components.ID("{e3c8ad09-ff53-40cf-9942-26c8d7a96fe7}");
 const B2R_GLOBAL_SERVICE_CNAME = "b2rGlobalService js component";
 
+var gGlobalService = null;
 
 
-
-	// ********** ********* b2rGlobalIO ********** **********
-
-function b2rGlobalIO(){
-}
-
-b2rGlobalIO.prototype = {
-
-	getDataDir: function(){
-		const DATA_DIR_NAME = "bbs2chreader";
-
-		if(!this._dataDir){
-			var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
-
-				// ???????ゃ????臀?????
-			if(pref.getBoolPref("extensions.bbs2chreader.appoint_data_dir")){
-				try{
-					var dataDirPath = pref.getComplexValue("extensions.bbs2chreader.data_dir",
-												Ci.nsISupportsString).data;
-					this._dataDir = XPC.createInstance("@mozilla.org/file/local;1", "nsILocalFile");
-					this._dataDir.initWithPath(dataDirPath);
-					if(this._dataDir.leafName != DATA_DIR_NAME){
-						this._dataDir.appendRelativePath(DATA_DIR_NAME);
-					}
-				}catch(ex){
-					dump("b2rGlobalIO.getDataDir() :" + ex +"\n");
-					this._dataDir = null;
-				}
-			}
-			if(!this._dataDir){
-					// ??????????????????????ゃ??????????
-				var dirService = XPC.getService("@mozilla.org/file/directory_service;1", "nsIProperties");
-				this._dataDir = dirService.get("ProfD", Ci.nsILocalFile);
-				this._dataDir.appendRelativePath(DATA_DIR_NAME);
-			}
-		}
-
-		var dataDir = this._dataDir.clone().QueryInterface(Ci.nsILocalFile);
-		if(!dataDir.exists()){
-			dataDir.create(Ci.nsILocalFile.DIRECTORY_TYPE, 0666);
-		}
-		return dataDir;
-	},
-
-
-	getLogFileAtURL: function(aURLSpec){
-		const LOGS_DIR_NAME = "data";
-
-		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
-		var fromURL = ioService.newURI(aURLSpec, null, null).QueryInterface(Ci.nsIURL);
-
-		var logFile = this.getDataDir();
-		logFile.appendRelativePath(LOGS_DIR_NAME);
-
-		if(fromURL.host.indexOf(".2ch.net")!=-1){
-			logFile.appendRelativePath("2ch");
-		}else if(fromURL.host.indexOf(".machi.to")!=-1){
-			logFile.appendRelativePath("machi");
-		}else if(fromURL.host.indexOf(".bbspink.com")!=-1){
-			logFile.appendRelativePath("bbspink");
-		}else if(fromURL.host == "jbbs.livedoor.jp"){
-			logFile.appendRelativePath("jbbs");
-		}else{
-			logFile.appendRelativePath("outside");
-			logFile.appendRelativePath(fromURL.host);
-		}
-
-		var pathArray = fromURL.path.split("/");
-		for(let i=0; i<pathArray.length; i++){
-			if(pathArray[i]) logFile.appendRelativePath(pathArray[i]);
-		}
-
-		return logFile;
-	},
-
-
-	readFile: function(aLocalFile, aCharset){
-		var inputStream;
-		try{
-			inputStream = this.getFileInputStream(aLocalFile, aCharset);
-		}catch(ex){
-			throw ex;
-		}
-
-		var result = new Array();
-		var str = {};
-		while (inputStream.readString(1024*8, str) != 0) {
-			result.push(str.value);
-		}
-		inputStream.close();
-		return result.join("");
-	},
-
-
-	getFileInputStream: function(aLocalFile, aCharset){
-		const PR_RDONLY = 0x01;
-		var charset = aCharset || "UTF-8";
-
-		var fileInputStream = XPC.createInstance(
-				"@mozilla.org/network/file-input-stream;1", "nsIFileInputStream");
-		var converterInputStream = XPC.createInstance(
-				"@mozilla.org/intl/converter-input-stream;1", "nsIConverterInputStream");
-
-		try{
-			fileInputStream.init(aLocalFile, PR_RDONLY, 0666, Ci.nsIFileInputStream.CLOSE_ON_EOF);
-			converterInputStream.init(fileInputStream, charset, 1024*8,
-					Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
-		}catch(ex){
-			throw ex;
-		}
-		return converterInputStream;
-	},
-
-
-	getFileOutputStream: function(aLocalFile, aCharset, aAppend){
-		const PR_WRONLY = 0x02;
-		const PR_CREATE_FILE = 0x08;
-		const PR_APPEND = 0x10;
-		const PR_TRUNCATE = 0x20;
-
-		var charset = aCharset || "UTF-8";
-		var ioFlags = (aAppend==true) ? PR_WRONLY|PR_CREATE_FILE|PR_APPEND : PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE;
-
-		var fileOutputStream = XPC.createInstance(
-				"@mozilla.org/network/file-output-stream;1", "nsIFileOutputStream");
-		var converterOutputStream = XPC.createInstance(
-				"@mozilla.org/intl/converter-output-stream;1", "nsIConverterOutputStream");
-
-		try{
-			fileOutputStream.init(aLocalFile, ioFlags, 0666, 0);
-			converterOutputStream.init(fileOutputStream, charset, 1024*8,
-					Ci.nsIConverterOutputStream.DEFAULT_REPLACEMENT_CHARACTER);
-		}catch(ex){
-			throw ex;
-		}
-
-
-		return converterOutputStream;
-	}
-
-
-};
-
-
-
-
-	// ********** ********* b2rGlobalThreadUtils ********** **********
-
-function b2rGlobalThreadUtils(){
-		// getBoardType ?у???????紊????URL ????鴻?( 2ch ???????????? URL)
-	this._exHosts = new Array(
-		"find.2ch.net",
-		"info.2ch.net",
-		"epg.2ch.net",
-		"headline.2ch.net",
-		"newsnavi.2ch.net",
-		"headline.bbspink.com"
-	);
-
-}
-
-b2rGlobalThreadUtils.prototype = {
-
-	getBoardType: function(aThreadURL){
-			// HTTP 篁ュ?
-		if(aThreadURL.scheme != "http") return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
-			// HOST ?????URL
-		if(aThreadURL.directory.length == 1) return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
-
-		if(this._exHosts.indexOf(aThreadURL.host) != -1) return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
-
-			// Be ＠ 2ch.net
-		if(aThreadURL.host == "be.2ch.net") return Ci.b2rIGlobalService.BOARD_TYPE_BE2CH;
-			// 2ch.net
-		if(aThreadURL.host.indexOf(".2ch.net") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
-			// bbspink.com
-		if(aThreadURL.host.indexOf(".bbspink.com") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
-			// ?障?BBS
-		if(aThreadURL.host.indexOf(".machi.to") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
-			// JBBS
-		if(aThreadURL.host == "jbbs.livedoor.jp") return Ci.b2rIGlobalService.BOARD_TYPE_JBBS;
-
-			// ?鴻???? URL
-		if(aThreadURL.directory.indexOf("/test/read.cgi/") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
-		if((aThreadURL.fileName == "read.cgi") && (aThreadURL.query.indexOf("key=") != -1))
-				return Ci.b2rIGlobalService.BOARD_TYPE_OLD2CH;
-
-		return Ci.b2rIGlobalService.BOARD_TYPE_PAGE;
-	},
-
-
-	getBoardURL: function(aURL){
-		var boardURLSpec = aURL.resolve("../");
-
-		switch(this.getBoardType(aURL)){
-			case Ci.b2rIGlobalService.BOARD_TYPE_2CH:
-			case Ci.b2rIGlobalService.BOARD_TYPE_BE2CH:
-				boardURLSpec = boardURLSpec.replace("/test/read.cgi/", "/");
-				break;
-			case Ci.b2rIGlobalService.BOARD_TYPE_JBBS:
-				boardURLSpec = boardURLSpec.replace("/bbs/read.cgi/", "/");
-				break;
-			case Ci.b2rIGlobalService.BOARD_TYPE_OLD2CH:
-			case Ci.b2rIGlobalService.BOARD_TYPE_MACHI:
-				boardURLSpec += aURL.query.match(/bbs=(\w+)/i) ? RegExp.$1 + "/" : null;
-				break;
-			case Ci.b2rIGlobalService.BOARD_TYPE_PAGE:
-				throw Components.results.NS_ERROR_INVALID_ARG;
-				break;
-		}
-
-		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
-		return ioService.newURI(boardURLSpec, null, null).QueryInterface(Ci.nsIURL);
-	}
-
-};
-
-
-	// ********** ********* b2rGlobalHistory ********** **********
-
-function b2rGlobalHistory(aGlobalService){
-	this._init(aGlobalService);
-}
-
-b2rGlobalHistory.prototype = {
-
-	get database(){
-		return this._database;
-	},
-
-
-	_init: function(aGlobalService){
-		var storageService = XPC.getService("@mozilla.org/storage/service;1", "mozIStorageService");
-		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
-
-		var dbFile = aGlobalService.io.getDataDir();
-		dbFile.appendRelativePath("history.sqlite");
-		this._database = storageService.openDatabase(dbFile);
-
-		this._database.beginTransaction();
-		try{
-			if(!this._database.tableExists("history")){
-				var sql = <>
-					CREATE TABLE history(
-						id INTEGER PRIMARY KEY,
-						url TEXT NOT NULL,
-						title NOT NULL,
-						last_visited INTEGER NOT NULL DEFAULT 0,
-						visit_count INTEGER NOT NULL DEFAULT 1,
-						type INTEGER NOT NULL DEFAULT 0
-					);
-				</>.toString();
-				this._database.executeSimpleSQL(sql);
-			}
-
-			var historyExpireDays = pref.getIntPref("extensions.bbs2chreader.history_expire_days");
-			if(historyExpireDays > 365) historyExpireDays = 365;
-			var sql = "DELETE FROM history WHERE last_visited < strftime('%s', 'now', '-" + historyExpireDays +  " day')";
-			this._database.executeSimpleSQL(sql);
-
-		}finally{
-			this._database.commitTransaction();
-		}
-	},
-
-
-	visitPage: function(aBoardURL, aTitle, aType){
-		var pageID = null;
-
-		this._database.beginTransaction();
-		try{
-			var sql = "SELECT id FROM history WHERE url=?1";
-			var statement = this._database.createStatement(sql);
-			statement.bindStringParameter(0, aBoardURL.spec);
-			if(statement.executeStep()){
-				pageID = statement.getInt32(0);
-			}
-			statement.reset();
-
-			if(pageID){
-				sql = "UPDATE history SET title=?1, visit_count=visit_count+1, last_visited=?2 WHERE id=?3;";
-				statement = this._database.createStatement(sql);
-				statement.bindStringParameter(0, aTitle);
-				statement.bindInt32Parameter(1, Date.now() / 1000);
-				statement.bindInt32Parameter(2, pageID);
-				statement.execute();
-			}else{
-				sql = "INSERT INTO history(url, title, type, last_visited) VALUES(?1, ?2, ?3, ?4);";
-				statement = this._database.createStatement(sql);
-				statement.bindStringParameter(0, aBoardURL.spec);
-				statement.bindStringParameter(1, aTitle);
-				statement.bindInt32Parameter(2, aType);
-				statement.bindInt32Parameter(3, Date.now() / 1000);
-				statement.execute();
-			}
-		}finally{
-			this._database.commitTransaction();
-		}
-		return true;
-	},
-
-
-	clearAll: function(){
-		this._database.beginTransaction();
-		try{
-			this._database.executeSimpleSQL("DELETE FROM history;");
-		}finally{
-			this._database.commitTransaction();
-		}
-
-		try{
-			this._database.executeSimpleSQL("VACUUM");
-		}catch(ex){}
-	}
-
-};
-
-
-
-
-	// ********** ********* b2rGlobalViewer ********** **********
-
-function b2rGlobalViewer(){
-	this._init();
-}
-
-b2rGlobalViewer.prototype = {
-
-	get logined(){
-		return this._logined;
-	},
-
-
-	get sessionID(){
-		return this._sessionID;
-	},
-
-
-	_init: function(){
-		this._logined = false;
-		this._sessionID = "";
-
-		this._autoAuth();
-	},
-
-
-	auth: function(){
-		this._logined = false;
-		this._sessionID = "";
-
-		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
-		var maruEnabled = pref.getBoolPref("extensions.bbs2chreader.maru_enabled");
-		if(!maruEnabled){ return; }
-		this._authDelay();
-	},
-
-
-	_autoAuth: function(){
-		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
-
-		var maruAutoAuth = pref.getBoolPref("extensions.bbs2chreader.maru_auto_auth");
-		if(!maruAutoAuth){ return; }
-		var maruEnabled = pref.getBoolPref("extensions.bbs2chreader.maru_enabled");
-		if(!maruEnabled){ return; }
-
-			// 6???篁ュ?????違??潟??????????????????-			// 絎????2ch viewer ???????с?????????24 ????
-		var lastAuthTime = pref.getIntPref("extensions.bbs2chreader.maru_last_auth_time");
-		var nowTime = Math.round(Date.now() / 1000);
-		if((nowTime - lastAuthTime) < 21600){
-			this._logined = true;
-			this._sessionID = pref.getCharPref("extensions.bbs2chreader.maru_session_id");
-
-			dump("b2rGlobalViewer: 2ch Viewer Auth SKIP\n");
-			var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
-			os.notifyObservers(null, "b2r-2ch-viewer-auth", "SKIP");
-			return;
-		}
-
-		var timer = XPC.createInstance("@mozilla.org/timer;1", "nsITimer");
-		var timerCallback = {};
-		timerCallback._context = this;
-		timerCallback.observe = function(aTimer){
-			dump("b2rGlobalViewer: 2ch Viewer Auth Start\n");
-			this._context._authDelay();
-		}
-		timer.init(timerCallback, 500, Ci.nsITimer.TYPE_ONE_SHOT);
-
-	},
-
-	_authDelay: function(){
-		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
-
-		var maruAuthURLSpec = pref.getCharPref("extensions.bbs2chreader.maru_auth_url");
-		var maruID = pref.getCharPref("extensions.bbs2chreader.maru_id");
-		var maruPass = pref.getCharPref("extensions.bbs2chreader.maru_password");
-
-		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
-		var maruAuthURL = ioService.newURI(maruAuthURLSpec, null, null).QueryInterface(Ci.nsIURL);
-
-		var b2rService = XPC.getService("@bbs2ch.sourceforge.jp/b2r-global-service;1", "b2rIGlobalService");
-		var httpChannel = b2rService.getHttpChannel(maruAuthURL);
-		httpChannel.setRequestHeader("User-Agent", "DOLIB/1.00", false);
-		httpChannel.setRequestHeader("X-2ch-UA", b2rService.userAgent, false);
-		httpChannel.setRequestHeader("Content-Type", "application/x-www-form-urlencoded", false);
-		httpChannel = httpChannel.QueryInterface(Ci.nsIUploadChannel);
-
-		var strIStream = XPC.createInstance("@mozilla.org/io/string-input-stream;1", "nsIStringInputStream");
-		var postString = String("ID=" + maruID + "&PW=" + maruPass);
-		strIStream.setData(postString, postString.length);
-		httpChannel.setUploadStream(strIStream, "application/x-www-form-urlencoded", -1);
-		httpChannel.requestMethod = "POST";
-
-		var listener = {
-			onStartRequest: function(aRequest, aContext){
-				this._bInputStream = XPC.createInstance("@mozilla.org/binaryinputstream;1", "nsIBinaryInputStream");
-				this._data = new Array();
-			},
-			onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount){
-				this._bInputStream.setInputStream(aInputStream);
-				this._data.push(this._bInputStream.readBytes(aCount));
-			},
-			onStopRequest: function(aRequest, aContext, aStatus){
-				var data = this._data.join("");
-				if(data.indexOf("ERROR:") != -1){
-					aContext.wrappedJSObject._maruLoginNG();
-					return;
-				}
-				aContext.wrappedJSObject._maruLoginOK(data.substring(11, data.length -1));
-			}
-		};
-		this.wrappedJSObject = this;
-		httpChannel.asyncOpen(listener, this);
-
-	},
-
-	_maruLoginOK: function(aSessionID){
-		this._logined = true;
-		this._sessionID = aSessionID;
-
-		var pref = XPC.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
-		var nowTime = Math.round(Date.now() / 1000);
-		pref.setCharPref("extensions.bbs2chreader.maru_session_id", aSessionID);
-		pref.setIntPref("extensions.bbs2chreader.maru_last_auth_time", nowTime);
-		dump("b2rGlobalViewer: 2ch Viewer Auth OK\n");
-
-		var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
-		os.notifyObservers(null, "b2r-2ch-viewer-auth", "OK");
-	},
-
-	_maruLoginNG: function(aSessionID){
-		this._maruLogined = false;
-		this._maruSessionID = "";
-		dump(this.maruSessionID + "\n");
-		dump("b2rGlobalViewer: 2ch Viewer Auth NG\n");
-
-		var alertsService = XPC.getService("@mozilla.org/alerts-service;1", "nsIAlertsService");
-		alertsService.showAlertNotification("", "bbs2chreader", "Login failed on 2ch Viewer", false, "", null);
-
-		var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
-		os.notifyObservers(null, "b2r-2ch-viewer-auth", "NG");
-	}
-
-};
-
-
-
-
 	// ********** ********* b2rGlobalService ********** **********
 
 function b2rGlobalService(){
@@ -689,11 +220,17 @@
 
 
 	_startup: function(){
+		var subScriptLoader = XPC.getService("@mozilla.org/moz/jssubscript-loader;1", "mozIJSSubScriptLoader");
+		subScriptLoader.loadSubScript("chrome://bbs2chreader/content/components/b2rGlobalIO.js", null);
+		subScriptLoader.loadSubScript("chrome://bbs2chreader/content/components/b2rGlobalThreadUtils.js", null);
+		subScriptLoader.loadSubScript("chrome://bbs2chreader/content/components/b2rGlobalHistory.js", null);
+		subScriptLoader.loadSubScript("chrome://bbs2chreader/content/components/b2rGlobalViewer.js", null);
+
 		this._initialized = true;
 		this._io = new b2rGlobalIO();
 		this._threadUtils = new b2rGlobalThreadUtils();
-		this._history = new b2rGlobalHistory(this);
-		this._viewer = new b2rGlobalViewer(this);
+		this._history = new b2rGlobalHistory();
+		this._viewer = new b2rGlobalViewer();
 
 		dump("b2rGlobalService._startup()\n");
 	},
@@ -783,6 +320,8 @@
 		if(aIID.equals(Ci.nsIClassInfo)) return this;
 		if(aIID.equals(Ci.nsIObserver)) return this;
 		if(aIID.equals(Ci.nsISupports)) return this;
+
+		throw Components.results.NS_ERROR_NO_INTERFACE;
 	}
 
 };
@@ -799,22 +338,11 @@
 		if(aOuter != null)
 			throw Components.results.NS_ERROR_NO_AGGREGATION;
 
-		if(aIID.equals(Ci.b2rIGlobalService))
-			return this.getInstance(aIID);
-		if(aIID.equals(Ci.nsIClassInfo))
-			return this.getInstance(aIID);
-		if(aIID.equals(Ci.nsIObserver))
-			return this.getInstance(aIID);
-		if(aIID.equals(Ci.nsISupports))
-			return this.getInstance(aIID);
-	},
-
-
-	getInstance: function(aIID){
-		if(!this._instance){
-			this._instance = new b2rGlobalService();
+		if(!gGlobalService){
+			gGlobalService = new b2rGlobalService();
 		}
-		return this._instance.QueryInterface(aIID);
+
+		return gGlobalService.QueryInterface(aIID);
 	}
 
 };

From svnnotify ＠ sourceforge.jp  Sun Nov 25 20:58:46 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 25 Nov 2007 20:58:46 +0900
Subject: [Bbs2ch-cvs 277]
 =?utf-8?b?WzI1OV0gIOato+imj+ihqOePvuOCkuOBp+OBjeOCi+OBoOOBkQ==?=
 =?utf-8?b?6KGM44KP44Gq44GE44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1195991926.975684.2160.nullmailer@users.sourceforge.jp>

Revision: 259
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=259
Author:   flyson
Date:     2007-11-25 20:58:46 +0900 (Sun, 25 Nov 2007)

Log Message:
-----------
罩ｈ?茵?憗??с????????????????????

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-11-23 18:31:25 UTC (rev 258)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-11-25 11:58:46 UTC (rev 259)
@@ -317,21 +317,23 @@
 		}
 
 			// resDate ? DATE?BeID ???
-		if(resDate.match(/(.+)BE:([^ ]+)/)){
+		if(resDate.indexOf("BE:")!=-1 && resDate.match(/(.+)BE:([^ ]+)/)){
 			resDate = RegExp.$1;
 			resBeID = RegExp.$2;
 		}
 			// resDate ? DATE ? ID ???
-		if(resDate.match(/(.+)ID:(.+)/)){
+		if(resDate.indexOf("ID:")!=-1 && resDate.match(/(.+)ID:(.+)/)){
 			resDate = RegExp.$1;
 			resID = RegExp.$2;
 		}
 
 			// resDate ? IP ??????????IP ? ID ?????
+		/*
 		if(resDate.match(/(.+)???:(.+)/)){
 			resDate = RegExp.$1;
 			resID = RegExp.$2;
 		}
+		*/
 
 		if(resBeID){
 			var regBeID = /^(\d+)/;
@@ -375,9 +377,10 @@
 		}
 
 			// ????N??-		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>');
-
+		if(resMes.indexOf("ttp")!=-1){
+			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>');
+		}
 			// ??ID
 		var regResID = / (ID:)([0-9a-z\+\/]+)/ig;
 		resMes = resMes.replace(regResID, ' <span class="resMesID"><span class="mesID_$2">$1$2</span></span>');

From svnnotify ＠ sourceforge.jp  Wed Nov 28 18:57:35 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 28 Nov 2007 18:57:35 +0900
Subject: [Bbs2ch-cvs 278]
 =?utf-8?b?WzI2MF0gIGIyckRvd25sb2FkZXLjgafjg4Djgqbjg7Pjg63jg7w=?=
 =?utf-8?b?44OJ44GZ44KL44Go44GN44Gr5LiA5pmC44OV44Kh44Kk44Or44KS5L2c5oiQ?=
 =?utf-8?b?44GZ44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1196243855.776415.8182.nullmailer@users.sourceforge.jp>

Revision: 260
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=260
Author:   flyson
Date:     2007-11-28 18:57:35 +0900 (Wed, 28 Nov 2007)

Log Message:
-----------
b2rDownloaderでダウンロードするときに一時ファイルを作成するようにした

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/lib/downloader.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul	2007-11-25 11:58:46 UTC (rev 259)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul	2007-11-28 09:57:35 UTC (rev 260)
@@ -12,10 +12,11 @@
 	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/bbsmenu/treeview.js"/>
-<script type="application/x-javascript" src="chrome://bbs2chreader/content/bbsmenu/page.js"/>
+<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/lib/xpc.js"/>
+<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/lib/downloader.js"/>
+<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/lib/clipboard.js"/>
+<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/bbsmenu/treeview.js"/>
+<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/bbsmenu/page.js"/>
 
 <popupset>
 	<popup id="popBbsMenuContext"

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/lib/downloader.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/lib/downloader.js	2007-11-25 11:58:46 UTC (rev 259)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/lib/downloader.js	2007-11-28 09:57:35 UTC (rev 260)
@@ -139,11 +139,24 @@
 			this._httpChannel = null;
 		}
 
-		var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-					.getService(Components.interfaces.nsIIOService);
-		var bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-					.getService(Components.interfaces.nsIBbs2chService);
+		var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+		var b2rService = Cc["@bbs2ch.sourceforge.jp/b2r-global-service;1"].getService(Ci.b2rIGlobalService);
 
+		try{
+			this._file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+			this._file.initWithPath(this.filePath);
+
+			this._tempFile = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+			this._tempFile.initWithPath(this._file.path + ".tmp");
+			this._tempFile.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0666);
+			if(!this._tempFile.exists()){
+				this._tempFile.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0666);
+			}
+		}catch(ex){
+			this.onError(context, context.ERROR_BAD_FILE_PATH);
+			return;
+		}
+
 			// nsIURI の作成
 		try{
 			var fromURI = ioService.newURI(this.urlSpec, null, null);
@@ -152,14 +165,14 @@
 			return;
 		}
 
-		this._httpChannel = bbs2chService.getHttpChannel(fromURI);
+		this._httpChannel = b2rService.getHttpChannel(fromURI);
 		this._httpChannel.requestMethod = "GET";
 		this._httpChannel.redirectionLimit = 0; // 302 等のリダイレクトを行わない
-		this._httpChannel.loadFlags = this._httpChannel.LOAD_BYPASS_CACHE;
+		this._httpChannel.loadFlags = Ci.nsIHttpChannel.LOAD_BYPASS_CACHE;
 
 		try{
-			this._listener._context = this;
-			this._httpChannel.asyncOpen(this._listener, null);
+			this.wrappedJSObject = this;
+			this._httpChannel.asyncOpen(this._listener, this);
 			this._loading = true;
 		}catch(ex){
 			this.onError(this, this.ERROR_FAILURE);
@@ -169,11 +182,21 @@
 
 	_listener: {
 		onStartRequest: function(aRequest, aContext){
-			this._bInputStream = Components.classes["@mozilla.org/binaryinputstream;1"]
-				.createInstance(Components.interfaces.nsIBinaryInputStream);
-			this._data = new Array();
+			var context = aContext.wrappedJSObject;
+
+				// 0x02=PR_WRONLY; 0x08=PR_CREATE_FILE;
+				// 0x10=PR_APPEND; 0x20=PR_TRUNCATE;
+			var fileOutputStream = Cc["@mozilla.org/network/file-output-stream;1"]
+						.createInstance(Ci.nsIFileOutputStream);
+			fileOutputStream.init(context._tempFile, 0x02|0x08|0x20, 0666, 0);
+
+			this._outputStream = Cc["@mozilla.org/network/buffered-output-stream;1"]
+						.createInstance(Ci.nsIBufferedOutputStream);
+			this._outputStream.init(fileOutputStream, 1024*16);
 		},
 		onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount){
+			var context = aContext.wrappedJSObject;
+
 			aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
 			var httpStatus = aRequest.responseStatus;
 				// 必要な情報がないなら終了
@@ -181,35 +204,37 @@
 			if(aCount == 0) return;
 
 			if(aRequest.contentLength > 0){
-				var context = this._context;
 				percentage = Math.floor((aOffset * 100.0) / aRequest.contentLength);
 				context.onProgressChange(context, percentage);
 			}
 
-			this._bInputStream.setInputStream(aInputStream);
-			this._data.push(this._bInputStream.readBytes(aCount));
+			this._outputStream.writeFrom(aInputStream, aCount);
 		},
 		onStopRequest: function(aRequest, aContext, aStatus){
+			var context = aContext.wrappedJSObject;
+			context._loading = false;
+
+			if(!this._outputStream) return;
+			this._outputStream.close();
+			this._outputStream = null;
+
 				// nsNetError.h
 			const NS_ERROR_MODULE_NETWORK = 2152398848;
 			const NS_ERROR_NET_TIMEOUT         = NS_ERROR_MODULE_NETWORK + 14;
 			const NS_ERROR_UNKNOWN_HOST        = NS_ERROR_MODULE_NETWORK + 30;
 			const NS_ERROR_DOCUMENT_NOT_CACHED = NS_ERROR_MODULE_NETWORK + 70;
 
-			var context = this._context;
-			var data = this._data.join("");
-			this._data = null;
-
 			try{
 				aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
 				var httpStatus = aRequest.responseStatus;
 				if(httpStatus==200 || httpStatus==206){
-					bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-						.getService(Components.interfaces.nsIBbs2chService);
-					var writed = bbs2chService.writeFile(context.filePath, data, false);
-					if(!writed){
-						this.onError(context, context.ERROR_BAD_FILE_PATH);
-						return;
+					try{
+						if(context._file.exists()){
+							context._file.remove(false);
+						}
+						context._tempFile.moveTo(context._file.parent, context._file.leafName);
+					}catch(ex){
+						context.onError(context, context.ERROR_BAD_FILE_PATH);
 					}
 				}
 				context.onStop(context, httpStatus);
@@ -241,10 +266,17 @@
 		try{
 			this._httpChannel.cancel(0);
 			this._httpChannel = null;
+			if(this._listener._outputStream){
+				this._listener._outputStream.close();
+				this._listener._outputStream = null;
+			}
+			if(this._tempFile.exists()){
+				this._tempFile.remove(false);
+			}
 		}catch(ex){}
-		
-		if(!aSilent) this.onError(this.ERROR_CANCEL);
-		
+
+		if(!aSilent) this.onError(this, this.ERROR_CANCEL);
+
 		this._loading = false;
 	},
 

From svnnotify ＠ sourceforge.jp  Fri Nov 30 19:39:15 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 30 Nov 2007 19:39:15 +0900
Subject: [Bbs2ch-cvs 279]
 =?utf-8?b?WzI2MV0gIFhQQyDjgqrjg5bjgrjjgqfjgq/jg4jjgpLliKnnlKg=?=
 =?utf-8?b?44GZ44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1196419155.737792.16368.nullmailer@users.sourceforge.jp>

Revision: 261
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=261
Author:   flyson
Date:     2007-11-30 19:39:15 +0900 (Fri, 30 Nov 2007)

Log Message:
-----------
XPC オブジェクトを利用するようにした

Modified Paths:
--------------
    trunk/bbs2chreader/components/b2rServer.js


-------------- next part --------------
Modified: trunk/bbs2chreader/components/b2rServer.js
===================================================================
--- trunk/bbs2chreader/components/b2rServer.js	2007-11-28 09:57:35 UTC (rev 260)
+++ trunk/bbs2chreader/components/b2rServer.js	2007-11-30 10:39:15 UTC (rev 261)
@@ -37,12 +37,25 @@
 
 const Ci = Components.interfaces;
 const Cc = Components.classes;
+const XPC = {
+	createInstance: function(aContractId, aInterface){
+		return Components.classes[aContractId].createInstance(Components.interfaces[aInterface]);
+	},
+	getService: function(aContractId, aInterface){
+	    return Components.classes[aContractId].getService(Components.interfaces[aInterface]);
+	}
+}
 
 
+const B2R_SERVER_CONTRACTID = "@bbs2ch.sourceforge.jp/b2r-server;1";
+const B2R_SERVER_CID = Components.ID("{f99671cf-868a-4e46-a849-a7bf35a878d7}");
+const B2R_SERVER_CNAME = "b2rServer js component";
+
+
 // ********** ********* b2rServer ********** **********
 
 function b2rServer(){
-	this._runningEventLoop = false;
+	this._listening = false;
 }
 
 b2rServer.prototype = {
@@ -52,19 +65,19 @@
 	},
 
 	start: function(){
-		if(this._runningEventLoop){
+		if(this._listening){
 			dump("b2rServer.start : Is Running\n");
 			return;
 		}
 
-        this._thread = Cc["@mozilla.org/thread;1"].createInstance(Ci.nsIThread);
+        this._thread = XPC.createInstance("@mozilla.org/thread;1", "nsIThread");
         this._thread.init(this, 0, Ci.nsIThread.PRIORITY_NORMAL,
         					Ci.nsIThread.SCOPE_GLOBAL, Ci.nsIThread.STATE_JOINABLE);
 		dump("b2rServer.start\n");
 	},
 
 	stop: function(){
-		if(this._runningEventLoop){
+		if(this._listening){
 	        this._thread.interrupt();
 	        this._thread = null;
        		dump("b2rServer.stop\n");
@@ -75,21 +88,18 @@
   	// ********** ********* implements nsIRunnable ********** **********
 
 	run: function (){
-		var eventQueueService = Cc["@mozilla.org/event-queue-service;1"]
-					.getService(Ci.nsIEventQueueService);
+		var eventQueueService = XPC.getService("@mozilla.org/event-queue-service;1", "nsIEventQueueService");
 		this._eventQueue = eventQueueService.createFromIThread(this.currentThread, false);
 
-		var port = Cc["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
-						.getService(Ci.b2rIGlobalService).serverURL.port;
-		var serverSocket = Cc["@mozilla.org/network/server-socket;1"]
-				.createInstance(Ci.nsIServerSocket);
+		var port = XPC.getService("@bbs2ch.sourceforge.jp/b2r-global-service;1", "b2rIGlobalService").serverURL.port;
+		var serverSocket = XPC.createInstance("@mozilla.org/network/server-socket;1", "nsIServerSocket");
 		serverSocket.init(port, true, 10);
 		serverSocket.asyncListen(this);
 
 		dump("b2rServer.run : Start Listening Port " +  port + "\n");
-		this._runningEventLoop = true;
+		this._listening = true;
 		this._eventQueue.eventLoop();
-		this._runningEventLoop = false;
+		this._listening = false;
 		serverSocket.close();
 		this._eventQueue.processPendingEvents();
 		this._eventQueue.stopAcceptingEvents();
@@ -102,12 +112,11 @@
   	// ********** ********* implements nsIServerSocketListener ********** **********
 
 	onSocketAccepted: function(aServerSocket, aTransport){
-		const nsITransport = Ci.nsITransport;
-		aTransport.setTimeout(nsITransport.TIMEOUT_CONNECT, 30);
-		aTransport.setTimeout(nsITransport.TIMEOUT_READ_WRITE, 30);
+		aTransport.setTimeout(Ci.nsITransport.TIMEOUT_CONNECT, 30);
+		aTransport.setTimeout(Ci.nsITransport.TIMEOUT_READ_WRITE, 30);
 
-		var input = aTransport.openInputStream(nsITransport.OPEN_BLOCKING, 0, 0);
-		var output = aTransport.openOutputStream(nsITransport.OPEN_BLOCKING, 1024*16, 64);
+		var input = aTransport.openInputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0);
+		var output = aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 1024*16, 64);
 
 		new b2rServerHandler(aServerSocket.port, input, output);
 		// dump("b2rServer.onSocketAccepted\n");
@@ -121,7 +130,7 @@
 	// ********** ********* implements nsIObserver ********** **********
 
 	observe: function(aSubject, aTopic, aData){
-		var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+		var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
 
 		switch(aTopic){
 			case "app-startup":
@@ -202,10 +211,8 @@
   	// ********** ********* implements nsIRunnable ********** **********
 
 	run: function (){
-		var port = Cc["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
-						.getService(Ci.b2rIGlobalService).serverURL.port;
-		var serverSocket = Cc["@mozilla.org/network/server-socket;1"]
-					.createInstance(Ci.nsIServerSocket);
+		var port = XPC.getService("@bbs2ch.sourceforge.jp/b2r-global-service;1", "b2rIGlobalService").serverURL.port;
+		var serverSocket = XPC.createInstance("@mozilla.org/network/server-socket;1", "nsIServerSocket");
 		serverSocket.init(port, true, 10);
 		serverSocket.asyncListen(this);
 
@@ -222,12 +229,11 @@
   	// ********** ********* implements nsIServerSocketListener ********** **********
 
 	onSocketAccepted: function(aServerSocket, aTransport){
-		const nsITransport = Ci.nsITransport;
-		aTransport.setTimeout(nsITransport.TIMEOUT_CONNECT, 30);
-		aTransport.setTimeout(nsITransport.TIMEOUT_READ_WRITE, 30);
+		aTransport.setTimeout(Ci.nsITransport.TIMEOUT_CONNECT, 30);
+		aTransport.setTimeout(Ci.nsITransport.TIMEOUT_READ_WRITE, 30);
 
-		var input = aTransport.openInputStream(nsITransport.OPEN_BLOCKING, 0, 0);
-		var output = aTransport.openOutputStream(nsITransport.OPEN_BLOCKING, 1024*16, 64);
+		var input = aTransport.openInputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0);
+		var output = aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 1024*16, 64);
 
 		new b2rServerHandler(aServerSocket.port, input, output);
 		// dump("b2rServer.onSocketAccepted\n");
@@ -241,7 +247,7 @@
 	// ********** ********* implements nsIObserver ********** **********
 
 	observe: function(aSubject, aTopic, aData){
-		var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+		var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
 
 		switch(aTopic){
 			case "app-startup":
@@ -339,8 +345,7 @@
 
 
 	_parseRequestData: function(){
-		var inputStram = Cc["@mozilla.org/intl/converter-input-stream;1"]
-				.createInstance(Ci.nsIConverterInputStream)
+		var inputStram = XPC.createInstance("@mozilla.org/intl/converter-input-stream;1", "nsIConverterInputStream")
 				.QueryInterface(Ci.nsIUnicharLineInputStream);
 		inputStram.init(this._input, "ISO-8859-1", 1024, 0xFFFD);
 		var line = {};
@@ -366,7 +371,7 @@
 			this._httpVersion = RegExp.$3;
 		}
 
-		var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
 		try{
 			var baseURI = ioService.newURI("http://127.0.0.1:" + this._port, null, null);
 			this._requestURL = ioService.newURI(uri, null, baseURI).QueryInterface(Ci.nsIURL);
@@ -521,7 +526,7 @@
 }
 
 
-// ********** ********* b2rServer Factory ********** **********
+// ********** ********* Component Registration ********** **********
 
 
 var Factory = {
@@ -559,9 +564,6 @@
 };
 
 
-// ********** ********* Component Registration ********** **********
-
-
 var ComponentModule = {
 
 	CONTRACTID: "@mozilla.org/b2r-server;1",
@@ -572,27 +574,25 @@
 	registerSelf: function(aCompMgr, aFileSpec, aLocation, aType){
 		aCompMgr = aCompMgr.QueryInterface(Ci.nsIComponentRegistrar);
 
-		aCompMgr.registerFactoryLocation(this.CID, this.CNAME, this.CONTRACTID,
+		aCompMgr.registerFactoryLocation(B2R_SERVER_CID, B2R_SERVER_CNAME, B2R_SERVER_CONTRACTID,
 											aFileSpec, aLocation, aType);
 
-		var categoryManager = Cc["@mozilla.org/categorymanager;1"]
-					.getService(Ci.nsICategoryManager);
-		categoryManager.addCategoryEntry("app-startup", this.CNAME, this.CONTRACTID, true, true);
+		var categoryManager = XPC.getService("@mozilla.org/categorymanager;1", "nsICategoryManager");
+		categoryManager.addCategoryEntry("app-startup", B2R_SERVER_CNAME, B2R_SERVER_CONTRACTID, true, true);
 	},
 
 
 	unregisterSelf: function(aCompMgr, aFileSpec, aLocation){
 		aCompMgr = aCompMgr.QueryInterface(Ci.nsIComponentRegistrar);
-		aCompMgr.unregisterFactoryLocation(this.CID, aFileSpec);
+		aCompMgr.unregisterFactoryLocation(B2R_SERVER_CID, aFileSpec);
 
-		var categoryManager = Cc["@mozilla.org/categorymanager;1"]
-					.getService(Ci.nsICategoryManager);
-		categoryManager.deleteCategoryEntry("app-startup", this.CONTRACTID, true);
+		var categoryManager = XPC.getService("@mozilla.org/categorymanager;1", "nsICategoryManager");
+		categoryManager.deleteCategoryEntry("app-startup", B2R_SERVER_CONTRACTID, true);
 	},
 
 
 	getClassObject: function(aCompMgr, aCID, aIID){
-		if(aCID.equals(this.CID))
+		if(aCID.equals(B2R_SERVER_CID))
 				return Factory;
 
 		if(!aIID.equals(Ci.nsIFactory))

From svnnotify ＠ sourceforge.jp  Fri Nov 30 19:58:01 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 30 Nov 2007 19:58:01 +0900
Subject: [Bbs2ch-cvs 280]
 =?utf-8?b?WzI2Ml0gIG5zSUJ1ZmZlcmVkT3V0cHV0U3RyZWFtIOOBruS9vw==?=
 =?utf-8?b?55So44KS5YaN6ZaL?=
Message-ID: <1196420281.142979.27840.nullmailer@users.sourceforge.jp>

Revision: 262
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=262
Author:   flyson
Date:     2007-11-30 19:58:01 +0900 (Fri, 30 Nov 2007)

Log Message:
-----------
nsIBufferedOutputStream の使用を再開

Modified Paths:
--------------
    trunk/bbs2chreader/components/b2rServer.js


-------------- next part --------------
Modified: trunk/bbs2chreader/components/b2rServer.js
===================================================================
--- trunk/bbs2chreader/components/b2rServer.js	2007-11-30 10:39:15 UTC (rev 261)
+++ trunk/bbs2chreader/components/b2rServer.js	2007-11-30 10:58:01 UTC (rev 262)
@@ -116,7 +116,8 @@
 		aTransport.setTimeout(Ci.nsITransport.TIMEOUT_READ_WRITE, 30);
 
 		var input = aTransport.openInputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0);
-		var output = aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 1024*16, 64);
+		var output = XPC.createInstance("@mozilla.org/network/buffered-output-stream;1", "nsIBufferedOutputStream");
+		output.init(aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0), 1024*16);
 
 		new b2rServerHandler(aServerSocket.port, input, output);
 		// dump("b2rServer.onSocketAccepted\n");
@@ -233,7 +234,8 @@
 		aTransport.setTimeout(Ci.nsITransport.TIMEOUT_READ_WRITE, 30);
 
 		var input = aTransport.openInputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0);
-		var output = aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 1024*16, 64);
+		var output = XPC.createInstance("@mozilla.org/network/buffered-output-stream;1", "nsIBufferedOutputStream");
+		output.init(aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0), 1024*16);
 
 		new b2rServerHandler(aServerSocket.port, input, output);
 		// dump("b2rServer.onSocketAccepted\n");

From svnnotify ＠ sourceforge.jp  Fri Nov 30 21:56:26 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 30 Nov 2007 21:56:26 +0900
Subject: [Bbs2ch-cvs 281]
 =?utf-8?b?WzI2M10gIFZJUCDjga7mjrLnpLrmnb/jgr/jgqTjg4jjg6vjgYw=?=
 =?utf-8?b?5Y+W5b6X44Gn44GN44Gq44GL44Gj44Gf44Gu44KS5L+u5q2j?=
Message-ID: <1196427386.623581.5738.nullmailer@users.sourceforge.jp>

Revision: 263
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=263
Author:   flyson
Date:     2007-11-30 21:56:26 +0900 (Fri, 30 Nov 2007)

Log Message:
-----------
VIP の掲示板タイトルが取得できなかったのを修正

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-11-30 10:58:01 UTC (rev 262)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-11-30 12:56:26 UTC (rev 263)
@@ -88,7 +88,9 @@
 
 
 	get title(){
-		return this.getSetting("BBS_TITLE") || this.url.spec;
+			// VIP のタイトルに A タグが追加されたので除去
+		var title = this.getSetting("BBS_TITLE");
+		return title ? title.replace(/<[^>]+>/g, "") : this.url.spec;
 	},
 
 
@@ -154,7 +156,7 @@
 			this._settings = new Array();
 			if(this.settingFile.exists()){
 				var fileLineIterator = this._getFileLineIterator(this.settingFile, this._getCharset());
-				var regLine = /^(.+)=(.+)$/;
+				var regLine = /^([^=]+)=(.+)$/;
 				for(let[i, line] in fileLineIterator){
 					if(regLine.test(line)) this._settings[RegExp.$1] = RegExp.$2;
 				}

From svnnotify ＠ sourceforge.jp  Thu Dec  6 21:57:05 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 06 Dec 2007 21:57:05 +0900
Subject: [Bbs2ch-cvs 282]
 =?utf-8?b?WzI2NF0gIEpCQlMg5paH5a2X5YyW44GR44GM44Gh44KD44KT44Go?=
 =?utf-8?b?55u044Gj44Gm44GE44Gq44GL44Gj44Gf44Gu44KS5L+u5q2j?=
Message-ID: <1196945825.837760.13764.nullmailer@users.sourceforge.jp>

Revision: 264
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=264
Author:   flyson
Date:     2007-12-06 21:57:05 +0900 (Thu, 06 Dec 2007)

Log Message:
-----------
JBBS 文字化けがちゃんと直っていなかったのを修正

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-11-30 12:56:26 UTC (rev 263)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-12-06 12:57:05 UTC (rev 264)
@@ -363,7 +363,7 @@
 		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)
+			var cacheLine = this._bbs2chService.fromSJIS(cacheContents[i], this.type)
 			cacheLine = cacheLine.split("<>");
 			var cacheItem = {};
 			cacheItem.datID = cacheLine[0];

From svnnotify ＠ sourceforge.jp  Thu Dec  6 21:59:20 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 06 Dec 2007 21:59:20 +0900
Subject: [Bbs2ch-cvs 283]
 =?utf-8?b?WzI2NV0gIEpCQlMg5paH5a2X5YyW44GR44GM44Gh44KD44KT44Go?=
 =?utf-8?b?55u044Gj44Gm44GE44Gq44GL44Gj44Gf44Gu44KS5L+u5q2jMg==?=
Message-ID: <1196945960.346758.14876.nullmailer@users.sourceforge.jp>

Revision: 265
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=265
Author:   flyson
Date:     2007-12-06 21:59:20 +0900 (Thu, 06 Dec 2007)

Log Message:
-----------
JBBS 文字化けがちゃんと直っていなかったのを修正2

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-12-06 12:57:05 UTC (rev 264)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-12-06 12:59:20 UTC (rev 265)
@@ -363,7 +363,7 @@
 		var cacheContents = this._bbs2chService.readFileLine(cacheFile.path, {});
 		var cacheItemHash = new Array();
 		for(var i=0; i<cacheContents.length; i++){
-			var cacheLine = this._bbs2chService.fromSJIS(cacheContents[i], this.type)
+			var cacheLine = this._bbs2chService.fromSJIS(cacheContents[i]);
 			cacheLine = cacheLine.split("<>");
 			var cacheItem = {};
 			cacheItem.datID = cacheLine[0];

From svnnotify ＠ sourceforge.jp  Sat Dec  8 01:31:40 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 08 Dec 2007 01:31:40 +0900
Subject: [Bbs2ch-cvs 284]
 =?utf-8?b?WzI2Nl0gIOato+OBl+OBj+OBquOBhOW8leaVsOOCkua4oeOBlw==?=
 =?utf-8?b?44Gf44Go44GN44Gu44Ko44Op44O844KSIFhQQ09NIOOCqOODqeODvOOBqw==?=
 =?utf-8?b?44GX44Gf?=
Message-ID: <1197045100.682647.26471.nullmailer@users.sourceforge.jp>

Revision: 266
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=266
Author:   flyson
Date:     2007-12-08 01:31:40 +0900 (Sat, 08 Dec 2007)

Log Message:
-----------
正しくない引数を渡したときのエラーを XPCOM エラーにした

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalIO.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalIO.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalIO.js	2007-12-06 12:59:20 UTC (rev 265)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalIO.js	2007-12-07 16:31:40 UTC (rev 266)
@@ -82,7 +82,11 @@
 		const LOGS_DIR_NAME = "data";
 
 		var ioService = XPC.getService("@mozilla.org/network/io-service;1", "nsIIOService");
-		var fromURL = ioService.newURI(aURLSpec, null, null).QueryInterface(Ci.nsIURL);
+		try{
+			var fromURL = ioService.newURI(aURLSpec, null, null).QueryInterface(Ci.nsIURL);
+		}catch(ex){
+			throw Components.results.NS_ERROR_INVALID_ARG;
+		}
 
 		var logFile = this.getDataDir();
 		logFile.appendRelativePath(LOGS_DIR_NAME);
@@ -141,7 +145,7 @@
 			converterInputStream.init(fileInputStream, charset, 1024*8,
 					Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
 		}catch(ex){
-			throw ex;
+			throw Components.results.NS_ERROR_INVALID_ARG;
 		}
 		return converterInputStream;
 	},
@@ -166,7 +170,7 @@
 			converterOutputStream.init(fileOutputStream, charset, 1024*8,
 					Ci.nsIConverterOutputStream.DEFAULT_REPLACEMENT_CHARACTER);
 		}catch(ex){
-			throw ex;
+			throw Components.results.NS_ERROR_INVALID_ARG;
 		}
 
 

From svnnotify ＠ sourceforge.jp  Sat Dec  8 23:06:17 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 08 Dec 2007 23:06:17 +0900
Subject: [Bbs2ch-cvs 285]  [267] ver 0.5pre1
Message-ID: <1197122777.219943.4248.nullmailer@users.sourceforge.jp>

Revision: 267
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=267
Author:   flyson
Date:     2007-12-08 23:06:16 +0900 (Sat, 08 Dec 2007)

Log Message:
-----------
ver 0.5pre1

Modified Paths:
--------------
    trunk/bbs2chreader/install.rdf


-------------- next part --------------
Modified: trunk/bbs2chreader/install.rdf
===================================================================
--- trunk/bbs2chreader/install.rdf	2007-12-07 16:31:40 UTC (rev 266)
+++ trunk/bbs2chreader/install.rdf	2007-12-08 14:06:16 UTC (rev 267)
@@ -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.4.9</em:version>
+		<em:version>0.5pre1</em:version>
 		<em:description>2ch.net(Japanese Web Forums) Browser</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><!-- Firefox -->
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>2.0</em:minVersion>
-				<em:maxVersion>3.0a8</em:maxVersion>
+				<em:maxVersion>3.0b2</em:maxVersion>
 			</Description>
 			<!-- Seamonkey
 			<Description>

From svnnotify ＠ sourceforge.jp  Sat Dec  8 23:08:41 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 08 Dec 2007 23:08:41 +0900
Subject: [Bbs2ch-cvs 286]
 =?utf-8?b?WzI2OF0gIGxvY2FsZSDjgpLkvb/jgo/jgarjgYTjgojjgYbjgas=?=
 =?utf-8?b?44GX44Gf?=
Message-ID: <1197122921.795215.5381.nullmailer@users.sourceforge.jp>

Revision: 268
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=268
Author:   flyson
Date:     2007-12-08 23:08:40 +0900 (Sat, 08 Dec 2007)

Log Message:
-----------
locale ??戎????????????
Modified Paths:
--------------
    trunk/bbs2chreader/build/chrome.manifest
    trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
    trunk/bbs2chreader/chrome.manifest

Added Paths:
-----------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread-status.properties

Removed Paths:
-------------
    trunk/bbs2chreader/chrome/locale/


-------------- next part --------------
Modified: trunk/bbs2chreader/build/chrome.manifest
===================================================================
--- trunk/bbs2chreader/build/chrome.manifest	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/build/chrome.manifest	2007-12-08 14:08:40 UTC (rev 268)
@@ -1,7 +1,5 @@
 content	bbs2chreader	jar:chrome/bbs2chreader.jar!/content/bbs2chreader/
 skin	bbs2chreader	classic/1.0	jar:chrome/bbs2chreader.jar!/skin/classic/bbs2chreader/
-locale	bbs2chreader	en-US	jar:chrome/bbs2chreader.jar!/locale/en-US/bbs2chreader/
-locale	bbs2chreader	ja-JP	jar:chrome/bbs2chreader.jar!/locale/ja-JP/bbs2chreader/
 overlay	chrome://browser/content/browser.xul	chrome://bbs2chreader/content/ff-overlay.xul
 style	chrome://browser/content/browser.xul	chrome://bbs2chreader/skin/ff-toolbarbutton.css
 style	chrome://global/content/customizeToolbar.xul	chrome://bbs2chreader/skin/ff-toolbarbutton.css
\ No newline at end of file

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul	2007-12-08 14:08:40 UTC (rev 268)
@@ -2,10 +2,6 @@
 <?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.stopPropagation()" onkeypress="event.stopPropagation()"
@@ -21,11 +17,11 @@
 <popupset>
 	<popup id="popBbsMenuContext"
 				onpopupshowing="return showBbsMenuContext(event)">
-		<menuitem label="&ctxtOpen.label;" oncommand="openBoard(false)"/>
-		<menuitem label="&ctxtOpenInNewTab.label;" oncommand="openBoard(true)"/>
+		<menuitem label="???" oncommand="openBoard(false)"/>
+		<menuitem label="?違??????????" oncommand="openBoard(true)"/>
 		<menuseparator/>
-		<menuitem label="&ctxtCopuURL.label;" oncommand="copyURL(false)"/>
-		<menuitem label="&ctxtCopuURLnTitle.label;" oncommand="copyURL(true)"/>
+		<menuitem label="URL ??????" oncommand="copyURL(false)"/>
+		<menuitem label="URL ????ゃ?????潟??? oncommand="copyURL(true)"/>
 	</popup>
 </popupset>
 
@@ -34,17 +30,17 @@
 			autocompletesearch="form-history"
 			autocompletesearchparam="bbs2ch-bbsmenu-history"
 			ontextentered="searchTitle(this.value)"/>
-	<toolbarbutton id="btnHistory" label="&history.label;" type="menu">
+	<toolbarbutton id="btnHistory" label="絮ユ?" type="menu">
 		<menupopup id="popHistory" onpopupshowing="updateHistoryMenu()"
 				onclick="popHistoryClick(event)"/>
 	</toolbarbutton>
-	<toolbarbutton label="&tools.label;" type="menu">
+	<toolbarbutton label="????? type="menu">
 		<menupopup>
-			<menuitem label="&bbsmenuUpdate.label;" oncommand="bbsmenuUpdate()"/>
+			<menuitem label="bbsmenu ?贋?" oncommand="bbsmenuUpdate()"/>
 			<menuseparator/>
-			<menuitem label="&openLogsDirectory.label;" oncommand="openLogsDir()"/>
-			<menuitem label="&options.label;" oncommand="openSettings()"/>
-			<menuitem label="&about.label;" oncommand="openAbout()"/>
+			<menuitem label="??????????????；腓? oncommand="openLogsDir()"/>
+			<menuitem label="????激???.." oncommand="openSettings()"/>
+			<menuitem label="bbs2chreader ??????" oncommand="openAbout()"/>
 		</menupopup>
 	</toolbarbutton>
 	<spacer class="small-margin"/>

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-12-08 14:08:40 UTC (rev 268)
@@ -2,10 +2,6 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://bbs2chreader/skin/board-page.css" type="text/css"?>
 
-<!DOCTYPE page [
-	<!ENTITY % board-page-dtd SYSTEM "chrome://bbs2chreader/locale/board-page.dtd">
-	%board-page-dtd;
-]>
 <page id="pageMain" onload="startup()" onunload="shutdown()"
 	onmousedown="eventBubbleCheck(event)" onkeypress="eventBubbleCheck(event)"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -18,27 +14,27 @@
 
 <popupset>
 	<popup id="popAddBookmark" position="after_start">
-		<menuitem label="&ctxtBookmark.label;" oncommand="addBookmark(false)"/>
-		<menuitem label="&ctxtLiveBookmark.label;" oncommand="addBookmark(true)"/>
+		<menuitem label="???????若?" oncommand="addBookmark(false)"/>
+		<menuitem label="?????????????? oncommand="addBookmark(true)"/>
 	</popup>
 
 	<popup id="popTools" position="after_end">
-		<menuitem label="&popShowBrowser.label;" oncommand="showBrowser(false)"
+		<menuitem label="???????ц；腓? oncommand="showBrowser(false)"
 			onclick="if(event.button==1)showBrowser(true)"/>
-		<menuitem label="&popOpenLogsDir.label;" oncommand="openLogsDir()"/>
+		<menuitem label="??????????????；腓? oncommand="openLogsDir()"/>
 		<menuseparator/>
-		<menuitem label="&popOpenSettings.label;" oncommand="openSettings()"/>
+		<menuitem label="????激???.." oncommand="openSettings()"/>
 	</popup>
 
 	<popup id="popTreeSubjectContext"
 				onpopupshowing="return showTreeSubjectContext(event)">
-		<menuitem label="&ctxtOpen.label;" oncommand="openThread(false)"/>
-		<menuitem label="&ctxtOpenInNewTab.label;" oncommand="openThread(true)"/>
+		<menuitem label="???" oncommand="openThread(false)"/>
+		<menuitem label="?違??????????" oncommand="openThread(true)"/>
 		<menuseparator/>
-		<menuitem label="&ctxtCopyURL.label;" oncommand="copyURL()"/>
-		<menuitem label="&ctxtCopyURLnTitle.label;" oncommand="copyTitleAndURL()"/>
+		<menuitem label="URL ??????" oncommand="copyURL()"/>
+		<menuitem label="URL ????ゃ?????潟??? oncommand="copyTitleAndURL()"/>
 		<menuseparator/>
-		<menuitem label="&ctxtDeleteLog.label;" oncommand="deleteLog()"/>
+		<menuitem label="???????? oncommand="deleteLog()"/>
 	</popup>
 
 	<tooltip id="popBanner" position="after_end"
@@ -57,20 +53,20 @@
 	<hbox id="boxMenu" flex="1" align="center">
 		<label id="lblStatus" crop="end" value="" flex="1"/>
 
-		<label id="lblShowBanner" class="text-link" value="&lblShowBanner.label;"
+		<label id="lblShowBanner" class="text-link" value="????取；腓?
 			onclick="showBanner(event)"/>
 		<label class="menu-separator" value=" | "/>
 
-		<label id="lblTools" class="text-link" value="&lblTools.label;"
+		<label id="lblTools" class="text-link" value="?????
 			popup="popTools"/>
 		<label class="menu-separator" value=" | "/>
 
 		<deck id="dckUpdate" selectedIndex="0">
-			<label id="lblUpdate" class="text-link" value="&menuUpdate.label;"
+			<label id="lblUpdate" class="text-link" value="?贋?;"
 					onclick="subjectUpdate(event)"/>
-			<label id="lblMoveCheck" class="text-link" value="&lblMoveCheck.label;"
+			<label id="lblMoveCheck" class="text-link" value="腆肴?"
 					onclick="boardMoveCheck(event)"/>
-			<label id="lblMoveNewURL" class="text-link" value="&lblMoveNewURL.label;"
+			<label id="lblMoveNewURL" class="text-link" value="腱糸?"
 					onclick="moveNewURL(event)"/>
 		</deck>
 
@@ -81,24 +77,24 @@
 
 <toolbox>
 	<toolbar align="center">
-		<label value="&txtSearch.label;"/>
+		<label value="罎?刈: "/>
 		<textbox id="txtSearch" value="" flex="2" type="autocomplete"
 				autocompletesearch="form-history"
 				autocompletesearchparam="bbs2ch-board-history"
 				onkeypress="searchTitle(event, this.value)"/>
 		<spacer flex="1"/>
 
-		<label value="&lblFilter.label;"/>
+		<label value="??????: "/>
 		<menulist id="mlstFilterLimit" value="-1" persist2="value" oncommand="initTreeSubject()">
 			<menupopup>
-				<menuitem label="ALL" value="-1"/>
-				<menuitem label="TOP 200" value="200"/>
-				<menuitem label="TOP 400" value="400"/>
-				<menuitem label="Subscribing" value="0"/>
+				<menuitem label="????? value="-1"/>
+				<menuitem label="?????200" value="200"/>
+				<menuitem label="?????400" value="400"/>
+				<menuitem label="莖取?筝? value="0"/>
 			</menupopup>
 		</menulist>
 
-		<checkbox id="chkShowDownedLogs" label="&chkShowDownedLogs.label;"
+		<checkbox id="chkShowDownedLogs" label="??ｻ???茵?ず"
 				checked="true" persist2="checked" oncommand="initTreeSubject()"/>
 
 		<spacer class="small-margin"/>
@@ -114,31 +110,31 @@
 				property="status" cellType="icon"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colNumber" label="&colNumber.label;" flex="1"
+		<treecol id="colNumber" label="No" flex="1"
 				property="number" cellType="int"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colTitle" label="&colTitle.label;" flex="15"
+		<treecol id="colTitle" label="?帥????" flex="15"
 				property="title" cellType="str"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colCount" label="&colCount.label;" flex="1"
+		<treecol id="colCount" label="????? flex="1"
 				property="count" cellType="int"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colRead" label="&colRead.label;" flex="1"
+		<treecol id="colRead" label="?∵??? flex="1"
 				property="read" cellType="int"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colUnread" label="&colUnread.label;" flex="1"
+		<treecol id="colUnread" label="????? flex="1"
 				property="unread" cellType="int"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colForce" label="&colForce.label;" flex="1"
+		<treecol id="colForce" label="?≪?" flex="1"
 				property="force" cellType="int"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colMakeDate" label="&colMakeDate.label;" flex="1"
+		<treecol id="colMakeDate" label="篏???? flex="1"
 				property="makeDate" cellType="str"
 				persist2="hidden width sortActive sortDirection"/>
 	</treecols>

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul	2007-12-08 14:08:40 UTC (rev 268)
@@ -2,10 +2,6 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://bbs2chreader/skin/subscribe.css" type="text/css"?>
 
-<!DOCTYPE page [
-	<!ENTITY % board-page-dtd SYSTEM "chrome://bbs2chreader/locale/board-page.dtd">
-	%board-page-dtd;
-]>
 <page id="pageMain" title="莖取? [bbs2chreader]"
 		onload="startup()" onunload="shutdown()"
 		onmousedown="eventBubbleCheck(event)" onkeypress="eventBubbleCheck(event)"
@@ -20,27 +16,27 @@
 <popupset>
 	<popup id="treeSubscribeContext"
 				onpopupshowing="return showTreeSubscribeContext(event)">
-		<menuitem label="&ctxtOpen.label;" oncommand="openThread(false)"/>
-		<menuitem label="&ctxtOpenInNewTab.label;" oncommand="openThread(true)"/>
+		<menuitem label="???" oncommand="openThread(false)"/>
+		<menuitem label="?違??????????" oncommand="openThread(true)"/>
 		<menuseparator/>
-		<menuitem label="&ctxtCopyURL.label;" oncommand="copyURL()" disabled="true"/>
-		<menuitem label="&ctxtCopyURLnTitle.label;" oncommand="copyTitleAndURL()" disabled="true"/>
+		<menuitem label="URL ??????" oncommand="copyURL()" disabled="true"/>
+		<menuitem label="?帥??????URL ??????" oncommand="copyTitleAndURL()" disabled="true"/>
 		<menuseparator/>
-		<menuitem label="&ctxtDeleteLog.label;" oncommand="deleteLog()"/>
+		<menuitem label="???????? oncommand="deleteLog()"/>
 	</popup>
 </popupset>
 
 <hbox align="center">
 	<label id="lblStatus" flex="1" crop="start"/>
 	<spacer class="small-margin"/>
-	<toolbarbutton label="&lblTools.label;" type="menu">
+	<toolbarbutton label="????? type="menu">
 		<menupopup>
-				<menuitem label="Manage Subscribe Boards" oncommand="openSubscribeManager()"/>
+				<menuitem label="莖取?????? oncommand="openSubscribeManager()"/>
 				<menuseparator/>
-				<menuitem label="&popOpenSettings.label;" oncommand="openSettings()"/>
+				<menuitem label="????激???.." oncommand="openSettings()"/>
 		</menupopup>
 	</toolbarbutton>
-	<toolbarbutton id="btnUpdate" label="&menuUpdate.label;" oncommand="subjectUpdateAll()"/>
+	<toolbarbutton id="btnUpdate" label="?贋?" oncommand="subjectUpdateAll()"/>
 	<spacer class="small-margin"/>
 </hbox>
 

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul	2007-12-08 14:08:40 UTC (rev 268)
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
-
-<!DOCTYPE wizard [
-	<!ENTITY % post-wizard-dtd SYSTEM "chrome://bbs2chreader/locale/post-wizard.dtd">
-	%post-wizard-dtd;
-]>
 <wizard id="wizPostWizard" title="post" windowtype="bbs2ch:postWizard"
 	onload="startup()" onwizardcancel="shutdown()"
 	onwizardfinish="shutdown(); reloadThreadPage()"
@@ -21,14 +16,14 @@
 	<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/post/filter.js"/>
 
 	<wizardpage pageid="wpgForm" id="wpgForm" onpageadvanced="return formCheck()"
-			label="&wpgForm.label;" description="&wpgForm.desc;">
+			label="書き込みウィザード" description="マターリ">
 
 		<label id="lblThreadTitle" class="header" value=""/>
 		<spacer class="small-margin"/>
 		<hbox align="center">
-			<label value="&lblMame.value;" style="text-align:right"/>
+			<label value="名前 :" style="text-align:right"/>
 			<textbox id="txtName" value="" flex="2"/>
-			<label value="&lblMail.value;" style="text-align:right"/>
+			<label value="メール :" style="text-align:right"/>
 			<textbox id="txtMail" value="" flex="1"/>
 			<checkbox id="chkSage" label="sage" persist="checked" oncommand="mailDisabled()"/>
 		</hbox>
@@ -43,24 +38,24 @@
 		<hbox align="center" pack="end">
 			<!--<button id="btnRePost" label="この板のディフォルトに設定"/>
 			<button id="btnRePost" label="このスレのディフォルトに設定"/>-->
-			<checkbox id="chkBeLogin" label="&chkBeLogin.label;" oncommand="toggleBeLogin()"/>
+			<checkbox id="chkBeLogin" label="Be ログイン" oncommand="toggleBeLogin()"/>
 		</hbox>
 	</wizardpage>
 
 
 	<wizardpage pageid="wpgPreview" onpageshow="preview()"
-					label="&wpgPreview.label;" description="&wpgPreview.desc;">
+					label="プレビュー" description="次へ進むと実際に書き込みます">
 		<iframe id="bwrPreview" src="about:blank" flex="1" class="box-inset"
 			onload="event.stopPropagation()"/>
 	</wizardpage>
 
 
 	<wizardpage pageid="wpgPost" onpageshow="post()"
-					label="&wpgPost.label;" description="&wpgPost.desc;">
+					label="書き込み中..." description="">
 		<hbox flex="1">
 			<textbox id="txtResponse" multiline="true" readonly="true" flex="1"/>
 			<hbox align="end">
-				<button id="btnRePost" disabled="true" label="&btnRePost.label;" oncommand="post()"/>
+				<button id="btnRePost" disabled="true" label="再書き込み" oncommand="post()"/>
 			</hbox>
 		</hbox>
 	</wizardpage>

Added: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread-status.properties
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread-status.properties	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread-status.properties	2007-12-08 14:08:40 UTC (rev 268)
@@ -0,0 +1,8 @@
+ok              = (鐔????斬???K??+dat_down        = ( 鐔囲?衆)??AT ?純???+not_modified    = ( 鐔囲?衆)?????????
+abone           = (卒?始??`)????若????????割????????潟??若?????違?羔?????????粋昭?帥??????+network_error   = (卒?始??`)?????????????????+error           = (卒?始??`)?????? : %S??+offline_mode    = ( 鐔囲?衆)???????ゃ??≪????
+log_pickup_mode = ( 鐔囲?衆)????違?????≪?????若???\ No newline at end of file

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-08 14:08:40 UTC (rev 268)
@@ -1283,7 +1283,7 @@
 	    var strBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
                                       .getService(Components.interfaces.nsIStringBundleService);
 		var statusBundle = strBundleService.createBundle(
-								"chrome://bbs2chreader/locale/thread-status.properties");
+								"chrome://bbs2chreader/content/server/thread-status.properties");
 		var statusText = "";
 		if(typeof(aStatus) == "string"){
 			try{

Modified: trunk/bbs2chreader/chrome.manifest
===================================================================
--- trunk/bbs2chreader/chrome.manifest	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome.manifest	2007-12-08 14:08:40 UTC (rev 268)
@@ -1,7 +1,5 @@
 content	bbs2chreader	chrome/content/bbs2chreader/
 skin	bbs2chreader	classic/1.0	chrome/skin/classic/bbs2chreader/
-locale	bbs2chreader	en-US	chrome/locale/en-US/bbs2chreader/
-locale	bbs2chreader	ja-JP	chrome/locale/ja-JP/bbs2chreader/
 overlay	chrome://browser/content/browser.xul	chrome://bbs2chreader/content/ff-overlay.xul
 style	chrome://browser/content/browser.xul	chrome://bbs2chreader/skin/ff-toolbarbutton.css
 style	chrome://global/content/customizeToolbar.xul	chrome://bbs2chreader/skin/ff-toolbarbutton.css
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Wed Dec 12 19:48:12 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 12 Dec 2007 19:48:12 +0900
Subject: [Bbs2ch-cvs 287]
 =?utf-8?b?WzI2OV0gIOODqeODmeODq+OBq+S4jeimgeOBqiA7ICDjgYzmros=?=
 =?utf-8?b?44Gj44Gm44GE44Gf44Gu44KS6Zmk5Y67?=
Message-ID: <1197456492.677467.32214.nullmailer@users.sourceforge.jp>

Revision: 269
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=269
Author:   flyson
Date:     2007-12-12 19:48:12 +0900 (Wed, 12 Dec 2007)

Log Message:
-----------
ラベルに不要な ; が残っていたのを除去

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-12-08 14:08:40 UTC (rev 268)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-12-12 10:48:12 UTC (rev 269)
@@ -62,7 +62,7 @@
 		<label class="menu-separator" value=" | "/>
 
 		<deck id="dckUpdate" selectedIndex="0">
-			<label id="lblUpdate" class="text-link" value="更新;"
+			<label id="lblUpdate" class="text-link" value="更新"
 					onclick="subjectUpdate(event)"/>
 			<label id="lblMoveCheck" class="text-link" value="確認"
 					onclick="boardMoveCheck(event)"/>

From svnnotify ＠ sourceforge.jp  Sat Dec 15 02:42:50 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 15 Dec 2007 02:42:50 +0900
Subject: [Bbs2ch-cvs 288]
 =?utf-8?b?WzI3MF0gIGIycklHbG9iYWxTZXJ2aWNlIOOBuOOBruenu+ihjCA=?=
 =?utf-8?b?44Gd44GuMQ==?=
Message-ID: <1197654170.528367.14267.nullmailer@users.sourceforge.jp>

Revision: 270
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=270
Author:   flyson
Date:     2007-12-15 02:42:50 +0900 (Sat, 15 Dec 2007)

Log Message:
-----------
b2rIGlobalService ?吾?腱肢? ???1

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/skin.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/skin.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/skin.js	2007-12-12 10:48:12 UTC (rev 269)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/skin.js	2007-12-14 17:42:50 UTC (rev 270)
@@ -41,21 +41,23 @@
 	},
 
 	resolveSkinFile: function(aFilePath){
-		var bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-				.getService(Components.interfaces.nsIBbs2chService);
-		var skinName = bbs2chService.pref.getComplexValue(
-							"extensions.bbs2chreader.thread_skin",
+		var b2rService  = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+				.getService(Components.interfaces.b2rIGlobalService);
+		var pref = Components.classes["@mozilla.org/preferences-service;1"]
+				.getService(Components.interfaces.nsIPrefBranch);
+
+		var skinName = pref.getComplexValue("extensions.bbs2chreader.thread_skin",
 							Components.interfaces.nsISupportsString).data;
 
 		var skinFile = null;
 		if(skinName){
-			skinFile = bbs2chService.getDataDir();
+			skinFile = b2rService.io.getDataDir();
 			skinFile.appendRelativePath("skin");
 			skinFile.appendRelativePath(skinName);
 		}else{
 			var bbs2chreaderID = "{0B9D558E-6983-486b-9AAD-B6CBCD2FC807}";
 			var extensionManager = Components.classes["@mozilla.org/extensions/manager;1"]
-				.getService(Components.interfaces.nsIExtensionManager);
+					.getService(Components.interfaces.nsIExtensionManager);
 			var installLocation = extensionManager.getInstallLocation(bbs2chreaderID);
 			skinFile = installLocation.getItemFile(bbs2chreaderID, "defaults/skin").clone()
 							.QueryInterface(Components.interfaces.nsILocalFile);

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-12 10:48:12 UTC (rev 269)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-14 17:42:50 UTC (rev 270)
@@ -1,12 +1,6 @@
 this.script = {
 
 	start: function(aServerHandler){
-		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);
-
 		aServerHandler.setResponseHeader("Content-Type", "text/html; charset=Shift_JIS");
 		aServerHandler.writeResponseHeader(200);
 
@@ -16,24 +10,26 @@
 			aServerHandler.close();
 			return;
 		}
-		var boardURL = this._bbs2chService.getBoardURL(threadURL.spec);
-		var type = this._bbs2chService.getBoardType(threadURL.spec);
+
+		var b2rService = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+				.getService(Components.interfaces.b2rIGlobalService);
+
+		var boardURL = b2rService.threadUtils.getBoardURL(threadURL);
+		var type = b2rService.threadUtils.getBoardType(threadURL);
 			// ???????BOARD_TYPE_PAGE ???
 			// URL ? /test/read.cgi/ ??????? 2ch??????
-		if(type == this._bbs2chService.BOARD_TYPE_PAGE &&
-					threadURL.spec.indexOf("/test/read.cgi/") != -1){
-			type = this._bbs2chService.BOARD_TYPE_2CH;
+		if(type == b2rService.BOARD_TYPE_PAGE && threadURL.spec.indexOf("/test/read.cgi/") != -1){
+			type = b2rService.BOARD_TYPE_2CH;
 		}
 
-
 		switch(type){
-			case this._bbs2chService.BOARD_TYPE_2CH:
+			case b2rService.BOARD_TYPE_2CH:
 				this.thread = new b2rThread2ch();
 				break;
-			case this._bbs2chService.BOARD_TYPE_JBBS:
+			case b2rService.BOARD_TYPE_JBBS:
 				this.thread = new b2rThreadJbbs();
 				break;
-			case this._bbs2chService.BOARD_TYPE_MACHI:
+			case b2rService.BOARD_TYPE_MACHI:
 				this.thread = new b2rThreadMachi();
 				break;
 			default:
@@ -63,11 +59,13 @@
 		// threadURLSpec = decodeURIComponent(threadURLSpec);
 
 		try{
-			var threadURL = this._ioService.newURI(threadURLSpec, null, null)
+			var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+					.getService(Components.interfaces.nsIIOService);
+			var threadURL = ioService.newURI(threadURLSpec, null, null)
 					.QueryInterface(Components.interfaces.nsIURL);
 				// URL ??DAT ID ???????"/" ?????
 			if(threadURL.fileName.match(/^\d{9,10}$/)){
-				threadURL = this._ioService.newURI(threadURLSpec + "/", null, null)
+				threadURL = ioService.newURI(threadURLSpec + "/", null, null)
 						.QueryInterface(Components.interfaces.nsIURL);
 			}
 			return threadURL;

From svnnotify ＠ sourceforge.jp  Sat Dec 15 02:49:00 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 15 Dec 2007 02:49:00 +0900
Subject: [Bbs2ch-cvs 289]
 =?utf-8?b?WzI3MV0gIGIycklHbG9iYWxTZXJ2aWNlIOOBuOOBruenu+ihjCA=?=
 =?utf-8?b?44Gd44GuMg==?=
Message-ID: <1197654540.257892.17844.nullmailer@users.sourceforge.jp>

Revision: 271
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=271
Author:   flyson
Date:     2007-12-15 02:49:00 +0900 (Sat, 15 Dec 2007)

Log Message:
-----------
b2rIGlobalService ?吾?腱肢? ???2

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-14 17:42:50 UTC (rev 270)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-14 17:49:00 UTC (rev 271)
@@ -104,6 +104,8 @@
 
 		this._bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
 					.getService(Components.interfaces.nsIBbs2chService);
+		this._pref = Components.classes["@mozilla.org/preferences-service;1"]
+				.getService(Components.interfaces.nsIPrefBranch);
 		this._aboneManager = Components.classes["@mozilla.org/b2r-abone-manager;1"]
 					.getService(Components.interfaces.b2rIAboneManager);
 
@@ -111,7 +113,7 @@
 					.getService(Components.interfaces.nsIIOService);
 
 		this._chainAboneNumbers = new Array();
-		this._enableChainAbone = this._bbs2chService.pref.getBoolPref("extensions.bbs2chreader.thread_chain_abone")
+		this._enableChainAbone = this._pref.getBoolPref("extensions.bbs2chreader.thread_chain_abone")
 
 			// HTML ????????? true ???
 		this._headerResponded = false;
@@ -131,14 +133,13 @@
 			this.converter.init(this, this.dat.threadURL, this.dat.boardURL, this.dat.type);
 		}catch(ex){
 			if(ex.result == Components.results.NS_ERROR_FILE_NOT_FOUND){
-				var skinName = this._bbs2chService.pref.getComplexValue(
-						"extensions.bbs2chreader.thread_skin",
+				var skinName = this._pref.getComplexValue("extensions.bbs2chreader.thread_skin",
 						Components.interfaces.nsISupportsString).data;
 				skinName = this._bbs2chService.toSJIS(skinName);
 				this.write("??? ("+ skinName +") ??????ｸ??????");
 				this.write("??????????????????<br>?????????????");
 				this.close();
-				this._bbs2chService.pref.setCharPref("extensions.bbs2chreader.thread_skin", "");
+				this._pref.setCharPref("extensions.bbs2chreader.thread_skin", "");
 				return;
 			}else {
 				this.write(ex);
@@ -345,7 +346,7 @@
 		if(this._aboneManager.shouldAbone(resName, resMail, resID, resMes)){
 			this._chainAboneNumbers.push(aNumber);
 			resName = resMail = resDate = resMes = "ABONE";
-			if(aNumber>1 && this._bbs2chService.pref.getBoolPref("extensions.bbs2chreader.thread_hide_abone")){
+			if(aNumber>1 && this._pref.getBoolPref("extensions.bbs2chreader.thread_hide_abone")){
 				return "";
 			}
 		}
@@ -369,7 +370,7 @@
 		if(this._enableChainAbone && chainAbone){
 			this._chainAboneNumbers.push(aNumber);
 			resName = resMail = resDate = resMes = "ABONE";
-			if(aNumber>1 && this._bbs2chService.pref.getBoolPref("extensions.bbs2chreader.thread_hide_abone")){
+			if(aNumber>1 && this._pref.getBoolPref("extensions.bbs2chreader.thread_hide_abone")){
 				return "";
 			}
 		}
@@ -646,7 +647,7 @@
 
 		if(this._aboneManager.shouldAbone(resName, resMail, resID, resMes)){
 			resName = resMail = resDate = resMes = "ABONE";
-			if(aNumber>1 && this._bbs2chService.pref.getBoolPref("extensions.bbs2chreader.thread_hide_abone")){
+			if(aNumber>1 && this._pref.getBoolPref("extensions.bbs2chreader.thread_hide_abone")){
 				return "";
 			}
 		}
@@ -671,7 +672,7 @@
 		if(this._enableChainAbone && chainAbone){
 			this._chainAboneNumbers.push(aNumber);
 			resName = resMail = resDate = resMes = "ABONE";
-			if(aNumber>1 && this._bbs2chService.pref.getBoolPref("extensions.bbs2chreader.thread_hide_abone")){
+			if(aNumber>1 && this._pref.getBoolPref("extensions.bbs2chreader.thread_hide_abone")){
 				return "";
 			}
 		}
@@ -1159,17 +1160,18 @@
 		this._type = aType;
 
 		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);
+				.getService(Components.interfaces.nsIIOService);
+		this._pref = Components.classes["@mozilla.org/preferences-service;1"]
+				.getService(Components.interfaces.nsIPrefBranch);
 
 		this._dd2Color = new b2rId2Color();
 		this._dd2Color.init();
 
 
 		var skinURISpec = "chrome://bbs2chreader/content/res/skin-default/";
-		var skinName = this._bbs2chService.pref.getComplexValue(
-							"extensions.bbs2chreader.thread_skin",
+		var skinName = this._pref.getComplexValue("extensions.bbs2chreader.thread_skin",
 							Components.interfaces.nsISupportsString).data;
 		if(skinName != ""){
 			var skinDir = this._bbs2chService.getDataDir();
@@ -1202,7 +1204,7 @@
 	},
 
 	_resolveSkinFile: function(aFilePath){
-		var skinName = this._bbs2chService.pref.getComplexValue("extensions.bbs2chreader.thread_skin",
+		var skinName = this._pref.getComplexValue("extensions.bbs2chreader.thread_skin",
 							Components.interfaces.nsISupportsString).data;
 
 		var skinFile = null;
@@ -1231,18 +1233,14 @@
 		var threadURLSpec = requestURL.path.substring(8);
 		var skinURISpec = this._bbs2chService.serverURL.resolve("./skin/");
 		var serverURLSpec = this._bbs2chService.serverURL.resolve("./thread/");
-		var fontName = this._bbs2chService.pref.getComplexValue(
-							"extensions.bbs2chreader.thread_font_name",
+		var fontName = this._pref.getComplexValue("extensions.bbs2chreader.thread_font_name",
 							Components.interfaces.nsISupportsString).data;
 		fontName = this._bbs2chService.toSJIS(fontName);
-		var fontSize = this._bbs2chService.pref.getIntPref(
-							"extensions.bbs2chreader.thread_font_size");
-		var aaFontName = this._bbs2chService.pref.getComplexValue(
-							"extensions.bbs2chreader.thread_aa_font_name",
+		var fontSize = this._pref.getIntPref("extensions.bbs2chreader.thread_font_size");
+		var aaFontName = this._pref.getComplexValue("extensions.bbs2chreader.thread_aa_font_name",
 							Components.interfaces.nsISupportsString).data;
 		aaFontName = this._bbs2chService.toSJIS(aaFontName);
-		var aaFontSize = this._bbs2chService.pref.getIntPref(
-							"extensions.bbs2chreader.thread_aa_font_size");
+		var aaFontSize = this._pref.getIntPref("extensions.bbs2chreader.thread_aa_font_size");
 
 		return aString.replace(/<SKINPATH\/>/g, skinURISpec)
 				.replace(/<THREADURL\/>/g, this._threadURL.resolve("./"))

From svnnotify ＠ sourceforge.jp  Sat Dec 15 22:42:09 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 15 Dec 2007 22:42:09 +0900
Subject: [Bbs2ch-cvs 290]
 =?utf-8?b?WzI3Ml0gIOODl+ODreODleOCoeOCpOODq+iqreOBv+i+vOOBvw==?=
 =?utf-8?b?5YmN44Gr6LW35YuV44GX44Gm44GE44Gf44Gu44Gn44K/44Kk44Of44Oz44Kw?=
 =?utf-8?b?44KS5L+u5q2j?=
Message-ID: <1197726129.941832.17037.nullmailer@users.sourceforge.jp>

Revision: 272
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=272
Author:   flyson
Date:     2007-12-15 22:42:09 +0900 (Sat, 15 Dec 2007)

Log Message:
-----------
プロファイル読み込み前に起動していたのでタイミングを修正

Modified Paths:
--------------
    trunk/bbs2chreader/components/b2rGlobalService.js
    trunk/bbs2chreader/components/b2rServer.js


-------------- next part --------------
Modified: trunk/bbs2chreader/components/b2rGlobalService.js
===================================================================
--- trunk/bbs2chreader/components/b2rGlobalService.js	2007-12-14 17:49:00 UTC (rev 271)
+++ trunk/bbs2chreader/components/b2rGlobalService.js	2007-12-15 13:42:09 UTC (rev 272)
@@ -254,12 +254,12 @@
 
 		switch(aTopic){
 			case "app-startup":
-				observerService.addObserver(this, "profile-do-change", false);
+				observerService.addObserver(this, "profile-after-change", false);
 				observerService.addObserver(this, "xpcom-shutdown", false);
 				break;
-			case "profile-do-change":
+			case "profile-after-change":
 				this._startup();
-				observerService.removeObserver(this, "profile-do-change");
+				observerService.removeObserver(this, "profile-after-change");
 				break;
 			case "xpcom-shutdown":
 				this._shutdown();

Modified: trunk/bbs2chreader/components/b2rServer.js
===================================================================
--- trunk/bbs2chreader/components/b2rServer.js	2007-12-14 17:49:00 UTC (rev 271)
+++ trunk/bbs2chreader/components/b2rServer.js	2007-12-15 13:42:09 UTC (rev 272)
@@ -136,11 +136,11 @@
 		switch(aTopic){
 			case "app-startup":
 				os.addObserver(this, "network:offline-status-changed", false);
-				os.addObserver(this, "profile-after-change", false);
+				os.addObserver(this, "final-ui-startup", false);
 				os.addObserver(this, "xpcom-shutdown", false);
 				break;
-		    case "profile-after-change":
-				os.removeObserver(this, "profile-after-change");
+		    case "final-ui-startup":
+				os.removeObserver(this, "final-ui-startup");
 				this.start();
 				break;
 			case "network:offline-status-changed":
@@ -254,11 +254,11 @@
 		switch(aTopic){
 			case "app-startup":
 				os.addObserver(this, "network:offline-status-changed", false);
-				os.addObserver(this, "profile-after-change", false);
+				os.addObserver(this, "final-ui-startup", false);
 				os.addObserver(this, "xpcom-shutdown", false);
 				break;
-		    case "profile-after-change":
-				os.removeObserver(this, "profile-after-change");
+		    case "final-ui-startup":
+				os.removeObserver(this, "final-ui-startup");
 				this.start();
 				break;
 			case "network:offline-status-changed":

From svnnotify ＠ sourceforge.jp  Sat Dec 15 23:07:15 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 15 Dec 2007 23:07:15 +0900
Subject: [Bbs2ch-cvs 291]
 =?utf-8?b?WzI3M10gIGIycklHbG9iYWxTZXJ2aWNlIOOBuOOBruenu+ihjCA=?=
 =?utf-8?b?44Gd44GuMw==?=
Message-ID: <1197727635.697219.1246.nullmailer@users.sourceforge.jp>

Revision: 273
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=273
Author:   flyson
Date:     2007-12-15 23:07:15 +0900 (Sat, 15 Dec 2007)

Log Message:
-----------
b2rIGlobalService ?吾?腱肢? ???3

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-15 13:42:09 UTC (rev 272)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-15 14:07:15 UTC (rev 273)
@@ -104,8 +104,10 @@
 
 		this._bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
 					.getService(Components.interfaces.nsIBbs2chService);
+		this._b2rService  = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+					.getService(Components.interfaces.b2rIGlobalService);
 		this._pref = Components.classes["@mozilla.org/preferences-service;1"]
-				.getService(Components.interfaces.nsIPrefBranch);
+					.getService(Components.interfaces.nsIPrefBranch);
 		this._aboneManager = Components.classes["@mozilla.org/b2r-abone-manager;1"]
 					.getService(Components.interfaces.b2rIAboneManager);
 
@@ -260,9 +262,7 @@
 	close: function(){
 		if(this._headerResponded && this.dat){
 			var title = this._bbs2chService.fromSJIS(this.dat.title);
-			var gB2rService = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
-						.getService(Components.interfaces.b2rIGlobalService);
-			gB2rService.history.visitPage(this.dat.threadPlainURL, title, 1);
+			this._b2rService.history.visitPage(this.dat.threadPlainURL, title, 1);
 		}
 		this._opend = false;
 		this._httpChannel = null;
@@ -401,23 +401,21 @@
 
 	datDownload: function(aKako){
 		if(aKako){
-			var b2rService = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
-						.getService(Components.interfaces.b2rIGlobalService);
-			if(b2rService.viewer.logined){
+			if(this._b2rService.viewer.logined){
 				var sid = encodeURIComponent(b2rService.viewer.sessionID);
 				var datURLSpec = this.dat.threadPlainURL.spec.replace(/\/read\.cgi\//, "/offlaw.cgi/");
 				datURLSpec += "?raw=.0&sid=" + sid;
 				var datKakoURL = this._ioService.newURI(datURLSpec, null, null)
 						.QueryInterface(Components.interfaces.nsIURL);
-				this.httpChannel = this._bbs2chService.getHttpChannel(datKakoURL);
+				this.httpChannel = this._b2rService.getHttpChannel(datKakoURL);
 				this._maruMode = true;
 			}else{
-				this.httpChannel = this._bbs2chService.getHttpChannel(this.dat.datKakoURL);
+				this.httpChannel = this._b2rService.getHttpChannel(this.dat.datKakoURL);
 			}
 			this._kakoDatDownload = true;
 
 		}else{
-			this.httpChannel = this._bbs2chService.getHttpChannel(this.dat.datURL);
+			this.httpChannel = this._b2rService.getHttpChannel(this.dat.datURL);
 			this._kakoDatDownload = false;
 		}
 		this.httpChannel.requestMethod = "GET";
@@ -614,7 +612,7 @@
 		var datURL = this._ioService.newURI(datURLSpec, null, null)
 				.QueryInterface(Components.interfaces.nsIURL);
 
-		this.httpChannel = this._bbs2chService.getHttpChannel(datURL);
+		this.httpChannel = this._b2rService.getHttpChannel(datURL);
 		this.httpChannel.requestMethod = "GET";
 		this.httpChannel.redirectionLimit = 0; // 302 ?????????????
 		this.httpChannel.loadFlags = this.httpChannel.LOAD_BYPASS_CACHE;
@@ -775,7 +773,7 @@
 		var datURL = this._ioService.newURI(datURLSpec, null, null)
 				.QueryInterface(Components.interfaces.nsIURL);
 
-		this.httpChannel = this._bbs2chService.getHttpChannel(datURL);
+		this.httpChannel = this._b2rService.getHttpChannel(datURL);
 		this.httpChannel.requestMethod = "GET";
 		this.httpChannel.redirectionLimit = 0; // 302 ?????????????
 		this.httpChannel.loadFlags = this.httpChannel.LOAD_BYPASS_CACHE;
@@ -896,7 +894,7 @@
 
 	get threadPlainURL(){
 		if(!this._threadPlainURL){
-			if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){
+			if(this.type == this._b2rService.BOARD_TYPE_MACHI){
 				this._threadPlainURL = this.datURL;
 			}else{
 				var threadPlainSpec = this.threadURL.resolve("./");
@@ -913,7 +911,7 @@
 
 	get datURL(){
 		if(!this._datURL){
-			if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){
+			if(this.type == this._b2rService.BOARD_TYPE_MACHI){
 				var datURLSpec = this.threadURL.resolve("./read.cgi");
 				datURLSpec += "?BBS=" + this.queryHash["BBS"] + "&KEY=" + this.queryHash["KEY"];
 				this._datURL = this._ioService.newURI(datURLSpec, null, null)
@@ -928,7 +926,7 @@
 	},
 
 	get datKakoURL(){
-		if(this.type != this._bbs2chService.BOARD_TYPE_2CH){
+		if(this.type != this._b2rService.BOARD_TYPE_2CH){
 			return this.datURL;
 		}
 
@@ -956,7 +954,7 @@
 
 	get id(){
 		if(!this._id){
-			if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){
+			if(this.type == this._b2rService.BOARD_TYPE_MACHI){
 				this._id = this.queryHash["KEY"] || null;
 			}else{
 				this._id = this.threadURL.directory.match(/\/(\d{9,10})/) ? RegExp.$1 : null;
@@ -1009,26 +1007,28 @@
 	init: function(aThreadURL, aBoardURL, aType){
 		this._bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
 				.getService(Components.interfaces.nsIBbs2chService);
+		this._b2rService  = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+					.getService(Components.interfaces.b2rIGlobalService);
 		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._b2rService.threadUtils.getBoardURL(this.threadURL) : aBoardURL;
 		this._type = (isNaN(parseInt(aType))) ?
-				this._bbs2chService.getBoardType(this.threadURL.spec) : aType;
+				this._b2rService.threadUtils.getBoardType(this.threadURL) : aType;
 
 			// ???????BOARD_TYPE_PAGE ???
 			// URL ? /test/read.cgi/ ??????? 2ch??????
-		if(this._type == this._bbs2chService.BOARD_TYPE_PAGE &&
+		if(this._type == this._b2rService.BOARD_TYPE_PAGE &&
 					this._threadURL.spec.indexOf("/test/read.cgi/") != -1){
-			this._type = this._bbs2chService.BOARD_TYPE_2CH;
+			this._type = this._b2rService.BOARD_TYPE_2CH;
 		}
 
-		this._datFile = this._bbs2chService.getLogFileAtURL(
+		this._datFile = this._b2rService.io.getLogFileAtURL(
 								this.boardURL.resolve(this.id + ".dat"));
-		this._idxFile = this._bbs2chService.getLogFileAtURL(
+		this._idxFile = this._b2rService.io.getLogFileAtURL(
 								this.boardURL.resolve(this.id + ".idx"));
 
 			// DAT ??? IDX ?????????????A????????????? IDX ???@@ -1161,6 +1161,8 @@
 
 		this._bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
 				.getService(Components.interfaces.nsIBbs2chService);
+		this._b2rService  = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+				.getService(Components.interfaces.b2rIGlobalService);
 		this._ioService = Components.classes["@mozilla.org/network/io-service;1"]
 				.getService(Components.interfaces.nsIIOService);
 		this._pref = Components.classes["@mozilla.org/preferences-service;1"]
@@ -1174,7 +1176,7 @@
 		var skinName = this._pref.getComplexValue("extensions.bbs2chreader.thread_skin",
 							Components.interfaces.nsISupportsString).data;
 		if(skinName != ""){
-			var skinDir = this._bbs2chService.getDataDir();
+			var skinDir = this._b2rService.io.getDataDir();
 			skinDir.appendRelativePath("skin");
 			var fileURL = this._ioService.newFileURI(skinDir)
 						.QueryInterface(Components.interfaces.nsIFileURL);
@@ -1209,7 +1211,7 @@
 
 		var skinFile = null;
 		if(skinName){
-			skinFile = this._bbs2chService.getDataDir();
+			skinFile = this._b2rService.io.getDataDir();
 			skinFile.appendRelativePath("skin");
 			skinFile.appendRelativePath(skinName);
 		}else{
@@ -1231,8 +1233,8 @@
 	_replaceBaseTag: function(aString){
 		var requestURL = this._context._handler.requestURL;
 		var threadURLSpec = requestURL.path.substring(8);
-		var skinURISpec = this._bbs2chService.serverURL.resolve("./skin/");
-		var serverURLSpec = this._bbs2chService.serverURL.resolve("./thread/");
+		var skinURISpec = this._b2rService.serverURL.resolve("./skin/");
+		var serverURLSpec = this._b2rService.serverURL.resolve("./thread/");
 		var fontName = this._pref.getComplexValue("extensions.bbs2chreader.thread_font_name",
 							Components.interfaces.nsISupportsString).data;
 		fontName = this._bbs2chService.toSJIS(fontName);

From svnnotify ＠ sourceforge.jp  Tue Dec 18 22:04:42 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 18 Dec 2007 22:04:42 +0900
Subject: [Bbs2ch-cvs 292]
 =?utf-8?b?WzI3NF0gIOOCueOCreODs+OBruiqreOBv+i+vOOBv+WkseaVlw==?=
 =?utf-8?b?5pmC44Gu5Zue5b6p44GM5q2j44GX44GP5YuV5L2c44GX44Gm44GE44Gq44GL?=
 =?utf-8?b?44Gj44Gf44Gu44KS5L+u5q2j?=
Message-ID: <1197983082.468981.21681.nullmailer@users.sourceforge.jp>

Revision: 274
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=274
Author:   flyson
Date:     2007-12-18 22:04:42 +0900 (Tue, 18 Dec 2007)

Log Message:
-----------
?鴻??潟?茯??莨若?紊掩??????奨???????????????????????信罩?
Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-15 14:07:15 UTC (rev 273)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-18 13:04:42 UTC (rev 274)
@@ -134,7 +134,7 @@
 		try{
 			this.converter.init(this, this.dat.threadURL, this.dat.boardURL, this.dat.type);
 		}catch(ex){
-			if(ex.result == Components.results.NS_ERROR_FILE_NOT_FOUND){
+			if(ex == Components.results.NS_ERROR_FILE_NOT_FOUND){
 				var skinName = this._pref.getComplexValue("extensions.bbs2chreader.thread_skin",
 						Components.interfaces.nsISupportsString).data;
 				skinName = this._bbs2chService.toSJIS(skinName);
@@ -1172,23 +1172,16 @@
 		this._dd2Color.init();
 
 
-		var skinURISpec = "chrome://bbs2chreader/content/res/skin-default/";
-		var skinName = this._pref.getComplexValue("extensions.bbs2chreader.thread_skin",
-							Components.interfaces.nsISupportsString).data;
-		if(skinName != ""){
-			var skinDir = this._b2rService.io.getDataDir();
-			skinDir.appendRelativePath("skin");
-			var fileURL = this._ioService.newFileURI(skinDir)
-						.QueryInterface(Components.interfaces.nsIFileURL);
-			skinURISpec = fileURL.resolve(encodeURIComponent(skinName)) + "/";
-		}
-
 		this._tmpHeader   = this._bbs2chService.readFile(this._resolveSkinFile("Header.html").path);
 		this._tmpFooter   = this._bbs2chService.readFile(this._resolveSkinFile("Footer.html").path);
 		this._tmpRes	  = this._bbs2chService.readFile(this._resolveSkinFile("Res.html").path);
 		this._tmpNewRes	  = this._bbs2chService.readFile(this._resolveSkinFile("NewRes.html").path);
 		this._tmpNewMark  = this._bbs2chService.readFile(this._resolveSkinFile("NewMark.html").path);
 
+		if(this._tmpHeader===null || this._tmpFooter===null || this._tmpRes===null || this._tmpNewRes===null || this._tmpNewMark===null){
+			throw Components.results.NS_ERROR_FILE_NOT_FOUND
+		}
+
 			// ??????????
 		this._tmpHeader = this._replaceBaseTag(this._tmpHeader);
 		this._tmpFooter = this._replaceBaseTag(this._tmpFooter);

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:18:12 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:18:12 +0900
Subject: [Bbs2ch-cvs 293]
 =?utf-8?b?WzI3NV0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+ODlQ==?=
 =?utf-8?b?44Kp44Or44OA5L2c5oiQ?=
Message-ID: <1198063092.414398.13263.nullmailer@users.sourceforge.jp>

Revision: 275
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=275
Author:   flyson
Date:     2007-12-19 20:18:12 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作によるフォルダ作成

Added Paths:
-----------
    branches/bbs2chreader/


-------------- next part --------------


From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:18:24 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:18:24 +0900
Subject: [Bbs2ch-cvs 294]
 =?utf-8?b?WzI3Nl0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063104.597833.13319.nullmailer@users.sourceforge.jp>

Revision: 276
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=276
Author:   flyson
Date:     2007-12-19 20:18:24 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    branches/bbs2chreader/GP_BRANCH/

Removed Paths:
-------------
    branches/GP_BRANCH/


-------------- next part --------------
Copied: branches/bbs2chreader/GP_BRANCH (from rev 275, branches/GP_BRANCH)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:19:30 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:19:30 +0900
Subject: [Bbs2ch-cvs 295]
 =?utf-8?b?WzI3N10gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+ODlQ==?=
 =?utf-8?b?44Kp44Or44OA5L2c5oiQ?=
Message-ID: <1198063170.208097.13708.nullmailer@users.sourceforge.jp>

Revision: 277
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=277
Author:   flyson
Date:     2007-12-19 20:19:29 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作によるフォルダ作成

Added Paths:
-----------
    tags/bbs2chreader/


-------------- next part --------------


From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:20:24 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:20:24 +0900
Subject: [Bbs2ch-cvs 296]
 =?utf-8?b?WzI3OF0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063224.871528.14656.nullmailer@users.sourceforge.jp>

Revision: 278
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=278
Author:   flyson
Date:     2007-12-19 20:20:24 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_PRE_2/

Removed Paths:
-------------
    tags/RELEASE_0_4_PRE_2/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_PRE_2 (from rev 277, tags/RELEASE_0_4_PRE_2)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:21:50 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:21:50 +0900
Subject: [Bbs2ch-cvs 297]
 =?utf-8?b?WzI3OV0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063310.371384.15093.nullmailer@users.sourceforge.jp>

Revision: 279
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=279
Author:   flyson
Date:     2007-12-19 20:21:50 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_PRE_3/

Removed Paths:
-------------
    tags/RELEASE_0_4_PRE_3/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_PRE_3 (from rev 278, tags/RELEASE_0_4_PRE_3)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:23:00 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:23:00 +0900
Subject: [Bbs2ch-cvs 298]
 =?utf-8?b?WzI4MF0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063380.161982.16377.nullmailer@users.sourceforge.jp>

Revision: 280
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=280
Author:   flyson
Date:     2007-12-19 20:23:00 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_PRE_4/

Removed Paths:
-------------
    tags/RELEASE_0_4_PRE_4/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_PRE_4 (from rev 279, tags/RELEASE_0_4_PRE_4)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:23:32 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:23:32 +0900
Subject: [Bbs2ch-cvs 299]
 =?utf-8?b?WzI4MV0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063412.120718.16564.nullmailer@users.sourceforge.jp>

Revision: 281
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=281
Author:   flyson
Date:     2007-12-19 20:23:31 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_PRE_5/

Removed Paths:
-------------
    tags/RELEASE_0_4_PRE_5/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_PRE_5 (from rev 280, tags/RELEASE_0_4_PRE_5)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:24:00 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:24:00 +0900
Subject: [Bbs2ch-cvs 300]
 =?utf-8?b?WzI4Ml0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063440.783760.16703.nullmailer@users.sourceforge.jp>

Revision: 282
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=282
Author:   flyson
Date:     2007-12-19 20:24:00 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_PRE_6/

Removed Paths:
-------------
    tags/RELEASE_0_4_PRE_6/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_PRE_6 (from rev 281, tags/RELEASE_0_4_PRE_6)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:25:00 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:25:00 +0900
Subject: [Bbs2ch-cvs 301]
 =?utf-8?b?WzI4M10gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063500.413409.17708.nullmailer@users.sourceforge.jp>

Revision: 283
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=283
Author:   flyson
Date:     2007-12-19 20:25:00 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_PRE_7/

Removed Paths:
-------------
    tags/RELEASE_0_4_PRE_7/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_PRE_7 (from rev 282, tags/RELEASE_0_4_PRE_7)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:25:26 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:25:26 +0900
Subject: [Bbs2ch-cvs 302]
 =?utf-8?b?WzI4NF0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063526.326415.17959.nullmailer@users.sourceforge.jp>

Revision: 284
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=284
Author:   flyson
Date:     2007-12-19 20:25:26 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_PRE_8/

Removed Paths:
-------------
    tags/RELEASE_0_4_PRE_8/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_PRE_8 (from rev 283, tags/RELEASE_0_4_PRE_8)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:25:58 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:25:58 +0900
Subject: [Bbs2ch-cvs 303]
 =?utf-8?b?WzI4NV0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063558.642796.18121.nullmailer@users.sourceforge.jp>

Revision: 285
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=285
Author:   flyson
Date:     2007-12-19 20:25:58 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_0/

Removed Paths:
-------------
    tags/RELEASE_0_4_0/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_0 (from rev 284, tags/RELEASE_0_4_0)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:26:31 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:26:31 +0900
Subject: [Bbs2ch-cvs 304]
 =?utf-8?b?WzI4Nl0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063591.553129.19002.nullmailer@users.sourceforge.jp>

Revision: 286
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=286
Author:   flyson
Date:     2007-12-19 20:26:31 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_1/

Removed Paths:
-------------
    tags/RELEASE_0_4_1/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_1 (from rev 285, tags/RELEASE_0_4_1)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:26:59 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:26:59 +0900
Subject: [Bbs2ch-cvs 305]
 =?utf-8?b?WzI4N10gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063619.388814.19126.nullmailer@users.sourceforge.jp>

Revision: 287
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=287
Author:   flyson
Date:     2007-12-19 20:26:59 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_2/

Removed Paths:
-------------
    tags/RELEASE_0_4_2/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_2 (from rev 286, tags/RELEASE_0_4_2)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:28:05 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:28:05 +0900
Subject: [Bbs2ch-cvs 306]
 =?utf-8?b?WzI4OF0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063685.151090.20136.nullmailer@users.sourceforge.jp>

Revision: 288
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=288
Author:   flyson
Date:     2007-12-19 20:28:04 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_5/

Removed Paths:
-------------
    tags/RELEASE_0_4_5/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_5 (from rev 287, tags/RELEASE_0_4_5)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:29:23 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:29:23 +0900
Subject: [Bbs2ch-cvs 307]
 =?utf-8?b?WzI4OV0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063763.918107.20495.nullmailer@users.sourceforge.jp>

Revision: 289
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=289
Author:   flyson
Date:     2007-12-19 20:29:23 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_6/

Removed Paths:
-------------
    tags/RELEASE_0_4_6/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_6 (from rev 288, tags/RELEASE_0_4_6)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:30:30 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:30:30 +0900
Subject: [Bbs2ch-cvs 308]
 =?utf-8?b?WzI5MF0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063830.299036.21631.nullmailer@users.sourceforge.jp>

Revision: 290
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=290
Author:   flyson
Date:     2007-12-19 20:30:30 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_7/

Removed Paths:
-------------
    tags/RELEASE_0_4_7/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_7 (from rev 289, tags/RELEASE_0_4_7)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:31:27 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:31:27 +0900
Subject: [Bbs2ch-cvs 309]
 =?utf-8?b?WzI5MV0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063887.217427.21899.nullmailer@users.sourceforge.jp>

Revision: 291
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=291
Author:   flyson
Date:     2007-12-19 20:31:27 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_8/

Removed Paths:
-------------
    tags/RELEASE_0_4_8/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_8 (from rev 290, tags/RELEASE_0_4_8)

From svnnotify ＠ sourceforge.jp  Wed Dec 19 20:32:45 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 19 Dec 2007 20:32:45 +0900
Subject: [Bbs2ch-cvs 310]
 =?utf-8?b?WzI5Ml0gIOODquODouODvOODiOaTjeS9nOOBq+OCiOOCi+enuw==?=
 =?utf-8?b?5YuV?=
Message-ID: <1198063965.112917.22981.nullmailer@users.sourceforge.jp>

Revision: 292
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=292
Author:   flyson
Date:     2007-12-19 20:32:44 +0900 (Wed, 19 Dec 2007)

Log Message:
-----------
リモート操作による移動

Added Paths:
-----------
    tags/bbs2chreader/RELEASE_0_4_9/

Removed Paths:
-------------
    tags/RELEASE_0_4_9/


-------------- next part --------------
Copied: tags/bbs2chreader/RELEASE_0_4_9 (from rev 291, tags/RELEASE_0_4_9)

From svnnotify ＠ sourceforge.jp  Thu Dec 20 20:39:35 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 20 Dec 2007 20:39:35 +0900
Subject: [Bbs2ch-cvs 311]
 =?utf-8?b?WzI5M10gIOOCueODrOeri+OBpuaXpeOBruihqOekuuOBqyBuc0lT?=
 =?utf-8?b?Y3JpcHRhYmxlRGF0ZUZvcm1hdCDjgpLkvb/jgo/jgarjgYTjgojjgYbjgas=?=
 =?utf-8?b?44GX44Gf?=
Message-ID: <1198150775.782987.12246.nullmailer@users.sourceforge.jp>

Revision: 293
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=293
Author:   flyson
Date:     2007-12-20 20:39:35 +0900 (Thu, 20 Dec 2007)

Log Message:
-----------
スレ立て日の表示に nsIScriptableDateFormat を使わないようにした

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-12-19 11:32:44 UTC (rev 292)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-12-20 11:39:35 UTC (rev 293)
@@ -121,8 +121,6 @@
 	init: function(aURLSpec){
 		this._bbs2chService = Cc["@mozilla.org/bbs2ch-service;1"].getService(Ci.nsIBbs2chService);
 		this._ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-		this._dateFormat = Cc["@mozilla.org/intl/scriptabledateformat;1"]
-				.getService(Ci.nsIScriptableDateFormat);
 
 		this._validURL = false;
 		try{
@@ -210,10 +208,13 @@
 	 * Date オブジェクトからフォーマットされた日付文字列(短い形式)を返す
 	 */
 	_getFormatedDate: function(aDate){
-		return this._dateFormat.FormatDate("", this._dateFormat.dateFormatShort,
-						aDate.getFullYear(),
-						aDate.getMonth() + 1,
-						aDate.getDate());
+		var fullYear = String(aDate.getFullYear());
+		var month = String(aDate.getMonth() + 1);
+		if(month.length == 1) month = "0" + month;
+		var date = String(aDate.getDate());
+		if(date.length == 1) date = "0" + date;
+
+		return [fullYear, month, date].join("/");
 	},
 
 

From svnnotify ＠ sourceforge.jp  Sat Dec 29 01:21:18 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 29 Dec 2007 01:21:18 +0900
Subject: [Bbs2ch-cvs 312]
 =?utf-8?b?WzI5NF0gIOODrOOCueODneODs+OCueOCs+ODvOODieOBruWPlg==?=
 =?utf-8?b?5b6X44KS5Yil44Kq44OW44K444Kn44Kv44OI5YyW?=
Message-ID: <1198858878.336848.22115.nullmailer@users.sourceforge.jp>

Revision: 294
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=294
Author:   flyson
Date:     2007-12-29 01:21:17 +0900 (Sat, 29 Dec 2007)

Log Message:
-----------
レスポンスコードの取得を別オブジェクト化

Modified Paths:
--------------
    trunk/bbs2chreader/components/b2rServer.js


-------------- next part --------------
Modified: trunk/bbs2chreader/components/b2rServer.js
===================================================================
--- trunk/bbs2chreader/components/b2rServer.js	2007-12-20 11:39:35 UTC (rev 293)
+++ trunk/bbs2chreader/components/b2rServer.js	2007-12-28 16:21:17 UTC (rev 294)
@@ -52,6 +52,84 @@
 const B2R_SERVER_CNAME = "b2rServer js component";
 
 
+
+
+var StatusCode = {
+
+	getStatusCode: function(aCode){
+		if(!this._statusCode){
+			this._statusCode = new Array();
+
+			this._statusCode["s100"] = "100 Continue";
+			this._statusCode["s101"] = "101 Switching Protocols";
+			this._statusCode["s102"] = "102 Processing";
+
+			this._statusCode["s200"] = "200 OK";
+			this._statusCode["s201"] = "201 Created";
+			this._statusCode["s202"] = "202 Accepted";
+			this._statusCode["s203"] = "203 Non-Authoritative Information";
+			this._statusCode["s204"] = "204 No Content";
+			this._statusCode["s205"] = "205 Reset Content";
+			this._statusCode["s206"] = "206 Partial Content";
+			this._statusCode["s207"] = "207 Multi-Status";
+			this._statusCode["s226"] = "226 IM Used";
+
+			this._statusCode["s300"] = "300 Multiple Choices";
+			this._statusCode["s301"] = "301 Moved Permanently";
+			this._statusCode["s302"] = "302 Found";
+			this._statusCode["s303"] = "303 See Other";
+			this._statusCode["s304"] = "304 Not Modified";
+			this._statusCode["s305"] = "305 Use Proxy";
+			this._statusCode["s306"] = "306 (Unused)";
+			this._statusCode["s307"] = "307 Temporary Redirect";
+			this._statusCode["s400"] = "400 Bad Request";
+			this._statusCode["s401"] = "401 Unauthorized";
+			this._statusCode["s402"] = "402 Payment Required";
+			this._statusCode["s403"] = "403 Forbidden";
+			this._statusCode["s404"] = "404 Not Found";
+			this._statusCode["s405"] = "405 Method Not Allowed";
+			this._statusCode["s406"] = "406 Not Acceptable";
+			this._statusCode["s407"] = "407 Proxy Authentication Required";
+			this._statusCode["s408"] = "408 Request Timeout";
+			this._statusCode["s403"] = "409 Conflict";
+			this._statusCode["s410"] = "410 Gone";
+			this._statusCode["s411"] = "411 Length Required";
+			this._statusCode["s412"] = "412 Precondition Failed";
+			this._statusCode["s413"] = "413 Request Entity Too Large";
+			this._statusCode["s414"] = "414 Request-URI Too Long";
+			this._statusCode["s415"] = "415 Unsupported Media Type";
+			this._statusCode["s416"] = "416 Requested Range Not Satisfiable";
+			this._statusCode["s417"] = "417 Expectation Failed";
+			this._statusCode["s418"] = "418 I'm a teapot";
+			this._statusCode["s422"] = "422 Unprocessable Entity";
+			this._statusCode["s423"] = "423 Locked";
+			this._statusCode["s424"] = "424 Failed Dependency";
+			this._statusCode["s426"] = "426 Upgrade Required";
+
+			this._statusCode["s500"] = "500 Internal Server Error";
+			this._statusCode["s501"] = "501 Not Implemented";
+			this._statusCode["s502"] = "502 Bad Gateway";
+			this._statusCode["s503"] = "503 Service Unavailable";
+			this._statusCode["s504"] = "504 Gateway Timeout";
+			this._statusCode["s505"] = "505 HTTP Version Not Supported";
+			this._statusCode["s506"] = "506 Variant Also Negotiates";
+			this._statusCode["s507"] = "507 Insufficient Storage";
+			this._statusCode["s510"] = "510 Not Extended";
+		}
+
+		if(this._statusCode["s" + aCode]){
+			return this._statusCode["s" + aCode];
+		}
+
+		// throw "Not Difined Response Code";
+		return "200 OK";
+	}
+
+};
+
+
+
+
 // ********** ********* b2rServer ********** **********
 
 function b2rServer(){
@@ -445,32 +523,7 @@
 	},
 
 	writeResponseHeader: function(aStatusCode){
-		var status = "200 OK";
-		switch(aStatusCode){
-			case 200:
-				status = "200 OK";
-				break;
-			case 304:
-				status = "304 Not Modified";
-				break;
-			case 400:
-				status = "400 Bad Request";
-				break;
-			case 402:
-				status = "402 Forbidden";
-				break;
-			case 404:
-				status = "404 Not Found";
-				break;
-			case 500:
-				status = "500 Internal Server Error";
-				break;
-			case 501:
-				status = "501 Not Implemented";
-				break;
-		}
-
-		this.write("HTTP/1.0 " + status + "\r\n");
+		this.write("HTTP/1.1 " + StatusCode.getStatusCode(aStatusCode) + "\r\n");
 		for(var i in this._responseHeaders){
 			this.write(i + ": " + this._responseHeaders[i] + "\r\n");
 		}
@@ -494,24 +547,7 @@
 		this.setResponseHeader("Content-Type", "text/html; charset=UTF-8");
 		this.writeResponseHeader(aStatusCode);
 
-		var status = "200 OK";
-		switch(aStatusCode){
-			case 200:
-				status = "200 OK";
-				break;
-			case 400:
-				status = "400 Bad Request";
-				break;
-			case 404:
-				status = "404 Not Found";
-				break;
-			case 500:
-				status = "500 Internal Server Error";
-				break;
-			case 501:
-				status = "501 Not Implemented";
-				break;
-		}
+		var status = StatusCode.getStatusCode(aStatusCode);
 
 		var html = <html>
 			<head><title>{status} [bbs2chserver]</title></head>

From svnnotify ＠ sourceforge.jp  Sat Dec 29 22:01:24 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 29 Dec 2007 22:01:24 +0900
Subject: [Bbs2ch-cvs 313]
 =?utf-8?b?WzI5NV0gIOOCteODvOODkOOCueOCr+ODquODl+ODiOOCkuODoQ==?=
 =?utf-8?b?44Kk44Oz44K544Os44OD44OJ5YG044Gn5a6f6KGM44GZ44KL44KI44GG44Gr?=
 =?utf-8?b?44GX44Gf?=
Message-ID: <1198933284.625156.20552.nullmailer@users.sourceforge.jp>

Revision: 295
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=295
Author:   flyson
Date:     2007-12-29 22:01:24 +0900 (Sat, 29 Dec 2007)

Log Message:
-----------
?泣??????????????ゃ??鴻?????眼?絎?????????????
Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
    trunk/bbs2chreader/components/b2rServer.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-28 16:21:17 UTC (rev 294)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-29 13:01:24 UTC (rev 295)
@@ -144,7 +144,7 @@
 				this._pref.setCharPref("extensions.bbs2chreader.thread_skin", "");
 				return;
 			}else {
-				this.write(ex);
+				this.write(ex.toSource());
 				this.close();
 				return;
 			}
@@ -1294,7 +1294,7 @@
 
 	toFunction: function(aRes){
 		return eval(
-			"function(aNumber, aName, aMail, aMailName, aDate, aID, resIDColor, resIDBgColor, aBeID, aMessage){return \""+aRes
+			"(function(aNumber, aName, aMail, aMailName, aDate, aID, resIDColor, resIDBgColor, aBeID, aMessage){return \""+aRes
 				.replace(/\\/g,"\\\\").replace(/\"/g,"\\\"")
 				.replace(/(\r|\n|\t)/g,"").replace(/<!--.*?-->/g,"")
 				.replace(/<PLAINNUMBER\/>/g, "\"+aNumber+\"")
@@ -1307,7 +1307,7 @@
 				.replace(/<IDCOLOR\/>/g, "\"+resIDColor+\"")
 				.replace(/<IDBACKGROUNDCOLOR\/>/g, "\"+resIDBgColor+\"")
 				.replace(/<BEID\/>/g, "\"+aBeID+\"")
-				.replace(/<MESSAGE\/>/g, "\"+aMessage+\"")+"\";}"
+				.replace(/<MESSAGE\/>/g, "\"+aMessage+\"")+"\";})"
 		);
 	},
 

Modified: trunk/bbs2chreader/components/b2rServer.js
===================================================================
--- trunk/bbs2chreader/components/b2rServer.js	2007-12-28 16:21:17 UTC (rev 294)
+++ trunk/bbs2chreader/components/b2rServer.js	2007-12-29 13:01:24 UTC (rev 295)
@@ -193,7 +193,7 @@
 		aTransport.setTimeout(Ci.nsITransport.TIMEOUT_CONNECT, 30);
 		aTransport.setTimeout(Ci.nsITransport.TIMEOUT_READ_WRITE, 30);
 
-		var input = aTransport.openInputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0);
+		var input = aTransport.openInputStream(0, 1024*8, 1024).QueryInterface(Ci.nsIAsyncInputStream);
 		var output = XPC.createInstance("@mozilla.org/network/buffered-output-stream;1", "nsIBufferedOutputStream");
 		output.init(aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0), 1024*16);
 
@@ -311,7 +311,7 @@
 		aTransport.setTimeout(Ci.nsITransport.TIMEOUT_CONNECT, 30);
 		aTransport.setTimeout(Ci.nsITransport.TIMEOUT_READ_WRITE, 30);
 
-		var input = aTransport.openInputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0);
+		var input = aTransport.openInputStream(0, 1024*8, 1024).QueryInterface(Ci.nsIAsyncInputStream);
 		var output = XPC.createInstance("@mozilla.org/network/buffered-output-stream;1", "nsIBufferedOutputStream");
 		output.init(aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0), 1024*16);
 
@@ -414,38 +414,46 @@
 		this._requestURL = null;
 		this._getData = new Array();
 
-		this._parseRequestData();
-		this._responseHeaders["Host"] = this.requestURL.host;
-		this._responseHeaders["Date"] = new Date().toUTCString();
-		this._responseHeaders["Content-Type"] = "text/plain; charset=UTF-8";
-		this._responseHeaders["Connection"] = "close";
-		this._startScript();
+		this._requestBuffer = "";
+		this._input.asyncWait(this, 0, 0, this._getMainThread());
 	},
 
+	_getMainThread: function(){
+		if("@mozilla.org/thread-manager;1" in Components.classes){
+			return Cc["@mozilla.org/thread-manager;1"].getService().mainThread;
+		}else{
+			var eventQueueService = XPC.getService("@mozilla.org/event-queue-service;1", "nsIEventQueueService");
+			return eventQueueService.getSpecialEventQueue(Ci.nsIEventQueueService.UI_THREAD_EVENT_QUEUE);
+		}
+	},
 
+	onInputStreamReady: function(aInput){
+		var available = aInput.available();
+		var bInputStream = XPC.createInstance("@mozilla.org/binaryinputstream;1", "nsIBinaryInputStream");
+		bInputStream.setInputStream(aInput);
+		this._requestBuffer += bInputStream.readBytes(available);
+		if((/\r\n\r\n/).test(this._requestBuffer)){
+			this._parseRequestData();
+		}else{
+			this._input.asyncWait(this, 0, 0, this._getMainThread());
+		}
+	},
 
 	_parseRequestData: function(){
-		var inputStram = XPC.createInstance("@mozilla.org/intl/converter-input-stream;1", "nsIConverterInputStream")
-				.QueryInterface(Ci.nsIUnicharLineInputStream);
-		inputStram.init(this._input, "ISO-8859-1", 1024, 0xFFFD);
-		var line = {};
+		var lines = this._requestBuffer.split("\r\n");
+		this._requestBuffer = "";
+		var headerLine = lines.shift();
 
-			// HTTP ???
-		while (inputStram.readLine(line) && line.value.length == 0){
-			// ???????????
-		}
-		var herderLine = line.value;
-
 			// ??????????
-		while (inputStram.readLine(line)){
-			if(line.value == "") break;
-			if(line.value.match(/([^: ]+)[: ]*(.+)/i)){
+		for(let [i, line] in Iterator(lines)){
+			if(line == "") break;
+			if(line.match(/([^: ]+)[: ]*(.+)/i)){
 				this._requestHeaders[RegExp.$1] = RegExp.$2;
 			}
 		}
 
 		var uri = "";
-		if(herderLine.match(/(.+) (.+) (.+)/)){
+		if(headerLine.match(/(.+) (.+) (.+)/)){
 			this._method = RegExp.$1;
 			uri = RegExp.$2;
 			this._httpVersion = RegExp.$3;
@@ -464,6 +472,12 @@
 				this._getData[query[0]] = query[1];
 			}
 		}
+
+		this._responseHeaders["Host"] = this.requestURL.host;
+		this._responseHeaders["Date"] = new Date().toUTCString();
+		this._responseHeaders["Content-Type"] = "text/plain; charset=UTF-8";
+		this._responseHeaders["Connection"] = "close";
+		this._startScript();
 	},
 
 
@@ -475,23 +489,25 @@
 
 		var mode = (this.requestURL.directory.match(/^\/([^\/]+)\//)) ? RegExp.$1 : null;
 		if(!mode){
-			this.sendErrorPage(404, "b2rServerHandler Internal");
+			this.sendErrorPage(404, this.requestURL.spec);
 			return;
 		}
 
 		var scriptURL = "chrome://bbs2chreader/content/server/%MODE%.js";
 		scriptURL = scriptURL.replace("%MODE%", mode);
 
-		var subScrLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
-				.getService(Ci.mozIJSSubScriptLoader);
-
+		var subScrLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
 		try{
 			this._scope = { script:null };
-			subScrLoader.loadSubScript(scriptURL, this._scope);
+			try{
+				subScrLoader.loadSubScript(scriptURL, this._scope);
+			}catch(ex){
+				this.sendErrorPage(404, this.requestURL.spec);
+				return;
+			}
 			this._scope.script.start(this);
 		}catch(ex){
-			var message = (typeof(ex) == "string") ? ex :
-					ex.message + "\n" + ex.fileName +" : "+ ex.lineNumber;
+			var message = (typeof(ex) == "string") ? ex : ex.message + "\n" + ex.fileName +" : "+ ex.lineNumber;
 			this.sendErrorPage(500, message);
 		}
 	},

From svnnotify ＠ sourceforge.jp  Sun Dec 30 00:44:29 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 30 Dec 2007 00:44:29 +0900
Subject: [Bbs2ch-cvs 314]
 =?utf-8?b?WzI5Nl0gIOOCueODrOeri+OBpuaXpeOBq+aZgumWk+OCkui/vQ==?=
 =?utf-8?b?5Yqg?=
Message-ID: <1198943069.824263.12929.nullmailer@users.sourceforge.jp>

Revision: 296
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=296
Author:   flyson
Date:     2007-12-30 00:44:29 +0900 (Sun, 30 Dec 2007)

Log Message:
-----------
スレ立て日に時間を追加

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-12-29 13:01:24 UTC (rev 295)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/items.js	2007-12-29 15:44:29 UTC (rev 296)
@@ -210,11 +210,14 @@
 	_getFormatedDate: function(aDate){
 		var fullYear = String(aDate.getFullYear());
 		var month = String(aDate.getMonth() + 1);
-		if(month.length == 1) month = "0" + month;
+			if(month.length == 1) month = "0" + month;
 		var date = String(aDate.getDate());
-		if(date.length == 1) date = "0" + date;
-
-		return [fullYear, month, date].join("/");
+			if(date.length == 1) date = "0" + date;
+		var hours = String(aDate.getHours());
+			if(hours.length == 1) hours = "0" + hours;
+		var minutes = String(aDate.getMinutes());
+			if(minutes.length == 1) minutes = "0" + minutes;
+		return [fullYear, month, date].join("/") + " " + [hours, minutes].join(":");
 	},
 
 

From svnnotify ＠ sourceforge.jp  Sun Dec 30 20:30:08 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 30 Dec 2007 20:30:08 +0900
Subject: [Bbs2ch-cvs 315]
 =?utf-8?q?=5B297=5D__b2rAboneManager_=E3=82=92_b2rGlobalService_?=
 =?utf-8?b?LiBhYm9uZSDjgavnp7vli5U=?=
Message-ID: <1199014208.438982.31009.nullmailer@users.sourceforge.jp>

Revision: 297
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=297
Author:   flyson
Date:     2007-12-30 20:30:07 +0900 (Sun, 30 Dec 2007)

Log Message:
-----------
b2rAboneManager を b2rGlobalService.abone に移動

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/settings/abone-manager.js
    trunk/bbs2chreader/chrome/content/bbs2chreader/settings/abone-manager.xul
    trunk/bbs2chreader/components/b2rGlobalService.js
    trunk/bbs2chreader/components/b2rIGlobalService.xpt
    trunk/bbs2chreader/components/idl/b2rIGlobalService.idl

Added Paths:
-----------
    trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rAboneManager.js

Removed Paths:
-------------
    trunk/bbs2chreader/components/b2rAboneManager.js
    trunk/bbs2chreader/components/idl/b2rIAboneManager.idl


-------------- next part --------------
Added: trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rAboneManager.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rAboneManager.js	2007-12-29 15:44:29 UTC (rev 296)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rAboneManager.js	2007-12-30 11:30:07 UTC (rev 297)
@@ -0,0 +1,222 @@
+/* ***** 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) 2007
+ * 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 b2rAboneManager(){
+	this._init();
+}
+
+b2rAboneManager.prototype = {
+
+	get ABONE_TYPE_NAME(){ return Ci.b2rIAboneManager.ABONE_TYPE_NAME },
+	get ABONE_TYPE_MAIL(){ return Ci.b2rIAboneManager.ABONE_TYPE_MAIL },
+	get ABONE_TYPE_ID  (){ return Ci.b2rIAboneManager.ABONE_TYPE_ID   },
+	get ABONE_TYPE_WORD(){ return Ci.b2rIAboneManager.ABONE_TYPE_WORD },
+
+	_init: function(){
+		this._loadAboneData();
+	},
+
+	_loadAboneData: function(){
+		this._aboneData = new Array();
+		this._aboneData["name"] = this._loadNgFile("NGnames.txt");
+		this._aboneData["mail"] = this._loadNgFile("NGaddrs.txt");
+		this._aboneData["id"] = this._loadNgFile("NGid.txt");
+		this._aboneData["word"] = this._loadNgFile("NGwords.txt");
+	},
+	_loadNgFile: function(aNgFileName){
+		var ngFile = gGlobalService.io.getDataDir();
+		ngFile.appendRelativePath(aNgFileName);
+		if(!ngFile.exists()) return new Array();
+
+		var resultArray = new Array();
+		var fileInputStream = XPC.createInstance("@mozilla.org/network/file-input-stream;1",
+			"nsIFileInputStream");
+		fileInputStream.init(ngFile, 0x01, 0666, 0);
+		fileInputStream.QueryInterface(Ci.nsILineInputStream);
+		let(more, line = {}){
+			do{
+				more = fileInputStream.readLine(line);
+				if(line.value) resultArray.push(line.value);
+			}while(more);
+		}
+		fileInputStream.close();
+		return resultArray;
+	},
+
+
+	_saveAboneData: function(){
+		this._saveNgFile("NGnames.txt", this._aboneData["name"]);
+		this._saveNgFile("NGaddrs.txt", this._aboneData["mail"]);
+		this._saveNgFile("NGid.txt", this._aboneData["id"]);
+		this._saveNgFile("NGwords.txt", this._aboneData["word"]);
+	},
+	_saveNgFile: function(aNgFileName, aboneDataArray){
+		var ngFile = gGlobalService.io.getDataDir();
+		ngFile.appendRelativePath(aNgFileName);
+			// nsILocalFile.create は親フォルダをふくめて作成する
+		if(!ngFile.exists()) ngFile.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0666);
+
+		var content = aboneDataArray.join("\n");
+
+		var fileOutputStream = XPC.createInstance("@mozilla.org/network/file-output-stream;1",
+				"nsIFileOutputStream");
+			// 0x02=PR_WRONLY; 0x08=PR_CREATE_FILE;
+			// 0x10=PR_APPEND; 0x20=PR_TRUNCATE;
+		fileOutputStream.init(ngFile, 0x02|0x08|0x20, 0666, 0);
+		fileOutputStream.write(content, content.length);
+		fileOutputStream.flush();
+		fileOutputStream.close();
+	},
+
+
+	shouldAbone: function(aName, aMail, aID, aMsg){
+		function checkFunc(aElement, aIndex, aArray){
+			return this.indexOf(aElement) != -1;
+		}
+		if(this._aboneData["name"].some(checkFunc, aName)) return true;
+		if(this._aboneData["mail"].some(checkFunc, aMail)) return true;
+		if(this._aboneData["id"].some(checkFunc, aID)) return true;
+		if(this._aboneData["word"].some(checkFunc, aMsg)) return true;
+
+		return false;
+	},
+
+
+	getAboneData: function(aType){
+		var ngArray;
+		switch(aType){
+			case this.ABONE_TYPE_NAME:
+				ngArray = this._aboneData["name"];
+				break;
+			case this.ABONE_TYPE_MAIL:
+				ngArray = this._aboneData["mail"];
+				break;
+			case this.ABONE_TYPE_ID:
+				ngArray = this._aboneData["id"];
+				break;
+			case this.ABONE_TYPE_WORD:
+				ngArray = this._aboneData["word"];
+				break;
+			default:
+				return null;
+		}
+
+		var unicodeConverter = XPC.createInstance("@mozilla.org/intl/scriptableunicodeconverter",
+				"nsIScriptableUnicodeConverter");
+		unicodeConverter.charset = "Shift_JIS";
+
+		var resultArray = ngArray.map(function testFunc(aElement, aIndex, aArray){
+				return unicodeConverter.ConvertToUnicode(aElement);
+		});
+		return resultArray;
+	},
+
+
+	addAbone: function(aWord, aType){
+		var unicodeConverter = XPC.createInstance("@mozilla.org/intl/scriptableunicodeconverter",
+				"nsIScriptableUnicodeConverter");
+		unicodeConverter.charset = "Shift_JIS";
+
+		var sjisWord = unicodeConverter.ConvertFromUnicode(aWord);
+
+		var ngArray;
+		switch(aType){
+			case this.ABONE_TYPE_NAME:
+				ngArray = this._aboneData["name"];
+				break;
+			case this.ABONE_TYPE_MAIL:
+				ngArray = this._aboneData["mail"];
+				break;
+			case this.ABONE_TYPE_ID:
+				ngArray = this._aboneData["id"];
+				break;
+			case this.ABONE_TYPE_WORD:
+				ngArray = this._aboneData["word"];
+				break;
+			default:
+				return;
+		}
+
+			// 二重登録の禁止
+		if(ngArray.indexOf(sjisWord) != -1) return;
+
+		ngArray.push(sjisWord);
+
+		var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
+		var type = XPC.createInstance("@mozilla.org/supports-PRInt32;1", "nsISupportsPRInt32");
+		type.data = aType;
+
+		os.notifyObservers(type, "b2r-abone-data-add", aWord);
+	},
+
+
+	removeAbone: function(aWord, aType){
+		var unicodeConverter = XPC.createInstance("@mozilla.org/intl/scriptableunicodeconverter",
+				"nsIScriptableUnicodeConverter");
+		unicodeConverter.charset = "Shift_JIS";
+
+		var sjisWord = unicodeConverter.ConvertFromUnicode(aWord);
+
+		var ngArray;
+		switch(aType){
+			case this.ABONE_TYPE_NAME:
+				ngArray = this._aboneData["name"];
+				break;
+			case this.ABONE_TYPE_MAIL:
+				ngArray = this._aboneData["mail"];
+				break;
+			case this.ABONE_TYPE_ID:
+				ngArray = this._aboneData["id"];
+				break;
+			case this.ABONE_TYPE_WORD:
+				ngArray = this._aboneData["word"];
+				break;
+			default:
+				return;
+		}
+
+		var wordIndex = ngArray.indexOf(sjisWord);
+		if(wordIndex != -1) ngArray.splice(wordIndex, 1);
+
+		var os = XPC.getService("@mozilla.org/observer-service;1", "nsIObserverService");
+		var type = XPC.createInstance("@mozilla.org/supports-PRInt32;1", "nsISupportsPRInt32");
+		type.data = aType;
+		os.notifyObservers(type, "b2r-abone-data-remove", aWord);
+	}
+
+};
\ No newline at end of file

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-29 15:44:29 UTC (rev 296)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-30 11:30:07 UTC (rev 297)
@@ -108,8 +108,6 @@
 					.getService(Components.interfaces.b2rIGlobalService);
 		this._pref = Components.classes["@mozilla.org/preferences-service;1"]
 					.getService(Components.interfaces.nsIPrefBranch);
-		this._aboneManager = Components.classes["@mozilla.org/b2r-abone-manager;1"]
-					.getService(Components.interfaces.b2rIAboneManager);
 
 		this._ioService = Components.classes["@mozilla.org/network/io-service;1"]
 					.getService(Components.interfaces.nsIIOService);
@@ -343,7 +341,7 @@
 			}
 		}
 
-		if(this._aboneManager.shouldAbone(resName, resMail, resID, resMes)){
+		if(this._b2rService.abone.shouldAbone(resName, resMail, resID, resMes)){
 			this._chainAboneNumbers.push(aNumber);
 			resName = resMail = resDate = resMes = "ABONE";
 			if(aNumber>1 && this._pref.getBoolPref("extensions.bbs2chreader.thread_hide_abone")){
@@ -643,7 +641,7 @@
 			resID = resArray[6];
 		}
 
-		if(this._aboneManager.shouldAbone(resName, resMail, resID, resMes)){
+		if(this._b2rService.abone.shouldAbone(resName, resMail, resID, resMes)){
 			resName = resMail = resDate = resMes = "ABONE";
 			if(aNumber>1 && this._pref.getBoolPref("extensions.bbs2chreader.thread_hide_abone")){
 				return "";

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/settings/abone-manager.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/settings/abone-manager.js	2007-12-29 15:44:29 UTC (rev 296)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/settings/abone-manager.js	2007-12-30 11:30:07 UTC (rev 297)
@@ -35,15 +35,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const b2rIAboneManager = Components.interfaces.b2rIAboneManager;
+var gAboneManager = Cc["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+		.getService(Ci.b2rIGlobalService).abone;
 
-var gBbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-			.getService(Components.interfaces.nsIBbs2chService);
 
-var gAboneManager = Components.classes["@mozilla.org/b2r-abone-manager;1"]
-					.getService(b2rIAboneManager);
-
-
 var gAboneObserver = {
 	observe: function(aSubject, aTopic, aData){
 		var aboneType;
@@ -58,16 +53,16 @@
 
 		var aboneListBox;
 		switch(aboneType){
-			case b2rIAboneManager.ABONE_TYPE_NAME:
+			case Ci.b2rIAboneManager.ABONE_TYPE_NAME:
 				aboneListBox = document.getElementById("aboneNameListBox");
 				break;
-			case b2rIAboneManager.ABONE_TYPE_MAIL:
+			case Ci.b2rIAboneManager.ABONE_TYPE_MAIL:
 				aboneListBox = document.getElementById("aboneMailListBox");
 				break;
-			case b2rIAboneManager.ABONE_TYPE_ID:
+			case Ci.b2rIAboneManager.ABONE_TYPE_ID:
 				aboneListBox = document.getElementById("aboneIDListBox");
 				break;
-			case b2rIAboneManager.ABONE_TYPE_WORD:
+			case Ci.b2rIAboneManager.ABONE_TYPE_WORD:
 				aboneListBox = document.getElementById("aboneWordListBox");
 				break;
 		}
@@ -84,10 +79,10 @@
 	var aboneWordListBox = document.getElementById("aboneWordListBox");
 
 
-	initList(gAboneManager.getAboneData(b2rIAboneManager.ABONE_TYPE_NAME), aboneNameListBox);
-	initList(gAboneManager.getAboneData(b2rIAboneManager.ABONE_TYPE_MAIL), aboneMailListBox);
-	initList(gAboneManager.getAboneData(b2rIAboneManager.ABONE_TYPE_ID), aboneIDListBox);
-	initList(gAboneManager.getAboneData(b2rIAboneManager.ABONE_TYPE_WORD), aboneWordListBox);
+	initList(gAboneManager.getAboneData(Ci.b2rIAboneManager.ABONE_TYPE_NAME), aboneNameListBox);
+	initList(gAboneManager.getAboneData(Ci.b2rIAboneManager.ABONE_TYPE_MAIL), aboneMailListBox);
+	initList(gAboneManager.getAboneData(Ci.b2rIAboneManager.ABONE_TYPE_ID), aboneIDListBox);
+	initList(gAboneManager.getAboneData(Ci.b2rIAboneManager.ABONE_TYPE_WORD), aboneWordListBox);
 
 	var os = Components.classes["@mozilla.org/observer-service;1"]
 				.getService(Components.interfaces.nsIObserverService);
@@ -126,19 +121,19 @@
 	var aboneListBox;
 
 	switch(aType){
-		case b2rIAboneManager.ABONE_TYPE_NAME:
+		case Ci.b2rIAboneManager.ABONE_TYPE_NAME:
 			aboneWord = document.getElementById("aboneNameTextBox").value;
 			aboneListBox = document.getElementById("aboneNameListBox");
 			break;
-		case b2rIAboneManager.ABONE_TYPE_MAIL:
+		case Ci.b2rIAboneManager.ABONE_TYPE_MAIL:
 			aboneWord = document.getElementById("aboneMailTextBox").value;
 			aboneListBox = document.getElementById("aboneMailListBox");
 			break;
-		case b2rIAboneManager.ABONE_TYPE_ID:
+		case Ci.b2rIAboneManager.ABONE_TYPE_ID:
 			aboneWord = document.getElementById("aboneIDTextBox").value;
 			aboneListBox = document.getElementById("aboneIDListBox");
 			break;
-		case b2rIAboneManager.ABONE_TYPE_WORD:
+		case Ci.b2rIAboneManager.ABONE_TYPE_WORD:
 			aboneWord = document.getElementById("aboneWordTextBox").value;
 			aboneListBox = document.getElementById("aboneWordListBox");
 			break;
@@ -152,16 +147,16 @@
 function removeAbone(aType){
 	var aboneListBox;
 	switch(aType){
-		case b2rIAboneManager.ABONE_TYPE_NAME:
+		case Ci.b2rIAboneManager.ABONE_TYPE_NAME:
 			aboneListBox = document.getElementById("aboneNameListBox");
 			break;
-		case b2rIAboneManager.ABONE_TYPE_MAIL:
+		case Ci.b2rIAboneManager.ABONE_TYPE_MAIL:
 			aboneListBox = document.getElementById("aboneMailListBox");
 			break;
-		case b2rIAboneManager.ABONE_TYPE_ID:
+		case Ci.b2rIAboneManager.ABONE_TYPE_ID:
 			aboneListBox = document.getElementById("aboneIDListBox");
 			break;
-		case b2rIAboneManager.ABONE_TYPE_WORD:
+		case Ci.b2rIAboneManager.ABONE_TYPE_WORD:
 			aboneListBox = document.getElementById("aboneWordListBox");
 			break;
 	}

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/settings/abone-manager.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/settings/abone-manager.xul	2007-12-29 15:44:29 UTC (rev 296)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/settings/abone-manager.xul	2007-12-30 11:30:07 UTC (rev 297)
@@ -7,8 +7,8 @@
 	persist="screenX screenY width height"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/javascript; version=1.7"
-			src="chrome://bbs2chreader/content/settings/abone-manager.js"/>
+<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/lib/xpc.js"/>
+<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/settings/abone-manager.js"/>
 
 <tabbox id="aboneManagerTabBox" flex="1">
 	<tabs>

Deleted: trunk/bbs2chreader/components/b2rAboneManager.js
===================================================================
--- trunk/bbs2chreader/components/b2rAboneManager.js	2007-12-29 15:44:29 UTC (rev 296)
+++ trunk/bbs2chreader/components/b2rAboneManager.js	2007-12-30 11:30:07 UTC (rev 297)
@@ -1,373 +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 ***** */
-
-const Ci = Components.interfaces;
-const Cc = Components.classes;
-
-
-function b2rAboneManager(){
-
-}
-
-b2rAboneManager.prototype = {
-
-	get ABONE_TYPE_NAME(){ return Ci.b2rIAboneManager.ABONE_TYPE_NAME },
-	get ABONE_TYPE_MAIL(){ return Ci.b2rIAboneManager.ABONE_TYPE_MAIL },
-	get ABONE_TYPE_ID  (){ return Ci.b2rIAboneManager.ABONE_TYPE_ID   },
-	get ABONE_TYPE_WORD(){ return Ci.b2rIAboneManager.ABONE_TYPE_WORD },
-
-	_startup: function(){
-		this._loadAboneData();
-		dump("b2rAboneManager.startup\n");
-	},
-
-	_shutdown: function(){
-		this._saveAboneData();
-		dump("b2rAboneManager.shutdown\n");
-	},
-
-	_loadAboneData: function(){
-		this._aboneData = new Array();
-		this._aboneData["name"] = this._loadNgFile("NGnames.txt");
-		this._aboneData["mail"] = this._loadNgFile("NGaddrs.txt");
-		this._aboneData["id"] = this._loadNgFile("NGid.txt");
-		this._aboneData["word"] = this._loadNgFile("NGwords.txt");
-	},
-	_loadNgFile: function(aNgFileName){
-		var bbs2chService = Cc["@mozilla.org/bbs2ch-service;1"]
-						.getService(Ci.nsIBbs2chService);
-
-		var ngFile = bbs2chService.getDataDir();
-		ngFile.appendRelativePath(aNgFileName);
-		if(!ngFile.exists()) return new Array();
-
-		var contentLine = bbs2chService.readFileLine(ngFile.path, {});
-		var resultArray = new Array();
-			// 空白行は読み込まない
-		for(let [i, line] in Iterator(contentLine)){
-			if(line) resultArray.push(line);
-		}
-		return resultArray;
-	},
-
-
-	_saveAboneData: function(){
-		this._saveNgFile("NGnames.txt", this._aboneData["name"]);
-		this._saveNgFile("NGaddrs.txt", this._aboneData["mail"]);
-		this._saveNgFile("NGid.txt", this._aboneData["id"]);
-		this._saveNgFile("NGwords.txt", this._aboneData["word"]);
-	},
-	_saveNgFile: function(aNgFileName, aboneDataArray){
-		var bbs2chService = Cc["@mozilla.org/bbs2ch-service;1"]
-						.getService(Ci.nsIBbs2chService);
-
-		var ngFile = bbs2chService.getDataDir();
-		ngFile.appendRelativePath(aNgFileName);
-		bbs2chService.writeFile(ngFile.path, aboneDataArray.join("\n"), false);
-	},
-
-
-
-	shouldAbone: function(aName, aMail, aID, aMsg){
-		function checkFunc(aElement, aIndex, aArray){
-			return this.indexOf(aElement) != -1;
-		}
-		if(this._aboneData["name"].some(checkFunc, aName)) return true;
-		if(this._aboneData["mail"].some(checkFunc, aMail)) return true;
-		if(this._aboneData["id"].some(checkFunc, aID)) return true;
-		if(this._aboneData["word"].some(checkFunc, aMsg)) return true;
-
-		return false;
-	},
-
-
-	getAboneData: function(aType){
-		var ngArray;
-		switch(aType){
-			case this.ABONE_TYPE_NAME:
-				ngArray = this._aboneData["name"];
-				break;
-			case this.ABONE_TYPE_MAIL:
-				ngArray = this._aboneData["mail"];
-				break;
-			case this.ABONE_TYPE_ID:
-				ngArray = this._aboneData["id"];
-				break;
-			case this.ABONE_TYPE_WORD:
-				ngArray = this._aboneData["word"];
-				break;
-			default:
-				return null;
-		}
-
-		var unicodeConverter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-					.createInstance(Ci.nsIScriptableUnicodeConverter);
-		unicodeConverter.charset = "Shift_JIS";
-
-		var resultArray = ngArray.map(function testFunc(aElement, aIndex, aArray){
-				return unicodeConverter.ConvertToUnicode(aElement);
-		});
-		return resultArray;
-	},
-
-
-	addAbone: function(aWord, aType){
-		var unicodeConverter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-					.createInstance(Ci.nsIScriptableUnicodeConverter);
-		unicodeConverter.charset = "Shift_JIS";
-
-		var sjisWord = unicodeConverter.ConvertFromUnicode(aWord);
-
-		var ngArray;
-		switch(aType){
-			case this.ABONE_TYPE_NAME:
-				ngArray = this._aboneData["name"];
-				break;
-			case this.ABONE_TYPE_MAIL:
-				ngArray = this._aboneData["mail"];
-				break;
-			case this.ABONE_TYPE_ID:
-				ngArray = this._aboneData["id"];
-				break;
-			case this.ABONE_TYPE_WORD:
-				ngArray = this._aboneData["word"];
-				break;
-			default:
-				return;
-		}
-
-			// 二重登録の禁止
-		if(ngArray.indexOf(sjisWord) != -1) return;
-
-		ngArray.push(sjisWord);
-
-		var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-		var type = Cc["@mozilla.org/supports-PRInt32;1"].createInstance(Ci.nsISupportsPRInt32);
-		type.data = aType;
-
-		os.notifyObservers(type, "b2r-abone-data-add", aWord);
-	},
-
-
-	removeAbone: function(aWord, aType){
-		var unicodeConverter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-					.createInstance(Ci.nsIScriptableUnicodeConverter);
-		unicodeConverter.charset = "Shift_JIS";
-
-		var sjisWord = unicodeConverter.ConvertFromUnicode(aWord);
-
-		var ngArray;
-		switch(aType){
-			case this.ABONE_TYPE_NAME:
-				ngArray = this._aboneData["name"];
-				break;
-			case this.ABONE_TYPE_MAIL:
-				ngArray = this._aboneData["mail"];
-				break;
-			case this.ABONE_TYPE_ID:
-				ngArray = this._aboneData["id"];
-				break;
-			case this.ABONE_TYPE_WORD:
-				ngArray = this._aboneData["word"];
-				break;
-			default:
-				return;
-		}
-
-		var wordIndex = ngArray.indexOf(sjisWord);
-		if(wordIndex != -1) ngArray.splice(wordIndex, 1);
-
-		var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-		var type = Cc["@mozilla.org/supports-PRInt32;1"].createInstance(Ci.nsISupportsPRInt32);
-		type.data = aType;
-		os.notifyObservers(type, "b2r-abone-data-remove", aWord);
-
-	},
-
-
-
-
-  	// ********** ********* implements nsIObserver ********** **********
-
-	observe: function(aSubject, aTopic, aData){
-		var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-		switch(aTopic){
-			case "app-startup":
-				dump("b2rAboneManager\n");
-				os.addObserver(this, "profile-after-change", false);
-				os.addObserver(this, "quit-application", false);
-				break;
-			case "profile-after-change":
-				this._startup();
-				os.removeObserver(this, "profile-after-change");
-				break;
-			case "quit-application":
-				this._shutdown();
-				os.removeObserver(this, "quit-application");
-				break;
-		}
-	},
-
-
-  	// ********** ********* implements nsIClassInfo ********** **********
-
-	get classDescription() {
-		return "b2rAboneManager js component";
-	},
-	get classID() {
-		return Components.ID("{ff8a31ea-d3c1-47f1-a72b-0a2a0975d69a}");
-	},
-	get implementationLanguage() {
-		return Ci.nsIProgrammingLanguage.JAVASCRIPT;
-	},
-	get flags() {
-		return Ci.nsIClassInfo.SINGLETON;
-	},
-	get contractID() {
-    	return "@mozilla.org/b2r-abone-manager;1";
-	},
-
-	getInterfaces: function(aCount) {
-	    var interfaces = [
-			Ci.b2rIAboneManager,
-			Ci.nsIClassInfo,
-			Ci.nsIObserver,
-			Ci.nsISupports
-		];
-	    aCount.value = interfaces.length;
-    	return interfaces;
-	},
-
- 	getHelperForLanguage: function(aLanguage) {
-    	return null;
-	},
-
-
-  	// ********** ********* implements nsISupports ********** **********
-
-	QueryInterface: function(aIID){
-		if(aIID.equals(Ci.b2rIAboneManager) ||
-				aIID.equals(Ci.nsIClassInfo) ||
-				aIID.equals(Ci.nsIObserver) ||
-				aIID.equals(Ci.nsISupports)){
-			return this;
-		}
-		throw Components.results.NS_ERROR_NO_INTERFACE;
-	}
-
-};
-
-
-
-
-// ********** ********* Component Registration ********** **********
-
-var Factory = {
-
-	createInstance: function (aOuter, aIID){
-		if(aOuter != null)
-			throw Components.results.NS_ERROR_NO_AGGREGATION;
-
-		if(aIID.equals(Ci.b2rIAboneManager))
-			return this.getInstance(aIID);
-		if(aIID.equals(Ci.nsIClassInfo))
-			return this.getInstance(aIID);
-		if(aIID.equals(Ci.nsIObserver))
-			return this.getInstance(aIID);
-		if(aIID.equals(Ci.nsISupports))
-			return this.getInstance(aIID);
-
-		throw Components.results.NS_ERROR_INVALID_ARG;
-	},
-
-	getInstance: function(aIID){
-		if(!this._instance){
-			this._instance = new b2rAboneManager();
-		}
-		return this._instance.QueryInterface(aIID);
-	}
-
-};
-
-var Module = {
-
-	CONTRACTID: "@mozilla.org/b2r-abone-manager;1",
-	CID: Components.ID("{ff8a31ea-d3c1-47f1-a72b-0a2a0975d69a}"),
-	CNAME: "b2rAboneManager js component",
-
-
-	registerSelf: function(aCompMgr, aFileSpec, aLocation, aType){
-		aCompMgr = aCompMgr.QueryInterface(Ci.nsIComponentRegistrar);
-		aCompMgr.registerFactoryLocation(this.CID, this.CNAME, this.CONTRACTID,
-											aFileSpec, aLocation, aType);
-		var categoryManager = Cc["@mozilla.org/categorymanager;1"]
-					.getService(Ci.nsICategoryManager);
-		categoryManager.addCategoryEntry("app-startup", this.CONTRACTID,
-											this.CONTRACTID, true, true);
-	},
-
-
-	unregisterSelf: function(aCompMgr, aFileSpec, aLocation){
-		aCompMgr = aCompMgr.QueryInterface(Ci.nsIComponentRegistrar);
-
-		var categoryManager = Cc["@mozilla.org/categorymanager;1"]
-					.getService(Ci.nsICategoryManager);
-		categoryManager.deleteCategoryEntry("app-startup", this.CONTRACTID, true);
-	},
-
-
-	getClassObject: function(aCompMgr, aCID, aIID){
-		if(aCID.equals(this.CID))
-			return Factory;
-
-		if(!aIID.equals(Ci.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 Module;
-}
\ No newline at end of file

Modified: trunk/bbs2chreader/components/b2rGlobalService.js
===================================================================
--- trunk/bbs2chreader/components/b2rGlobalService.js	2007-12-29 15:44:29 UTC (rev 296)
+++ trunk/bbs2chreader/components/b2rGlobalService.js	2007-12-30 11:30:07 UTC (rev 297)
@@ -136,8 +136,11 @@
 		if(!this._initialized) throw Components.results.NS_ERROR_NOT_INITIALIZED;
 		return this._viewer;
 	},
+	get abone(){
+		if(!this._initialized) throw Components.results.NS_ERROR_NOT_INITIALIZED;
+		return this._abone;
+	},
 
-
 	getHttpChannel: function(aURL){
 		if(!this._initialized) throw Components.results.NS_ERROR_NOT_INITIALIZED;
 		var httpChannel;
@@ -225,25 +228,29 @@
 		subScriptLoader.loadSubScript("chrome://bbs2chreader/content/components/b2rGlobalThreadUtils.js", null);
 		subScriptLoader.loadSubScript("chrome://bbs2chreader/content/components/b2rGlobalHistory.js", null);
 		subScriptLoader.loadSubScript("chrome://bbs2chreader/content/components/b2rGlobalViewer.js", null);
+		subScriptLoader.loadSubScript("chrome://bbs2chreader/content/components/b2rAboneManager.js", null);
 
 		this._initialized = true;
 		this._io = new b2rGlobalIO();
 		this._threadUtils = new b2rGlobalThreadUtils();
 		this._history = new b2rGlobalHistory();
 		this._viewer = new b2rGlobalViewer();
+		this._abone = new b2rAboneManager();
+	},
 
-		dump("b2rGlobalService._startup()\n");
+
+	_quitApp: function(){
+		this._abone._saveAboneData();
 	},
 
-
 	_shutdown: function(){
 		this._io = null;
 		this._threadUtils = null;
 		this._history = null;
 		this._viewer = null;
+		this._abone = null;
 
 		this._initialized = false;
-		dump("b2rGlobalService._shutdown()\n");
 	},
 
 
@@ -255,12 +262,17 @@
 		switch(aTopic){
 			case "app-startup":
 				observerService.addObserver(this, "profile-after-change", false);
+				observerService.addObserver(this, "quit-application", false);
 				observerService.addObserver(this, "xpcom-shutdown", false);
 				break;
 			case "profile-after-change":
 				this._startup();
 				observerService.removeObserver(this, "profile-after-change");
 				break;
+			case "quit-application":
+				this._quitApp();
+				observerService.removeObserver(this, "quit-application");
+				break;
 			case "xpcom-shutdown":
 				this._shutdown();
 				observerService.removeObserver(this, "xpcom-shutdown");

Modified: trunk/bbs2chreader/components/b2rIGlobalService.xpt
===================================================================
(Binary files differ)

Deleted: trunk/bbs2chreader/components/idl/b2rIAboneManager.idl
===================================================================
--- trunk/bbs2chreader/components/idl/b2rIAboneManager.idl	2007-12-29 15:44:29 UTC (rev 296)
+++ trunk/bbs2chreader/components/idl/b2rIAboneManager.idl	2007-12-30 11:30:07 UTC (rev 297)
@@ -1,29 +0,0 @@
-#include "nsISupports.idl"
-
-interface nsIVariant;
-
-[scriptable, uuid(cfdf8cd6-c1b2-4d17-a82b-0616d457e647)]
-interface b2rIAboneManager : nsISupports
-{
-
-	const unsigned long ABONE_TYPE_NAME = 0;
-	const unsigned long ABONE_TYPE_MAIL = 1;
-	const unsigned long ABONE_TYPE_ID   = 2;
-	const unsigned long ABONE_TYPE_WORD = 3;
-
-
-	/**
-	 * レスが、NGワードに該当したら真を返す。引数の文字列は SJIS を渡すこと
-	 * @param aName 名前
-	 * @param aMail メールアドレス
-	 * @param aID ID
-	 * @param aMsg レス本文
-	 * @return boolean 該当したら真
-	 */
-	boolean shouldAbone(in AString aName, in AString aMail, in AString aID, in AString aMsg);
-
-	nsIVariant getAboneData(in unsigned long aType);
-
-	boolean addAbone(in AString aWord, in unsigned long aType);
-	boolean removeAbone(in AString aWord, in unsigned long aType);
-};
\ No newline at end of file

Modified: trunk/bbs2chreader/components/idl/b2rIGlobalService.idl
===================================================================
--- trunk/bbs2chreader/components/idl/b2rIGlobalService.idl	2007-12-29 15:44:29 UTC (rev 296)
+++ trunk/bbs2chreader/components/idl/b2rIGlobalService.idl	2007-12-30 11:30:07 UTC (rev 297)
@@ -6,8 +6,8 @@
 interface nsIURL;
 interface nsIHttpChannel;
 interface mozIStorageConnection;
+interface nsIVariant;
 
-
 [scriptable, uuid(fe8fed8e-6449-4b68-8899-026f806be131)]
 interface b2rIGlobalIO : nsISupports
 {
@@ -112,6 +112,33 @@
 };
 
 
+[scriptable, uuid(cfdf8cd6-c1b2-4d17-a82b-0616d457e647)]
+interface b2rIAboneManager : nsISupports
+{
+
+	const unsigned long ABONE_TYPE_NAME = 0;
+	const unsigned long ABONE_TYPE_MAIL = 1;
+	const unsigned long ABONE_TYPE_ID   = 2;
+	const unsigned long ABONE_TYPE_WORD = 3;
+
+
+	/**
+	 * レスが、NGワードに該当したら真を返す。引数の文字列は SJIS を渡すこと
+	 * @param aName 名前
+	 * @param aMail メールアドレス
+	 * @param aID ID
+	 * @param aMsg レス本文
+	 * @return boolean 該当したら真
+	 */
+	boolean shouldAbone(in AString aName, in AString aMail, in AString aID, in AString aMsg);
+
+	nsIVariant getAboneData(in unsigned long aType);
+
+	boolean addAbone(in AString aWord, in unsigned long aType);
+	boolean removeAbone(in AString aWord, in unsigned long aType);
+};
+
+
 [scriptable, uuid(b7823d3f-eb1c-44a2-b178-b3a8f64fa371)]
 interface b2rIGlobalService : nsISupports
 {
@@ -160,6 +187,7 @@
 	readonly attribute b2rIGlobalThreadUtils threadUtils;
 	readonly attribute b2rIGlobalHistory history;
 	readonly attribute b2rIGlobal2chViewer viewer;
+	readonly attribute b2rIAboneManager abone;
 
 	/**
 	 * プロクシや UserAgent などの設定を施した nsIHttpChannel を返す

From svnnotify ＠ sourceforge.jp  Sun Dec 30 20:36:13 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 30 Dec 2007 20:36:13 +0900
Subject: [Bbs2ch-cvs 316]
 =?utf-8?b?WzI5OF0gIOOBvuOBoUJCUyDjgYwgMmNoIOOBqOOBl+OBpuiqjQ==?=
 =?utf-8?b?6K2Y44GV44KM44Gm44GE44Gf44Gu44KS5L+u5q2j?=
Message-ID: <1199014573.488640.2014.nullmailer@users.sourceforge.jp>

Revision: 298
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=298
Author:   flyson
Date:     2007-12-30 20:36:13 +0900 (Sun, 30 Dec 2007)

Log Message:
-----------
?障?BBS ??2ch ??????茘???????????篆??

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalThreadUtils.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalThreadUtils.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalThreadUtils.js	2007-12-30 11:30:07 UTC (rev 297)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/components/b2rGlobalThreadUtils.js	2007-12-30 11:36:13 UTC (rev 298)
@@ -66,7 +66,7 @@
 			// bbspink.com
 		if(aThreadURL.host.indexOf(".bbspink.com") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
 			// ??BBS
-		if(aThreadURL.host.indexOf(".machi.to") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_2CH;
+		if(aThreadURL.host.indexOf(".machi.to") != -1) return Ci.b2rIGlobalService.BOARD_TYPE_MACHI;
 			// JBBS
 		if(aThreadURL.host == "jbbs.livedoor.jp") return Ci.b2rIGlobalService.BOARD_TYPE_JBBS;
 

From svnnotify ＠ sourceforge.jp  Sun Dec 30 21:03:06 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 30 Dec 2007 21:03:06 +0900
Subject: [Bbs2ch-cvs 317]
 =?utf-8?b?WzI5OV0gIGIycklHbG9iYWxTZXJ2aWNlIOOBuOOBruenu+ihjA==?=
Message-ID: <1199016186.304719.17439.nullmailer@users.sourceforge.jp>

Revision: 299
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=299
Author:   flyson
Date:     2007-12-30 21:03:05 +0900 (Sun, 30 Dec 2007)

Log Message:
-----------
b2rIGlobalService への移行

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/ff-overlay.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/ff-overlay.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/ff-overlay.js	2007-12-30 11:36:13 UTC (rev 298)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/ff-overlay.js	2007-12-30 12:03:05 UTC (rev 299)
@@ -90,22 +90,21 @@
 
 		if(!gContextMenu || !gContextMenu.onLink) return;
 
-		var bbs2chService = Components.classes["@mozilla.org/bbs2ch-service;1"]
-					.getService(Components.interfaces.nsIBbs2chService);
+		var b2rService = Components.classes["@bbs2ch.sourceforge.jp/b2r-global-service;1"]
+					.getService(Components.interfaces.b2rIGlobalService);
 		var ioService = Components.classes["@mozilla.org/network/io-service;1"]
 					.getService(Components.interfaces.nsIIOService);
+		var pref = Components.classes["@mozilla.org/preferences-service;1"]
+					.getService(Components.interfaces.nsIPrefBranch);
 
 		var threadURLSpec = gContextMenu.link.href;
+		var threadURL = ioService.newURI(threadURLSpec, null, null)	.QueryInterface(Components.interfaces.nsIURL);
 
 				// スレッド表示数の制限
-		var disregardURLOption = bbs2chService.pref.getBoolPref(
-						"extensions.bbs2chreader.browser_contextmenu_disregard_url_option");
-		var type = bbs2chService.getBoardType(threadURLSpec);
-		if(disregardURLOption && (type != bbs2chService.BOARD_TYPE_MACHI)){
-			var threadURL = ioService.newURI(threadURLSpec, null, null)
-					.QueryInterface(Components.interfaces.nsIURL);
-			var threadViewLimit = Number(bbs2chService.pref.getIntPref(
-						"extensions.bbs2chreader.board_thread_view_limit"));
+		var disregardURLOption = pref.getBoolPref("extensions.bbs2chreader.browser_contextmenu_disregard_url_option");
+		var type = b2rService.threadUtils.getBoardType(threadURL);
+		if(disregardURLOption && (type != b2rService.BOARD_TYPE_MACHI)){
+			var threadViewLimit = Number(pref.getIntPref("extensions.bbs2chreader.board_thread_view_limit"));
 			if(isNaN(threadViewLimit) || threadViewLimit == 0){
 				threadViewLimit = "./";
 			}else{
@@ -114,7 +113,7 @@
 			threadURLSpec = threadURL.resolve(threadViewLimit);
 		}
 
-		threadURLSpec = bbs2chService.serverURL.resolve("./thread/" + threadURLSpec);
+		threadURLSpec = b2rService.serverURL.resolve("./thread/" + threadURLSpec);
 
 		if(aNewTab){
 			var newTab = gBrowser.addTab(threadURLSpec, null);

From svnnotify ＠ sourceforge.jp  Mon Dec 31 17:55:34 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 31 Dec 2007 17:55:34 +0900
Subject: [Bbs2ch-cvs 318]
 =?utf-8?b?WzMwMF0gIOODreOCseODvOODq+eZu+mMsuOBjOOBruOBk+OBow==?=
 =?utf-8?b?44Gm44GE44Gf44Gu44KS5YmK6Zmk?=
Message-ID: <1199091334.191792.14639.nullmailer@users.sourceforge.jp>

Revision: 300
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=300
Author:   flyson
Date:     2007-12-31 17:55:33 +0900 (Mon, 31 Dec 2007)

Log Message:
-----------
ロケール登録がのこっていたのを削除

Modified Paths:
--------------
    trunk/bbs2chreader/build/build_svn.bat
    trunk/bbs2chreader/build/build_tar.bat


-------------- next part --------------
Modified: trunk/bbs2chreader/build/build_svn.bat
===================================================================
--- trunk/bbs2chreader/build/build_svn.bat	2007-12-30 12:03:05 UTC (rev 299)
+++ trunk/bbs2chreader/build/build_svn.bat	2007-12-31 08:55:33 UTC (rev 300)
@@ -4,10 +4,9 @@
 
 REM ***** Create JAR File *****
 CD work\chrome
-ZIP -r bbs2chreader.jar content skin locale
+ZIP -r bbs2chreader.jar content skin
 RMDIR /S /Q content
 RMDIR /S /Q skin
-RMDIR /S /Q locale
 
 REM ***** Create XIP File *****
 CD ..

Modified: trunk/bbs2chreader/build/build_tar.bat
===================================================================
--- trunk/bbs2chreader/build/build_tar.bat	2007-12-30 12:03:05 UTC (rev 299)
+++ trunk/bbs2chreader/build/build_tar.bat	2007-12-31 08:55:33 UTC (rev 300)
@@ -7,10 +7,9 @@
 
 REM ***** Create JAR File *****
 CD work\chrome
-ZIP -r bbs2chreader.jar content skin locale
+ZIP -r bbs2chreader.jar content skin
 RMDIR /S /Q content
 RMDIR /S /Q skin
-RMDIR /S /Q locale
 
 REM ***** Create XIP File *****
 CD ..

From svnnotify ＠ sourceforge.jp  Mon Dec 31 18:01:43 2007
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 31 Dec 2007 18:01:43 +0900
Subject: [Bbs2ch-cvs 319]
 =?utf-8?b?WzMwMV0gIOODleODquODvOOCuuOBl+OBquOBhOOCiOOBhuOBqw==?=
 =?utf-8?b?44K144O844OQ44Gu44Os44K544Od44Oz44K55pu444GN5Ye644GX44KS6Kq/?=
 =?utf-8?b?5pW0?=
Message-ID: <1199091703.308039.18153.nullmailer@users.sourceforge.jp>

Revision: 301
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=301
Author:   flyson
Date:     2007-12-31 18:01:43 +0900 (Mon, 31 Dec 2007)

Log Message:
-----------
????若???????????泣???????????号???????茯炊?

Modified Paths:
--------------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
    trunk/bbs2chreader/components/b2rServer.js


-------------- next part --------------
Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-31 08:55:33 UTC (rev 300)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-31 09:01:43 UTC (rev 301)
@@ -199,11 +199,9 @@
 				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(this.datLineParse(datLines[i], i+1, false));
+					this.write(this.datLineParse(datLines[i], i+1, false) +"\n");
 				}
-				this.write(content.join("\n"));
 
 				this.write(this.converter.getFooter("log_pickup_mode"));
 				this.close();
@@ -234,12 +232,10 @@
 					if(start > end) start = end;
 				}
 
-				var content = new Array();
 				for(var i=start; i<end; i++){
-					content.push(this.datLineParse(datLines[i], i+1, false));
+					this.write(this.datLineParse(datLines[i], i+1, false) +"\n");
 				}
 
-				this.write(content.join("\n"));
 				this.write(this.converter.getNewMark() +"\n");
 			}
 		}
@@ -496,9 +492,9 @@
 			// DAT ? ??????o?
 		for(var i=0; i<datLines.length; i++){
 			this.dat.lineCount++;
-			datLines[i] = this.datLineParse(datLines[i], this.dat.lineCount, true);
+			this.write(this.datLineParse(datLines[i], this.dat.lineCount, true) +"\n");
 		}
-		this.write(datLines.join("\n"));
+		this._handler.flush();
 	},
 
 	onStopRequest: function(aRequest, aContext, aStatus){

Modified: trunk/bbs2chreader/components/b2rServer.js
===================================================================
--- trunk/bbs2chreader/components/b2rServer.js	2007-12-31 08:55:33 UTC (rev 300)
+++ trunk/bbs2chreader/components/b2rServer.js	2007-12-31 09:01:43 UTC (rev 301)
@@ -195,7 +195,7 @@
 
 		var input = aTransport.openInputStream(0, 1024*8, 1024).QueryInterface(Ci.nsIAsyncInputStream);
 		var output = XPC.createInstance("@mozilla.org/network/buffered-output-stream;1", "nsIBufferedOutputStream");
-		output.init(aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0), 1024*16);
+		output.init(aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 1024*8, 1024), 1024*32);
 
 		new b2rServerHandler(aServerSocket.port, input, output);
 		// dump("b2rServer.onSocketAccepted\n");
@@ -313,7 +313,7 @@
 
 		var input = aTransport.openInputStream(0, 1024*8, 1024).QueryInterface(Ci.nsIAsyncInputStream);
 		var output = XPC.createInstance("@mozilla.org/network/buffered-output-stream;1", "nsIBufferedOutputStream");
-		output.init(aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0), 1024*16);
+		output.init(aTransport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 1024*8, 1024), 1024*32);
 
 		new b2rServerHandler(aServerSocket.port, input, output);
 		// dump("b2rServer.onSocketAccepted\n");