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

Bug 474046 - Remove unused nsIAutoCompleteMdbResult[2]. r=mconnor

This commit is contained in:
Justin Dolske 2009-08-20 15:17:30 -07:00
Родитель a2036ff99b
Коммит c7ada3ceed
6 изменённых файлов: 0 добавлений и 556 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
toolkit/components/autocomplete/public/Makefile.in
Просмотреть файл

@ -51,7 +51,6 @@ XPIDLSRCS = nsIAutoCompleteController.idl \
nsIAutoCompletePopup.idl \
nsIAutoCompleteSearch.idl \
nsIAutoCompleteResult.idl \
nsIAutoCompleteResultTypes.idl \
nsIAutoCompleteSimpleResult.idl \
$(NULL)

90
toolkit/components/autocomplete/public/nsIAutoCompleteResultTypes.idl
Просмотреть файл

@ -1,90 +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 Mozilla Communicator client code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Joe Hewitt <hewitt@netscape.com> (Original Author)
*
* 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 ***** */
#include "nsIAutoCompleteResult.idl"
interface nsIMdbTable;
interface nsIMdbEnv;
interface nsIMdbRow;
%{ C++
#include "mdb.h"
%}
native mdb_scope(mdb_scope);
native mdb_column(mdb_column);
/* noscript */
[uuid(e6396544-921d-4776-aa62-8bf2dc1ae058)]
interface nsIAutoCompleteBaseResult : nsIAutoCompleteResult
{
void setSearchString(in AString searchString);
void setErrorDescription(in AString errorDescription);
void setDefaultIndex(in long defaultIndex);
void setSearchResult(in unsigned long searchResult);
};
/* noscript */
[uuid(f7e7b341-2d5c-4d04-9f51-496cb2ce178c)]
interface nsIAutoCompleteMdbResult : nsIAutoCompleteBaseResult
{
const short kUnicharType = 0;
const short kCharType = 1;
const short kIntType = 2;
void init(in nsIMdbEnv env, in nsIMdbTable table);
void setTokens(in mdb_scope valueToken, in short valueType,
in mdb_scope commentToken, in short commentType);
void addRow(in nsIMdbRow row);
nsIMdbRow getRowAt(in unsigned long rowIndex);
AString getRowValue(in nsIMdbRow row, in mdb_column col);
AUTF8String getUTF8RowValue(in nsIMdbRow row, in mdb_column col);
long getIntRowValue(in nsIMdbRow row, in mdb_column col);
};
/* noscript */
[uuid(148C9DC5-0FBB-408B-80FE-544F6A85B433)]
interface nsIAutoCompleteMdbResult2 : nsIAutoCompleteMdbResult
{
attribute boolean reverseByteOrder;
};

5
toolkit/components/autocomplete/src/Makefile.in
Просмотреть файл

@ -64,11 +64,6 @@ CPPSRCS = nsAutoCompleteController.cpp \
nsAutoCompleteSimpleResult.cpp \
$(NULL)
ifdef MOZ_MORK
REQUIRES += mork
CPPSRCS += nsAutoCompleteMdbResult.cpp
endif
EXTRA_DSO_LDOPTS += \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \

13
toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
Просмотреть файл

@ -40,9 +40,6 @@
* ***** END LICENSE BLOCK ***** */
#include "nsAutoCompleteController.h"
#ifdef MOZ_MORK
#include "nsAutoCompleteMdbResult.h"
#endif
#include "nsAutoCompleteSimpleResult.h"
#include "nsNetCID.h"
@ -1564,9 +1561,6 @@ nsAutoCompleteController::RowIndexToSearch(PRInt32 aRowIndex, PRInt32 *aSearchIn
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteController)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteSimpleResult)
#ifdef MOZ_MORK
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteMdbResult)
#endif
static const nsModuleComponentInfo components[] =
{
@ -1579,13 +1573,6 @@ static const nsModuleComponentInfo components[] =
NS_AUTOCOMPLETESIMPLERESULT_CID,
NS_AUTOCOMPLETESIMPLERESULT_CONTRACTID,
nsAutoCompleteSimpleResultConstructor },
#ifdef MOZ_MORK
{ "AutoComplete Mdb Result",
NS_AUTOCOMPLETEMDBRESULT_CID,
NS_AUTOCOMPLETEMDBRESULT_CONTRACTID,
nsAutoCompleteMdbResultConstructor },
#endif
};
NS_IMPL_NSGETMODULE(tkAutoCompleteModule, components)

368
toolkit/components/autocomplete/src/nsAutoCompleteMdbResult.cpp
Просмотреть файл

@ -1,368 +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 Mozilla Communicator client code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Joe Hewitt <hewitt@netscape.com> (Original Author)
*
* 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 ***** */
#include "nsAutoCompleteMdbResult.h"
#include "nsCOMPtr.h"
#include "nsCRT.h"
static void SwapBytes(PRUnichar* aDest, const PRUnichar* aSrc, PRUint32 aLen)
{
for(PRUint32 i = 0; i < aLen; i++)
{
PRUnichar aChar = *aSrc++;
*aDest++ = (0xff & (aChar >> 8)) | (aChar << 8);
}
}
NS_INTERFACE_MAP_BEGIN(nsAutoCompleteMdbResult)
NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteResult)
NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteBaseResult)
NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteMdbResult)
NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteMdbResult2)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAutoCompleteResult)
NS_INTERFACE_MAP_END
NS_IMPL_ADDREF(nsAutoCompleteMdbResult)
NS_IMPL_RELEASE(nsAutoCompleteMdbResult)
nsAutoCompleteMdbResult::nsAutoCompleteMdbResult() :
mDefaultIndex(-1),
mSearchResult(nsIAutoCompleteResult::RESULT_IGNORED),
mReverseByteOrder(PR_FALSE)
{
}
nsAutoCompleteMdbResult::~nsAutoCompleteMdbResult()
{
}
////////////////////////////////////////////////////////////////////////
//// nsIAutoCompleteResult
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetSearchString(nsAString &aSearchString)
{
aSearchString = mSearchString;
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetSearchResult(PRUint16 *aSearchResult)
{
*aSearchResult = mSearchResult;
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetDefaultIndex(PRInt32 *aDefaultIndex)
{
*aDefaultIndex = mDefaultIndex;
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetErrorDescription(nsAString & aErrorDescription)
{
aErrorDescription = mErrorDescription;
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetMatchCount(PRUint32 *aMatchCount)
{
*aMatchCount = mResults.Count();
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetValueAt(PRInt32 aIndex, nsAString & _retval)
{
NS_ENSURE_TRUE(aIndex >= 0 && aIndex < mResults.Count(), NS_ERROR_ILLEGAL_VALUE);
nsIMdbRow *row = mResults.ObjectAt(aIndex);
if (!row) return NS_OK;
if (mValueType == kUnicharType) {
GetRowValue(row, mValueToken, _retval);
} else if (mValueType == kCharType) {
nsCAutoString value;
GetUTF8RowValue(row, mValueToken, value);
_retval = NS_ConvertUTF8toUTF16(value);
}
/* // TESTING: return ordinaly labeled values
char *value = new char(20);
sprintf(value, "foopy (%d)", aIndex);
nsAutoString result;
result.AssignASCII(value);
_retval = result;*/
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetCommentAt(PRInt32 aIndex, nsAString & _retval)
{
NS_ENSURE_TRUE(aIndex >= 0 && aIndex < mResults.Count(), NS_ERROR_ILLEGAL_VALUE);
nsIMdbRow *row = mResults.ObjectAt(aIndex);
if (!row) return NS_OK;
if (mCommentType == kUnicharType) {
GetRowValue(row, mCommentToken, _retval);
} else if (mCommentType == kCharType) {
nsCAutoString value;
GetUTF8RowValue(row, mCommentToken, value);
_retval = NS_ConvertUTF8toUTF16(value);
}
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetStyleAt(PRInt32 aIndex, nsAString & _retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetImageAt(PRInt32 aIndex, nsAString & _retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
////////////////////////////////////////////////////////////////////////
//// nsIAutoCompleteBaseResult
NS_IMETHODIMP
nsAutoCompleteMdbResult::SetSearchString(const nsAString &aSearchString)
{
mSearchString.Assign(aSearchString);
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::SetErrorDescription(const nsAString &aErrorDescription)
{
mErrorDescription.Assign(aErrorDescription);
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::SetDefaultIndex(PRInt32 aDefaultIndex)
{
mDefaultIndex = aDefaultIndex;
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::SetSearchResult(PRUint32 aSearchResult)
{
mSearchResult = aSearchResult;
return NS_OK;
}
////////////////////////////////////////////////////////////////////////
//// nsIAutoCompleteMdbResult
NS_IMETHODIMP
nsAutoCompleteMdbResult::Init(nsIMdbEnv *aEnv, nsIMdbTable *aTable)
{
mEnv = aEnv;
mTable = aTable;
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::SetTokens(mdb_scope aValueToken, PRInt16 aValueType, mdb_scope aCommentToken, PRInt16 aCommentType)
{
mValueToken = aValueToken;
mValueType = aValueType;
mCommentToken = aCommentToken;
mCommentType = aCommentType;
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::AddRow(nsIMdbRow *aRow)
{
mResults.AppendObject(aRow);
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::RemoveValueAt(PRInt32 aRowIndex, PRBool aRemoveFromDb)
{
nsIMdbRow *row = mResults.ObjectAt(aRowIndex);
NS_ENSURE_TRUE(row, NS_ERROR_INVALID_ARG);
if (aRemoveFromDb && mTable && mEnv) {
// TODO: share this code with nsGlobalHistory::RemovePageInternal(),
// rather than duplicating it here.
nsIMdbPort *port = nsnull;
mTable->GetPort(mEnv, &port); // note: doesn't addref
nsCOMPtr<nsIMdbStore> store = do_QueryInterface(port);
NS_ENSURE_TRUE(store, NS_ERROR_FAILURE);
mdb_err err = mTable->CutRow(mEnv, row);
NS_ENSURE_TRUE(!err, NS_ERROR_FAILURE);
row->CutAllColumns(mEnv);
// We must do a CompressCommit on the store now. If we don't,
// mork can leave the file in an inconsistent state, which causes it to
// be killed the next time it's opened.
nsCOMPtr<nsIMdbThumb> thumb;
err = store->CompressCommit(mEnv, getter_AddRefs(thumb));
if (err == 0) {
mdb_count total, current;
mdb_bool done, broken;
do {
err = thumb->DoMore(mEnv, &total, &current, &done, &broken);
} while ((err == 0) && !broken && !done);
}
}
mResults.RemoveObjectAt(aRowIndex);
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetRowAt(PRUint32 aRowIndex, nsIMdbRow **aRow)
{
*aRow = mResults.ObjectAt(aRowIndex);
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetRowValue(nsIMdbRow *aRow, mdb_column aCol, nsAString &aValue)
{
mdbYarn yarn;
mdb_err err = aRow->AliasCellYarn(mEnv, aCol, &yarn);
if (err != 0)
return NS_ERROR_FAILURE;
aValue.Truncate(0);
if (!yarn.mYarn_Fill)
return NS_OK;
switch (yarn.mYarn_Form) {
case 0: { // unicode
PRUint32 len = yarn.mYarn_Fill / sizeof(PRUnichar);
if (mReverseByteOrder) {
// The mdb file is other-endian, byte-swap the result
PRUnichar *swapval = new PRUnichar[len];
if (!swapval)
return NS_ERROR_OUT_OF_MEMORY;
SwapBytes(swapval, (const PRUnichar *)yarn.mYarn_Buf, len);
aValue.Assign(swapval, len);
delete[] swapval;
}
else
aValue.Assign((const PRUnichar *)yarn.mYarn_Buf, len);
break;
}
case 1: // utf 8
aValue.Assign(NS_ConvertUTF8toUTF16((const char*)yarn.mYarn_Buf, yarn.mYarn_Fill));
break;
default:
return NS_ERROR_UNEXPECTED;
}
return NS_OK;
}
nsresult
nsAutoCompleteMdbResult::GetUTF8RowValue(nsIMdbRow *aRow, mdb_column aCol,
nsACString& aValue)
{
mdb_err err;
mdbYarn yarn;
err = aRow->AliasCellYarn(mEnv, aCol, &yarn);
if (err != 0) return NS_ERROR_FAILURE;
const char* startPtr = (const char*)yarn.mYarn_Buf;
if (startPtr)
aValue.Assign(Substring(startPtr, startPtr + yarn.mYarn_Fill));
else
aValue.Truncate();
return NS_OK;
}
nsresult
nsAutoCompleteMdbResult::GetIntRowValue(nsIMdbRow *aRow, mdb_column aCol,
PRInt32 *aValue)
{
mdb_err err;
mdbYarn yarn;
err = aRow->AliasCellYarn(mEnv, aCol, &yarn);
if (err != 0) return NS_ERROR_FAILURE;
if (yarn.mYarn_Buf)
*aValue = atoi((char *)yarn.mYarn_Buf);
else
*aValue = 0;
return NS_OK;
}
////////////////////////////////////////////////////////////////////////
//// nsIAutoCompleteMdbResult2
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetReverseByteOrder(PRBool *aReverseByteOrder)
{
*aReverseByteOrder = mReverseByteOrder;
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::SetReverseByteOrder(PRBool aReverseByteOrder)
{
mReverseByteOrder = aReverseByteOrder;
return NS_OK;
}

79
toolkit/components/autocomplete/src/nsAutoCompleteMdbResult.h
Просмотреть файл

@ -1,79 +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 Mozilla Communicator client code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Joe Hewitt <hewitt@netscape.com> (Original Author)
*
* 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 ***** */
#ifndef __nsAutoCompleteResultBase__
#define __nsAutoCompleteResultBase__
#include "nsIAutoCompleteResult.h"
#include "nsIAutoCompleteResultTypes.h"
#include "nsString.h"
#include "nsCOMArray.h"
#include "mdb.h"
class nsAutoCompleteMdbResult : public nsIAutoCompleteMdbResult2
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIAUTOCOMPLETERESULT
nsAutoCompleteMdbResult();
virtual ~nsAutoCompleteMdbResult();
NS_DECL_NSIAUTOCOMPLETEBASERESULT
NS_DECL_NSIAUTOCOMPLETEMDBRESULT
NS_DECL_NSIAUTOCOMPLETEMDBRESULT2
protected:
nsCOMArray<nsIMdbRow> mResults;
nsAutoString mSearchString;
nsAutoString mErrorDescription;
PRInt32 mDefaultIndex;
PRUint32 mSearchResult;
nsIMdbEnv *mEnv;
nsIMdbTable *mTable;
mdb_scope mValueToken;
PRInt16 mValueType;
mdb_scope mCommentToken;
PRInt16 mCommentType;
PRPackedBool mReverseByteOrder;
};
#endif // __nsAutoCompleteResultBase__