mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Use GetUnicodeResource instead of GetResource to fix intl issues. Bug 189106, 

r=timeless, sr=dmose, a=asa.
This commit is contained in:
bzbarsky%mit.edu 2006-05-17 02:36:31 +00:00
Родитель 0719034156
Коммит 143f96976e
1 изменённых файлов: 31 добавлений и 31 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

62
suite/common/pref/overrideHandler.js
Просмотреть файл

@ -75,8 +75,8 @@ HandlerOverride.prototype = {
get extensions() get extensions()
{ {
var extensionResource = gRDF.GetResource(NC_RDF("fileExtensions")); var extensionResource = gRDF.GetUnicodeResource(NC_RDF("fileExtensions"));
var contentTypeResource = gRDF.GetResource(MIME_URI(this.mimeType)); var contentTypeResource = gRDF.GetUnicodeResource(MIME_URI(this.mimeType));
var extensionTargets = gDS.GetTargets(contentTypeResource, extensionResource, true); var extensionTargets = gDS.GetTargets(contentTypeResource, extensionResource, true);
var extString = ""; var extString = "";
if (extensionTargets) { if (extensionTargets) {
@ -151,8 +151,8 @@ HandlerOverride.prototype = {
setHandlerProcedure: function (aHandlerProcedure, aValue) setHandlerProcedure: function (aHandlerProcedure, aValue)
{ {
var handlerSource = gRDF.GetResource(HANDLER_URI(this.mimeType)); var handlerSource = gRDF.GetUnicodeResource(HANDLER_URI(this.mimeType));
var handlerProperty = gRDF.GetResource(NC_RDF(aHandlerProcedure)); var handlerProperty = gRDF.GetUnicodeResource(NC_RDF(aHandlerProcedure));
var oppositeValue = aValue == "false" ? "true" : "false"; var oppositeValue = aValue == "false" ? "true" : "false";
var trueLiteral = gRDF.GetLiteral(oppositeValue); var trueLiteral = gRDF.GetLiteral(oppositeValue);
var hasCounterpart = gDS.HasAssertion(handlerSource, handlerProperty, trueLiteral, true); var hasCounterpart = gDS.HasAssertion(handlerSource, handlerProperty, trueLiteral, true);
@ -202,22 +202,22 @@ HandlerOverride.prototype = {
buildLinks: function() buildLinks: function()
{ {
// assert the handler resource // assert the handler resource
var mimeSource = gRDF.GetResource(MIME_URI(this.mimeType)); var mimeSource = gRDF.GetUnicodeResource(MIME_URI(this.mimeType));
var handlerProperty = gRDF.GetResource(NC_RDF("handlerProp")); var handlerProperty = gRDF.GetUnicodeResource(NC_RDF("handlerProp"));
var handlerResource = gRDF.GetResource(HANDLER_URI(this.mimeType)); var handlerResource = gRDF.GetUnicodeResource(HANDLER_URI(this.mimeType));
gDS.Assert(mimeSource, handlerProperty, handlerResource, true); gDS.Assert(mimeSource, handlerProperty, handlerResource, true);
// assert the helper app resource // assert the helper app resource
var helperAppProperty = gRDF.GetResource(NC_RDF("externalApplication")); var helperAppProperty = gRDF.GetUnicodeResource(NC_RDF("externalApplication"));
var helperAppResource = gRDF.GetResource(APP_URI(this.mimeType)); var helperAppResource = gRDF.GetUnicodeResource(APP_URI(this.mimeType));
gDS.Assert(handlerResource, helperAppProperty, helperAppResource, true); gDS.Assert(handlerResource, helperAppProperty, helperAppResource, true);
// add the mime type to the MIME types seq // add the mime type to the MIME types seq
var container = Components.classes["@mozilla.org/rdf/container;1"].createInstance(); var container = Components.classes["@mozilla.org/rdf/container;1"].createInstance();
if (container) { if (container) {
container = container.QueryInterface(Components.interfaces.nsIRDFContainer); container = container.QueryInterface(Components.interfaces.nsIRDFContainer);
if (container) { if (container) {
var containerRes = gRDF.GetResource("urn:mimetypes:root"); var containerRes = gRDF.GetUnicodeResource("urn:mimetypes:root");
container.Init(gDS, containerRes); container.Init(gDS, containerRes);
var element = gRDF.GetResource(MIME_URI(this.mimeType)); var element = gRDF.GetUnicodeResource(MIME_URI(this.mimeType));
if (container.IndexOf(element) == -1) if (container.IndexOf(element) == -1)
container.AppendElement(element); container.AppendElement(element);
} }
@ -254,8 +254,8 @@ function MIME_URI(aType)
**/ **/
function getLiteralForContentType(aURI, aProperty) function getLiteralForContentType(aURI, aProperty)
{ {
var contentTypeResource = gRDF.GetResource(aURI); var contentTypeResource = gRDF.GetUnicodeResource(aURI);
var propertyResource = gRDF.GetResource(NC_RDF(aProperty)); var propertyResource = gRDF.GetUnicodeResource(NC_RDF(aProperty));
return getLiteral(contentTypeResource, propertyResource); return getLiteral(contentTypeResource, propertyResource);
} }
@ -273,8 +273,8 @@ function getHandlerInfoForType(aURI, aPropertyString)
{ {
// get current selected type // get current selected type
var handler = HANDLER_URI(getLiteralForContentType(aURI, "value")); var handler = HANDLER_URI(getLiteralForContentType(aURI, "value"));
var source = gRDF.GetResource(handler); var source = gRDF.GetUnicodeResource(handler);
var property = gRDF.GetResource(NC_RDF(aPropertyString)); var property = gRDF.GetUnicodeResource(NC_RDF(aPropertyString));
var target = gDS.GetTarget(source, property, true); var target = gDS.GetTarget(source, property, true);
if (target) { if (target) {
target = target.QueryInterface(Components.interfaces.nsIRDFLiteral); target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
@ -286,15 +286,15 @@ function getHandlerInfoForType(aURI, aPropertyString)
function getHelperAppInfoForType(aURI, aPropertyString) function getHelperAppInfoForType(aURI, aPropertyString)
{ {
var appURI = APP_URI(getLiteralForContentType(aURI, "value")); var appURI = APP_URI(getLiteralForContentType(aURI, "value"));
var appRes = gRDF.GetResource(appURI); var appRes = gRDF.GetUnicodeResource(appURI);
var appProperty = gRDF.GetResource(NC_RDF(aPropertyString)); var appProperty = gRDF.GetUnicodeResource(NC_RDF(aPropertyString));
return getLiteral(appRes, appProperty); return getLiteral(appRes, appProperty);
} }
function mimeHandlerExists(aMIMEType) function mimeHandlerExists(aMIMEType)
{ {
var valueProperty = gRDF.GetResource(NC_RDF("value")); var valueProperty = gRDF.GetUnicodeResource(NC_RDF("value"));
var mimeSource = gRDF.GetResource(MIME_URI(aMIMEType)); var mimeSource = gRDF.GetUnicodeResource(MIME_URI(aMIMEType));
var mimeLiteral = gRDF.GetLiteral(aMIMEType); var mimeLiteral = gRDF.GetLiteral(aMIMEType);
return gDS.HasAssertion(mimeSource, valueProperty, mimeLiteral, true); return gDS.HasAssertion(mimeSource, valueProperty, mimeLiteral, true);
} }
@ -302,16 +302,16 @@ function mimeHandlerExists(aMIMEType)
// write to the ds // write to the ds
function assertMIMEStuff(aMIMEString, aPropertyString, aValueString) function assertMIMEStuff(aMIMEString, aPropertyString, aValueString)
{ {
var mimeSource = gRDF.GetResource(aMIMEString); var mimeSource = gRDF.GetUnicodeResource(aMIMEString);
var valueProperty = gRDF.GetResource(NC_RDF(aPropertyString)); var valueProperty = gRDF.GetUnicodeResource(NC_RDF(aPropertyString));
var mimeLiteral = gRDF.GetLiteral(aValueString); var mimeLiteral = gRDF.GetLiteral(aValueString);
gDS.Assert(mimeSource, valueProperty, mimeLiteral, true); gDS.Assert(mimeSource, valueProperty, mimeLiteral, true);
} }
function changeMIMEStuff(aMIMEString, aPropertyString, aValueString) function changeMIMEStuff(aMIMEString, aPropertyString, aValueString)
{ {
var mimeSource = gRDF.GetResource(aMIMEString); var mimeSource = gRDF.GetUnicodeResource(aMIMEString);
var valueProperty = gRDF.GetResource(NC_RDF(aPropertyString)); var valueProperty = gRDF.GetUnicodeResource(NC_RDF(aPropertyString));
var mimeLiteral = gRDF.GetLiteral(aValueString); var mimeLiteral = gRDF.GetLiteral(aValueString);
var currentValue = gDS.GetTarget(mimeSource, valueProperty, true); var currentValue = gDS.GetTarget(mimeSource, valueProperty, true);
if (currentValue) { if (currentValue) {
@ -323,8 +323,8 @@ function changeMIMEStuff(aMIMEString, aPropertyString, aValueString)
function unassertMIMEStuff(aMIMEString, aPropertyString, aValueString) function unassertMIMEStuff(aMIMEString, aPropertyString, aValueString)
{ {
var mimeSource = gRDF.GetResource(aMIMEString); var mimeSource = gRDF.GetUnicodeResource(aMIMEString);
var valueProperty = gRDF.GetResource(NC_RDF(aPropertyString)); var valueProperty = gRDF.GetUnicodeResource(NC_RDF(aPropertyString));
var mimeLiteral = gRDF.GetLiteral(aValueString); var mimeLiteral = gRDF.GetLiteral(aValueString);
gDS.Unassert(mimeSource, valueProperty, mimeLiteral, true); gDS.Unassert(mimeSource, valueProperty, mimeLiteral, true);
} }
@ -336,9 +336,9 @@ function removeOverride(aMIMEType)
if (rdfc) { if (rdfc) {
rdfc = rdfc.QueryInterface(Components.interfaces.nsIRDFContainer); rdfc = rdfc.QueryInterface(Components.interfaces.nsIRDFContainer);
if (rdfc) { if (rdfc) {
var containerRes = gRDF.GetResource("urn:mimetypes:root"); var containerRes = gRDF.GetUnicodeResource("urn:mimetypes:root");
rdfc.Init(gDS, containerRes); rdfc.Init(gDS, containerRes);
var element = gRDF.GetResource(MIME_URI(aMIMEType)); var element = gRDF.GetUnicodeResource(MIME_URI(aMIMEType));
if (rdfc.IndexOf(element) != -1) { if (rdfc.IndexOf(element) != -1) {
try { try {
rdfc.RemoveElement(element, true); rdfc.RemoveElement(element, true);
@ -357,11 +357,11 @@ function removeOverride(aMIMEType)
[APP_URI, "externalApplication"]], [APP_URI, "externalApplication"]],
[APP_URI, ["path", "prettyName"]] ]; [APP_URI, ["path", "prettyName"]] ];
for (var i = 0; i < urns.length; i++) { for (var i = 0; i < urns.length; i++) {
var mimeRes = gRDF.GetResource(urns[i][0](aMIMEType)); var mimeRes = gRDF.GetUnicodeResource(urns[i][0](aMIMEType));
// unassert the toplevel properties // unassert the toplevel properties
var properties = urns[i][1]; var properties = urns[i][1];
for (var j = 0; j < properties.length; j++) { for (var j = 0; j < properties.length; j++) {
var propertyRes = gRDF.GetResource(NC_RDF(properties[j]), true); var propertyRes = gRDF.GetUnicodeResource(NC_RDF(properties[j]), true);
if (properties[j] == "fileExtensions") { // hacky. do it better next time. if (properties[j] == "fileExtensions") { // hacky. do it better next time.
var mimeValues = gDS.GetTargets(mimeRes, propertyRes, true); var mimeValues = gDS.GetTargets(mimeRes, propertyRes, true);
mimeValues = mimeValues.QueryInterface(Components.interfaces.nsISimpleEnumerator); mimeValues = mimeValues.QueryInterface(Components.interfaces.nsISimpleEnumerator);
@ -378,8 +378,8 @@ function removeOverride(aMIMEType)
} }
} }
if ("2" in urns[i] && urns[i][2]) { if ("2" in urns[i] && urns[i][2]) {
var linkRes = gRDF.GetResource(NC_RDF(urns[i][2][1]), true); var linkRes = gRDF.GetUnicodeResource(NC_RDF(urns[i][2][1]), true);
var linkTarget = gRDF.GetResource(urns[i][2][0](aMIMEType), true); var linkTarget = gRDF.GetUnicodeResource(urns[i][2][0](aMIMEType), true);
gDS.Unassert(mimeRes, linkRes, linkTarget); gDS.Unassert(mimeRes, linkRes, linkTarget);
} }
} }