svnno****@sourc*****
svnno****@sourc*****
2007年 12月 15日 (土) 02:42:50 JST
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);
// ”‚̃^ƒCƒv‚ªABOARD_TYPE_PAGE ‚Å‚àA
// 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 ‚ªADAT ID ‚ÅI‚í‚é‚Æ‚«‚Í "/" ‚ð’ljÁ‚·‚é
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;