diff --git a/accessible/atk/AccessibleWrap.cpp b/accessible/atk/AccessibleWrap.cpp index 68f5370c06..2e1a1ada2f 100644 --- a/accessible/atk/AccessibleWrap.cpp +++ b/accessible/atk/AccessibleWrap.cpp @@ -689,9 +689,9 @@ getRoleCB(AtkObject *aAtkObj) role = accWrap->Role(); } -#define ROLE(geckoRole, stringRole, atkRole, macRole, \ +#define ROLE(goannaRole, stringRole, atkRole, macRole, \ msaaRole, ia2Role, nameRule) \ - case roles::geckoRole: \ + case roles::goannaRole: \ aAtkObj->role = atkRole; \ break; @@ -962,7 +962,7 @@ refRelationSetCB(AtkObject *aAtkObj) ATK_OBJECT_CLASS(parent_class)->ref_relation_set(aAtkObj); const AtkRelationType typeMap[] = { -#define RELATIONTYPE(gecko, s, atk, m, i) atk, +#define RELATIONTYPE(goanna, s, atk, m, i) atk, #include "RelationTypeMap.h" #undef RELATIONTYPE }; @@ -999,8 +999,8 @@ refRelationSetCB(AtkObject *aAtkObj) if (!accWrap) return relation_set; -#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \ - UpdateAtkRelation(RelationType::geckoType, accWrap, atkType, relation_set); +#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \ + UpdateAtkRelation(RelationType::goannaType, accWrap, atkType, relation_set); #include "RelationTypeMap.h" diff --git a/accessible/atk/ApplicationAccessibleWrap.cpp b/accessible/atk/ApplicationAccessibleWrap.cpp index 9be6be947e..f5f6547d5f 100644 --- a/accessible/atk/ApplicationAccessibleWrap.cpp +++ b/accessible/atk/ApplicationAccessibleWrap.cpp @@ -36,10 +36,10 @@ toplevel_event_watcher(GSignalInvocationHint* ihint, const GValue* param_values, gpointer data) { - static GQuark sQuark_gecko_acc_obj = 0; + static GQuark sQuark_goanna_acc_obj = 0; - if (!sQuark_gecko_acc_obj) - sQuark_gecko_acc_obj = g_quark_from_static_string("GoannaAccObj"); + if (!sQuark_goanna_acc_obj) + sQuark_goanna_acc_obj = g_quark_from_static_string("GoannaAccObj"); if (nsAccessibilityService::IsShutdown()) return TRUE; @@ -58,7 +58,7 @@ toplevel_event_watcher(GSignalInvocationHint* ihint, // Attach the dialog accessible to app accessible tree Accessible* windowAcc = GetAccService()->AddNativeRootAccessible(child); - g_object_set_qdata(G_OBJECT(child), sQuark_gecko_acc_obj, + g_object_set_qdata(G_OBJECT(child), sQuark_goanna_acc_obj, reinterpret_cast(windowAcc)); } else { @@ -66,10 +66,10 @@ toplevel_event_watcher(GSignalInvocationHint* ihint, // Deattach the dialog accessible Accessible* windowAcc = reinterpret_cast - (g_object_get_qdata(G_OBJECT(child), sQuark_gecko_acc_obj)); + (g_object_get_qdata(G_OBJECT(child), sQuark_goanna_acc_obj)); if (windowAcc) { GetAccService()->RemoveNativeRootAccessible(windowAcc); - g_object_set_qdata(G_OBJECT(child), sQuark_gecko_acc_obj, nullptr); + g_object_set_qdata(G_OBJECT(child), sQuark_goanna_acc_obj, nullptr); } } diff --git a/accessible/atk/nsMaiInterfaceImage.cpp b/accessible/atk/nsMaiInterfaceImage.cpp index 8bac5ddf0b..7a0a55e03d 100644 --- a/accessible/atk/nsMaiInterfaceImage.cpp +++ b/accessible/atk/nsMaiInterfaceImage.cpp @@ -28,10 +28,10 @@ getImagePositionCB(AtkImage* aImage, gint* aAccX, gint* aAccY, return; ImageAccessible* image = accWrap->AsImage(); - uint32_t geckoCoordType = (aCoordType == ATK_XY_WINDOW) ? + uint32_t goannaCoordType = (aCoordType == ATK_XY_WINDOW) ? nsIAccessibleCoordinateType::COORDTYPE_WINDOW_RELATIVE : nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE; - nsIntPoint pos = image->Position(geckoCoordType); + nsIntPoint pos = image->Position(goannaCoordType); *aAccX = pos.x; *aAccY = pos.y; } diff --git a/accessible/atk/nsMaiInterfaceText.cpp b/accessible/atk/nsMaiInterfaceText.cpp index ee3f995018..b6d80a30a5 100644 --- a/accessible/atk/nsMaiInterfaceText.cpp +++ b/accessible/atk/nsMaiInterfaceText.cpp @@ -59,12 +59,12 @@ ConvertToAtkTextAttributeSet(nsIPersistentProperties* aAttributes) const char* atkName = nullptr; nsAutoString atkValue; if (name.EqualsLiteral("color")) { - // The format of the atk attribute is r,g,b and the gecko one is + // The format of the atk attribute is r,g,b and the goanna one is // rgb(r,g,b). atkValue = Substring(value, 5, value.Length() - 1); atkName = sAtkTextAttrNames[ATK_TEXT_ATTR_FG_COLOR]; } else if (name.EqualsLiteral("background-color")) { - // The format of the atk attribute is r,g,b and the gecko one is + // The format of the atk attribute is r,g,b and the goanna one is // rgb(r,g,b). atkValue = Substring(value, 5, value.Length() - 1); atkName = sAtkTextAttrNames[ATK_TEXT_ATTR_BG_COLOR]; @@ -288,13 +288,13 @@ getCharacterExtentsCB(AtkText *aText, gint aOffset, if (!text || !text->IsTextRole()) return; - uint32_t geckoCoordType; + uint32_t goannaCoordType; if (aCoords == ATK_XY_SCREEN) - geckoCoordType = nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE; + goannaCoordType = nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE; else - geckoCoordType = nsIAccessibleCoordinateType::COORDTYPE_WINDOW_RELATIVE; + goannaCoordType = nsIAccessibleCoordinateType::COORDTYPE_WINDOW_RELATIVE; - nsIntRect rect = text->CharBounds(aOffset, geckoCoordType); + nsIntRect rect = text->CharBounds(aOffset, goannaCoordType); *aX = rect.x; *aY = rect.y; *aWidth = rect.width; @@ -313,13 +313,13 @@ getRangeExtentsCB(AtkText *aText, gint aStartOffset, gint aEndOffset, if (!text || !text->IsTextRole()) return; - uint32_t geckoCoordType; + uint32_t goannaCoordType; if (aCoords == ATK_XY_SCREEN) - geckoCoordType = nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE; + goannaCoordType = nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE; else - geckoCoordType = nsIAccessibleCoordinateType::COORDTYPE_WINDOW_RELATIVE; + goannaCoordType = nsIAccessibleCoordinateType::COORDTYPE_WINDOW_RELATIVE; - nsIntRect rect = text->TextBounds(aStartOffset, aEndOffset, geckoCoordType); + nsIntRect rect = text->TextBounds(aStartOffset, aEndOffset, goannaCoordType); aRect->x = rect.x; aRect->y = rect.y; aRect->width = rect.width; diff --git a/accessible/base/Asserts.cpp b/accessible/base/Asserts.cpp index b97a48ec48..f77094d6a9 100644 --- a/accessible/base/Asserts.cpp +++ b/accessible/base/Asserts.cpp @@ -11,16 +11,16 @@ using namespace mozilla::a11y; -#define ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule) \ - static_assert(static_cast(roles::geckoRole) \ - == static_cast(nsIAccessibleRole::ROLE_ ## geckoRole), \ +#define ROLE(goannaRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule) \ + static_assert(static_cast(roles::goannaRole) \ + == static_cast(nsIAccessibleRole::ROLE_ ## goannaRole), \ "internal and xpcom roles differ!"); #include "RoleMap.h" #undef ROLE -#define RELATIONTYPE(geckoType, stringType, atkType, msaaType, ia2Type) \ - static_assert(static_cast(RelationType::geckoType) \ - == static_cast(nsIAccessibleRelation::RELATION_ ## geckoType), \ +#define RELATIONTYPE(goannaType, stringType, atkType, msaaType, ia2Type) \ + static_assert(static_cast(RelationType::goannaType) \ + == static_cast(nsIAccessibleRelation::RELATION_ ## goannaType), \ "internal and xpcom relations differ!"); #include "RelationTypeMap.h" #undef RELATIONTYPE diff --git a/accessible/base/RelationTypeMap.h b/accessible/base/RelationTypeMap.h index 7dc4c13310..09a4d5839c 100644 --- a/accessible/base/RelationTypeMap.h +++ b/accessible/base/RelationTypeMap.h @@ -6,7 +6,7 @@ /** * Usage: declare the macro RELATIONTYPE()with the following arguments: - * RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) + * RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) */ RELATIONTYPE(LABELLED_BY, diff --git a/accessible/base/RoleMap.h b/accessible/base/RoleMap.h index 70a3721b1f..26e4357d4b 100644 --- a/accessible/base/RoleMap.h +++ b/accessible/base/RoleMap.h @@ -4,7 +4,7 @@ /** * Usage: declare the macro ROLE()with the following arguments: - * ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule) + * ROLE(goannaRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule) */ ROLE(NOTHING, diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp index 6be70ea90d..3582039170 100644 --- a/accessible/base/nsAccessibilityService.cpp +++ b/accessible/base/nsAccessibilityService.cpp @@ -586,9 +586,9 @@ nsAccessibilityService::GetAccessibleFor(nsIDOMNode *aNode, NS_IMETHODIMP nsAccessibilityService::GetStringRole(uint32_t aRole, nsAString& aString) { -#define ROLE(geckoRole, stringRole, atkRole, \ +#define ROLE(goannaRole, stringRole, atkRole, \ macRole, msaaRole, ia2Role, nameRule) \ - case roles::geckoRole: \ + case roles::goannaRole: \ CopyUTF8toUTF16(stringRole, aString); \ return NS_OK; @@ -740,9 +740,9 @@ nsAccessibilityService::GetStringRelationType(uint32_t aRelationType, { NS_ENSURE_ARG(aRelationType <= static_cast(RelationType::LAST)); -#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \ - case RelationType::geckoType: \ - aString.AssignLiteral(geckoTypeName); \ +#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \ + case RelationType::goannaType: \ + aString.AssignLiteral(goannaTypeName); \ return NS_OK; RelationType relationType = static_cast(aRelationType); diff --git a/accessible/base/nsTextEquivUtils.cpp b/accessible/base/nsTextEquivUtils.cpp index bab1eee569..aef07a5318 100644 --- a/accessible/base/nsTextEquivUtils.cpp +++ b/accessible/base/nsTextEquivUtils.cpp @@ -347,9 +347,9 @@ nsTextEquivUtils::AppendString(nsAString *aString, uint32_t nsTextEquivUtils::GetRoleRule(role aRole) { -#define ROLE(geckoRole, stringRole, atkRole, \ +#define ROLE(goannaRole, stringRole, atkRole, \ macRole, msaaRole, ia2Role, nameRule) \ - case roles::geckoRole: \ + case roles::goannaRole: \ return nameRule; switch (aRole) { diff --git a/accessible/ipc/DocAccessibleChild.cpp b/accessible/ipc/DocAccessibleChild.cpp index af0f890e3b..bf3672a926 100644 --- a/accessible/ipc/DocAccessibleChild.cpp +++ b/accessible/ipc/DocAccessibleChild.cpp @@ -199,7 +199,7 @@ DocAccessibleChild::RecvRelations(const uint64_t& aID, if (!aID) return false; -#define RELATIONTYPE(gecko, s, a, m, i) AddRelation(acc, RelationType::gecko, aRelations); +#define RELATIONTYPE(goanna, s, a, m, i) AddRelation(acc, RelationType::goanna, aRelations); #include "RelationTypeMap.h" #undef RELATIONTYPE diff --git a/accessible/mac/mozAccessible.h b/accessible/mac/mozAccessible.h index 587965a0b9..66faaef506 100644 --- a/accessible/mac/mozAccessible.h +++ b/accessible/mac/mozAccessible.h @@ -49,13 +49,13 @@ GetNativeFromGoannaAccessible(mozilla::a11y::Accessible* aAccessible) mozAccessible* mParent; /** - * The role of our gecko accessible. + * The role of our goanna accessible. */ mozilla::a11y::role mRole; } -// inits with the gecko owner. -- (id)initWithAccessible:(mozilla::a11y::AccessibleWrap*)geckoParent; +// inits with the goanna owner. +- (id)initWithAccessible:(mozilla::a11y::AccessibleWrap*)goannaParent; // our accessible parent (AXParent) - (id )parent; diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm index 48a57eeac3..6fb6a04d23 100644 --- a/accessible/mac/mozAccessible.mm +++ b/accessible/mac/mozAccessible.mm @@ -60,13 +60,13 @@ GetClosestInterestingAccessible(id anObject) @implementation mozAccessible -- (id)initWithAccessible:(AccessibleWrap*)geckoAccessible +- (id)initWithAccessible:(AccessibleWrap*)goannaAccessible { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; if ((self = [super init])) { - mGoannaAccessible = geckoAccessible; - mRole = geckoAccessible->Role(); + mGoannaAccessible = goannaAccessible; + mRole = goannaAccessible->Role(); } return self; @@ -236,10 +236,10 @@ GetClosestInterestingAccessible(id anObject) NSScreen* mainView = [[NSScreen screens] objectAtIndex:0]; NSPoint tmpPoint = NSMakePoint(point.x, [mainView frame].size.height - point.y); - nsIntPoint geckoPoint = nsCocoaUtils:: + nsIntPoint goannaPoint = nsCocoaUtils:: CocoaPointsToDevPixels(tmpPoint, nsCocoaUtils::GetBackingScaleFactor(mainView)); - Accessible* child = mGoannaAccessible->ChildAtPoint(geckoPoint.x, geckoPoint.y, + Accessible* child = mGoannaAccessible->ChildAtPoint(goannaPoint.x, goannaPoint.y, Accessible::eDeepestChild); if (child) { @@ -411,8 +411,8 @@ GetClosestInterestingAccessible(id anObject) "Does not support Text when it should"); #endif -#define ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule) \ - case roles::geckoRole: \ +#define ROLE(goannaRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule) \ + case roles::goannaRole: \ return macRole; switch (mRole) { diff --git a/accessible/tests/mochitest/events/test_valuechange.html b/accessible/tests/mochitest/events/test_valuechange.html index 839d65ca04..163a32501f 100644 --- a/accessible/tests/mochitest/events/test_valuechange.html +++ b/accessible/tests/mochitest/events/test_valuechange.html @@ -50,7 +50,7 @@ return; // Note: always test against valuetext first because the existence of - // aria-valuetext takes precedence over aria-valuenow in gecko. + // aria-valuetext takes precedence over aria-valuenow in goanna. is(acc.value, (aValuetext != undefined)? aValuetext : aValuenow, "Wrong value of " + prettyName(aNodeOrID)); } diff --git a/accessible/tests/mochitest/role/test_general.html b/accessible/tests/mochitest/role/test_general.html index 72c8244766..91d0352c83 100644 --- a/accessible/tests/mochitest/role/test_general.html +++ b/accessible/tests/mochitest/role/test_general.html @@ -169,8 +169,8 @@
A heading level 6
-
gecko
-
geckos have sticky toes
+
goanna
+
goannas have sticky toes
clickable span diff --git a/accessible/windows/ia2/ia2Accessible.cpp b/accessible/windows/ia2/ia2Accessible.cpp index c500358fb7..3b599fd9e6 100644 --- a/accessible/windows/ia2/ia2Accessible.cpp +++ b/accessible/windows/ia2/ia2Accessible.cpp @@ -163,14 +163,14 @@ ia2Accessible::role(long* aRole) if (acc->IsDefunct()) return CO_E_OBJNOTCONNECTED; -#define ROLE(_geckoRole, stringRole, atkRole, macRole, \ +#define ROLE(_goannaRole, stringRole, atkRole, macRole, \ msaaRole, ia2Role, nameRule) \ - case roles::_geckoRole: \ + case roles::_goannaRole: \ *aRole = ia2Role; \ break; - a11y::role geckoRole = acc->Role(); - switch (geckoRole) { + a11y::role goannaRole = acc->Role(); + switch (goannaRole) { #include "RoleMap.h" default: MOZ_CRASH("Unknown role."); @@ -180,7 +180,7 @@ ia2Accessible::role(long* aRole) // Special case, if there is a ROLE_ROW inside of a ROLE_TREE_TABLE, then call // the IA2 role a ROLE_OUTLINEITEM. - if (geckoRole == roles::ROW) { + if (goannaRole == roles::ROW) { Accessible* xpParent = acc->Parent(); if (xpParent && xpParent->Role() == roles::TREE_TABLE) *aRole = ROLE_SYSTEM_OUTLINEITEM; @@ -217,11 +217,11 @@ ia2Accessible::scrollToPoint(enum IA2CoordinateType aCoordType, if (acc->IsDefunct()) return CO_E_OBJNOTCONNECTED; - uint32_t geckoCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? + uint32_t goannaCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE : nsIAccessibleCoordinateType::COORDTYPE_PARENT_RELATIVE; - acc->ScrollToPoint(geckoCoordType, aX, aY); + acc->ScrollToPoint(goannaCoordType, aX, aY); return S_OK; A11Y_TRYBLOCK_END diff --git a/accessible/windows/ia2/ia2AccessibleImage.cpp b/accessible/windows/ia2/ia2AccessibleImage.cpp index 989fde9250..12da18b7ef 100644 --- a/accessible/windows/ia2/ia2AccessibleImage.cpp +++ b/accessible/windows/ia2/ia2AccessibleImage.cpp @@ -82,11 +82,11 @@ ia2AccessibleImage::get_imagePosition(enum IA2CoordinateType aCoordType, if (imageAcc->IsDefunct()) return CO_E_OBJNOTCONNECTED; - uint32_t geckoCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? + uint32_t goannaCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE : nsIAccessibleCoordinateType::COORDTYPE_PARENT_RELATIVE; - nsIntPoint pos = imageAcc->Position(geckoCoordType); + nsIntPoint pos = imageAcc->Position(goannaCoordType); *aX = pos.x; *aY = pos.y; return S_OK; diff --git a/accessible/windows/ia2/ia2AccessibleRelation.cpp b/accessible/windows/ia2/ia2AccessibleRelation.cpp index cc6fd83c8a..716ca69273 100644 --- a/accessible/windows/ia2/ia2AccessibleRelation.cpp +++ b/accessible/windows/ia2/ia2AccessibleRelation.cpp @@ -41,8 +41,8 @@ ia2AccessibleRelation::get_relationType(BSTR* aRelationType) *aRelationType = nullptr; -#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \ - case RelationType::geckoType: \ +#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \ + case RelationType::goannaType: \ *aRelationType = ::SysAllocString(ia2Type); \ break; diff --git a/accessible/windows/ia2/ia2AccessibleRelation.h b/accessible/windows/ia2/ia2AccessibleRelation.h index 9f8eff27e4..a2f13928c5 100644 --- a/accessible/windows/ia2/ia2AccessibleRelation.h +++ b/accessible/windows/ia2/ia2AccessibleRelation.h @@ -65,8 +65,8 @@ private: const WCHAR *const IA2_RELATION_NULL = L""; -#define RELATIONTYPE(geckoType, name, atkType, msaaType, ia2Type) \ - std::pair(RelationType::geckoType, ia2Type), +#define RELATIONTYPE(goannaType, name, atkType, msaaType, ia2Type) \ + std::pair(RelationType::goannaType, ia2Type), static const std::pair sRelationTypePairs[] = { #include "RelationTypeMap.h" diff --git a/accessible/windows/ia2/ia2AccessibleText.cpp b/accessible/windows/ia2/ia2AccessibleText.cpp index 0bd23b0600..e44fb16d24 100644 --- a/accessible/windows/ia2/ia2AccessibleText.cpp +++ b/accessible/windows/ia2/ia2AccessibleText.cpp @@ -102,11 +102,11 @@ ia2AccessibleText::get_characterExtents(long aOffset, if (textAcc->IsDefunct()) return CO_E_OBJNOTCONNECTED; - uint32_t geckoCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? + uint32_t goannaCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE : nsIAccessibleCoordinateType::COORDTYPE_PARENT_RELATIVE; - nsIntRect rect = textAcc->CharBounds(aOffset, geckoCoordType); + nsIntRect rect = textAcc->CharBounds(aOffset, goannaCoordType); *aX = rect.x; *aY = rect.y; @@ -151,11 +151,11 @@ ia2AccessibleText::get_offsetAtPoint(long aX, long aY, if (textAcc->IsDefunct()) return CO_E_OBJNOTCONNECTED; - uint32_t geckoCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? + uint32_t goannaCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE : nsIAccessibleCoordinateType::COORDTYPE_PARENT_RELATIVE; - *aOffset = textAcc->OffsetAtPoint(aX, aY, geckoCoordType); + *aOffset = textAcc->OffsetAtPoint(aX, aY, goannaCoordType); return *aOffset == -1 ? S_FALSE : S_OK; A11Y_TRYBLOCK_END @@ -457,12 +457,12 @@ ia2AccessibleText::scrollSubstringToPoint(long aStartIndex, long aEndIndex, if (!textAcc->IsValidRange(aStartIndex, aEndIndex)) return E_INVALIDARG; - uint32_t geckoCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? + uint32_t goannaCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE : nsIAccessibleCoordinateType::COORDTYPE_PARENT_RELATIVE; textAcc->ScrollSubstringToPoint(aStartIndex, aEndIndex, - geckoCoordType, aX, aY); + goannaCoordType, aX, aY); return S_OK; A11Y_TRYBLOCK_END diff --git a/accessible/windows/msaa/AccessibleWrap.cpp b/accessible/windows/msaa/AccessibleWrap.cpp index 1c8061b1c7..f98cf838bb 100644 --- a/accessible/windows/msaa/AccessibleWrap.cpp +++ b/accessible/windows/msaa/AccessibleWrap.cpp @@ -398,27 +398,27 @@ AccessibleWrap::get_accRole( if (xpAccessible->IsDefunct()) return CO_E_OBJNOTCONNECTED; - a11y::role geckoRole; + a11y::role goannaRole; if (xpAccessible->IsProxy()) { - geckoRole = xpAccessible->Proxy()->Role(); + goannaRole = xpAccessible->Proxy()->Role(); } else { #ifdef DEBUG NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(xpAccessible), "Does not support Text when it should"); #endif - geckoRole = xpAccessible->Role(); + goannaRole = xpAccessible->Role(); } uint32_t msaaRole = 0; -#define ROLE(_geckoRole, stringRole, atkRole, macRole, \ +#define ROLE(_goannaRole, stringRole, atkRole, macRole, \ _msaaRole, ia2Role, nameRule) \ - case roles::_geckoRole: \ + case roles::_goannaRole: \ msaaRole = _msaaRole; \ break; - switch (geckoRole) { + switch (goannaRole) { #include "RoleMap.h" default: MOZ_CRASH("Unknown role."); @@ -430,11 +430,11 @@ AccessibleWrap::get_accRole( // a ROLE_OUTLINEITEM for consistency and compatibility. // We need this because ARIA has a role of "row" for both grid and treegrid if (xpAccessible->IsProxy()) { - if (geckoRole == roles::ROW + if (goannaRole == roles::ROW && xpAccessible->Proxy()->Parent()->Role() == roles::TREE_TABLE) msaaRole = ROLE_SYSTEM_OUTLINEITEM; } else { - if (geckoRole == roles::ROW) { + if (goannaRole == roles::ROW) { Accessible* xpParent = Parent(); if (xpParent && xpParent->Role() == roles::TREE_TABLE) msaaRole = ROLE_SYSTEM_OUTLINEITEM; @@ -968,9 +968,9 @@ AccessibleWrap::accNavigate( Accessible* navAccessible = nullptr; Maybe xpRelation; -#define RELATIONTYPE(geckoType, stringType, atkType, msaaType, ia2Type) \ +#define RELATIONTYPE(goannaType, stringType, atkType, msaaType, ia2Type) \ case msaaType: \ - xpRelation.emplace(RelationType::geckoType); \ + xpRelation.emplace(RelationType::goannaType); \ break; switch(navDir) { diff --git a/addon-sdk/source/examples/actor-repl/data/codemirror-compressed.js b/addon-sdk/source/examples/actor-repl/data/codemirror-compressed.js index 6d8e4bf719..d0951fc888 100644 --- a/addon-sdk/source/examples/actor-repl/data/codemirror-compressed.js +++ b/addon-sdk/source/examples/actor-repl/data/codemirror-compressed.js @@ -1,5 +1,5 @@ window.CodeMirror=function(){"use strict";function z(a,c){if(!(this instanceof z))return new z(a,c);this.options=c=c||{};for(var d in fd)!c.hasOwnProperty(d)&&fd.hasOwnProperty(d)&&(c[d]=fd[d]);M(c);var e="string"==typeof c.value?0:c.value.first,f=this.display=A(a,e);f.wrapper.CodeMirror=this,J(this),c.autofocus&&!r&&Qb(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,draggingText:!1,highlight:new jf},H(this),c.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap");var g=c.value;"string"==typeof g&&(g=new te(c.value,c.mode)),Ib(this,xe)(this,g),b&&setTimeout(tf(Pb,this,!0),20),Tb(this);var h;try{h=document.activeElement==f.input}catch(i){}h||c.autofocus&&!r?setTimeout(tf(rc,this),20):sc(this),Ib(this,function(){for(var a in ed)ed.propertyIsEnumerable(a)&&ed[a](this,c[a],hd);for(var b=0;bb.maxLineLength&&(b.maxLineLength=d,b.maxLine=a)})}function M(a){var b=pf(a.gutters,"CodeMirror-linenumbers");-1==b&&a.lineNumbers?a.gutters=a.gutters.concat(["CodeMirror-linenumbers"]):b>-1&&!a.lineNumbers&&(a.gutters=a.gutters.slice(0),a.gutters.splice(b,1))}function N(a){var b=a.display,c=a.doc.height,d=c+jb(b);b.sizer.style.minHeight=b.heightForcer.style.top=d+"px",b.gutters.style.height=Math.max(d,b.scroller.clientHeight-gf)+"px";var e=Math.max(d,b.scroller.scrollHeight),f=b.scroller.scrollWidth>b.scroller.clientWidth+1,g=e>b.scroller.clientHeight+1;g?(b.scrollbarV.style.display="block",b.scrollbarV.style.bottom=f?Hf(b.measure)+"px":"0",b.scrollbarV.firstChild.style.height=Math.max(0,e-b.scroller.clientHeight+b.scrollbarV.clientHeight)+"px"):(b.scrollbarV.style.display="",b.scrollbarV.firstChild.style.height="0"),f?(b.scrollbarH.style.display="block",b.scrollbarH.style.right=g?Hf(b.measure)+"px":"0",b.scrollbarH.firstChild.style.width=b.scroller.scrollWidth-b.scroller.clientWidth+b.scrollbarH.clientWidth+"px"):(b.scrollbarH.style.display="",b.scrollbarH.firstChild.style.width="0"),f&&g?(b.scrollbarFiller.style.display="block",b.scrollbarFiller.style.height=b.scrollbarFiller.style.width=Hf(b.measure)+"px"):b.scrollbarFiller.style.display="",f&&a.options.coverGutterNextToScrollbar&&a.options.fixedGutter?(b.gutterFiller.style.display="block",b.gutterFiller.style.height=Hf(b.measure)+"px",b.gutterFiller.style.width=b.gutters.offsetWidth+"px"):b.gutterFiller.style.display="",n&&0===Hf(b.measure)&&(b.scrollbarV.style.minWidth=b.scrollbarH.style.minHeight=o?"18px":"12px",b.scrollbarV.style.pointerEvents=b.scrollbarH.style.pointerEvents="none")}function O(a,b,c){var d=a.scroller.scrollTop,e=a.wrapper.clientHeight;"number"==typeof c?d=c:c&&(d=c.top,e=c.bottom-c.top),d=Math.floor(d-ib(a));var f=Math.ceil(d+e);return{from:De(b,d),to:De(b,f)}}function P(a){var b=a.display;if(b.alignWidgets||b.gutters.firstChild&&a.options.fixedGutter){for(var c=S(b)-b.scroller.scrollLeft+a.doc.scrollLeft,d=b.gutters.offsetWidth,e=c+"px",f=b.lineDiv.firstChild;f;f=f.nextSibling)if(f.alignable)for(var g=0,h=f.alignable;g=a.display.showingFrom&&h.to<=a.display.showingTo)break}return g&&(bf(a,"update",a),(a.display.showingFrom!=e||a.display.showingTo!=f)&&bf(a,"viewportChange",a,a.display.showingFrom,a.display.showingTo)),g}function U(a,b,c,d){var e=a.display,f=a.doc;if(!e.wrapper.offsetWidth)return e.showingFrom=e.showingTo=f.first,e.viewOffset=0,void 0;if(!(!d&&0==b.length&&c.from>e.showingFrom&&c.tol&&e.showingTo-l<20&&(l=Math.min(j,e.showingTo)),y)for(k=Ce(Rd(f,ye(f,k)));j>l&&Sd(f,ye(f,l));)++l;var m=[{from:Math.max(e.showingFrom,f.first),to:Math.min(e.showingTo,j)}];if(m=m[0].from>=m[0].to?[]:X(m,b),y)for(var i=0;in.from)){m.splice(i--,1);break}n.to=p}for(var q=0,i=0;il&&(n.to=l),n.from>=n.to?m.splice(i--,1):q+=n.to-n.from}if(!d&&q==l-k&&k==e.showingFrom&&l==e.showingTo)return W(a),void 0;m.sort(function(a,b){return a.from-b.from});try{var r=document.activeElement}catch(s){}.7*(l-k)>q&&(e.lineDiv.style.display="none"),Z(a,k,l,m,h),e.lineDiv.style.display="",r&&document.activeElement!=r&&r.offsetHeight&&r.focus();var t=k!=e.showingFrom||l!=e.showingTo||e.lastSizeC!=e.wrapper.clientHeight;return t&&(e.lastSizeC=e.wrapper.clientHeight,eb(a,400)),e.showingFrom=k,e.showingTo=l,e.gutters.style.height="",V(a),W(a),!0}}function V(a){for(var f,b=a.display,d=b.lineDiv.offsetTop,e=b.lineDiv.firstChild;e;e=e.nextSibling)if(e.lineObj){if(c){var g=e.offsetTop+e.offsetHeight;f=g-d,d=g}else{var h=Df(e);f=h.bottom-h.top}var i=e.lineObj.height-f;if(2>f&&(f=Db(b)),i>.001||-.001>i){Be(e.lineObj,f);var j=e.lineObj.widgets;if(j)for(var k=0;kc;++c){for(var e=b[c],f=[],g=e.diff||0,h=0,i=a.length;i>h;++h){var j=a[h];e.to<=j.from&&e.diff?f.push({from:j.from+g,to:j.to+g}):e.to<=j.from||e.from>=j.to?f.push(j):(e.from>j.from&&f.push({from:j.from,to:e.from}),e.ton){for(;k.lineObj!=b;)k=l(k);i&&n>=e&&k.lineNumber&&Cf(k.lineNumber,R(a.options,n)),k=k.nextSibling}else{if(b.widgets)for(var s,q=0,r=k;r&&20>q;++q,r=r.nextSibling)if(r.lineObj==b&&/div/i.test(r.nodeName)){s=r;break}var t=$(a,b,n,f,s);if(t!=s)j.insertBefore(t,k);else{for(;k!=s;)k=l(k);k=k.nextSibling}t.lineObj=b}++n});k;)k=l(k)}function $(a,b,d,e,f){var k,g=ie(a,b),h=g.pre,i=b.gutterMarkers,j=a.display,l=g.bgClass?g.bgClass+" "+(b.bgClass||""):b.bgClass;if(!(a.options.lineNumbers||i||l||b.wrapClass||b.widgets))return h;if(f){f.alignable=null;for(var q,m=!0,n=0,o=null,p=f.firstChild;p;p=q)if(q=p.nextSibling,/\bCodeMirror-linewidget\b/.test(p.className)){for(var r=0;rb&&(b=0),e.appendChild(zf("div",null,"CodeMirror-selected","position: absolute; left: "+a+"px; top: "+b+"px; width: "+(null==c?h-a:c)+"px; height: "+(d-b)+"px"))}function j(b,d,e){function m(c,d){return xb(a,Gc(b,c),"div",f,d)}var k,l,f=ye(c,b),j=f.text.length;return Of(Fe(f),d||0,null==e?j:e,function(a,b,c){var n,o,p,f=m(a,"left");if(a==b)n=f,o=p=f.left;else{if(n=m(b-1,"right"),"rtl"==c){var q=f;f=n,n=q}o=f.left,p=n.right}null==d&&0==a&&(o=g),n.top-f.top>3&&(i(o,f.top,null,f.bottom),o=g,f.bottoml.bottom||n.bottom==l.bottom&&n.right>l.right)&&(l=n),g+1>o&&(o=g),i(o,n.top,p-o,n.bottom)}),{start:k,end:l}}var b=a.display,c=a.doc,d=a.doc.sel,e=document.createDocumentFragment(),f=kb(a.display),g=f.left,h=b.lineSpace.offsetWidth-f.right;if(d.from.line==d.to.line)j(d.from.line,d.from.ch,d.to.ch);else{var k=ye(c,d.from.line),l=ye(c,d.to.line),m=Rd(c,k)==Rd(c,l),n=j(d.from.line,d.from.ch,m?k.text.length:null).end,o=j(d.to.line,m?0:null,d.to.ch).start;m&&(n.top0&&(b.blinker=setInterval(function(){b.cursor.style.visibility=b.otherCursor.style.visibility=(c=!c)?"":"hidden"},a.options.cursorBlinkRate))}}function eb(a,b){a.doc.mode.startState&&a.doc.frontier=a.display.showingTo)){var f,c=+new Date+a.options.workTime,d=nd(b.mode,hb(a,b.frontier)),e=[];b.iter(b.frontier,Math.min(b.first+b.size,a.display.showingTo+500),function(g){if(b.frontier>=a.display.showingFrom){var h=g.styles;g.styles=ce(a,g,d,!0);for(var i=!h||h.length!=g.styles.length,j=0;!i&&jc?(eb(a,a.options.workDelay),!0):void 0}),e.length&&Ib(a,function(){for(var a=0;ag;--h){if(h<=f.first)return f.first;var i=ye(f,h-1);if(i.stateAfter&&(!c||h<=f.frontier))return h;var j=kf(i.text,null,a.options.tabSize);(null==e||d>j)&&(e=h-1,d=j)}return e}function hb(a,b,c){var d=a.doc,e=a.display;if(!d.mode.startState)return!0;var f=gb(a,b,c),g=f>d.first&&ye(d,f-1).stateAfter;return g=g?nd(d.mode,g):od(d.mode),d.iter(f,b,function(c){ee(a,c.text,g);var h=f==b-1||0==f%5||f>=e.showingFrom&&ff&&0==h&&(f=1)}return e=h>c?"left":c>h?"right":e,"left"==e&&i.leftSide?i=i.leftSide:"right"==e&&i.rightSide&&(i=i.rightSide),{left:c>h?i.right:i.left,right:h>c?i.left:i.right,top:i.top,bottom:i.bottom}}function mb(a,b){for(var c=a.display.measureLineCache,d=0;ds&&(c=s),0>b&&(b=0);for(var d=q.length-2;d>=0;d-=2){var e=q[d],f=q[d+1];if(!(e>c||b>f)&&(b>=e&&f>=c||e>=b&&c>=f||Math.min(c,f)-Math.max(b,e)>=c-b>>1)){q[d]=Math.min(b,e),q[d+1]=Math.max(c,f);break}}return 0>d&&(d=q.length,q.push(b,c)),{left:a.left-p.left,right:a.right-p.left,top:d,bottom:null}}function u(a){a.bottom=q[a.top+1],a.top=q[a.top]}if(!a.options.lineWrapping&&e.text.length>=a.options.crudeMeasuringFrom)return qb(a,e);var f=a.display,g=sf(e.text.length),h=ie(a,e,g,!0).pre;if(b&&!c&&!a.options.lineWrapping&&h.childNodes.length>100){for(var i=document.createDocumentFragment(),j=10,k=h.childNodes.length,l=0,m=Math.ceil(k/j);m>l;++l){for(var n=zf("div",null,null,"display: inline-block"),o=0;j>o&&k;++o)n.appendChild(h.firstChild),--k;i.appendChild(n)}h.appendChild(i)}Bf(f.measure,h);var p=Df(f.lineDiv),q=[],r=sf(e.text.length),s=h.offsetHeight;d&&f.measure.first!=h&&Bf(f.measure,h);for(var v,l=0;l1&&(x=r[l]=t(y[0]),x.rightSide=t(y[y.length-1]))}x||(x=r[l]=t(Df(w))),v.measureRight&&(x.right=Df(v.measureRight).left-p.left),v.leftSide&&(x.leftSide=t(Df(v.leftSide)))}Af(a.display.measure);for(var v,l=0;l=a.options.crudeMeasuringFrom)return lb(a,b,b.text.length,f&&f.measure,"right").right;var g=ie(a,b,null,!0).pre,h=g.appendChild(Jf(a.display.measure));Bf(a.display.measure,g);var i=Df(h);return 0==i.right&&0==i.bottom&&(h=g.appendChild(zf("span","\xa0")),i=Df(h)),i.left-Df(a.display.lineDiv).left}function sb(a){a.display.measureLineCache.length=a.display.measureLineCachePos=0,a.display.cachedCharWidth=a.display.cachedTextHeight=a.display.cachedPaddingH=null,a.options.lineWrapping||(a.display.maxLineChanged=!0),a.display.lineNumChars=null}function tb(){return window.pageXOffset||(document.documentElement||document.body).scrollLeft}function ub(){return window.pageYOffset||(document.documentElement||document.body).scrollTop}function vb(a,b,c,d){if(b.widgets)for(var e=0;ec.from?f(a-1):f(a,d)}d=d||ye(a.doc,b.line),e||(e=ob(a,d));var h=Fe(d),i=b.ch;if(!h)return f(i);var j=Xf(h,i),k=g(i,j);return null!=Wf&&(k.other=g(i,Wf)),k}function zb(a,b,c,d){var e=new Gc(a,b);return e.xRel=d,c&&(e.outside=!0),e}function Ab(a,b,c){var d=a.doc;if(c+=a.display.viewOffset,0>c)return zb(d.first,0,!0,-1);var e=De(d,c),f=d.first+d.size-1;if(e>f)return zb(d.first+d.size-1,ye(d,f).text.length,!0,1);for(0>b&&(b=0);;){var g=ye(d,e),h=Bb(a,g,e,b,c),i=Pd(g),j=i&&i.find();if(!i||!(h.ch>j.from.ch||h.ch==j.from.ch&&h.xRel>0))return h;e=j.to.line}}function Bb(a,b,c,d,e){function j(d){var e=yb(a,Gc(c,d),"line",b,i);return g=!0,f>e.bottom?e.left-h:fq)return zb(c,n,r,1);for(;;){if(k?n==m||n==Zf(b,m,1):1>=n-m){for(var s=o>d||q-d>=d-o?m:n,t=d-(s==m?o:q);yf(b.text.charAt(s));)++s;var u=zb(c,s,s==m?p:r,0>t?-1:t?1:0);return u}var v=Math.ceil(l/2),w=m+v;if(k){w=m;for(var x=0;v>x;++x)w=Zf(b,w,1)}var y=j(w);y>d?(n=w,q=y,(r=g)&&(q+=1e3),l=v):(m=w,o=y,p=g,l-=v)}}function Db(a){if(null!=a.cachedTextHeight)return a.cachedTextHeight;if(null==Cb){Cb=zf("pre");for(var b=0;49>b;++b)Cb.appendChild(document.createTextNode("x")),Cb.appendChild(zf("br"));Cb.appendChild(document.createTextNode("x"))}Bf(a.measure,Cb);var c=Cb.offsetHeight/50;return c>3&&(a.cachedTextHeight=c),Af(a.measure),c||1}function Eb(a){if(null!=a.cachedCharWidth)return a.cachedCharWidth;var b=zf("span","x"),c=zf("pre",[b]);Bf(a.measure,c);var d=b.offsetWidth;return d>2&&(a.cachedCharWidth=d),d||10}function Gb(a){a.curOp={changes:[],forceUpdate:!1,updateInput:null,userSelChange:null,textChanged:null,selectionChanged:!1,cursorActivity:!1,updateMaxLine:!1,updateScrollPos:!1,id:++Fb},af++||(_e=[])}function Hb(a){var b=a.curOp,c=a.doc,d=a.display;if(a.curOp=null,b.updateMaxLine&&L(a),d.maxLineChanged&&!a.options.lineWrapping&&d.maxLine){var e=rb(a,d.maxLine);d.sizer.style.minWidth=Math.max(0,e+3)+"px",d.maxLineChanged=!1;var f=Math.max(0,d.sizer.offsetLeft+d.sizer.offsetWidth-d.scroller.clientWidth);fj&&c.charCodeAt(j)==h.charCodeAt(j);)++j;var l=f.from,m=f.to,n=h.slice(j);j-1){$c(a,f.head.line,"smart");break}}return h.length>1e3||h.indexOf("\n")>-1?b.value=a.display.prevInput="":a.display.prevInput=h,i&&Hb(a),a.state.pasteIncoming=a.state.cutIncoming=!1,!0}function Pb(a,b){var c,e,f=a.doc;if(Hc(f.sel.from,f.sel.to))b&&(a.display.prevInput=a.display.input.value="",g&&!d&&(a.display.inputHasSelection=null));else{a.display.prevInput="",c=Mf&&(f.sel.to.line-f.sel.from.line>100||(e=a.getSelection()).length>1e3);var h=c?"-":e||a.getSelection();a.display.input.value=h,a.state.focused&&of(a.display.input),g&&!d&&(a.display.inputHasSelection=h)}a.display.inaccurateSelection=c}function Qb(a){"nocursor"==a.options.readOnly||r&&document.activeElement==a.display.input||a.display.input.focus()}function Rb(a){a.state.focused||(Qb(a),rc(a))}function Sb(a){return a.options.readOnly||a.doc.cantEdit}function Tb(a){function e(){a.state.focused&&setTimeout(tf(Qb,a),0)}function i(){null==f&&(f=setTimeout(function(){f=null,c.cachedCharWidth=c.cachedTextHeight=c.cachedPaddingH=Gf=null,sb(a),Kb(a,tf(Lb,a))},100))}function j(){for(var a=c.wrapper.parentNode;a&&a!=document.body;a=a.parentNode);a?setTimeout(j,5e3):Ze(window,"resize",i)}function k(b){cf(a,b)||a.options.onDragEvent&&a.options.onDragEvent(a,Re(b))||Ve(b)}function l(b){c.inaccurateSelection&&(c.prevInput="",c.inaccurateSelection=!1,c.input.value=a.getSelection(),of(c.input)),"cut"==b.type&&(a.state.cutIncoming=!0)}var c=a.display;Ye(c.scroller,"mousedown",Ib(a,Yb)),b?Ye(c.scroller,"dblclick",Ib(a,function(b){if(!cf(a,b)){var c=Vb(a,b);if(c&&!_b(a,b)&&!Ub(a.display,b)){Se(b);var d=cd(ye(a.doc,c.line).text,c);Pc(a.doc,d.from,d.to)}}})):Ye(c.scroller,"dblclick",function(b){cf(a,b)||Se(b)}),Ye(c.lineSpace,"selectstart",function(a){Ub(c,a)||Se(a)}),w||Ye(c.scroller,"contextmenu",function(b){uc(a,b)}),Ye(c.scroller,"scroll",function(){c.scroller.clientHeight&&(dc(a,c.scroller.scrollTop),ec(a,c.scroller.scrollLeft,!0),$e(a,"scroll",a))}),Ye(c.scrollbarV,"scroll",function(){c.scroller.clientHeight&&dc(a,c.scrollbarV.scrollTop)}),Ye(c.scrollbarH,"scroll",function(){c.scroller.clientHeight&&ec(a,c.scrollbarH.scrollLeft)}),Ye(c.scroller,"mousewheel",function(b){hc(a,b)}),Ye(c.scroller,"DOMMouseScroll",function(b){hc(a,b)}),Ye(c.scrollbarH,"mousedown",e),Ye(c.scrollbarV,"mousedown",e),Ye(c.wrapper,"scroll",function(){c.wrapper.scrollTop=c.wrapper.scrollLeft=0});var f;Ye(window,"resize",i),setTimeout(j,5e3),Ye(c.input,"keyup",Ib(a,nc)),Ye(c.input,"input",function(){g&&!d&&a.display.inputHasSelection&&(a.display.inputHasSelection=null),Nb(a)}),Ye(c.input,"keydown",Ib(a,pc)),Ye(c.input,"keypress",Ib(a,qc)),Ye(c.input,"focus",tf(rc,a)),Ye(c.input,"blur",tf(sc,a)),a.options.dragDrop&&(Ye(c.scroller,"dragstart",function(b){cc(a,b)}),Ye(c.scroller,"dragenter",k),Ye(c.scroller,"dragover",k),Ye(c.scroller,"drop",Ib(a,bc))),Ye(c.scroller,"paste",function(b){Ub(c,b)||(Qb(a),Nb(a))}),Ye(c.input,"paste",function(){if(h&&!a.state.fakedLastChar&&!(new Date-a.state.lastMiddleDown<200)){var b=c.input.selectionStart,d=c.input.selectionEnd; c.input.value+="$",c.input.selectionStart=b,c.input.selectionEnd=d,a.state.fakedLastChar=!0}a.state.pasteIncoming=!0,Nb(a)}),Ye(c.input,"cut",l),Ye(c.input,"copy",l),m&&Ye(c.sizer,"mouseup",function(){document.activeElement==c.input&&c.input.blur(),Qb(a)})}function Ub(a,b){for(var c=We(b);c!=a.wrapper;c=c.parentNode)if(!c||c.ignoreEvents||c.parentNode==a.sizer&&c!=a.mover)return!0}function Vb(a,b,c){var d=a.display;if(!c){var e=We(b);if(e==d.scrollbarH||e==d.scrollbarH.firstChild||e==d.scrollbarV||e==d.scrollbarV.firstChild||e==d.scrollbarFiller||e==d.gutterFiller)return null}var f,g,h=Df(d.lineSpace);try{f=b.clientX,g=b.clientY}catch(b){return null}return Ab(a,f-h.left,g-h.top)}function Yb(a){function t(a){if(!Hc(s,a)){if(s=a,"single"==m)return Pc(c.doc,Mc(i,k),a),void 0;if(q=Mc(i,q),r=Mc(i,r),"double"==m){var b=cd(ye(i,a.line).text,a);Ic(a,q)?Pc(c.doc,b.from,r):Pc(c.doc,q,b.to)}else"triple"==m&&(Ic(a,q)?Pc(c.doc,r,Mc(i,Gc(a.line,0))):Pc(c.doc,q,Mc(i,Gc(a.line+1,0))))}}function x(a){var b=++v,d=Vb(c,a,!0);if(d)if(Hc(d,o)){var g=a.clientYu.bottom?20:0;g&&setTimeout(Ib(c,function(){v==b&&(f.scroller.scrollTop+=g,x(a))}),50)}else{Rb(c),o=d,t(d);var e=O(f,i);(d.line>=e.to||d.linel-400&&Hc(Xb.pos,k))m="triple",Se(a),setTimeout(tf(Qb,c),20),dd(c,k.line);else if(Wb&&Wb.time>l-400&&Hc(Wb.pos,k)){m="double",Xb={time:l,pos:k},Se(a);var n=cd(ye(i,k.line).text,k);Pc(c.doc,n.from,n.to)}else Wb={time:l,pos:k};var o=k;if(c.options.dragDrop&&Ef&&!Sb(c)&&!Hc(j.from,j.to)&&!Ic(k,j.from)&&!Ic(j.to,k)&&"single"==m){var p=Ib(c,function(e){h&&(f.scroller.draggable=!1),c.state.draggingText=!1,Ze(document,"mouseup",p),Ze(f.scroller,"drop",p),Math.abs(a.clientX-e.clientX)+Math.abs(a.clientY-e.clientY)<10&&(Se(e),Pc(c.doc,k),Qb(c),b&&!d&&setTimeout(function(){document.body.focus(),Qb(c)},20))});return h&&(f.scroller.draggable=!0),c.state.draggingText=p,f.scroller.dragDrop&&f.scroller.dragDrop(),Ye(document,"mouseup",p),Ye(f.scroller,"drop",p),void 0}Se(a),"single"==m&&Pc(c.doc,Mc(i,k));var q=j.from,r=j.to,s=k,u=Df(f.wrapper),v=0,z=Ib(c,function(a){(g&&!e?a.buttons:Xe(a))?x(a):y(a)}),A=Ib(c,y);Ye(document,"mousemove",z),Ye(document,"mouseup",A)}}}function Zb(a,b,c,d,e){try{var f=b.clientX,g=b.clientY}catch(b){return!1}if(f>=Math.floor(Df(a.display.gutters).right))return!1;d&&Se(b);var h=a.display,i=Df(h.lineDiv);if(g>i.bottom||!ef(a,c))return Ue(b);g-=i.top-h.viewOffset;for(var j=0;j=f){var l=De(a.doc,g),m=a.options.gutters[j];return e(a,c,a,l,m,b),Ue(b)}}}function $b(a,b){return ef(a,"gutterContextMenu")?Zb(a,b,"gutterContextMenu",!1,$e):!1}function _b(a,b){return Zb(a,b,"gutterClick",!0,bf)}function bc(a){var b=this;if(!(cf(b,a)||Ub(b.display,a)||b.options.onDragEvent&&b.options.onDragEvent(b,Re(a)))){Se(a),g&&(ac=+new Date);var c=Vb(b,a,!0),d=a.dataTransfer.files;if(c&&!Sb(b))if(d&&d.length&&window.FileReader&&window.File)for(var e=d.length,f=Array(e),h=0,i=function(a,d){var g=new FileReader;g.onload=function(){f[d]=g.result,++h==e&&(c=Mc(b.doc,c),zc(b.doc,{from:c,to:c,text:Kf(f.join("\n")),origin:"paste"},"around"))},g.readAsText(a)},j=0;e>j;++j)i(d[j],j);else{if(b.state.draggingText&&!Ic(c,b.doc.sel.from)&&!Ic(b.doc.sel.to,c))return b.state.draggingText(a),setTimeout(tf(Qb,b),20),void 0;try{var f=a.dataTransfer.getData("Text");if(f){var k=b.doc.sel.from,l=b.doc.sel.to;Rc(b.doc,c,c),b.state.draggingText&&Fc(b.doc,"",k,l,"paste"),b.replaceSelection(f,null,"paste"),Qb(b)}}catch(a){}}}}function cc(a,b){if(g&&(!a.state.draggingText||+new Date-ac<100))return Ve(b),void 0;if(!cf(a,b)&&!Ub(a.display,b)){var c=a.getSelection();if(b.dataTransfer.setData("Text",c),b.dataTransfer.setDragImage&&!l){var d=zf("img",null,null,"position: fixed; left: 0; top: 0;");d.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",k&&(d.width=d.height=1,a.display.wrapper.appendChild(d),d._top=d.offsetTop),b.dataTransfer.setDragImage(d,0,0),k&&d.parentNode.removeChild(d)}}}function dc(b,c){Math.abs(b.doc.scrollTop-c)<2||(b.doc.scrollTop=c,a||T(b,[],c),b.display.scroller.scrollTop!=c&&(b.display.scroller.scrollTop=c),b.display.scrollbarV.scrollTop!=c&&(b.display.scrollbarV.scrollTop=c),a&&T(b,[]),eb(b,100))}function ec(a,b,c){(c?b==a.doc.scrollLeft:Math.abs(a.doc.scrollLeft-b)<2)||(b=Math.min(b,a.display.scroller.scrollWidth-a.display.scroller.clientWidth),a.doc.scrollLeft=b,P(a),a.display.scroller.scrollLeft!=b&&(a.display.scroller.scrollLeft=b),a.display.scrollbarH.scrollLeft!=b&&(a.display.scrollbarH.scrollLeft=b))}function hc(b,c){var d=c.wheelDeltaX,e=c.wheelDeltaY;null==d&&c.detail&&c.axis==c.HORIZONTAL_AXIS&&(d=c.detail),null==e&&c.detail&&c.axis==c.VERTICAL_AXIS?e=c.detail:null==e&&(e=c.wheelDelta);var f=b.display,g=f.scroller;if(d&&g.scrollWidth>g.clientWidth||e&&g.scrollHeight>g.clientHeight){if(e&&s&&h)for(var i=c.target;i!=g;i=i.parentNode)if(i.lineObj){b.display.currentWheelTarget=i;break}if(d&&!a&&!k&&null!=gc)return e&&dc(b,Math.max(0,Math.min(g.scrollTop+e*gc,g.scrollHeight-g.clientHeight))),ec(b,Math.max(0,Math.min(g.scrollLeft+d*gc,g.scrollWidth-g.clientWidth))),Se(c),f.wheelStartX=null,void 0;if(e&&null!=gc){var j=e*gc,l=b.doc.scrollTop,m=l+f.wrapper.clientHeight;0>j?l=Math.max(0,l+j-50):m=Math.min(b.doc.height,m+j+50),T(b,[],{top:l,bottom:m})}20>fc&&(null==f.wheelStartX?(f.wheelStartX=g.scrollLeft,f.wheelStartY=g.scrollTop,f.wheelDX=d,f.wheelDY=e,setTimeout(function(){if(null!=f.wheelStartX){var a=g.scrollLeft-f.wheelStartX,b=g.scrollTop-f.wheelStartY,c=b&&f.wheelDY&&b/f.wheelDY||a&&f.wheelDX&&a/f.wheelDX;f.wheelStartX=f.wheelStartY=null,c&&(gc=(gc*fc+c)/(fc+1),++fc)}},200)):(f.wheelDX+=d,f.wheelDY+=e))}}function ic(a,b,c){if("string"==typeof b&&(b=pd[b],!b))return!1;a.display.pollingFast&&Ob(a)&&(a.display.pollingFast=!1);var d=a.doc,e=d.sel.shift,f=!1;try{Sb(a)&&(a.state.suppressEdits=!0),c&&(d.sel.shift=!1),f=b(a)!=hf}finally{d.sel.shift=e,a.state.suppressEdits=!1}return f}function jc(a){var b=a.state.keyMaps.slice(0);return a.options.extraKeys&&b.push(a.options.extraKeys),b.push(a.options.keyMap),b}function lc(a,b){var c=rd(a.options.keyMap),e=c.auto;clearTimeout(kc),e&&!td(b)&&(kc=setTimeout(function(){rd(a.options.keyMap)==c&&(a.options.keyMap=e.call?e.call(null,a):e,G(a))},50));var f=ud(b,!0),g=!1;if(!f)return!1;var h=jc(a);return g=b.shiftKey?sd("Shift-"+f,h,function(b){return ic(a,b,!0)})||sd(f,h,function(b){return("string"==typeof b?/^go[A-Z]/.test(b):b.motion)?ic(a,b):void 0}):sd(f,h,function(b){return ic(a,b)}),g&&(Se(b),db(a),d&&(b.oldKeyCode=b.keyCode,b.keyCode=0),bf(a,"keyHandled",a,f,b)),g}function mc(a,b,c){var d=sd("'"+c+"'",jc(a),function(b){return ic(a,b,!0)});return d&&(Se(b),db(a),bf(a,"keyHandled",a,"'"+c+"'",b)),d}function nc(a){var b=this;cf(b,a)||b.options.onKeyEvent&&b.options.onKeyEvent(b,Re(a))||16==a.keyCode&&(b.doc.sel.shift=!1)}function pc(a){var c=this;if(Rb(c),!(cf(c,a)||c.options.onKeyEvent&&c.options.onKeyEvent(c,Re(a)))){b&&27==a.keyCode&&(a.returnValue=!1);var d=a.keyCode;c.doc.sel.shift=16==d||a.shiftKey;var e=lc(c,a);k&&(oc=e?d:null,!e&&88==d&&!Mf&&(s?a.metaKey:a.ctrlKey)&&c.replaceSelection(""))}}function qc(a){var b=this;if(!(cf(b,a)||b.options.onKeyEvent&&b.options.onKeyEvent(b,Re(a)))){var c=a.keyCode,e=a.charCode;if(k&&c==oc)return oc=null,Se(a),void 0;if(!(k&&(!a.which||a.which<10)||m)||!lc(b,a)){var f=String.fromCharCode(null==e?c:e);mc(b,a,f)||(g&&!d&&(b.display.inputHasSelection=null),Nb(b))}}}function rc(a){"nocursor"!=a.options.readOnly&&(a.state.focused||($e(a,"focus",a),a.state.focused=!0,-1==a.display.wrapper.className.search(/\bCodeMirror-focused\b/)&&(a.display.wrapper.className+=" CodeMirror-focused"),a.curOp||(Pb(a,!0),h&&setTimeout(tf(Pb,a,!0),0))),Mb(a),db(a))}function sc(a){a.state.focused&&($e(a,"blur",a),a.state.focused=!1,a.display.wrapper.className=a.display.wrapper.className.replace(" CodeMirror-focused","")),clearInterval(a.display.blinker),setTimeout(function(){a.state.focused||(a.doc.sel.shift=!1)},150)}function uc(a,b){function l(){if(null!=c.input.selectionStart){var a=c.input.value="\u200b"+(Hc(e.from,e.to)?"":c.input.value);c.prevInput="\u200b",c.input.selectionStart=1,c.input.selectionEnd=a.length}}function m(){if(c.inputDiv.style.position="relative",c.input.style.cssText=j,d&&(c.scrollbarV.scrollTop=c.scroller.scrollTop=h),Mb(a),null!=c.input.selectionStart){(!g||d)&&l(),clearTimeout(tc);var b=0,e=function(){"\u200b"==c.prevInput&&0==c.input.selectionStart?Ib(a,pd.selectAll)(a):b++<10?tc=setTimeout(e,500):Pb(a)};tc=setTimeout(e,200)}}if(!cf(a,b,"contextmenu")){var c=a.display,e=a.doc.sel;if(!Ub(c,b)&&!$b(a,b)){var f=Vb(a,b),h=c.scroller.scrollTop;if(f&&!k){var i=a.options.resetSelectionOnContextMenu;i&&(Hc(e.from,e.to)||Ic(f,e.from)||!Ic(f,e.to))&&Ib(a,Rc)(a.doc,f,f);var j=c.input.style.cssText;if(c.inputDiv.style.position="absolute",c.input.style.cssText="position: fixed; width: 30px; height: 30px; top: "+(b.clientY-5)+"px; left: "+(b.clientX-5)+"px; z-index: 1000; background: transparent; outline: none;"+"border-width: 0; outline: none; overflow: hidden; opacity: .05; -ms-opacity: .05; filter: alpha(opacity=5);",Qb(a),Pb(a,!0),Hc(e.from,e.to)&&(c.input.value=c.prevInput=" "),g&&!d&&l(),w){Ve(b);var n=function(){Ze(window,"mouseup",n),setTimeout(m,20)};Ye(window,"mouseup",n)}else setTimeout(m,50)}}}}function wc(a,b,c){if(!Ic(b.from,c))return Mc(a,c);var d=b.text.length-1-(b.to.line-b.from.line);if(c.line>b.to.line+d){var e=c.line-d,f=a.first+a.size-1;return e>f?Gc(f,ye(a,f).text.length):Nc(c,ye(a,e).text.length)}if(c.line==b.to.line+d)return Nc(c,nf(b.text).length+(1==b.text.length?b.from.ch:0)+ye(a,b.to.line).text.length-b.to.ch);var g=c.line-b.from.line;return Nc(c,b.text[g].length+(g?0:b.from.ch))}function xc(a,b,c){if(c&&"object"==typeof c)return{anchor:wc(a,b,c.anchor),head:wc(a,b,c.head)};if("start"==c)return{anchor:b.from,head:b.from};var d=vc(b);if("around"==c)return{anchor:b.from,head:d};if("end"==c)return{anchor:d,head:d};var e=function(a){if(Ic(a,b.from))return a;if(!Ic(b.to,a))return d;var c=a.line+b.text.length-(b.to.line-b.from.line)-1,e=a.ch;return a.line==b.to.line&&(e+=d.ch-b.to.ch),Gc(c,e)};return{anchor:e(a.sel.anchor),head:e(a.sel.head)}}function yc(a,b,c){var d={canceled:!1,from:b.from,to:b.to,text:b.text,origin:b.origin,cancel:function(){this.canceled=!0}};return c&&(d.update=function(b,c,d,e){b&&(this.from=Mc(a,b)),c&&(this.to=Mc(a,c)),d&&(this.text=d),void 0!==e&&(this.origin=e)}),$e(a,"beforeChange",a,d),a.cm&&$e(a.cm,"beforeChange",a.cm,d),d.canceled?null:{from:d.from,to:d.to,text:d.text,origin:d.origin}}function zc(a,b,c,d){if(a.cm){if(!a.cm.curOp)return Ib(a.cm,zc)(a,b,c,d);if(a.cm.state.suppressEdits)return}if(!(ef(a,"beforeChange")||a.cm&&ef(a.cm,"beforeChange"))||(b=yc(a,b,!0))){var e=x&&!d&&Jd(a,b.from,b.to);if(e){for(var f=e.length-1;f>=1;--f)Ac(a,{from:e[f].from,to:e[f].to,text:[""]});e.length&&Ac(a,{from:e[0].from,to:e[0].to,text:b.text},c)}else Ac(a,b,c)}}function Ac(a,b,c){if(1!=b.text.length||""!=b.text[0]||!Hc(b.from,b.to)){var d=xc(a,b,c);Je(a,b,d,a.cm?a.cm.curOp.id:0/0),Dc(a,b,d,Gd(a,b));var e=[];we(a,function(a,c){c||-1!=pf(e,a.history)||(Pe(a.history,b),e.push(a.history)),Dc(a,b,null,Gd(a,b))})}}function Bc(a,b){if(!a.cm||!a.cm.state.suppressEdits){var c=a.history,d=("undo"==b?c.done:c.undone).pop();if(d){var e={changes:[],anchorBefore:d.anchorAfter,headBefore:d.headAfter,anchorAfter:d.anchorBefore,headAfter:d.headBefore,generation:c.generation};("undo"==b?c.undone:c.done).push(e),c.generation=d.generation||++c.maxGeneration;for(var f=ef(a,"beforeChange")||a.cm&&ef(a.cm,"beforeChange"),g=d.changes.length-1;g>=0;--g){var h=d.changes[g];if(h.origin=b,f&&!yc(a,h,!1))return("undo"==b?c.done:c.undone).length=0,void 0;e.changes.push(Ie(a,h));var i=g?xc(a,h,null):{anchor:d.anchorBefore,head:d.headBefore};Dc(a,h,i,Id(a,h));var j=[];we(a,function(a,b){b||-1!=pf(j,a.history)||(Pe(a.history,h),j.push(a.history)),Dc(a,h,null,Id(a,h))})}}}}function Cc(a,b){function c(a){return Gc(a.line+b,a.ch)}a.first+=b,a.cm&&Lb(a.cm,a.first,a.first,b),a.sel.head=c(a.sel.head),a.sel.anchor=c(a.sel.anchor),a.sel.from=c(a.sel.from),a.sel.to=c(a.sel.to)}function Dc(a,b,c,d){if(a.cm&&!a.cm.curOp)return Ib(a.cm,Dc)(a,b,c,d);if(b.to.linea.lastLine())){if(b.from.linef&&(b={from:b.from,to:Gc(f,ye(a,f).text.length),text:[b.text[0]],origin:b.origin}),b.removed=ze(a,b.from,b.to),c||(c=xc(a,b,null)),a.cm?Ec(a.cm,b,d,c):pe(a,b,d,c)}}function Ec(a,b,c,d){var e=a.doc,f=a.display,g=b.from,h=b.to,i=!1,j=g.line;a.options.lineWrapping||(j=Ce(Rd(e,ye(e,g.line))),e.iter(j,h.line+1,function(a){return a==f.maxLine?(i=!0,!0):void 0})),Ic(e.sel.head,b.from)||Ic(b.to,e.sel.head)||(a.curOp.cursorActivity=!0),pe(e,b,c,d,E(a)),a.options.lineWrapping||(e.iter(j,g.line+b.text.length,function(a){var b=K(e,a);b>f.maxLineLength&&(f.maxLine=a,f.maxLineLength=b,f.maxLineChanged=!0,i=!1)}),i&&(a.curOp.updateMaxLine=!0)),e.frontier=Math.min(e.frontier,g.line),eb(a,400);var k=b.text.length-(h.line-g.line)-1;if(Lb(a,g.line,h.line+1,k),ef(a,"change")){var l={from:g,to:h,text:b.text,removed:b.removed,origin:b.origin};if(a.curOp.textChanged){for(var m=a.curOp.textChanged;m.next;m=m.next);m.next=l}else a.curOp.textChanged=l}}function Fc(a,b,c,d,e){if(d||(d=c),Ic(d,c)){var f=d;d=c,c=f}"string"==typeof b&&(b=Kf(b)),zc(a,{from:c,to:d,text:b,origin:e},null)}function Gc(a,b){return this instanceof Gc?(this.line=a,this.ch=b,void 0):new Gc(a,b)}function Hc(a,b){return a.line==b.line&&a.ch==b.ch}function Ic(a,b){return a.linec?Gc(c,ye(a,c).text.length):Nc(b,ye(a,b.line).text.length)}function Nc(a,b){var c=a.ch;return null==c||c>b?Gc(a.line,b):0>c?Gc(a.line,0):a}function Oc(a,b){return b>=a.first&&b=f.ch:j.to>f.ch))){if(d&&($e(k,"beforeCursorEnter"),k.explicitlyCleared)){if(h.markedSpans){--i;continue}break}if(!k.atomic)continue;var l=k.find()[0>g?"from":"to"];if(Hc(l,f)&&(l.ch+=g,l.ch<0?l=l.line>a.first?Mc(a,Gc(l.line-1)):null:l.ch>h.text.length&&(l=l.line(window.innerHeight||document.documentElement.clientHeight)&&(e=!1),null!=e&&!p){var f=zf("div","\u200b",null,"position: absolute; top: "+(b.top-c.viewOffset)+"px; height: "+(b.bottom-b.top+gf)+"px; left: "+b.left+"px; width: 2px;");a.display.lineSpace.appendChild(f),f.scrollIntoView(e),a.display.lineSpace.removeChild(f)}}}function Vc(a,b,c,d){for(null==d&&(d=0);;){var e=!1,f=yb(a,b),g=c&&c!=b?yb(a,c):f,h=Xc(a,Math.min(f.left,g.left),Math.min(f.top,g.top)-d,Math.max(f.left,g.left),Math.max(f.bottom,g.bottom)+d),i=a.doc.scrollTop,j=a.doc.scrollLeft;if(null!=h.scrollTop&&(dc(a,h.scrollTop),Math.abs(a.doc.scrollTop-i)>1&&(e=!0)),null!=h.scrollLeft&&(ec(a,h.scrollLeft),Math.abs(a.doc.scrollLeft-j)>1&&(e=!0)),!e)return f}}function Wc(a,b,c,d,e){var f=Xc(a,b,c,d,e);null!=f.scrollTop&&dc(a,f.scrollTop),null!=f.scrollLeft&&ec(a,f.scrollLeft)}function Xc(a,b,c,d,e){var f=a.display,g=Db(a.display);0>c&&(c=0);var h=f.scroller.clientHeight-gf,i=f.scroller.scrollTop,j={},k=a.doc.height+jb(f),l=g>c,m=e>k-g;if(i>c)j.scrollTop=l?0:c;else if(e>i+h){var n=Math.min(c,(m?k:e)-h);n!=i&&(j.scrollTop=n)}var o=f.scroller.clientWidth-gf,p=f.scroller.scrollLeft;b+=f.gutters.offsetWidth,d+=f.gutters.offsetWidth;var q=f.gutters.offsetWidth,r=q+10>b;return p+q>b||r?(r&&(b=0),j.scrollLeft=Math.max(0,b-10-q)):d>o+p-3&&(j.scrollLeft=d+10-o),j}function Yc(a,b,c){a.curOp.updateScrollPos={scrollLeft:null==b?a.doc.scrollLeft:b,scrollTop:null==c?a.doc.scrollTop:c}}function Zc(a,b,c){var d=a.curOp.updateScrollPos||(a.curOp.updateScrollPos={scrollLeft:a.doc.scrollLeft,scrollTop:a.doc.scrollTop}),e=a.display.scroller;d.scrollTop=Math.max(0,Math.min(e.scrollHeight-e.clientHeight,d.scrollTop+c)),d.scrollLeft=Math.max(0,Math.min(e.scrollWidth-e.clientWidth,d.scrollLeft+b))}function $c(a,b,c,d){var f,e=a.doc;null==c&&(c="add"),"smart"==c&&(a.doc.mode.indent?f=hb(a,b):c="prev");var g=a.options.tabSize,h=ye(e,b),i=kf(h.text,null,g);h.stateAfter&&(h.stateAfter=null);var k,j=h.text.match(/^\s*/)[0];if(d||/\S/.test(h.text)){if("smart"==c&&(k=a.doc.mode.indent(f,h.text.slice(j.length),h.text),k==hf)){if(!d)return;c="prev"}}else k=0,c="not";"prev"==c?k=b>e.first?kf(ye(e,b-1).text,null,g):0:"add"==c?k=i+a.options.indentUnit:"subtract"==c?k=i-a.options.indentUnit:"number"==typeof c&&(k=i+c),k=Math.max(0,k);var l="",m=0;if(a.options.indentWithTabs)for(var n=Math.floor(k/g);n;--n)m+=g,l+=" ";k>m&&(l+=mf(k-m)),l!=j?Fc(a.doc,l,Gc(b,0),Gc(b,j.length),"+input"):e.sel.head.line==b&&e.sel.head.ch=a.first+a.size?j=!1:(f=b,i=ye(a,b))}function l(a){var b=(e?Zf:$f)(i,g,c,!0);if(null==b){if(a||!k())return j=!1;g=e?(0>c?Sf:Rf)(i):0>c?i.text.length:0}else g=b;return!0}var f=b.line,g=b.ch,h=c,i=ye(a,f),j=!0;if("char"==d)l();else if("column"==d)l(!0);else if("word"==d||"group"==d)for(var m=null,n="group"==d,o=!0;!(0>c)||l(!o);o=!1){var p=i.text.charAt(g)||"\n",q=vf(p)?"w":n&&"\n"==p?"n":!n||/\s/.test(p)?null:"p";if(!n||o||q||(q="s"),m&&m!=q){0>c&&(c=1,l());break}if(q&&(m=q),c>0&&!l(!o))break}var r=Tc(a,Gc(f,g),h,!0);return j||(r.hitSide=!0),r}function bd(a,b,c,d){var g,e=a.doc,f=b.left;if("page"==d){var h=Math.min(a.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight);g=b.top+c*(h-(0>c?1.5:.5)*Db(a.display))}else"line"==d&&(g=c>0?b.bottom+3:b.top-3);for(;;){var i=Ab(a,f,g);if(!i.outside)break;if(0>c?0>=g:g>=e.height){i.hitSide=!0;break}g+=5*c}return i}function cd(a,b){var c=b.ch,d=b.ch;if(a){(b.xRel<0||d==a.length)&&c?--c:++d;for(var e=a.charAt(c),f=vf(e)?vf:/\s/.test(e)?function(a){return/\s/.test(a)}:function(a){return!/\s/.test(a)&&!vf(a)};c>0&&f(a.charAt(c-1));)--c;for(;dg;++g){var i=d(f[g]);if(i)return i}return!1}for(var e=0;e=b:f.to>b);(e||(e=[])).push({from:f.from,to:i?null:f.to,marker:g})}}return e}function Fd(a,b,c){if(a)for(var e,d=0;d=b:f.to>b);if(h||f.from==b&&"bookmark"==g.type&&(!c||f.marker.insertLeft)){var i=null==f.from||(g.inclusiveLeft?f.from<=b:f.from0&&h)for(var l=0;ll;++l)o.push(q);o.push(i)}return o}function Hd(a){for(var b=0;b=0&&0>=l||0>=k&&l>=0)&&(0>=k&&(Jc(j.to,c)||Ld(i.marker)-Kd(e))>0||k>=0&&(Jc(j.from,d)||Kd(i.marker)-Ld(e))<0))return!0}}}function Rd(a,b){for(var c;c=Od(b);)b=ye(a,c.find().from.line);return b}function Sd(a,b){var c=y&&b.markedSpans;if(c)for(var d,e=0;ea.options.maxHighlightLength?(g=!1,f&&ee(a,b,d,j.pos),j.pos=b.length,k=null):k=c.token(j,d),a.options.addModeClass){var l=z.innerMode(c,d).mode.name;l&&(k="m-"+(k?l+" "+k:l))}g&&i==k||(hi;){var d=e[h];d>a&&e.splice(h,1,a,e[h+1],d),h+=2,i=Math.min(a,d)}if(b)if(g.opaque)e.splice(c,h-c,a,b),h=c+2;else for(;h>c;c+=2){var f=e[c+1];e[c+1]=f?f+" "+b:b}})}return e}function de(a,b){return b.styles&&b.styles[0]==a.state.modeGen||(b.styles=ce(a,b,b.stateAfter=hb(a,Ce(b)))),b.styles}function ee(a,b,c,d){var e=a.doc.mode,f=new vd(b,a.options.tabSize);for(f.start=f.pos=d||0,""==b&&e.blankLine&&e.blankLine(c);!f.eol()&&f.pos<=a.options.maxHighlightLength;)e.token(f,c),f.start=f.pos}function he(a,b){if(!a)return null;for(;;){var c=a.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!c)break;a=a.slice(0,c.index)+a.slice(c.index+c[0].length);var d=c[1]?"bgClass":"textClass";null==b[d]?b[d]=c[2]:new RegExp("(?:^|s)"+c[2]+"(?:$|s)").test(b[d])||(b[d]+=" "+c[2])}if(/^\s*$/.test(a))return null;var e=b.cm.options.addModeClass?ge:fe;return e[a]||(e[a]=a.replace(/\S+/g,"cm-$&"))}function ie(a,b,c,d){for(var e,f=b,i=!0;e=Od(f);)f=ye(a.doc,e.find().from.line);var j={pre:zf("pre"),col:0,pos:0,measure:null,measuredSomething:!1,cm:a,copyWidgets:d};do{f.text&&(i=!1),j.measure=f==b&&c,j.pos=0,j.addToken=j.measure?le:ke,(g||h)&&a.getOption("lineWrapping")&&(j.addToken=me(j.addToken));var k=oe(f,j,de(a,f));c&&f==b&&!j.measuredSomething&&(c[0]=j.pre.appendChild(Jf(a.display.measure)),j.measuredSomething=!0),k&&(f=ye(a.doc,k.to.line))}while(k);!c||j.measuredSomething||c[0]||(c[0]=j.pre.appendChild(i?zf("span","\xa0"):Jf(a.display.measure))),j.pre.firstChild||Sd(a.doc,b)||j.pre.appendChild(document.createTextNode("\xa0"));var l;if(c&&g&&(l=Fe(f))){var m=l.length-1;l[m].from==l[m].to&&--m;var n=l[m],o=l[m-1];if(n.from+1==n.to&&o&&n.leveli)?(null!=t.to&&l>t.to&&(l=t.to,n=""),u.className&&(m+=" "+u.className),u.startStyle&&t.from==i&&(o+=" "+u.startStyle),u.endStyle&&t.to==l&&(n+=" "+u.endStyle),u.title&&!p&&(p=u.title),u.collapsed&&(!q||Md(q.marker,u)<0)&&(q=t)):t.from>i&&l>t.from&&(l=t.from),"bookmark"==u.type&&t.from==i&&u.replacedWith&&r.push(u)}if(q&&(q.from||0)==i&&(ne(b,(null==q.to?h:q.to)-i,q.marker,null==q.from),null==q.to))return q.marker.find();if(!q&&r.length)for(var s=0;s=h)break;for(var v=Math.min(h,l);;){if(j){var w=i+j.length;if(!q){var x=w>v?j.slice(0,v-i):j;b.addToken(b,x,k?k+m:m,o,i+x.length==l?n:"",p)}if(w>=v){j=j.slice(v-i),i=v;break}i=w,o=""}j=e.slice(f,f=c[g++]),k=he(c[g++],b)}}else for(var g=1;gp;++p)r.push(new $d(j[p],f(p),e));r.push(new $d(m+k.text.slice(i.ch),n,e)),g(k,k.text.slice(0,h.ch)+j[0],f(0)),a.insert(h.line+1,r)}else if(1==j.length)g(k,k.text.slice(0,h.ch)+j[0]+l.text.slice(i.ch),f(0)),a.remove(h.line+1,o);else{g(k,k.text.slice(0,h.ch)+j[0],f(0)),g(l,m+l.text.slice(i.ch),n);for(var p=1,q=j.length-1,r=[];q>p;++p)r.push(new $d(j[p],f(p),e));o>1&&a.remove(h.line+1,o-1),a.insert(h.line+1,r)}else{for(var p=0,q=j.length-1,r=[];q>p;++p)r.push(new $d(j[p],f(p),e));g(l,l.text,n),o&&a.remove(h.line,o),r.length&&a.insert(h.line,r)}bf(a,"change",a,b),Rc(a,d.anchor,d.head,null,!0)}function qe(a){this.lines=a,this.parent=null;for(var b=0,c=a.length,d=0;c>b;++b)a[b].parent=this,d+=a[b].height;this.height=d}function re(a){this.children=a;for(var b=0,c=0,d=0,e=a.length;e>d;++d){var f=a[d];b+=f.chunkSize(),c+=f.height,f.parent=this}this.size=b,this.height=c,this.parent=null}function we(a,b,c){function d(a,e,f){if(a.linked)for(var g=0;gb){a=d;break}b-=e}return a.lines[b]}function ze(a,b,c){var d=[],e=b.line;return a.iter(b.line,c.line+1,function(a){var f=a.text;e==c.line&&(f=f.slice(0,c.ch)),e==b.line&&(f=f.slice(b.ch)),d.push(f),++e}),d}function Ae(a,b,c){var d=[];return a.iter(b,c,function(a){d.push(a.text)}),d}function Be(a,b){for(var c=b-a.height,d=a;d;d=d.parent)d.height+=c}function Ce(a){if(null==a.parent)return null;for(var b=a.parent,c=pf(b.lines,a),d=b.parent;d;b=d,d=d.parent)for(var e=0;d.children[e]!=b;++e)c+=d.children[e].chunkSize();return c+b.first}function De(a,b){var c=a.first;a:do{for(var d=0,e=a.children.length;e>d;++d){var f=a.children[d],g=f.height;if(g>b){a=f;continue a}b-=g,c+=f.chunkSize()}return c}while(!a.lines);for(var d=0,e=a.lines.length;e>d;++d){var h=a.lines[d],i=h.height;if(i>b)break;b-=i}return c+d}function Ee(a,b){b=Rd(a.doc,b);for(var c=0,d=b.parent,e=0;ef-a.cm.options.historyEventDelay||"*"==b.origin.charAt(0)))){var h=nf(g.changes);Hc(b.from,b.to)&&Hc(b.from,h.to)?h.to=vc(b):g.changes.push(Ie(a,b)),g.anchorAfter=c.anchor,g.headAfter=c.head}else for(g={changes:[Ie(a,b)],generation:e.generation,anchorBefore:a.sel.anchor,headBefore:a.sel.head,anchorAfter:c.anchor,headAfter:c.head},e.done.push(g);e.done.length>e.undoDepth;)e.done.shift();e.generation=++e.maxGeneration,e.lastTime=f,e.lastOp=d,e.lastOrigin=b.origin,h||$e(a,"historyAdded")}function Ke(a){if(!a)return null;for(var c,b=0;b-1&&(nf(g)[k]=i[k],delete i[k])}}return d}function Ne(a,b,c,d){c0}function ff(a){a.prototype.on=function(a,b){Ye(this,a,b)},a.prototype.off=function(a,b){Ze(this,a,b)}}function jf(){this.id=null}function kf(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),-1==b&&(b=a.length));for(var f=d||0,g=e||0;b>f;++f)" "==a.charAt(f)?g+=c-g%c:++g;return g}function mf(a){for(;lf.length<=a;)lf.push(nf(lf)+" ");return lf[a]}function nf(a){return a[a.length-1]}function of(a){if(q)a.selectionStart=0,a.selectionEnd=a.value.length;else try{a.select()}catch(b){}}function pf(a,b){if(a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;d>c;++c)if(a[c]==b)return c;return-1}function qf(a,b){function c(){}c.prototype=a;var d=new c;return b&&rf(b,d),d}function rf(a,b){b||(b={});for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function sf(a){for(var b=[],c=0;a>c;++c)b.push(void 0);return b}function tf(a){var b=Array.prototype.slice.call(arguments,1);return function(){return a.apply(null,b)}}function vf(a){return/\w/.test(a)||a>"\x80"&&(a.toUpperCase()!=a.toLowerCase()||uf.test(a))}function wf(a){for(var b in a)if(a.hasOwnProperty(b)&&a[b])return!1;return!0}function yf(a){return a.charCodeAt(0)>=768&&xf.test(a)}function zf(a,b,c,d){var e=document.createElement(a);if(c&&(e.className=c),d&&(e.style.cssText=d),"string"==typeof b)Cf(e,b);else if(b)for(var f=0;f0;--b)a.removeChild(a.firstChild);return a}function Bf(a,b){return Af(a).appendChild(b)}function Cf(a,b){d?(a.innerHTML="",a.appendChild(document.createTextNode(b))):a.textContent=b}function Df(a){return a.getBoundingClientRect()}function Ff(){return!1}function Hf(a){if(null!=Gf)return Gf;var b=zf("div",null,null,"width: 50px; height: 50px; overflow-x: scroll");return Bf(a,b),b.offsetWidth&&(Gf=b.offsetHeight-b.clientHeight),Gf||0}function Jf(a){if(null==If){var b=zf("span","\u200b");Bf(a,zf("span",[b,document.createTextNode("x")])),0!=a.firstChild.offsetHeight&&(If=b.offsetWidth<=1&&b.offsetHeight>2&&!c)}return If?zf("span","\u200b"):zf("span","\xa0",null,"display: inline-block; width: 1px; margin-right: -1px")}function Of(a,b,c,d){if(!a)return d(b,c,"ltr");for(var e=!1,f=0;fb||b==c&&g.to==b)&&(d(Math.max(g.from,b),Math.min(g.to,c),1==g.level?"rtl":"ltr"),e=!0)}e||d(b,c,"ltr")}function Pf(a){return a.level%2?a.to:a.from}function Qf(a){return a.level%2?a.from:a.to}function Rf(a){var b=Fe(a);return b?Pf(b[0]):0}function Sf(a){var b=Fe(a);return b?Qf(nf(b)):a.text.length}function Tf(a,b){var c=ye(a.doc,b),d=Rd(a.doc,c);d!=c&&(b=Ce(d));var e=Fe(d),f=e?e[0].level%2?Sf(d):Rf(d):0;return Gc(b,f)}function Uf(a,b){for(var c,d;c=Pd(d=ye(a.doc,b));)b=c.find().to.line;var e=Fe(d),f=e?e[0].level%2?Rf(d):Sf(d):d.text.length;return Gc(b,f)}function Vf(a,b,c){var d=a[0].level;return b==d?!0:c==d?!1:c>b}function Xf(a,b){Wf=null;for(var d,c=0;cb)return c;if(e.from==b||e.to==b){if(null!=d)return Vf(a,e.level,a[d].level)?(e.from!=e.to&&(Wf=d),c):(e.from!=e.to&&(Wf=c),d);d=c}}return d}function Yf(a,b,c,d){if(!d)return b+c;do b+=c;while(b>0&&yf(a.text.charAt(b)));return b}function Zf(a,b,c,d){var e=Fe(a);if(!e)return $f(a,b,c,d);for(var f=Xf(e,b),g=e[f],h=Yf(a,b,g.level%2?-c:c,d);;){if(h>g.from&&h0==g.level%2?g.to:g.from);if(g=e[f+=c],!g)return null;h=c>0==g.level%2?Yf(a,g.to,-1,d):Yf(a,g.from,1,d)}}function $f(a,b,c,d){var e=b+c;if(d)for(;e>0&&yf(a.text.charAt(e));)e+=c;return 0>e||e>a.text.length?null:e}var a=/gecko\/\d/i.test(navigator.userAgent),b=/MSIE \d/.test(navigator.userAgent),c=b&&(null==document.documentMode||document.documentMode<8),d=b&&(null==document.documentMode||document.documentMode<9),e=b&&(null==document.documentMode||document.documentMode<10),f=/Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent),g=b||f,h=/WebKit\//.test(navigator.userAgent),i=h&&/Qt\/\d+\.\d+/.test(navigator.userAgent),j=/Chrome\//.test(navigator.userAgent),k=/Opera\//.test(navigator.userAgent),l=/Apple Computer/.test(navigator.vendor),m=/KHTML\//.test(navigator.userAgent),n=/Mac OS X 1\d\D([7-9]|\d\d)\D/.test(navigator.userAgent),o=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent),p=/PhantomJS/.test(navigator.userAgent),q=/AppleWebKit/.test(navigator.userAgent)&&/Mobile\/\w+/.test(navigator.userAgent),r=q||/Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent),s=q||/Mac/.test(navigator.platform),t=/win/i.test(navigator.platform),u=k&&navigator.userAgent.match(/Version\/(\d*\.\d*)/);u&&(u=Number(u[1])),u&&u>=15&&(k=!1,h=!0);var Cb,Wb,Xb,v=s&&(i||k&&(null==u||12.11>u)),w=a||g&&!d,x=!1,y=!1,Fb=0,ac=0,fc=0,gc=null;g?gc=-.53:a?gc=15:j?gc=-.7:l&&(gc=-1/3);var kc,tc,oc=null,vc=z.changeEnd=function(a){return a.text?Gc(a.from.line+a.text.length-1,nf(a.text).length+(1==a.text.length?a.from.ch:0)):a.to};z.Pos=Gc,z.prototype={constructor:z,focus:function(){window.focus(),Qb(this),Nb(this)},setOption:function(a,b){var c=this.options,d=c[a];(c[a]!=b||"mode"==a)&&(c[a]=b,ed.hasOwnProperty(a)&&Ib(this,ed[a])(this,b,d))},getOption:function(a){return this.options[a]},getDoc:function(){return this.doc},addKeyMap:function(a,b){this.state.keyMaps[b?"push":"unshift"](a)},removeKeyMap:function(a){for(var b=this.state.keyMaps,c=0;c=d;++d)$c(this,d,a)}),getTokenAt:function(a,b){var c=this.doc;a=Mc(c,a);for(var d=hb(this,a.line,b),e=this.doc.mode,f=ye(c,a.line),g=new vd(f.text,this.options.tabSize);g.pos>1;if((f?b[2*f-1]:0)>=e)d=f;else{if(!(b[2*f+1]d&&(a=d,c=!0);var e=ye(this.doc,a);return vb(this,ye(this.doc,a),{top:0,left:0},b||"page").top+(c?e.height:0)},defaultTextHeight:function(){return Db(this.display)},defaultCharWidth:function(){return Eb(this.display)},setGutterMarker:Ib(null,function(a,b,c){return _c(this,a,function(a){var d=a.gutterMarkers||(a.gutterMarkers={});return d[b]=c,!c&&wf(d)&&(a.gutterMarkers=null),!0})}),clearGutter:Ib(null,function(a){var b=this,c=b.doc,d=c.first;c.iter(function(c){c.gutterMarkers&&c.gutterMarkers[a]&&(c.gutterMarkers[a]=null,Lb(b,d,d+1),wf(c.gutterMarkers)&&(c.gutterMarkers=null)),++d})}),addLineClass:Ib(null,function(a,b,c){return _c(this,a,function(a){var d="text"==b?"textClass":"background"==b?"bgClass":"wrapClass";if(a[d]){if(new RegExp("(?:^|\\s)"+c+"(?:$|\\s)").test(a[d]))return!1;a[d]+=" "+c}else a[d]=c;return!0})}),removeLineClass:Ib(null,function(a,b,c){return _c(this,a,function(a){var d="text"==b?"textClass":"background"==b?"bgClass":"wrapClass",e=a[d];if(!e)return!1;if(null==c)a[d]=null;else{var f=e.match(new RegExp("(?:^|\\s+)"+c+"(?:$|\\s+)"));if(!f)return!1;var g=f.index+f[0].length;a[d]=e.slice(0,f.index)+(f.index&&g!=e.length?" ":"")+e.slice(g)||null}return!0})}),addLineWidget:Ib(null,function(a,b,c){return Zd(this,a,b,c)}),removeLineWidget:function(a){a.clear()},lineInfo:function(a){if("number"==typeof a){if(!Oc(this.doc,a))return null;var b=a;if(a=ye(this.doc,a),!a)return null}else{var b=Ce(a);if(null==b)return null}return{line:b,handle:a,text:a.text,gutterMarkers:a.gutterMarkers,textClass:a.textClass,bgClass:a.bgClass,wrapClass:a.wrapClass,widgets:a.widgets}},getViewport:function(){return{from:this.display.showingFrom,to:this.display.showingTo}},addWidget:function(a,b,c,d,e){var f=this.display;a=yb(this,Mc(this.doc,a));var g=a.bottom,h=a.left;if(b.style.position="absolute",f.sizer.appendChild(b),"over"==d)g=a.top;else if("above"==d||"near"==d){var i=Math.max(f.wrapper.clientHeight,this.doc.height),j=Math.max(f.sizer.clientWidth,f.lineSpace.clientWidth);("above"==d||a.bottom+b.offsetHeight>i)&&a.top>b.offsetHeight?g=a.top-b.offsetHeight:a.bottom+b.offsetHeight<=i&&(g=a.bottom),h+b.offsetWidth>j&&(h=j-b.offsetWidth)}b.style.top=g+"px",b.style.left=b.style.right="","right"==e?(h=f.sizer.clientWidth-b.offsetWidth,b.style.right="0px"):("left"==e?h=0:"middle"==e&&(h=(f.sizer.clientWidth-b.offsetWidth)/2),b.style.left=h+"px"),c&&Wc(this,h,g,h+b.offsetWidth,g+b.offsetHeight)},triggerOnKeyDown:Ib(null,pc),triggerOnKeyPress:Ib(null,qc),triggerOnKeyUp:Ib(null,nc),execCommand:function(a){return pd.hasOwnProperty(a)?pd[a](this):void 0},findPosH:function(a,b,c,d){var e=1;0>b&&(e=-1,b=-b);for(var f=0,g=Mc(this.doc,a);b>f&&(g=ad(this.doc,g,e,c,d),!g.hitSide);++f);return g},moveH:Ib(null,function(a,b){var d,c=this.doc.sel;d=c.shift||c.extend||Hc(c.from,c.to)?ad(this.doc,c.head,a,b,this.options.rtlMoveVisually):0>a?c.from:c.to,Pc(this.doc,d,d,a)}),deleteH:Ib(null,function(a,b){var c=this.doc.sel;Hc(c.from,c.to)?Fc(this.doc,"",c.from,ad(this.doc,c.head,a,b,!1),"+delete"):Fc(this.doc,"",c.from,c.to,"+delete"),this.curOp.userSelChange=!0}),findPosV:function(a,b,c,d){var e=1,f=d;0>b&&(e=-1,b=-b);for(var g=0,h=Mc(this.doc,a);b>g;++g){var i=yb(this,h,"div");if(null==f?f=i.left:i.left=f,h=bd(this,i,e,c),h.hitSide)break}return h},moveV:Ib(null,function(a,b){var d,e,c=this.doc.sel;if(c.shift||c.extend||Hc(c.from,c.to)){var f=yb(this,c.head,"div");null!=c.goalColumn&&(f.left=c.goalColumn),d=bd(this,f,a,b),"page"==b&&Zc(this,0,xb(this,d,"div").top-f.top),e=f.left}else d=0>a?c.from:c.to;Pc(this.doc,d,d,a),null!=e&&(c.goalColumn=e)}),toggleOverwrite:function(a){(null==a||a!=this.state.overwrite)&&((this.state.overwrite=!this.state.overwrite)?this.display.cursor.className+=" CodeMirror-overwrite":this.display.cursor.className=this.display.cursor.className.replace(" CodeMirror-overwrite",""),$e(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return document.activeElement==this.display.input},scrollTo:Ib(null,function(a,b){Yc(this,a,b)}),getScrollInfo:function(){var a=this.display.scroller,b=gf;return{left:a.scrollLeft,top:a.scrollTop,height:a.scrollHeight-b,width:a.scrollWidth-b,clientHeight:a.clientHeight-b,clientWidth:a.clientWidth-b}},scrollIntoView:Ib(null,function(a,b){null==a?a={from:this.doc.sel.head,to:null}:"number"==typeof a?a={from:Gc(a,0),to:null}:null==a.from&&(a={from:a,to:null}),a.to||(a.to=a.from),b||(b=0);var c=a;null!=a.from.line&&(this.curOp.scrollToPos={from:a.from,to:a.to,margin:b},c={from:yb(this,a.from),to:yb(this,a.to)});var d=Xc(this,Math.min(c.from.left,c.to.left),Math.min(c.from.top,c.to.top)-b,Math.max(c.from.right,c.to.right),Math.max(c.from.bottom,c.to.bottom)+b);Yc(this,d.scrollLeft,d.scrollTop)}),setSize:Ib(null,function(a,b){function c(a){return"number"==typeof a||/^\d+$/.test(String(a))?a+"px":a}null!=a&&(this.display.wrapper.style.width=c(a)),null!=b&&(this.display.wrapper.style.height=c(b)),this.options.lineWrapping&&(this.display.measureLineCache.length=this.display.measureLineCachePos=0),this.curOp.forceUpdate=!0,$e(this,"refresh",this)}),operation:function(a){return Kb(this,a)},refresh:Ib(null,function(){var a=this.display.cachedTextHeight;sb(this),Yc(this,this.doc.scrollLeft,this.doc.scrollTop),Lb(this),(null==a||Math.abs(a-Db(this.display))>.5)&&F(this),$e(this,"refresh",this)}),swapDoc:Ib(null,function(a){var b=this.doc;return b.cm=null,xe(this,a),sb(this),Pb(this,!0),Yc(this,a.scrollLeft,a.scrollTop),bf(this,"swapDoc",this,b),b}),getInputField:function(){return this.display.input},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},ff(z);var ed=z.optionHandlers={},fd=z.defaults={},hd=z.Init={toString:function(){return"CodeMirror.Init"}};gd("value","",function(a,b){a.setValue(b)},!0),gd("mode",null,function(a,b){a.doc.modeOption=b,B(a)},!0),gd("indentUnit",2,B,!0),gd("indentWithTabs",!1),gd("smartIndent",!0),gd("tabSize",4,function(a){C(a),sb(a),Lb(a)},!0),gd("specialChars",/[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/g,function(a,b){a.options.specialChars=new RegExp(b.source+(b.test(" ")?"":"| "),"g"),a.refresh()},!0),gd("specialCharPlaceholder",je,function(a){a.refresh()},!0),gd("electricChars",!0),gd("rtlMoveVisually",!t),gd("wholeLineUpdateBefore",!0),gd("theme","default",function(a){H(a),I(a)},!0),gd("keyMap","default",G),gd("extraKeys",null),gd("onKeyEvent",null),gd("onDragEvent",null),gd("lineWrapping",!1,D,!0),gd("gutters",[],function(a){M(a.options),I(a)},!0),gd("fixedGutter",!0,function(a,b){a.display.gutters.style.left=b?S(a.display)+"px":"0",a.refresh()},!0),gd("coverGutterNextToScrollbar",!1,N,!0),gd("lineNumbers",!1,function(a){M(a.options),I(a)},!0),gd("firstLineNumber",1,I,!0),gd("lineNumberFormatter",function(a){return a},I,!0),gd("showCursorWhenSelecting",!1,ab,!0),gd("resetSelectionOnContextMenu",!0),gd("readOnly",!1,function(a,b){"nocursor"==b?(sc(a),a.display.input.blur(),a.display.disabled=!0):(a.display.disabled=!1,b||Pb(a,!0))}),gd("disableInput",!1,function(a,b){b||Pb(a,!0)},!0),gd("dragDrop",!0),gd("cursorBlinkRate",530),gd("cursorScrollMargin",0),gd("cursorHeight",1),gd("workTime",100),gd("workDelay",100),gd("flattenSpans",!0,C,!0),gd("addModeClass",!1,C,!0),gd("pollInterval",100),gd("undoDepth",40,function(a,b){a.doc.history.undoDepth=b}),gd("historyEventDelay",500),gd("viewportMargin",10,function(a){a.refresh()},!0),gd("maxHighlightLength",1e4,C,!0),gd("crudeMeasuringFrom",1e4),gd("moveInputWithCursor",!0,function(a,b){b||(a.display.inputDiv.style.top=a.display.inputDiv.style.left=0)}),gd("tabindex",null,function(a,b){a.display.input.tabIndex=b||""}),gd("autofocus",null);var id=z.modes={},jd=z.mimeModes={};z.defineMode=function(a,b){if(z.defaults.mode||"null"==a||(z.defaults.mode=a),arguments.length>2){b.dependencies=[];for(var c=2;c0&&b.chi)?(null!=t.to&&l>t.to&&(l=t.to,n=""),u.className&&(m+=" "+u.className),u.startStyle&&t.from==i&&(o+=" "+u.startStyle),u.endStyle&&t.to==l&&(n+=" "+u.endStyle),u.title&&!p&&(p=u.title),u.collapsed&&(!q||Md(q.marker,u)<0)&&(q=t)):t.from>i&&l>t.from&&(l=t.from),"bookmark"==u.type&&t.from==i&&u.replacedWith&&r.push(u)}if(q&&(q.from||0)==i&&(ne(b,(null==q.to?h:q.to)-i,q.marker,null==q.from),null==q.to))return q.marker.find();if(!q&&r.length)for(var s=0;s=h)break;for(var v=Math.min(h,l);;){if(j){var w=i+j.length;if(!q){var x=w>v?j.slice(0,v-i):j;b.addToken(b,x,k?k+m:m,o,i+x.length==l?n:"",p)}if(w>=v){j=j.slice(v-i),i=v;break}i=w,o=""}j=e.slice(f,f=c[g++]),k=he(c[g++],b)}}else for(var g=1;gp;++p)r.push(new $d(j[p],f(p),e));r.push(new $d(m+k.text.slice(i.ch),n,e)),g(k,k.text.slice(0,h.ch)+j[0],f(0)),a.insert(h.line+1,r)}else if(1==j.length)g(k,k.text.slice(0,h.ch)+j[0]+l.text.slice(i.ch),f(0)),a.remove(h.line+1,o);else{g(k,k.text.slice(0,h.ch)+j[0],f(0)),g(l,m+l.text.slice(i.ch),n);for(var p=1,q=j.length-1,r=[];q>p;++p)r.push(new $d(j[p],f(p),e));o>1&&a.remove(h.line+1,o-1),a.insert(h.line+1,r)}else{for(var p=0,q=j.length-1,r=[];q>p;++p)r.push(new $d(j[p],f(p),e));g(l,l.text,n),o&&a.remove(h.line,o),r.length&&a.insert(h.line,r)}bf(a,"change",a,b),Rc(a,d.anchor,d.head,null,!0)}function qe(a){this.lines=a,this.parent=null;for(var b=0,c=a.length,d=0;c>b;++b)a[b].parent=this,d+=a[b].height;this.height=d}function re(a){this.children=a;for(var b=0,c=0,d=0,e=a.length;e>d;++d){var f=a[d];b+=f.chunkSize(),c+=f.height,f.parent=this}this.size=b,this.height=c,this.parent=null}function we(a,b,c){function d(a,e,f){if(a.linked)for(var g=0;gb){a=d;break}b-=e}return a.lines[b]}function ze(a,b,c){var d=[],e=b.line;return a.iter(b.line,c.line+1,function(a){var f=a.text;e==c.line&&(f=f.slice(0,c.ch)),e==b.line&&(f=f.slice(b.ch)),d.push(f),++e}),d}function Ae(a,b,c){var d=[];return a.iter(b,c,function(a){d.push(a.text)}),d}function Be(a,b){for(var c=b-a.height,d=a;d;d=d.parent)d.height+=c}function Ce(a){if(null==a.parent)return null;for(var b=a.parent,c=pf(b.lines,a),d=b.parent;d;b=d,d=d.parent)for(var e=0;d.children[e]!=b;++e)c+=d.children[e].chunkSize();return c+b.first}function De(a,b){var c=a.first;a:do{for(var d=0,e=a.children.length;e>d;++d){var f=a.children[d],g=f.height;if(g>b){a=f;continue a}b-=g,c+=f.chunkSize()}return c}while(!a.lines);for(var d=0,e=a.lines.length;e>d;++d){var h=a.lines[d],i=h.height;if(i>b)break;b-=i}return c+d}function Ee(a,b){b=Rd(a.doc,b);for(var c=0,d=b.parent,e=0;ef-a.cm.options.historyEventDelay||"*"==b.origin.charAt(0)))){var h=nf(g.changes);Hc(b.from,b.to)&&Hc(b.from,h.to)?h.to=vc(b):g.changes.push(Ie(a,b)),g.anchorAfter=c.anchor,g.headAfter=c.head}else for(g={changes:[Ie(a,b)],generation:e.generation,anchorBefore:a.sel.anchor,headBefore:a.sel.head,anchorAfter:c.anchor,headAfter:c.head},e.done.push(g);e.done.length>e.undoDepth;)e.done.shift();e.generation=++e.maxGeneration,e.lastTime=f,e.lastOp=d,e.lastOrigin=b.origin,h||$e(a,"historyAdded")}function Ke(a){if(!a)return null;for(var c,b=0;b-1&&(nf(g)[k]=i[k],delete i[k])}}return d}function Ne(a,b,c,d){c0}function ff(a){a.prototype.on=function(a,b){Ye(this,a,b)},a.prototype.off=function(a,b){Ze(this,a,b)}}function jf(){this.id=null}function kf(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),-1==b&&(b=a.length));for(var f=d||0,g=e||0;b>f;++f)" "==a.charAt(f)?g+=c-g%c:++g;return g}function mf(a){for(;lf.length<=a;)lf.push(nf(lf)+" ");return lf[a]}function nf(a){return a[a.length-1]}function of(a){if(q)a.selectionStart=0,a.selectionEnd=a.value.length;else try{a.select()}catch(b){}}function pf(a,b){if(a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;d>c;++c)if(a[c]==b)return c;return-1}function qf(a,b){function c(){}c.prototype=a;var d=new c;return b&&rf(b,d),d}function rf(a,b){b||(b={});for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function sf(a){for(var b=[],c=0;a>c;++c)b.push(void 0);return b}function tf(a){var b=Array.prototype.slice.call(arguments,1);return function(){return a.apply(null,b)}}function vf(a){return/\w/.test(a)||a>"\x80"&&(a.toUpperCase()!=a.toLowerCase()||uf.test(a))}function wf(a){for(var b in a)if(a.hasOwnProperty(b)&&a[b])return!1;return!0}function yf(a){return a.charCodeAt(0)>=768&&xf.test(a)}function zf(a,b,c,d){var e=document.createElement(a);if(c&&(e.className=c),d&&(e.style.cssText=d),"string"==typeof b)Cf(e,b);else if(b)for(var f=0;f0;--b)a.removeChild(a.firstChild);return a}function Bf(a,b){return Af(a).appendChild(b)}function Cf(a,b){d?(a.innerHTML="",a.appendChild(document.createTextNode(b))):a.textContent=b}function Df(a){return a.getBoundingClientRect()}function Ff(){return!1}function Hf(a){if(null!=Gf)return Gf;var b=zf("div",null,null,"width: 50px; height: 50px; overflow-x: scroll");return Bf(a,b),b.offsetWidth&&(Gf=b.offsetHeight-b.clientHeight),Gf||0}function Jf(a){if(null==If){var b=zf("span","\u200b");Bf(a,zf("span",[b,document.createTextNode("x")])),0!=a.firstChild.offsetHeight&&(If=b.offsetWidth<=1&&b.offsetHeight>2&&!c)}return If?zf("span","\u200b"):zf("span","\xa0",null,"display: inline-block; width: 1px; margin-right: -1px")}function Of(a,b,c,d){if(!a)return d(b,c,"ltr");for(var e=!1,f=0;fb||b==c&&g.to==b)&&(d(Math.max(g.from,b),Math.min(g.to,c),1==g.level?"rtl":"ltr"),e=!0)}e||d(b,c,"ltr")}function Pf(a){return a.level%2?a.to:a.from}function Qf(a){return a.level%2?a.from:a.to}function Rf(a){var b=Fe(a);return b?Pf(b[0]):0}function Sf(a){var b=Fe(a);return b?Qf(nf(b)):a.text.length}function Tf(a,b){var c=ye(a.doc,b),d=Rd(a.doc,c);d!=c&&(b=Ce(d));var e=Fe(d),f=e?e[0].level%2?Sf(d):Rf(d):0;return Gc(b,f)}function Uf(a,b){for(var c,d;c=Pd(d=ye(a.doc,b));)b=c.find().to.line;var e=Fe(d),f=e?e[0].level%2?Rf(d):Sf(d):d.text.length;return Gc(b,f)}function Vf(a,b,c){var d=a[0].level;return b==d?!0:c==d?!1:c>b}function Xf(a,b){Wf=null;for(var d,c=0;cb)return c;if(e.from==b||e.to==b){if(null!=d)return Vf(a,e.level,a[d].level)?(e.from!=e.to&&(Wf=d),c):(e.from!=e.to&&(Wf=c),d);d=c}}return d}function Yf(a,b,c,d){if(!d)return b+c;do b+=c;while(b>0&&yf(a.text.charAt(b)));return b}function Zf(a,b,c,d){var e=Fe(a);if(!e)return $f(a,b,c,d);for(var f=Xf(e,b),g=e[f],h=Yf(a,b,g.level%2?-c:c,d);;){if(h>g.from&&h0==g.level%2?g.to:g.from);if(g=e[f+=c],!g)return null;h=c>0==g.level%2?Yf(a,g.to,-1,d):Yf(a,g.from,1,d)}}function $f(a,b,c,d){var e=b+c;if(d)for(;e>0&&yf(a.text.charAt(e));)e+=c;return 0>e||e>a.text.length?null:e}var a=/goanna\/\d/i.test(navigator.userAgent),b=/MSIE \d/.test(navigator.userAgent),c=b&&(null==document.documentMode||document.documentMode<8),d=b&&(null==document.documentMode||document.documentMode<9),e=b&&(null==document.documentMode||document.documentMode<10),f=/Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent),g=b||f,h=/WebKit\//.test(navigator.userAgent),i=h&&/Qt\/\d+\.\d+/.test(navigator.userAgent),j=/Chrome\//.test(navigator.userAgent),k=/Opera\//.test(navigator.userAgent),l=/Apple Computer/.test(navigator.vendor),m=/KHTML\//.test(navigator.userAgent),n=/Mac OS X 1\d\D([7-9]|\d\d)\D/.test(navigator.userAgent),o=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent),p=/PhantomJS/.test(navigator.userAgent),q=/AppleWebKit/.test(navigator.userAgent)&&/Mobile\/\w+/.test(navigator.userAgent),r=q||/Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent),s=q||/Mac/.test(navigator.platform),t=/win/i.test(navigator.platform),u=k&&navigator.userAgent.match(/Version\/(\d*\.\d*)/);u&&(u=Number(u[1])),u&&u>=15&&(k=!1,h=!0);var Cb,Wb,Xb,v=s&&(i||k&&(null==u||12.11>u)),w=a||g&&!d,x=!1,y=!1,Fb=0,ac=0,fc=0,gc=null;g?gc=-.53:a?gc=15:j?gc=-.7:l&&(gc=-1/3);var kc,tc,oc=null,vc=z.changeEnd=function(a){return a.text?Gc(a.from.line+a.text.length-1,nf(a.text).length+(1==a.text.length?a.from.ch:0)):a.to};z.Pos=Gc,z.prototype={constructor:z,focus:function(){window.focus(),Qb(this),Nb(this)},setOption:function(a,b){var c=this.options,d=c[a];(c[a]!=b||"mode"==a)&&(c[a]=b,ed.hasOwnProperty(a)&&Ib(this,ed[a])(this,b,d))},getOption:function(a){return this.options[a]},getDoc:function(){return this.doc},addKeyMap:function(a,b){this.state.keyMaps[b?"push":"unshift"](a)},removeKeyMap:function(a){for(var b=this.state.keyMaps,c=0;c=d;++d)$c(this,d,a)}),getTokenAt:function(a,b){var c=this.doc;a=Mc(c,a);for(var d=hb(this,a.line,b),e=this.doc.mode,f=ye(c,a.line),g=new vd(f.text,this.options.tabSize);g.pos>1;if((f?b[2*f-1]:0)>=e)d=f;else{if(!(b[2*f+1]d&&(a=d,c=!0);var e=ye(this.doc,a);return vb(this,ye(this.doc,a),{top:0,left:0},b||"page").top+(c?e.height:0)},defaultTextHeight:function(){return Db(this.display)},defaultCharWidth:function(){return Eb(this.display)},setGutterMarker:Ib(null,function(a,b,c){return _c(this,a,function(a){var d=a.gutterMarkers||(a.gutterMarkers={});return d[b]=c,!c&&wf(d)&&(a.gutterMarkers=null),!0})}),clearGutter:Ib(null,function(a){var b=this,c=b.doc,d=c.first;c.iter(function(c){c.gutterMarkers&&c.gutterMarkers[a]&&(c.gutterMarkers[a]=null,Lb(b,d,d+1),wf(c.gutterMarkers)&&(c.gutterMarkers=null)),++d})}),addLineClass:Ib(null,function(a,b,c){return _c(this,a,function(a){var d="text"==b?"textClass":"background"==b?"bgClass":"wrapClass";if(a[d]){if(new RegExp("(?:^|\\s)"+c+"(?:$|\\s)").test(a[d]))return!1;a[d]+=" "+c}else a[d]=c;return!0})}),removeLineClass:Ib(null,function(a,b,c){return _c(this,a,function(a){var d="text"==b?"textClass":"background"==b?"bgClass":"wrapClass",e=a[d];if(!e)return!1;if(null==c)a[d]=null;else{var f=e.match(new RegExp("(?:^|\\s+)"+c+"(?:$|\\s+)"));if(!f)return!1;var g=f.index+f[0].length;a[d]=e.slice(0,f.index)+(f.index&&g!=e.length?" ":"")+e.slice(g)||null}return!0})}),addLineWidget:Ib(null,function(a,b,c){return Zd(this,a,b,c)}),removeLineWidget:function(a){a.clear()},lineInfo:function(a){if("number"==typeof a){if(!Oc(this.doc,a))return null;var b=a;if(a=ye(this.doc,a),!a)return null}else{var b=Ce(a);if(null==b)return null}return{line:b,handle:a,text:a.text,gutterMarkers:a.gutterMarkers,textClass:a.textClass,bgClass:a.bgClass,wrapClass:a.wrapClass,widgets:a.widgets}},getViewport:function(){return{from:this.display.showingFrom,to:this.display.showingTo}},addWidget:function(a,b,c,d,e){var f=this.display;a=yb(this,Mc(this.doc,a));var g=a.bottom,h=a.left;if(b.style.position="absolute",f.sizer.appendChild(b),"over"==d)g=a.top;else if("above"==d||"near"==d){var i=Math.max(f.wrapper.clientHeight,this.doc.height),j=Math.max(f.sizer.clientWidth,f.lineSpace.clientWidth);("above"==d||a.bottom+b.offsetHeight>i)&&a.top>b.offsetHeight?g=a.top-b.offsetHeight:a.bottom+b.offsetHeight<=i&&(g=a.bottom),h+b.offsetWidth>j&&(h=j-b.offsetWidth)}b.style.top=g+"px",b.style.left=b.style.right="","right"==e?(h=f.sizer.clientWidth-b.offsetWidth,b.style.right="0px"):("left"==e?h=0:"middle"==e&&(h=(f.sizer.clientWidth-b.offsetWidth)/2),b.style.left=h+"px"),c&&Wc(this,h,g,h+b.offsetWidth,g+b.offsetHeight)},triggerOnKeyDown:Ib(null,pc),triggerOnKeyPress:Ib(null,qc),triggerOnKeyUp:Ib(null,nc),execCommand:function(a){return pd.hasOwnProperty(a)?pd[a](this):void 0},findPosH:function(a,b,c,d){var e=1;0>b&&(e=-1,b=-b);for(var f=0,g=Mc(this.doc,a);b>f&&(g=ad(this.doc,g,e,c,d),!g.hitSide);++f);return g},moveH:Ib(null,function(a,b){var d,c=this.doc.sel;d=c.shift||c.extend||Hc(c.from,c.to)?ad(this.doc,c.head,a,b,this.options.rtlMoveVisually):0>a?c.from:c.to,Pc(this.doc,d,d,a)}),deleteH:Ib(null,function(a,b){var c=this.doc.sel;Hc(c.from,c.to)?Fc(this.doc,"",c.from,ad(this.doc,c.head,a,b,!1),"+delete"):Fc(this.doc,"",c.from,c.to,"+delete"),this.curOp.userSelChange=!0}),findPosV:function(a,b,c,d){var e=1,f=d;0>b&&(e=-1,b=-b);for(var g=0,h=Mc(this.doc,a);b>g;++g){var i=yb(this,h,"div");if(null==f?f=i.left:i.left=f,h=bd(this,i,e,c),h.hitSide)break}return h},moveV:Ib(null,function(a,b){var d,e,c=this.doc.sel;if(c.shift||c.extend||Hc(c.from,c.to)){var f=yb(this,c.head,"div");null!=c.goalColumn&&(f.left=c.goalColumn),d=bd(this,f,a,b),"page"==b&&Zc(this,0,xb(this,d,"div").top-f.top),e=f.left}else d=0>a?c.from:c.to;Pc(this.doc,d,d,a),null!=e&&(c.goalColumn=e)}),toggleOverwrite:function(a){(null==a||a!=this.state.overwrite)&&((this.state.overwrite=!this.state.overwrite)?this.display.cursor.className+=" CodeMirror-overwrite":this.display.cursor.className=this.display.cursor.className.replace(" CodeMirror-overwrite",""),$e(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return document.activeElement==this.display.input},scrollTo:Ib(null,function(a,b){Yc(this,a,b)}),getScrollInfo:function(){var a=this.display.scroller,b=gf;return{left:a.scrollLeft,top:a.scrollTop,height:a.scrollHeight-b,width:a.scrollWidth-b,clientHeight:a.clientHeight-b,clientWidth:a.clientWidth-b}},scrollIntoView:Ib(null,function(a,b){null==a?a={from:this.doc.sel.head,to:null}:"number"==typeof a?a={from:Gc(a,0),to:null}:null==a.from&&(a={from:a,to:null}),a.to||(a.to=a.from),b||(b=0);var c=a;null!=a.from.line&&(this.curOp.scrollToPos={from:a.from,to:a.to,margin:b},c={from:yb(this,a.from),to:yb(this,a.to)});var d=Xc(this,Math.min(c.from.left,c.to.left),Math.min(c.from.top,c.to.top)-b,Math.max(c.from.right,c.to.right),Math.max(c.from.bottom,c.to.bottom)+b);Yc(this,d.scrollLeft,d.scrollTop)}),setSize:Ib(null,function(a,b){function c(a){return"number"==typeof a||/^\d+$/.test(String(a))?a+"px":a}null!=a&&(this.display.wrapper.style.width=c(a)),null!=b&&(this.display.wrapper.style.height=c(b)),this.options.lineWrapping&&(this.display.measureLineCache.length=this.display.measureLineCachePos=0),this.curOp.forceUpdate=!0,$e(this,"refresh",this)}),operation:function(a){return Kb(this,a)},refresh:Ib(null,function(){var a=this.display.cachedTextHeight;sb(this),Yc(this,this.doc.scrollLeft,this.doc.scrollTop),Lb(this),(null==a||Math.abs(a-Db(this.display))>.5)&&F(this),$e(this,"refresh",this)}),swapDoc:Ib(null,function(a){var b=this.doc;return b.cm=null,xe(this,a),sb(this),Pb(this,!0),Yc(this,a.scrollLeft,a.scrollTop),bf(this,"swapDoc",this,b),b}),getInputField:function(){return this.display.input},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},ff(z);var ed=z.optionHandlers={},fd=z.defaults={},hd=z.Init={toString:function(){return"CodeMirror.Init"}};gd("value","",function(a,b){a.setValue(b)},!0),gd("mode",null,function(a,b){a.doc.modeOption=b,B(a)},!0),gd("indentUnit",2,B,!0),gd("indentWithTabs",!1),gd("smartIndent",!0),gd("tabSize",4,function(a){C(a),sb(a),Lb(a)},!0),gd("specialChars",/[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/g,function(a,b){a.options.specialChars=new RegExp(b.source+(b.test(" ")?"":"| "),"g"),a.refresh()},!0),gd("specialCharPlaceholder",je,function(a){a.refresh()},!0),gd("electricChars",!0),gd("rtlMoveVisually",!t),gd("wholeLineUpdateBefore",!0),gd("theme","default",function(a){H(a),I(a)},!0),gd("keyMap","default",G),gd("extraKeys",null),gd("onKeyEvent",null),gd("onDragEvent",null),gd("lineWrapping",!1,D,!0),gd("gutters",[],function(a){M(a.options),I(a)},!0),gd("fixedGutter",!0,function(a,b){a.display.gutters.style.left=b?S(a.display)+"px":"0",a.refresh()},!0),gd("coverGutterNextToScrollbar",!1,N,!0),gd("lineNumbers",!1,function(a){M(a.options),I(a)},!0),gd("firstLineNumber",1,I,!0),gd("lineNumberFormatter",function(a){return a},I,!0),gd("showCursorWhenSelecting",!1,ab,!0),gd("resetSelectionOnContextMenu",!0),gd("readOnly",!1,function(a,b){"nocursor"==b?(sc(a),a.display.input.blur(),a.display.disabled=!0):(a.display.disabled=!1,b||Pb(a,!0))}),gd("disableInput",!1,function(a,b){b||Pb(a,!0)},!0),gd("dragDrop",!0),gd("cursorBlinkRate",530),gd("cursorScrollMargin",0),gd("cursorHeight",1),gd("workTime",100),gd("workDelay",100),gd("flattenSpans",!0,C,!0),gd("addModeClass",!1,C,!0),gd("pollInterval",100),gd("undoDepth",40,function(a,b){a.doc.history.undoDepth=b}),gd("historyEventDelay",500),gd("viewportMargin",10,function(a){a.refresh()},!0),gd("maxHighlightLength",1e4,C,!0),gd("crudeMeasuringFrom",1e4),gd("moveInputWithCursor",!0,function(a,b){b||(a.display.inputDiv.style.top=a.display.inputDiv.style.left=0)}),gd("tabindex",null,function(a,b){a.display.input.tabIndex=b||""}),gd("autofocus",null);var id=z.modes={},jd=z.mimeModes={};z.defineMode=function(a,b){if(z.defaults.mode||"null"==a||(z.defaults.mode=a),arguments.length>2){b.dependencies=[];for(var c=2;c0&&b.ch=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){return this.posb},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);return b>-1?(this.pos=b,!0):void 0},backUp:function(a){this.pos-=a},column:function(){return this.lastColumnPos0?null:(f&&b!==!1&&(this.pos+=f[0].length),f)}var d=function(a){return c?a.toLowerCase():a},e=this.string.substr(this.pos,a.length);return d(e)==d(a)?(b!==!1&&(this.pos+=a.length),!0):void 0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}}},z.StringStream=vd,z.TextMarker=wd,ff(wd),wd.prototype.clear=function(){if(!this.explicitlyCleared){var a=this.doc.cm,b=a&&!a.curOp;if(b&&Gb(a),ef(this,"clear")){var c=this.find();c&&bf(this,"clear",c.from,c.to)}for(var d=null,e=null,f=0;fa.display.maxLineLength&&(a.display.maxLine=i,a.display.maxLineLength=j,a.display.maxLineChanged=!0)}null!=d&&a&&Lb(a,d,e+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,a&&Sc(a)),bf(a,"markerCleared",a,this),b&&Hb(a)}},wd.prototype.find=function(a){for(var b,c,d=0;d=b.display.showingFrom&&a.linec;++c){var e=this.lines[c];this.height-=e.height,ae(e),bf(e,"delete")}this.lines.splice(a,b)},collapse:function(a){a.splice.apply(a,[a.length,0].concat(this.lines))},insertInner:function(a,b,c){this.height+=c,this.lines=this.lines.slice(0,a).concat(b).concat(this.lines.slice(a));for(var d=0,e=b.length;e>d;++d)b[d].parent=this},iterN:function(a,b,c){for(var d=a+b;d>a;++a)if(c(this.lines[a]))return!0}},re.prototype={chunkSize:function(){return this.size},removeInner:function(a,b){this.size-=b;for(var c=0;ca){var f=Math.min(b,e-a),g=d.height;if(d.removeInner(a,f),this.height-=g-d.height,e==f&&(this.children.splice(c--,1),d.parent=null),0==(b-=f))break;a=0}else a-=e}if(this.size-b<25){var h=[];this.collapse(h),this.children=[new qe(h)],this.children[0].parent=this}},collapse:function(a){for(var b=0,c=this.children.length;c>b;++b)this.children[b].collapse(a)},insertInner:function(a,b,c){this.size+=b.length,this.height+=c;for(var d=0,e=this.children.length;e>d;++d){var f=this.children[d],g=f.chunkSize();if(g>=a){if(f.insertInner(a,b,c),f.lines&&f.lines.length>50){for(;f.lines.length>50;){var h=f.lines.splice(f.lines.length-25,25),i=new qe(h);f.height-=i.height,this.children.splice(d+1,0,i),i.parent=this}this.maybeSpill()}break}a-=g}},maybeSpill:function(){if(!(this.children.length<=10)){var a=this;do{var b=a.children.splice(a.children.length-5,5),c=new re(b);if(a.parent){a.size-=c.size,a.height-=c.height;var e=pf(a.parent.children,a);a.parent.children.splice(e+1,0,c)}else{var d=new re(a.children);d.parent=a,a.children=[d,c],a=d}c.parent=a.parent}while(a.children.length>10);a.parent.maybeSpill()}},iterN:function(a,b,c){for(var d=0,e=this.children.length;e>d;++d){var f=this.children[d],g=f.chunkSize();if(g>a){var h=Math.min(b,g-a);if(f.iterN(a,h,c))return!0;if(0==(b-=h))break;a=0}else a-=g}}};var se=0,te=z.Doc=function(a,b,c){if(!(this instanceof te))return new te(a,b,c);null==c&&(c=0),re.call(this,[new qe([new $d("",null)])]),this.first=c,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.history=Ge(),this.cleanGeneration=1,this.frontier=c;var d=Gc(c,0);this.sel={from:d,to:d,head:d,anchor:d,shift:!1,extend:!1,goalColumn:null},this.id=++se,this.modeOption=b,"string"==typeof a&&(a=Kf(a)),pe(this,{from:d,to:d,text:a},null,{head:d,anchor:d})};te.prototype=qf(re.prototype,{constructor:te,iter:function(a,b,c){c?this.iterN(a-this.first,b-a,c):this.iterN(this.first,this.first+this.size,a)},insert:function(a,b){for(var c=0,d=0,e=b.length;e>d;++d)c+=b[d].height;this.insertInner(a-this.first,b,c)},remove:function(a,b){this.removeInner(a-this.first,b)},getValue:function(a){var b=Ae(this,this.first,this.first+this.size);return a===!1?b:b.join(a||"\n")},setValue:function(a){var b=Gc(this.first,0),c=this.first+this.size-1;zc(this,{from:b,to:Gc(c,ye(this,c).text.length),text:Kf(a),origin:"setValue"},{head:b,anchor:b},!0)},replaceRange:function(a,b,c,d){b=Mc(this,b),c=c?Mc(this,c):b,Fc(this,a,b,c,d)},getRange:function(a,b,c){var d=ze(this,Mc(this,a),Mc(this,b));return c===!1?d:d.join(c||"\n")},getLine:function(a){var b=this.getLineHandle(a);return b&&b.text},setLine:function(a,b){Oc(this,a)&&Fc(this,b,Gc(a,0),Mc(this,Gc(a)))},removeLine:function(a){a?Fc(this,"",Mc(this,Gc(a-1)),Mc(this,Gc(a))):Fc(this,"",Gc(0,0),Mc(this,Gc(1,0)))},getLineHandle:function(a){return Oc(this,a)?ye(this,a):void 0},getLineNumber:function(a){return Ce(a)},getLineHandleVisualStart:function(a){return"number"==typeof a&&(a=ye(this,a)),Rd(this,a)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(a){return Mc(this,a)},getCursor:function(a){var c,b=this.sel;return c=null==a||"head"==a?b.head:"anchor"==a?b.anchor:"end"==a||a===!1?b.to:b.from,Kc(c)},somethingSelected:function(){return!Hc(this.sel.head,this.sel.anchor)},setCursor:Jb(function(a,b,c){var d=Mc(this,"number"==typeof a?Gc(a,b||0):a);c?Pc(this,d):Rc(this,d,d)}),setSelection:Jb(function(a,b,c){Rc(this,Mc(this,a),Mc(this,b||a),c)}),extendSelection:Jb(function(a,b,c){Pc(this,Mc(this,a),b&&Mc(this,b),c)}),getSelection:function(a){return this.getRange(this.sel.from,this.sel.to,a)},replaceSelection:function(a,b,c){zc(this,{from:this.sel.from,to:this.sel.to,text:Kf(a),origin:c},b||"around")},undo:Jb(function(){Bc(this,"undo")}),redo:Jb(function(){Bc(this,"redo")}),setExtending:function(a){this.sel.extend=a},historySize:function(){var a=this.history;return{undo:a.done.length,redo:a.undone.length}},clearHistory:function(){this.history=Ge(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(a){return a&&(this.history.lastOp=this.history.lastOrigin=null),this.history.generation},isClean:function(a){return this.history.generation==(a||this.cleanGeneration)},getHistory:function(){return{done:Me(this.history.done),undone:Me(this.history.undone)}},setHistory:function(a){var b=this.history=Ge(this.history.maxGeneration);b.done=a.done.slice(0),b.undone=a.undone.slice(0)},markText:function(a,b,c){return yd(this,Mc(this,a),Mc(this,b),c,"range")},setBookmark:function(a,b){var c={replacedWith:b&&(null==b.nodeType?b.widget:b),insertLeft:b&&b.insertLeft,clearWhenEmpty:!1};return a=Mc(this,a),yd(this,a,a,c,"bookmark")},findMarksAt:function(a){a=Mc(this,a);var b=[],c=ye(this,a.line).markedSpans;if(c)for(var d=0;d=a.ch)&&b.push(e.marker.parent||e.marker)}return b},findMarks:function(a,b){a=Mc(this,a),b=Mc(this,b);var c=[],d=a.line;return this.iter(a.line,b.line+1,function(e){var f=e.markedSpans;if(f)for(var g=0;gh.to||null==h.from&&d!=a.line||d==b.line&&h.from>b.ch||c.push(h.marker.parent||h.marker)}++d}),c},getAllMarks:function(){var a=[];return this.iter(function(b){var c=b.markedSpans;if(c)for(var d=0;da?(b=a,!0):(a-=e,++c,void 0)}),Mc(this,Gc(c,b))},indexFromPos:function(a){a=Mc(this,a);var b=a.ch;return a.lineb&&(b=a.from),null!=a.to&&a.to=8208&&8212>=c}:h&&(Ff=function(a,b){if(b>1&&45==a.charCodeAt(b-1)){if(/\w/.test(a.charAt(b-2))&&/[^\-?\.]/.test(a.charAt(b)))return!0;if(b>2&&/[\d\.,]/.test(a.charAt(b-2))&&/[\d\.,]/.test(a.charAt(b)))return!1}return/[~!#%&*)=+}\]\\|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|\u2026[\w~`@#$%\^&*(_=+{[><]/.test(a.slice(b-1,b+1))});var Gf,If,Kf=3!="\n\nb".split(/\n/).length?function(a){for(var b=0,c=[],d=a.length;d>=b;){var e=a.indexOf("\n",b);-1==e&&(e=a.length);var f=a.slice(b,"\r"==a.charAt(e-1)?e-1:e),g=f.indexOf("\r");-1!=g?(c.push(f.slice(0,g)),b+=g+1):(c.push(f),b=e+1)}return c}:function(a){return a.split(/\r\n?|\n/)};z.splitLines=Kf;var Lf=window.getSelection?function(a){try{return a.selectionStart!=a.selectionEnd}catch(b){return!1}}:function(a){try{var b=a.ownerDocument.selection.createRange()}catch(c){}return b&&b.parentElement()==a?0!=b.compareEndPoints("StartToEnd",b):!1},Mf=function(){var a=zf("div");return"oncopy"in a?!0:(a.setAttribute("oncopy","return;"),"function"==typeof a.oncopy)}(),Nf={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",107:"=",109:"-",127:"Delete",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"};z.keyNames=Nf,function(){for(var a=0;10>a;a++)Nf[a+48]=Nf[a+96]=String(a);for(var a=65;90>=a;a++)Nf[a]=String.fromCharCode(a);for(var a=1;12>=a;a++)Nf[a+111]=Nf[a+63235]="F"+a}();var Wf,_f=function(){function c(c){return 255>=c?a.charAt(c):c>=1424&&1524>=c?"R":c>=1536&&1791>=c?b.charAt(c-1536):c>=1792&&2220>=c?"r":"L"}var a="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLL",b="rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmmrrrrrrrrrrrrrrrrrr",d=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,e=/[stwN]/,f=/[LRr]/,g=/[Lb1n]/,h=/[1n]/,i="L";return function(a){if(!d.test(a))return!1;for(var l,b=a.length,j=[],k=0;b>k;++k)j.push(l=c(a.charCodeAt(k)));for(var k=0,m=i;b>k;++k){var l=j[k];"m"==l?j[k]=m:m=l}for(var k=0,n=i;b>k;++k){var l=j[k];"1"==l&&"r"==n?j[k]="n":f.test(l)&&(n=l,"r"==l&&(j[k]="R"))}for(var k=1,m=j[0];b-1>k;++k){var l=j[k];"+"==l&&"1"==m&&"1"==j[k+1]?j[k]="1":","!=l||m!=j[k+1]||"1"!=m&&"n"!=m||(j[k]=m),m=l}for(var k=0;b>k;++k){var l=j[k];if(","==l)j[k]="N";else if("%"==l){for(var o=k+1;b>o&&"%"==j[o];++o);for(var p=k&&"!"==j[k-1]||b>o&&"1"==j[o]?"1":"N",q=k;o>q;++q)j[q]=p;k=o-1}}for(var k=0,n=i;b>k;++k){var l=j[k];"L"==n&&"1"==l?j[k]="L":f.test(l)&&(n=l)}for(var k=0;b>k;++k)if(e.test(j[k])){for(var o=k+1;b>o&&e.test(j[o]);++o);for(var r="L"==(k?j[k-1]:i),s="L"==(b>o?j[o]:i),p=r||s?"L":"R",q=k;o>q;++q)j[q]=p;k=o-1}for(var u,t=[],k=0;b>k;)if(g.test(j[k])){var v=k;for(++k;b>k&&g.test(j[k]);++k);t.push({from:v,to:k,level:0})}else{var w=k,x=t.length;for(++k;b>k&&"L"!=j[k];++k);for(var q=w;k>q;)if(h.test(j[q])){q>w&&t.splice(x,0,{from:w,to:q,level:1});var y=q;for(++q;k>q&&h.test(j[q]);++q);t.splice(x,0,{from:y,to:q,level:2}),w=q}else++q;k>w&&t.splice(x,0,{from:w,to:k,level:1})}return 1==t[0].level&&(u=a.match(/^\s+/))&&(t[0].from=u[0].length,t.unshift({from:0,to:u[0].length,level:0})),1==nf(t).level&&(u=a.match(/\s+$/))&&(nf(t).to-=u[0].length,t.push({from:b-u[0].length,to:b,level:0})),t[0].level!=nf(t).level&&t.push({from:b,to:b,level:t[0].level}),t}}();return z.version="3.22.1",z}(),CodeMirror.defineMode("javascript",function(a,b){function k(a){for(var c,b=!1,d=!1;null!=(c=a.next());){if(!b){if("/"==c&&!d)return;"["==c?d=!0:d&&"]"==c&&(d=!1)}b=!b&&"\\"==c}}function n(a,b,c){return l=a,m=c,b}function o(a,b){var c=a.next();if('"'==c||"'"==c)return b.tokenize=p(c),b.tokenize(a,b);if("."==c&&a.match(/^\d+(?:[eE][+\-]?\d+)?/))return n("number","number");if("."==c&&a.match(".."))return n("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(c))return n(c);if("="==c&&a.eat(">"))return n("=>","operator");if("0"==c&&a.eat(/x/i))return a.eatWhile(/[\da-f]/i),n("number","number");if(/\d/.test(c))return a.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),n("number","number");if("/"==c)return a.eat("*")?(b.tokenize=q,q(a,b)):a.eat("/")?(a.skipToEnd(),n("comment","comment")):"operator"==b.lastType||"keyword c"==b.lastType||"sof"==b.lastType||/^[\[{}\(,;:]$/.test(b.lastType)?(k(a),a.eatWhile(/[gimy]/),n("regexp","string-2")):(a.eatWhile(i),n("operator","operator",a.current()));if("`"==c)return b.tokenize=r,r(a,b);if("#"==c)return a.skipToEnd(),n("error","error");if(i.test(c))return a.eatWhile(i),n("operator","operator",a.current());a.eatWhile(/[\w\$_]/);var d=a.current(),e=h.propertyIsEnumerable(d)&&h[d];return e&&"."!=b.lastType?n(e.type,e.style,d):n("variable","variable",d)}function p(a){return function(b,c){var f,d=!1;if(e&&"@"==b.peek()&&b.match(j))return c.tokenize=o,n("jsonld-keyword","meta");for(;null!=(f=b.next())&&(f!=a||d);)d=!d&&"\\"==f;return d||(c.tokenize=o),n("string","string")}}function q(a,b){for(var d,c=!1;d=a.next();){if("/"==d&&c){b.tokenize=o;break}c="*"==d}return n("comment","comment")}function r(a,b){for(var d,c=!1;null!=(d=a.next());){if(!c&&("`"==d||"$"==d&&a.eat("{"))){b.tokenize=o;break}c=!c&&"\\"==d}return n("quasi","string-2",a.current())}function t(a,b){b.fatArrowAt&&(b.fatArrowAt=null);var c=a.string.indexOf("=>",a.start);if(!(0>c)){for(var d=0,e=!1,f=c-1;f>=0;--f){var g=a.string.charAt(f),h=s.indexOf(g);if(h>=0&&3>h){if(!d){++f;break}if(0==--d)break}else if(h>=3&&6>h)++d;else if(/[$\w]/.test(g))e=!0;else if(e&&!d){++f;break}}e&&!d&&(b.fatArrowAt=f)}}function v(a,b,c,d,e,f){this.indented=a,this.column=b,this.type=c,this.prev=e,this.info=f,null!=d&&(this.align=d)}function w(a,b){for(var c=a.localVars;c;c=c.next)if(c.name==b)return!0;for(var d=a.context;d;d=d.prev)for(var c=d.vars;c;c=c.next)if(c.name==b)return!0}function x(a,b,c,d,e){var g=a.cc;for(y.state=a,y.stream=e,y.marked=null,y.cc=g,a.lexical.hasOwnProperty("align")||(a.lexical.align=!0);;){var h=g.length?g.pop():f?J:I;if(h(c,d)){for(;g.length&&g[g.length-1].lex;)g.pop()();return y.marked?y.marked:"variable"==c&&w(a,d)?"variable-2":b}}}function z(){for(var a=arguments.length-1;a>=0;a--)y.cc.push(arguments[a])}function A(){return z.apply(null,arguments),!0}function B(a){function c(b){for(var c=b;c;c=c.next)if(c.name==a)return!0;return!1}var d=y.state;if(d.context){if(y.marked="def",c(d.localVars))return;d.localVars={name:a,next:d.localVars}}else{if(c(d.globalVars))return;b.globalVars&&(d.globalVars={name:a,next:d.globalVars})}}function D(){y.state.context={prev:y.state.context,vars:y.state.localVars},y.state.localVars=C}function E(){y.state.localVars=y.state.context.vars,y.state.context=y.state.context.prev}function F(a,b){var c=function(){var c=y.state,d=c.indented;"stat"==c.lexical.type&&(d=c.lexical.indented),c.lexical=new v(d,y.stream.column(),a,null,c.lexical,b)};return c.lex=!0,c}function G(){var a=y.state;a.lexical.prev&&(")"==a.lexical.type&&(a.indented=a.lexical.indented),a.lexical=a.lexical.prev)}function H(a){return function(b){return b==a?A():";"==a?z():A(arguments.callee)}}function I(a,b){return"var"==a?A(F("vardef",b.length),cb,H(";"),G):"keyword a"==a?A(F("form"),J,I,G):"keyword b"==a?A(F("form"),I,G):"{"==a?A(F("}"),_,G):";"==a?A():"if"==a?A(F("form"),J,I,G,hb):"function"==a?A(nb):"for"==a?A(F("form"),ib,I,G):"variable"==a?A(F("stat"),U):"switch"==a?A(F("form"),J,F("}","switch"),H("{"),_,G,G):"case"==a?A(J,H(":")):"default"==a?A(H(":")):"catch"==a?A(F("form"),D,H("("),ob,H(")"),I,G,E):"module"==a?A(F("form"),D,sb,E,G):"class"==a?A(F("form"),pb,rb,G):"export"==a?A(F("form"),tb,G):"import"==a?A(F("form"),ub,G):z(F("stat"),J,H(";"),G)}function J(a){return L(a,!1)}function K(a){return L(a,!0)}function L(a,b){if(y.state.fatArrowAt==y.stream.start){var c=b?T:S;if("("==a)return A(D,F(")"),Z(db,")"),G,H("=>"),c,E);if("variable"==a)return z(D,db,H("=>"),c,E)}var d=b?P:O;return u.hasOwnProperty(a)?A(d):"function"==a?A(nb):"keyword c"==a?A(b?N:M):"("==a?A(F(")"),M,zb,H(")"),G,d):"operator"==a||"spread"==a?A(b?K:J):"["==a?A(F("]"),xb,G,d):"{"==a?$(W,"}",null,d):A()}function M(a){return a.match(/[;\}\)\],]/)?z():z(J)}function N(a){return a.match(/[;\}\)\],]/)?z():z(K)}function O(a,b){return","==a?A(J):P(a,b,!1)}function P(a,b,c){var d=0==c?O:P,e=0==c?J:K;return"=>"==b?A(D,c?T:S,E):"operator"==a?/\+\+|--/.test(b)?A(d):"?"==b?A(J,H(":"),e):A(e):"quasi"==a?(y.cc.push(d),Q(b)):";"!=a?"("==a?$(K,")","call",d):"."==a?A(V,d):"["==a?A(F("]"),M,H("]"),G,d):void 0:void 0}function Q(a){return"${"!=a.slice(a.length-2)?A():A(J,R)}function R(a){return"}"==a?(y.marked="string-2",y.state.tokenize=r,A()):void 0}function S(a){return t(y.stream,y.state),"{"==a?z(I):z(J)}function T(a){return t(y.stream,y.state),"{"==a?z(I):z(K)}function U(a){return":"==a?A(G,I):z(O,H(";"),G)}function V(a){return"variable"==a?(y.marked="property",A()):void 0}function W(a,b){if("variable"==a){if(y.marked="property","get"==b||"set"==b)return A(X)}else if("number"==a||"string"==a)y.marked=e?"property":a+" property";else if("["==a)return A(J,H("]"),Y);return u.hasOwnProperty(a)?A(Y):void 0}function X(a){return"variable"!=a?z(Y):(y.marked="property",A(nb))}function Y(a){return":"==a?A(K):"("==a?z(nb):void 0}function Z(a,b){function c(d){if(","==d){var e=y.state.lexical;return"call"==e.info&&(e.pos=(e.pos||0)+1),A(a,c)}return d==b?A():A(H(b))}return function(d){return d==b?A():z(a,c)}}function $(a,b,c){for(var d=3;d!?|~^]/,j=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/,s="([{}])",u={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,"this":!0,"jsonld-keyword":!0},y={state:null,column:null,marked:null,cc:null},C={name:"this",next:{name:"arguments"}};return G.lex=!0,{startState:function(a){var d={tokenize:o,lastType:"sof",cc:[],lexical:new v((a||0)-c,0,"block",!1),localVars:b.localVars,context:b.localVars&&{vars:b.localVars},indented:0};return b.globalVars&&(d.globalVars=b.globalVars),d},token:function(a,b){if(a.sol()&&(b.lexical.hasOwnProperty("align")||(b.lexical.align=!1),b.indented=a.indentation(),t(a,b)),b.tokenize!=q&&a.eatSpace())return null;var c=b.tokenize(a,b);return"comment"==l?c:(b.lastType="operator"!=l||"++"!=m&&"--"!=m?l:"incdec",x(b,c,l,m,a))},indent:function(a,e){if(a.tokenize==q)return CodeMirror.Pass;if(a.tokenize!=o)return 0;for(var f=e&&e.charAt(0),g=a.lexical,h=a.cc.length-1;h>=0;--h){var i=a.cc[h];if(i==G)g=g.prev;else if(i!=hb)break}"stat"==g.type&&"}"==f&&(g=g.prev),d&&")"==g.type&&"stat"==g.prev.type&&(g=g.prev);var j=g.type,k=f==j;return"vardef"==j?g.indented+("operator"==a.lastType||","==a.lastType?g.info+1:0):"form"==j&&"{"==f?g.indented:"form"==j?g.indented+c:"stat"==j?g.indented+("operator"==a.lastType||","==a.lastType?d||c:0):"switch"!=g.info||k||0==b.doubleIndentSwitch?g.align?g.column+(k?0:1):g.indented+(k?0:c):g.indented+(/^(?:case|default)\b/.test(e)?c:2*c)},electricChars:":{}",blockCommentStart:f?null:"/*",blockCommentEnd:f?null:"*/",lineComment:f?null:"//",fold:"brace",helperType:f?"json":"javascript",jsonldMode:e,jsonMode:f}}),CodeMirror.defineMIME("text/javascript","javascript"),CodeMirror.defineMIME("text/ecmascript","javascript"),CodeMirror.defineMIME("application/javascript","javascript"),CodeMirror.defineMIME("application/ecmascript","javascript"),CodeMirror.defineMIME("application/json",{name:"javascript",json:!0}),CodeMirror.defineMIME("application/x-json",{name:"javascript",json:!0}),CodeMirror.defineMIME("application/ld+json",{name:"javascript",jsonld:!0}),CodeMirror.defineMIME("text/typescript",{name:"javascript",typescript:!0}),CodeMirror.defineMIME("application/typescript",{name:"javascript",typescript:!0}),function(){function d(a,d,e){function r(d,e,f){if(d.text){var h=m?0:d.text.length-1,i=m?d.text.length:-1;if(d.text.length>g)return null;for(null!=f&&(h=f+n);h!=i;h+=n){var j=d.text.charAt(h);if(q.test(j)&&a.getTokenTypeAt(b(e,h+1))==o){var k=c[j];if(">"==k.charAt(1)==m)p.push(j);else{if(p.pop()!=k.charAt(0))return{pos:h,match:!1};if(!p.length)return{pos:h,match:!0}}}}}}var f=a.state.matchBrackets,g=f&&f.maxScanLineLength||1e4,h=f&&f.maxScanLines||100,i=d||a.getCursor(),j=a.getLineHandle(i.line),k=i.ch-1,l=k>=0&&c[j.text.charAt(k)]||c[j.text.charAt(++k)];if(!l)return null;var m=">"==l.charAt(1),n=m?1:-1;if(e&&m!=(k==i.ch))return null;for(var t,o=a.getTokenTypeAt(b(i.line,k+1)),p=[j.text.charAt(k)],q=/[(){}[\]]/,s=i.line,u=m?Math.min(s+h,a.lineCount()):Math.max(-1,s-h);s!=u&&!(t=s==i.line?r(j,s,k):r(a.getLineHandle(s),s));s+=n);return{from:b(i.line,k),to:t&&b(s,t.pos),match:t&&t.match,forward:m}}function e(c,e){var f=c.state.matchBrackets.maxHighlightLineLength||1e3,g=d(c);if(!(!g||c.getLine(g.from.line).length>f||g.to&&c.getLine(g.to.line).length>f)){var h=g.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket",i=c.markText(g.from,b(g.from.line,g.from.ch+1),{className:h}),j=g.to&&c.markText(g.to,b(g.to.line,g.to.ch+1),{className:h});a&&c.state.focused&&c.display.input.focus();var k=function(){c.operation(function(){i.clear(),j&&j.clear()})};return e?(setTimeout(k,800),void 0):k }}function g(a){a.operation(function(){f&&(f(),f=null),a.somethingSelected()||(f=e(a,!1))})}var a=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<8),b=CodeMirror.Pos,c={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"},f=null;CodeMirror.defineOption("matchBrackets",!1,function(a,b,c){c&&c!=CodeMirror.Init&&a.off("cursorActivity",g),b&&(a.state.matchBrackets="object"==typeof b?b:{},a.on("cursorActivity",g))}),CodeMirror.defineExtension("matchBrackets",function(){e(this,!0)}),CodeMirror.defineExtension("findMatchingBracket",function(a,b){return d(this,a,b)})}(),CodeMirror.runMode=function(a,b,c,d){var e=CodeMirror.getMode(CodeMirror.defaults,b),f=/MSIE \d/.test(navigator.userAgent),g=f&&(null==document.documentMode||document.documentMode<9);if(1==c.nodeType){var h=d&&d.tabSize||CodeMirror.defaults.tabSize,i=c,j=0;i.innerHTML="",c=function(a,b){if("\n"==a)return i.appendChild(document.createTextNode(g?"\r":a)),j=0,void 0;for(var c="",d=0;;){var e=a.indexOf(" ",d);if(-1==e){c+=a.slice(d),j+=a.length-d;break}j+=e-d,c+=a.slice(d,e);var f=h-j%h;j+=f;for(var k=0;f>k;++k)c+=" ";d=e+1}if(b){var l=i.appendChild(document.createElement("span"));l.className="cm-"+b.replace(/ +/g," cm-"),l.appendChild(document.createTextNode(c))}else i.appendChild(document.createTextNode(c))}}for(var k=CodeMirror.splitLines(a),l=d&&d.state||CodeMirror.startState(e),m=0,n=k.length;n>m;++m){m&&c("\n");for(var o=new CodeMirror.StringStream(k[m]);!o.eol();){var p=e.token(o,l);c(o.current(),p,m,o.start,l),o.start=o.pos}}}; \ No newline at end of file diff --git a/addon-sdk/source/lib/framescript/context-menu.js b/addon-sdk/source/lib/framescript/context-menu.js index 3915b7cd89..e89123bade 100644 --- a/addon-sdk/source/lib/framescript/context-menu.js +++ b/addon-sdk/source/lib/framescript/context-menu.js @@ -56,7 +56,7 @@ const SVG_NS = "http://www.w3.org/2000/svg"; // Firefox always creates a HTMLVideoElement when loading an ogg file // directly. If the media is actually audio, be smarter and provide a // context menu with audio operations. -// Source: https://github.com/mozilla/gecko-dev/blob/28c2fca3753c5371643843fc2f2f205146b083b7/browser/base/content/nsContextMenu.js#L632-L637 +// Source: https://github.com/mozilla/goanna-dev/blob/28c2fca3753c5371643843fc2f2f205146b083b7/browser/base/content/nsContextMenu.js#L632-L637 const isVideoLoadingAudio = node => node.readyState >= node.HAVE_METADATA && (node.videoWidth == 0 || node.videoHeight == 0) diff --git a/addon-sdk/source/lib/sdk/tabs/observer.js b/addon-sdk/source/lib/sdk/tabs/observer.js index 615b408283..d924a6d46d 100644 --- a/addon-sdk/source/lib/sdk/tabs/observer.js +++ b/addon-sdk/source/lib/sdk/tabs/observer.js @@ -73,7 +73,7 @@ const Observer = Class({ }); - // Currently gecko does not dispatches "TabSelect" events when different + // Currently goanna does not dispatches "TabSelect" events when different // window gets activated. To work around this limitation we emulate "select" // event for this case. windowObserver.on("activate", chromeWindow => { diff --git a/addon-sdk/source/lib/sdk/windows/tabs-firefox.js b/addon-sdk/source/lib/sdk/windows/tabs-firefox.js index da1a7b32c8..daaecac883 100644 --- a/addon-sdk/source/lib/sdk/windows/tabs-firefox.js +++ b/addon-sdk/source/lib/sdk/windows/tabs-firefox.js @@ -66,7 +66,7 @@ const WindowTabTracker = Trait.compose({ this._onTabUnpinned = this._onTabEvent.bind(this, "unpinned"); for (let tab of getTabs(this._window)) { - // We emulate "open" events for all open tabs since gecko does not emits + // We emulate "open" events for all open tabs since goanna does not emits // them on the tabs that new windows are open with. Also this is // necessary to synchronize tabs lists with an actual state. this._onTabOpen(tab); @@ -84,7 +84,7 @@ const WindowTabTracker = Trait.compose({ tabsObserver.on("unpinned", this._onTabUnpinned); }, _destroyWindowTabTracker: function _destroyWindowTabTracker() { - // We emulate close events on all tabs, since gecko does not emits such + // We emulate close events on all tabs, since goanna does not emits such // events by itself. for (let tab of this.tabs) this._emitEvent("close", tab); diff --git a/addon-sdk/source/test/loader/b2g.js b/addon-sdk/source/test/loader/b2g.js index 2982a02026..5045672ccf 100644 --- a/addon-sdk/source/test/loader/b2g.js +++ b/addon-sdk/source/test/loader/b2g.js @@ -26,7 +26,7 @@ FakeCu.prototype = { Cu.evalInSandbox(`(function(){` + readURISync(url) + `\n})`, sandbox, "1.8", url).call(target); // Borrowed from mozJSComponentLoader.cpp to match errors closer. - // https://github.com/mozilla/gecko-dev/blob/f6ca65e8672433b2ce1a0e7c31f72717930b5e27/js/xpconnect/loader/mozJSComponentLoader.cpp#L1205-L1208 + // https://github.com/mozilla/goanna-dev/blob/f6ca65e8672433b2ce1a0e7c31f72717930b5e27/js/xpconnect/loader/mozJSComponentLoader.cpp#L1205-L1208 if (!Array.isArray(target.EXPORTED_SYMBOLS)) { throw Error("EXPORTED_SYMBOLS is not an array."); } diff --git a/b2g/chrome/content/devtools/debugger.js b/b2g/chrome/content/devtools/debugger.js index 45c56db880..f2612c2350 100644 --- a/b2g/chrome/content/devtools/debugger.js +++ b/b2g/chrome/content/devtools/debugger.js @@ -323,7 +323,7 @@ let WiFiRemoteDebugger = { let devtoolsWiFi = false; // Keep the old setting to not break people that won't have updated - // gaia and gecko. + // gaia and goanna. SettingsListener.observe("devtools.debugger.remote-enabled", false, function(value) { devtoolsUSB = value; diff --git a/b2g/chrome/content/identity.js b/b2g/chrome/content/identity.js index 548ecf54d8..204117652f 100644 --- a/b2g/chrome/content/identity.js +++ b/b2g/chrome/content/identity.js @@ -62,13 +62,13 @@ function identityCall(message) { } /* - * To close the dialog, we first tell the gecko SignInToWebsite manager that it + * To close the dialog, we first tell the goanna SignInToWebsite manager that it * can clean up. Then we tell the gaia component that we are finished. It is - * necessary to notify gecko first, so that the message can be sent before gaia + * necessary to notify goanna first, so that the message can be sent before gaia * destroys our context. */ function closeIdentityDialog() { - // tell gecko we're done. + // tell goanna we're done. func = null; options = null; sendAsyncMessage(kIdentityDelegateFinished); } diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js index 927fe99752..311170c59b 100644 --- a/b2g/chrome/content/settings.js +++ b/b2g/chrome/content/settings.js @@ -316,7 +316,7 @@ setUpdateTrackingId(); //In order of precedence they are: // //1. mozSettings "layers.composer.enabled" - //2. a gecko pref "layers.composer.enabled" + //2. a goanna pref "layers.composer.enabled" //3. presence of ro.display.colorfill at the Gonk level var req = navigator.mozSettings.createLock().get('layers.composer2d.enabled'); @@ -380,11 +380,11 @@ setUpdateTrackingId(); // =================== Telemetry ====================== (function setupTelemetrySettings() { let gaiaSettingName = 'debug.performance_data.shared'; - let geckoPrefName = 'toolkit.telemetry.enabled'; + let goannaPrefName = 'toolkit.telemetry.enabled'; SettingsListener.observe(gaiaSettingName, null, function(value) { if (value !== null) { // Gaia setting has been set; update Goanna pref to that. - Services.prefs.setBoolPref(geckoPrefName, value); + Services.prefs.setBoolPref(goannaPrefName, value); return; } // Gaia setting has not been set; set the gaia setting to default. @@ -394,7 +394,7 @@ setUpdateTrackingId(); let prefValue = false; #endif try { - prefValue = Services.prefs.getBoolPref(geckoPrefName); + prefValue = Services.prefs.getBoolPref(goannaPrefName); } catch (e) { // Pref not set; use default value. } @@ -406,14 +406,14 @@ setUpdateTrackingId(); // =================== Low-precision buffer ====================== (function setupLowPrecisionSettings() { - // The gaia setting layers.low-precision maps to two gecko prefs + // The gaia setting layers.low-precision maps to two goanna prefs SettingsListener.observe('layers.low-precision', null, function(value) { if (value !== null) { - // Update gecko from the new Gaia setting + // Update goanna from the new Gaia setting Services.prefs.setBoolPref('layers.low-precision-buffer', value); Services.prefs.setBoolPref('layers.progressive-paint', value); } else { - // Update gaia setting from gecko value + // Update gaia setting from goanna value try { let prefValue = Services.prefs.getBoolPref('layers.low-precision-buffer'); let setting = { 'layers.low-precision': prefValue }; @@ -424,13 +424,13 @@ setUpdateTrackingId(); } }); - // The gaia setting layers.low-opacity maps to a string gecko pref (0.5/1.0) + // The gaia setting layers.low-opacity maps to a string goanna pref (0.5/1.0) SettingsListener.observe('layers.low-opacity', null, function(value) { if (value !== null) { - // Update gecko from the new Gaia setting + // Update goanna from the new Gaia setting Services.prefs.setCharPref('layers.low-precision-opacity', value ? '0.5' : '1.0'); } else { - // Update gaia setting from gecko value + // Update gaia setting from goanna value try { let prefValue = Services.prefs.getCharPref('layers.low-precision-opacity'); let setting = { 'layers.low-opacity': (prefValue == '0.5') }; diff --git a/b2g/components/SystemAppProxy.jsm b/b2g/components/SystemAppProxy.jsm index eec500de31..240e564131 100644 --- a/b2g/components/SystemAppProxy.jsm +++ b/b2g/components/SystemAppProxy.jsm @@ -46,7 +46,7 @@ let SystemAppProxy = { /* * Common way to send an event to the system app. * - * // In gecko code: + * // In goanna code: * SystemAppProxy.sendCustomEvent('foo', { data: 'bar' }); * // In system app: * window.addEventListener('foo', function (event) { diff --git a/b2g/components/UpdatePrompt.js b/b2g/components/UpdatePrompt.js index fee312fb74..903e4da606 100644 --- a/b2g/components/UpdatePrompt.js +++ b/b2g/components/UpdatePrompt.js @@ -214,10 +214,10 @@ UpdatePrompt.prototype = { setUpdateStatus: function UP_setUpdateStatus(aStatus) { if (useSettings()) { - log("Setting gecko.updateStatus: " + aStatus); + log("Setting goanna.updateStatus: " + aStatus); let lock = Services.settings.createLock(); - lock.set("gecko.updateStatus", aStatus, null); + lock.set("goanna.updateStatus", aStatus, null); } }, @@ -364,7 +364,7 @@ UpdatePrompt.prototype = { finishUpdate: function UP_finishUpdate() { if (!this._update.isOSUpdate) { - // Standard gecko+gaia updates will just need to restart the process + // Standard goanna+gaia updates will just need to restart the process this.restartProcess(); return; } diff --git a/b2g/config/dolphin-512/config.json b/b2g/config/dolphin-512/config.json index 7d2253cdee..c801dc9e33 100644 --- a/b2g/config/dolphin-512/config.json +++ b/b2g/config/dolphin-512/config.json @@ -24,9 +24,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], + ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] + ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] ], "env": { "VARIANT": "user", @@ -35,7 +35,7 @@ "b2g_manifest": "dolphin-512.xml", "b2g_manifest_intree": true, "additional_source_tarballs": [], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/dolphin/config.json b/b2g/config/dolphin/config.json index 9958f01a16..d6d8849beb 100644 --- a/b2g/config/dolphin/config.json +++ b/b2g/config/dolphin/config.json @@ -26,9 +26,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], + ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] + ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] ], "env": { "VARIANT": "user", @@ -38,7 +38,7 @@ "b2g_manifest": "dolphin.xml", "b2g_manifest_intree": true, "additional_source_tarballs": [], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/emulator-ics/config.json b/b2g/config/emulator-ics/config.json index 8d610ec759..b2c4f0fb2d 100644 --- a/b2g/config/emulator-ics/config.json +++ b/b2g/config/emulator-ics/config.json @@ -17,7 +17,7 @@ "{workdir}/sources.xml" ], "upload_platform": "emulator-ics", - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/emulator-jb/config.json b/b2g/config/emulator-jb/config.json index d4444e9733..74f398ac32 100644 --- a/b2g/config/emulator-jb/config.json +++ b/b2g/config/emulator-jb/config.json @@ -23,7 +23,7 @@ "{workdir}/sources.xml" ], "upload_platform": "emulator-jb", - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/emulator-kk/config.json b/b2g/config/emulator-kk/config.json index d0ee1afcc3..2184890c8f 100644 --- a/b2g/config/emulator-kk/config.json +++ b/b2g/config/emulator-kk/config.json @@ -23,7 +23,7 @@ "{workdir}/sources.xml" ], "upload_platform": "emulator-kk", - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/emulator/config.json b/b2g/config/emulator/config.json index 085bed99f6..da06ab0788 100644 --- a/b2g/config/emulator/config.json +++ b/b2g/config/emulator/config.json @@ -23,7 +23,7 @@ "{objdir}/dist/b2g-*.tar.gz", "{workdir}/sources.xml" ], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/flame-kk/config.json b/b2g/config/flame-kk/config.json index ac1e680a59..5924461424 100644 --- a/b2g/config/flame-kk/config.json +++ b/b2g/config/flame-kk/config.json @@ -28,9 +28,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], + ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] + ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] ], "env": { "VARIANT": "user", @@ -42,7 +42,7 @@ "b2g_manifest": "flame-kk.xml", "b2g_manifest_intree": true, "additional_source_tarballs": ["backup-flame.tar.xz"], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/flame/config.json b/b2g/config/flame/config.json index 6757312a08..ea7c09c240 100644 --- a/b2g/config/flame/config.json +++ b/b2g/config/flame/config.json @@ -27,9 +27,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], + ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] + ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] ], "env": { "VARIANT": "user", @@ -41,7 +41,7 @@ "b2g_manifest": "flame.xml", "b2g_manifest_intree": true, "additional_source_tarballs": ["backup-flame.tar.xz"], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/hamachi/config.json b/b2g/config/hamachi/config.json index e2edf355d6..7f3b9a5e45 100644 --- a/b2g/config/hamachi/config.json +++ b/b2g/config/hamachi/config.json @@ -21,9 +21,9 @@ ], "zip_files": [ "{workdir}/profile.sh", - ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], + ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] + ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] ], "env": { "VARIANT": "user", @@ -34,7 +34,7 @@ "b2g_manifest": "hamachi.xml", "b2g_manifest_intree": true, "additional_source_tarballs": ["backup-hamachi.tar.xz"], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/hamachi/limited-memory-config.json b/b2g/config/hamachi/limited-memory-config.json index bef4a65824..34e47b19f0 100644 --- a/b2g/config/hamachi/limited-memory-config.json +++ b/b2g/config/hamachi/limited-memory-config.json @@ -27,7 +27,7 @@ "b2g_manifest": "hamachi.xml", "b2g_manifest_branch": "master", "additional_source_tarballs": ["backup-hamachi.tar.xz"], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/helix/config.json b/b2g/config/helix/config.json index 3ed73508f7..34dc6f39db 100644 --- a/b2g/config/helix/config.json +++ b/b2g/config/helix/config.json @@ -26,9 +26,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], + ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] + ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] ], "env": { "VARIANT": "user", @@ -40,7 +40,7 @@ "b2g_manifest": "helix.xml", "b2g_manifest_intree": true, "additional_source_tarballs": ["helix-ics.tar.xz"], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/nexus-4/config.json b/b2g/config/nexus-4/config.json index 9c4baad205..b46225d8e1 100644 --- a/b2g/config/nexus-4/config.json +++ b/b2g/config/nexus-4/config.json @@ -27,9 +27,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], + ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] + ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] ], "env": { "VARIANT": "user", @@ -40,7 +40,7 @@ "b2g_manifest": "nexus-4.xml", "b2g_manifest_intree": true, "additional_source_tarballs": [], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/nexus-5-l/config.json b/b2g/config/nexus-5-l/config.json index 14e5b3ad0a..932434246f 100644 --- a/b2g/config/nexus-5-l/config.json +++ b/b2g/config/nexus-5-l/config.json @@ -27,9 +27,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], + ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] + ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] ], "env": { "VARIANT": "userdebug", @@ -40,7 +40,7 @@ "b2g_manifest": "nexus-5-l.xml", "b2g_manifest_intree": true, "additional_source_tarballs": [], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/wasabi/config.json b/b2g/config/wasabi/config.json index 5fd61395f9..f0ec7a1914 100644 --- a/b2g/config/wasabi/config.json +++ b/b2g/config/wasabi/config.json @@ -21,9 +21,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], + ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] + ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] ], "env": { "VARIANT": "user", @@ -33,7 +33,7 @@ "b2g_manifest": "wasabi.xml", "b2g_manifest_intree": true, "additional_source_tarballs": ["backup-wasabi.tar.gz"], - "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", + "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/locales/Makefile.in b/b2g/locales/Makefile.in index e2c01341c5..c5c30cf378 100644 --- a/b2g/locales/Makefile.in +++ b/b2g/locales/Makefile.in @@ -134,7 +134,7 @@ endif ident: - @printf 'gecko_revision ' + @printf 'goanna_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(GECKO_PLATFORM_INI_PATH) Build SourceStamp @printf 'b2g_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(B2G_APPLICATION_INI_PATH) App SourceStamp diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 05168647f7..60f453f6af 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -913,7 +913,7 @@ pref("browser.audioFeeds.handler", "ask"); // region.properties file is newer than the version number in the handler // service datastore, it will add any new handlers it finds in the prefs (as // seeded by this file) to its datastore. -pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties"); // The default set of web-based protocol handlers shown in the application // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers @@ -921,47 +921,47 @@ pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/loc // protocol not currently listed here), we should go ahead and add those. // webcal -pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties"); // mailto -pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties"); // irc -pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties"); // ircs -pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties"); -pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties"); +pref("goanna.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties"); // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287 -pref("gecko.handlerService.allowRegisterFromDifferentHost", false); +pref("goanna.handlerService.allowRegisterFromDifferentHost", false); #ifdef MOZ_SAFE_BROWSING pref("browser.safebrowsing.enabled", true); diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index a78fb2bde1..88eb241698 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -5639,7 +5639,7 @@ function handleDroppedLink(event, url, name) }); // Keep the event from being handled by the dragDrop listeners - // built-in to gecko if they happen to be above us. + // built-in to goanna if they happen to be above us. event.preventDefault(); }; diff --git a/browser/base/content/test/general/browser_bug477014.js b/browser/base/content/test/general/browser_bug477014.js index 77770e1992..d7778cb076 100644 --- a/browser/base/content/test/general/browser_bug477014.js +++ b/browser/base/content/test/general/browser_bug477014.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// That's a gecko! +// That's a goanna! const iconURLSpec = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="; var testPage="data:text/plain,test bug 477014"; diff --git a/browser/base/content/test/plugins/browser_pluginplaypreview.js b/browser/base/content/test/plugins/browser_pluginplaypreview.js index 49b7c63c11..a8a1cb9651 100644 --- a/browser/base/content/test/plugins/browser_pluginplaypreview.js +++ b/browser/base/content/test/plugins/browser_pluginplaypreview.js @@ -44,7 +44,7 @@ function registerPlayPreview(mimeType, targetUrl) { // nsIFactory lockFactory: function lockFactory(lock) { - // No longer used as of gecko 1.7. + // No longer used as of goanna 1.7. throw Cr.NS_ERROR_NOT_IMPLEMENTED; } }; diff --git a/browser/components/feeds/WebContentConverter.js b/browser/components/feeds/WebContentConverter.js index 479a5fdf29..67861ddaf9 100644 --- a/browser/components/feeds/WebContentConverter.js +++ b/browser/components/feeds/WebContentConverter.js @@ -29,7 +29,7 @@ const PREF_SELECTED_WEB = "browser.feeds.handlers.webservice"; const PREF_SELECTED_ACTION = "browser.feeds.handler"; const PREF_SELECTED_READER = "browser.feeds.handler.default"; const PREF_HANDLER_EXTERNAL_PREFIX = "network.protocol-handler.external"; -const PREF_ALLOW_DIFFERENT_HOST = "gecko.handlerService.allowRegisterFromDifferentHost"; +const PREF_ALLOW_DIFFERENT_HOST = "goanna.handlerService.allowRegisterFromDifferentHost"; const STRING_BUNDLE_URI = "chrome://browser/locale/feeds/subscribe.properties"; diff --git a/browser/components/loop/README.txt b/browser/components/loop/README.txt index b7377b6085..eb31b9a057 100644 --- a/browser/components/loop/README.txt +++ b/browser/components/loop/README.txt @@ -58,7 +58,7 @@ Functional Tests ================ These are currently a work in progress, but it's already possible to run a test if you have a [loop-server](https://github.com/mozilla-services/loop-server) -install that is properly configured. From the top-level gecko directory, +install that is properly configured. From the top-level goanna directory, execute: export LOOP_SERVER=/Users/larry/src/loop-server diff --git a/browser/components/loop/test/functional/test_1_browser_call.py b/browser/components/loop/test/functional/test_1_browser_call.py index 5428126717..46f0ba906f 100644 --- a/browser/components/loop/test/functional/test_1_browser_call.py +++ b/browser/components/loop/test/functional/test_1_browser_call.py @@ -33,7 +33,7 @@ class Test1BrowserCall(MarionetteTestCase): # Unfortunately, enforcing preferences currently comes with the side # effect of launching and restarting the browser before running the # real functional tests. Bug 1048554 has been filed to track this. - self.marionette.enforce_gecko_prefs(FIREFOX_PREFERENCES) + self.marionette.enforce_goanna_prefs(FIREFOX_PREFERENCES) # this is browser chrome, kids, not the content window just yet self.marionette.set_context("chrome") diff --git a/browser/components/migration/SafariProfileMigrator.js b/browser/components/migration/SafariProfileMigrator.js index 6099468657..c8d64c6a70 100644 --- a/browser/components/migration/SafariProfileMigrator.js +++ b/browser/components/migration/SafariProfileMigrator.js @@ -373,7 +373,7 @@ Preferences.prototype = { * @param aSafariKey * The dictionary key for the preference of Safari. * @param aMozPref - * The gecko/firefox preference to which aSafariKey should be migrated + * The goanna/firefox preference to which aSafariKey should be migrated * @param [optional] aConvertFunction(aSafariValue) * a function that converts the safari-preference value to the * appropriate value for aMozPref. If it's not passed, then the diff --git a/browser/devtools/app-manager/content/device.xhtml b/browser/devtools/app-manager/content/device.xhtml index e8c115a57d..82e8fabeae 100644 --- a/browser/devtools/app-manager/content/device.xhtml +++ b/browser/devtools/app-manager/content/device.xhtml @@ -32,7 +32,7 @@

Goanna - +

diff --git a/browser/devtools/profiler/test/browser.ini b/browser/devtools/profiler/test/browser.ini index 3e84c15526..78772685af 100644 --- a/browser/devtools/profiler/test/browser.ini +++ b/browser/devtools/profiler/test/browser.ini @@ -29,7 +29,7 @@ skip-if = true # Bug 1047124 skip-if = true # Bug 1047124 [browser_profiler_data-samples.js] skip-if = true # Bug 1047124 -[browser_profiler_gecko-pref-changed.js] +[browser_profiler_goanna-pref-changed.js] skip-if = true # Bug 1047124 [browser_profiler_jump-to-debugger-01.js] [browser_profiler_jump-to-debugger-02.js] diff --git a/browser/devtools/sourceeditor/codemirror/codemirror.js b/browser/devtools/sourceeditor/codemirror/codemirror.js index 104ccd7d8e..40704a2cdc 100644 --- a/browser/devtools/sourceeditor/codemirror/codemirror.js +++ b/browser/devtools/sourceeditor/codemirror/codemirror.js @@ -22,7 +22,7 @@ // Kludges for bugs and behavior differences that can't be feature // detected are enabled based on userAgent etc sniffing. - var gecko = /gecko\/\d/i.test(navigator.userAgent); + var goanna = /goanna\/\d/i.test(navigator.userAgent); // ie_uptoN means Internet Explorer version N or lower var ie_upto10 = /MSIE \d/.test(navigator.userAgent); var ie_upto7 = ie_upto10 && (document.documentMode == null || document.documentMode < 8); @@ -50,7 +50,7 @@ if (presto_version && presto_version >= 15) { presto = false; webkit = true; } // Some browsers use the wrong event properties to signal cmd/ctrl on OS X var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11)); - var captureRightClick = gecko || (ie && !ie_upto8); + var captureRightClick = goanna || (ie && !ie_upto8); // Optimize some code when these features are not used. var sawReadOnlySpans = false, sawCollapsedSpans = false; @@ -2861,10 +2861,10 @@ function setScrollTop(cm, val) { if (Math.abs(cm.doc.scrollTop - val) < 2) return; cm.doc.scrollTop = val; - if (!gecko) updateDisplay(cm, {top: val}); + if (!goanna) updateDisplay(cm, {top: val}); if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val; if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val; - if (gecko) updateDisplay(cm); + if (goanna) updateDisplay(cm); startWorker(cm, 100); } // Sync scroller and scrollbar, ensure the gutter elements are @@ -2895,7 +2895,7 @@ // being wrong would just be a slight flicker on the first wheel // scroll (if it is large enough). if (ie) wheelPixelsPerUnit = -.53; - else if (gecko) wheelPixelsPerUnit = 15; + else if (goanna) wheelPixelsPerUnit = 15; else if (chrome) wheelPixelsPerUnit = -.7; else if (safari) wheelPixelsPerUnit = -1/3; @@ -2931,7 +2931,7 @@ // estimated pixels/delta value, we just handle horizontal // scrolling entirely here. It'll be slightly off from native, but // better than glitching out. - if (dx && !gecko && !presto && wheelPixelsPerUnit != null) { + if (dx && !goanna && !presto && wheelPixelsPerUnit != null) { if (dy) setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight))); setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth))); diff --git a/browser/experiments/test/xpcshell/test_conditions.js b/browser/experiments/test/xpcshell/test_conditions.js index 501653e7b5..82a168a6cf 100644 --- a/browser/experiments/test/xpcshell/test_conditions.js +++ b/browser/experiments/test/xpcshell/test_conditions.js @@ -97,8 +97,8 @@ const sanityFilter = function filter(c) { if (c.healthReportPayload === undefined) { throw Error("No .healthReportPayload"); } - if (c.healthReportPayload.geckoAppInfo == undefined) { - throw Error("No .geckoAppInfo"); + if (c.healthReportPayload.goannaAppInfo == undefined) { + throw Error("No .goannaAppInfo"); } return true; } diff --git a/browser/extensions/shumway/content/ShumwayStreamConverter.jsm b/browser/extensions/shumway/content/ShumwayStreamConverter.jsm index 369d4c8b4c..05f35ba56b 100644 --- a/browser/extensions/shumway/content/ShumwayStreamConverter.jsm +++ b/browser/extensions/shumway/content/ShumwayStreamConverter.jsm @@ -220,15 +220,15 @@ function isShumwayEnabledFor(actions) { function getVersionInfo() { var deferred = Promise.defer(); var versionInfo = { - geckoVersion: 'unknown', - geckoBuildID: 'unknown', + goannaVersion: 'unknown', + goannaBuildID: 'unknown', shumwayVersion: 'unknown' }; try { var appInfo = Components.classes["@mozilla.org/xre/app-info;1"] .getService(Components.interfaces.nsIXULAppInfo); - versionInfo.geckoVersion = appInfo.version; - versionInfo.geckoBuildID = appInfo.appBuildID; + versionInfo.goannaVersion = appInfo.version; + versionInfo.goannaBuildID = appInfo.appBuildID; } catch (e) { log('Error encountered while getting platform version info: ' + e); } @@ -552,7 +552,7 @@ ChromeActions.prototype = { getVersionInfo().then(function (versions) { params.versions = versions; }).then(function () { - var ffbuild = params.versions.geckoVersion + ' (' + params.versions.geckoBuildID + ')'; + var ffbuild = params.versions.goannaVersion + ' (' + params.versions.goannaBuildID + ')'; //params.exceptions = encodeURIComponent(exceptions); var comment = '+++ Initially filed via the problem reporting functionality in Shumway +++\n' + 'Please add any further information that you deem helpful here:\n\n\n\n' + diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 6b15f029fb..3b4f59a6c4 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -185,7 +185,7 @@ @RESPATH@/components/composer.xpt @RESPATH@/components/content_events.xpt @RESPATH@/components/content_html.xpt -@RESPATH@/components/content_geckomediaplugins.xpt +@RESPATH@/components/content_goannamediaplugins.xpt #ifdef MOZ_WEBRTC @RESPATH@/components/content_webrtc.xpt #endif diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties index e078ed5287..569e490a16 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -20,22 +20,22 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s # profile database. Note that "new" is defined as "has a different URL"; this # means that it's not possible to update the name of existing handler, so # don't make any spelling errors here. -gecko.handlerService.defaultHandlersVersion=4 +goanna.handlerService.defaultHandlersVersion=4 # The default set of protocol handlers for webcal: -gecko.handlerService.schemes.webcal.0.name=30 Boxes -gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s +goanna.handlerService.schemes.webcal.0.name=30 Boxes +goanna.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s # The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail -gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s +goanna.handlerService.schemes.mailto.0.name=Yahoo! Mail +goanna.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s +goanna.handlerService.schemes.mailto.1.name=Gmail +goanna.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s +goanna.handlerService.schemes.irc.0.name=Mibbit +goanna.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +goanna.handlerService.schemes.ircs.0.name=Mibbit +goanna.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s diff --git a/browser/locales/filter.py b/browser/locales/filter.py index 7ff7c0ac3e..1a3864b9a7 100755 --- a/browser/locales/filter.py +++ b/browser/locales/filter.py @@ -35,7 +35,7 @@ def test(mod, path, entity = None): return ("ignore" if (re.match(r"browser\.search\.order\.[1-9]", entity) or re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or - re.match(r"gecko\.handlerService\.schemes\.", entity) or - re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity)) + re.match(r"goanna\.handlerService\.schemes\.", entity) or + re.match(r"goanna\.handlerService\.defaultHandlersVersion", entity)) else "error") return "error" diff --git a/build/annotationProcessors/AnnotationInfo.java b/build/annotationProcessors/AnnotationInfo.java index 2477132eb4..ae415ecb09 100644 --- a/build/annotationProcessors/AnnotationInfo.java +++ b/build/annotationProcessors/AnnotationInfo.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors; +package org.mozilla.goanna.annotationProcessors; /** * Object holding annotation data. Used by GeneratableElementIterator. diff --git a/build/annotationProcessors/AnnotationProcessor.java b/build/annotationProcessors/AnnotationProcessor.java index 1408891a1d..6a0e80f066 100644 --- a/build/annotationProcessors/AnnotationProcessor.java +++ b/build/annotationProcessors/AnnotationProcessor.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors; +package org.mozilla.goanna.annotationProcessors; -import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity; -import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions; -import org.mozilla.gecko.annotationProcessors.classloader.IterableJarLoadingURLClassLoader; -import org.mozilla.gecko.annotationProcessors.utils.GeneratableElementIterator; +import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity; +import org.mozilla.goanna.annotationProcessors.classloader.ClassWithOptions; +import org.mozilla.goanna.annotationProcessors.classloader.IterableJarLoadingURLClassLoader; +import org.mozilla.goanna.annotationProcessors.utils.GeneratableElementIterator; import java.io.FileOutputStream; import java.io.IOException; diff --git a/build/annotationProcessors/CodeGenerator.java b/build/annotationProcessors/CodeGenerator.java index 9b965f1bc3..635eb8a7f1 100644 --- a/build/annotationProcessors/CodeGenerator.java +++ b/build/annotationProcessors/CodeGenerator.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors; +package org.mozilla.goanna.annotationProcessors; -import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity; -import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions; -import org.mozilla.gecko.annotationProcessors.utils.Utils; +import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity; +import org.mozilla.goanna.annotationProcessors.classloader.ClassWithOptions; +import org.mozilla.goanna.annotationProcessors.utils.Utils; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; diff --git a/build/annotationProcessors/SDKProcessor.java b/build/annotationProcessors/SDKProcessor.java index 2ffc1905ed..ea7fc3e7bb 100644 --- a/build/annotationProcessors/SDKProcessor.java +++ b/build/annotationProcessors/SDKProcessor.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors; +package org.mozilla.goanna.annotationProcessors; import com.android.tools.lint.checks.ApiLookup; import com.android.tools.lint.LintCliClient; -import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity; -import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions; -import org.mozilla.gecko.annotationProcessors.classloader.IterableJarLoadingURLClassLoader; -import org.mozilla.gecko.annotationProcessors.utils.GeneratableElementIterator; -import org.mozilla.gecko.annotationProcessors.utils.Utils; +import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity; +import org.mozilla.goanna.annotationProcessors.classloader.ClassWithOptions; +import org.mozilla.goanna.annotationProcessors.classloader.IterableJarLoadingURLClassLoader; +import org.mozilla.goanna.annotationProcessors.utils.GeneratableElementIterator; +import org.mozilla.goanna.annotationProcessors.utils.Utils; import java.io.File; import java.io.FileInputStream; diff --git a/build/annotationProcessors/classloader/AnnotatableEntity.java b/build/annotationProcessors/classloader/AnnotatableEntity.java index 9dffe6033b..6ad64ccc17 100644 --- a/build/annotationProcessors/classloader/AnnotatableEntity.java +++ b/build/annotationProcessors/classloader/AnnotatableEntity.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors.classloader; +package org.mozilla.goanna.annotationProcessors.classloader; -import org.mozilla.gecko.annotationProcessors.AnnotationInfo; +import org.mozilla.goanna.annotationProcessors.AnnotationInfo; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/build/annotationProcessors/classloader/ClassWithOptions.java b/build/annotationProcessors/classloader/ClassWithOptions.java index 070cff8b67..851a301503 100644 --- a/build/annotationProcessors/classloader/ClassWithOptions.java +++ b/build/annotationProcessors/classloader/ClassWithOptions.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors.classloader; +package org.mozilla.goanna.annotationProcessors.classloader; public class ClassWithOptions { public final Class wrappedClass; diff --git a/build/annotationProcessors/classloader/IterableJarLoadingURLClassLoader.java b/build/annotationProcessors/classloader/IterableJarLoadingURLClassLoader.java index 7e74399ca9..e6a8b65402 100644 --- a/build/annotationProcessors/classloader/IterableJarLoadingURLClassLoader.java +++ b/build/annotationProcessors/classloader/IterableJarLoadingURLClassLoader.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors.classloader; +package org.mozilla.goanna.annotationProcessors.classloader; import java.io.File; import java.io.IOException; diff --git a/build/annotationProcessors/classloader/JarClassIterator.java b/build/annotationProcessors/classloader/JarClassIterator.java index 003856a1c3..5e5d256819 100644 --- a/build/annotationProcessors/classloader/JarClassIterator.java +++ b/build/annotationProcessors/classloader/JarClassIterator.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors.classloader; +package org.mozilla.goanna.annotationProcessors.classloader; import java.util.Iterator; diff --git a/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java b/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java index 2ee2ae56a5..d63fef076c 100644 --- a/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java +++ b/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors.utils; +package org.mozilla.goanna.annotationProcessors.utils; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/build/annotationProcessors/utils/GeneratableElementIterator.java b/build/annotationProcessors/utils/GeneratableElementIterator.java index fa1e89dbc4..caf51aa151 100644 --- a/build/annotationProcessors/utils/GeneratableElementIterator.java +++ b/build/annotationProcessors/utils/GeneratableElementIterator.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors.utils; +package org.mozilla.goanna.annotationProcessors.utils; -import org.mozilla.gecko.annotationProcessors.AnnotationInfo; -import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity; +import org.mozilla.goanna.annotationProcessors.AnnotationInfo; +import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; @@ -50,7 +50,7 @@ public class GeneratableElementIterator implements Iterator { // Check for "Wrap ALL the things" flag. for (Annotation annotation : aClass.getDeclaredAnnotations()) { final String annotationTypeName = annotation.annotationType().getName(); - if (annotationTypeName.equals("org.mozilla.gecko.mozglue.generatorannotations.WrapEntireClassForJNI")) { + if (annotationTypeName.equals("org.mozilla.goanna.mozglue.generatorannotations.WrapEntireClassForJNI")) { mIterateEveryEntry = true; break; } @@ -71,7 +71,7 @@ public class GeneratableElementIterator implements Iterator { // WrappedJNIMethod has parameters. Use Reflection to obtain them. Class annotationType = annotation.annotationType(); final String annotationTypeName = annotationType.getName(); - if (annotationTypeName.equals("org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI")) { + if (annotationTypeName.equals("org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI")) { String stubName = null; boolean isMultithreadedStub = false; boolean noThrow = false; diff --git a/build/annotationProcessors/utils/Utils.java b/build/annotationProcessors/utils/Utils.java index 03e71291cd..7d6f84a551 100644 --- a/build/annotationProcessors/utils/Utils.java +++ b/build/annotationProcessors/utils/Utils.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.annotationProcessors.utils; +package org.mozilla.goanna.annotationProcessors.utils; -import org.mozilla.gecko.annotationProcessors.AnnotationInfo; +import org.mozilla.goanna.annotationProcessors.AnnotationInfo; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/build/autoconf/config.status.m4 b/build/autoconf/config.status.m4 index 93348b4be9..e35a52a81c 100644 --- a/build/autoconf/config.status.m4 +++ b/build/autoconf/config.status.m4 @@ -177,7 +177,7 @@ cat >> $CONFIG_STATUS <> $CONFIG_STATUS < - @@ -28,7 +28,7 @@ - diff --git a/build/mobile/robocop/Assert.java b/build/mobile/robocop/Assert.java index aa76dcf2b8..f65541fcd8 100644 --- a/build/mobile/robocop/Assert.java +++ b/build/mobile/robocop/Assert.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; public interface Assert { void dumpLog(String message); diff --git a/build/mobile/robocop/Driver.java b/build/mobile/robocop/Driver.java index bb821aae9b..974651607b 100644 --- a/build/mobile/robocop/Driver.java +++ b/build/mobile/robocop/Driver.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.app.Activity; diff --git a/build/mobile/robocop/Element.java b/build/mobile/robocop/Element.java index 97610ff32a..73219c41f5 100644 --- a/build/mobile/robocop/Element.java +++ b/build/mobile/robocop/Element.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; /** * Element provides access to a specific UI view (android.view.View). diff --git a/build/mobile/robocop/FennecInstrumentationTestRunner.java b/build/mobile/robocop/FennecInstrumentationTestRunner.java index d4fb727d16..11093775f0 100644 --- a/build/mobile/robocop/FennecInstrumentationTestRunner.java +++ b/build/mobile/robocop/FennecInstrumentationTestRunner.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.os.Bundle; import android.test.InstrumentationTestRunner; diff --git a/build/mobile/robocop/FennecMochitestAssert.java b/build/mobile/robocop/FennecMochitestAssert.java index 918f576fdd..dd36e97fe9 100644 --- a/build/mobile/robocop/FennecMochitestAssert.java +++ b/build/mobile/robocop/FennecMochitestAssert.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/build/mobile/robocop/FennecNativeActions.java b/build/mobile/robocop/FennecNativeActions.java index 46577fb932..0e005b2234 100644 --- a/build/mobile/robocop/FennecNativeActions.java +++ b/build/mobile/robocop/FennecNativeActions.java @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import org.json.JSONObject; -import org.mozilla.gecko.FennecNativeDriver.LogLevel; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.gfx.LayerView.DrawListener; -import org.mozilla.gecko.mozglue.GoannaLoader; -import org.mozilla.gecko.sqlite.SQLiteBridge; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.FennecNativeDriver.LogLevel; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.gfx.LayerView.DrawListener; +import org.mozilla.goanna.mozglue.GoannaLoader; +import org.mozilla.goanna.sqlite.SQLiteBridge; +import org.mozilla.goanna.util.GoannaEventListener; import android.app.Activity; import android.app.Instrumentation; @@ -52,12 +52,12 @@ public class FennecNativeActions implements Actions { private String mEventData; private BlockingQueue mEventDataQueue; - GoannaEventExpecter(final String geckoEvent) { - if (TextUtils.isEmpty(geckoEvent)) { - throw new IllegalArgumentException("geckoEvent must not be empty"); + GoannaEventExpecter(final String goannaEvent) { + if (TextUtils.isEmpty(goannaEvent)) { + throw new IllegalArgumentException("goannaEvent must not be empty"); } - mGoannaEvent = geckoEvent; + mGoannaEvent = goannaEvent; mEventDataQueue = new LinkedBlockingQueue(); final GoannaEventExpecter expecter = this; @@ -181,13 +181,13 @@ public class FennecNativeActions implements Actions { } } - public RepeatedEventExpecter expectGoannaEvent(final String geckoEvent) { - FennecNativeDriver.log(FennecNativeDriver.LogLevel.DEBUG, "waiting for " + geckoEvent); - return new GoannaEventExpecter(geckoEvent); + public RepeatedEventExpecter expectGoannaEvent(final String goannaEvent) { + FennecNativeDriver.log(FennecNativeDriver.LogLevel.DEBUG, "waiting for " + goannaEvent); + return new GoannaEventExpecter(goannaEvent); } - public void sendGoannaEvent(final String geckoEvent, final String data) { - GoannaAppShell.sendEventToGoanna(GoannaEvent.createBroadcastEvent(geckoEvent, data)); + public void sendGoannaEvent(final String goannaEvent, final String data) { + GoannaAppShell.sendEventToGoanna(GoannaEvent.createBroadcastEvent(goannaEvent, data)); } public void sendPreferencesGetEvent(int requestId, String[] prefNames) { diff --git a/build/mobile/robocop/FennecNativeDriver.java b/build/mobile/robocop/FennecNativeDriver.java index 3a3ad95fd0..097a8f6df9 100644 --- a/build/mobile/robocop/FennecNativeDriver.java +++ b/build/mobile/robocop/FennecNativeDriver.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -20,9 +20,9 @@ import java.util.Map; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.gfx.PanningPerfAPI; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.gfx.PanningPerfAPI; +import org.mozilla.goanna.util.GoannaEventListener; import android.app.Activity; import android.util.Log; @@ -72,17 +72,17 @@ public class FennecNativeDriver implements Driver { private int mGoannaWidth = 1024; private void getGoannaInfo() { - View geckoLayout = mActivity.findViewById(R.id.gecko_layout); - if (geckoLayout != null) { + View goannaLayout = mActivity.findViewById(R.id.goanna_layout); + if (goannaLayout != null) { int[] pos = new int[2]; - geckoLayout.getLocationOnScreen(pos); + goannaLayout.getLocationOnScreen(pos); mGoannaTop = pos[1]; mGoannaLeft = pos[0]; - mGoannaWidth = geckoLayout.getWidth(); - mGoannaHeight = geckoLayout.getHeight(); + mGoannaWidth = goannaLayout.getWidth(); + mGoannaHeight = goannaLayout.getHeight(); mGoannaInfo = true; } else { - throw new RoboCopException("Unable to find view gecko_layout"); + throw new RoboCopException("Unable to find view goanna_layout"); } } diff --git a/build/mobile/robocop/FennecNativeElement.java b/build/mobile/robocop/FennecNativeElement.java index 105c2b7c4b..f26c65200a 100644 --- a/build/mobile/robocop/FennecNativeElement.java +++ b/build/mobile/robocop/FennecNativeElement.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.app.Activity; import android.view.View; diff --git a/build/mobile/robocop/FennecTalosAssert.java b/build/mobile/robocop/FennecTalosAssert.java index 862f667770..f4008d50eb 100644 --- a/build/mobile/robocop/FennecTalosAssert.java +++ b/build/mobile/robocop/FennecTalosAssert.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; public class FennecTalosAssert implements Assert { diff --git a/build/mobile/robocop/PaintedSurface.java b/build/mobile/robocop/PaintedSurface.java index 17d77b7586..6554dce845 100644 --- a/build/mobile/robocop/PaintedSurface.java +++ b/build/mobile/robocop/PaintedSurface.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/build/mobile/robocop/RoboCopException.java b/build/mobile/robocop/RoboCopException.java index 420df818d9..6c7e754a85 100644 --- a/build/mobile/robocop/RoboCopException.java +++ b/build/mobile/robocop/RoboCopException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; public class RoboCopException extends RuntimeException { diff --git a/build/mobile/robocop/RobocopShare1.java b/build/mobile/robocop/RobocopShare1.java index 80ab3396c2..5d5ecca5b7 100644 --- a/build/mobile/robocop/RobocopShare1.java +++ b/build/mobile/robocop/RobocopShare1.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.os.Bundle; import android.support.v4.app.FragmentActivity; diff --git a/build/mobile/robocop/RobocopShare2.java b/build/mobile/robocop/RobocopShare2.java index 4874dffb76..1aa18f9c04 100644 --- a/build/mobile/robocop/RobocopShare2.java +++ b/build/mobile/robocop/RobocopShare2.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.os.Bundle; import android.support.v4.app.FragmentActivity; diff --git a/build/mobile/robocop/RobocopUtils.java b/build/mobile/robocop/RobocopUtils.java index 7a33abfa64..8339152d48 100644 --- a/build/mobile/robocop/RobocopUtils.java +++ b/build/mobile/robocop/RobocopUtils.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/build/mobile/robocop/StructuredLogger.java b/build/mobile/robocop/StructuredLogger.java index 87d5a3c250..ddd454148e 100644 --- a/build/mobile/robocop/StructuredLogger.java +++ b/build/mobile/robocop/StructuredLogger.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.HashSet; import java.util.Arrays; diff --git a/build/mobile/robocop/moz.build b/build/mobile/robocop/moz.build index 12d61eb171..b3498dfdf2 100644 --- a/build/mobile/robocop/moz.build +++ b/build/mobile/robocop/moz.build @@ -15,6 +15,6 @@ main.assets = TOPSRCDIR + '/mobile/android/base/tests/assets' main.referenced_projects += ['Fennec'] main.add_classpathentry('harness', SRCDIR, - dstdir='harness/org/mozilla/gecko') + dstdir='harness/org/mozilla/goanna') main.add_classpathentry('src', TOPSRCDIR + '/mobile/android/base/tests', - dstdir='src/org/mozilla/gecko/tests') + dstdir='src/org/mozilla/goanna/tests') diff --git a/build/templates.mozbuild b/build/templates.mozbuild index 1d99f3a27d..c69096b0d6 100644 --- a/build/templates.mozbuild +++ b/build/templates.mozbuild @@ -115,4 +115,4 @@ def HostLibrary(name): HOST_LIBRARY_NAME = name -include('gecko_templates.mozbuild') +include('goanna_templates.mozbuild') diff --git a/docshell/base/nsIGlobalHistory2.idl b/docshell/base/nsIGlobalHistory2.idl index aa8b446205..5967068028 100644 --- a/docshell/base/nsIGlobalHistory2.idl +++ b/docshell/base/nsIGlobalHistory2.idl @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /** - * Provides information about global history to gecko. + * Provides information about global history to goanna. * * @note This interface replaces and deprecates nsIGlobalHistory. */ diff --git a/dom/apps/AppsUtils.jsm b/dom/apps/AppsUtils.jsm index de7b830cc4..9c89798f9d 100644 --- a/dom/apps/AppsUtils.jsm +++ b/dom/apps/AppsUtils.jsm @@ -588,20 +588,20 @@ this.AppsUtils = { isFirstRun: function isFirstRun(aPrefBranch) { let savedmstone = null; try { - savedmstone = aPrefBranch.getCharPref("gecko.mstone"); + savedmstone = aPrefBranch.getCharPref("goanna.mstone"); } catch (e) {} let mstone = Services.appinfo.platformVersion; let savedBuildID = null; try { - savedBuildID = aPrefBranch.getCharPref("gecko.buildID"); + savedBuildID = aPrefBranch.getCharPref("goanna.buildID"); } catch (e) {} let buildID = Services.appinfo.platformBuildID; - aPrefBranch.setCharPref("gecko.mstone", mstone); - aPrefBranch.setCharPref("gecko.buildID", buildID); + aPrefBranch.setCharPref("goanna.mstone", mstone); + aPrefBranch.setCharPref("goanna.buildID", buildID); return ((mstone != savedmstone) || (buildID != savedBuildID)); }, diff --git a/dom/audiochannel/nsIAudioChannelAgent.idl b/dom/audiochannel/nsIAudioChannelAgent.idl index fdcf7ce22a..5d17c607b1 100644 --- a/dom/audiochannel/nsIAudioChannelAgent.idl +++ b/dom/audiochannel/nsIAudioChannelAgent.idl @@ -27,7 +27,7 @@ interface nsIAudioChannelAgentCallback : nsISupports }; /** - * This interface provides an agent for gecko components to participate + * This interface provides an agent for goanna components to participate * in the audio channel service. Goanna components are responsible for * 1. Indicating what channel type they are using (via the init() member * function). diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index d5483dea7e..80bdfdbaec 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -2316,7 +2316,7 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx, } struct InterfaceShimEntry { - const char *geckoName; + const char *goannaName; const char *domName; }; @@ -2380,7 +2380,7 @@ LookupComponentsShim(JSContext *cx, JS::Handle global, for (uint32_t i = 0; i < ArrayLength(kInterfaceShimMap); ++i) { // Grab the names from the table. - const char *geckoName = kInterfaceShimMap[i].geckoName; + const char *goannaName = kInterfaceShimMap[i].goannaName; const char *domName = kInterfaceShimMap[i].domName; // Look up the appopriate interface object on the global. @@ -2393,7 +2393,7 @@ LookupComponentsShim(JSContext *cx, JS::Handle global, } // Define the shim on the interfaces object. - ok = JS_DefineProperty(cx, interfaces, geckoName, v, + ok = JS_DefineProperty(cx, interfaces, goannaName, v, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY, JS_STUBGETTER, JS_STUBSETTER); NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); diff --git a/dom/base/nsHistory.cpp b/dom/base/nsHistory.cpp index 611fb64446..30cd047ac7 100644 --- a/dom/base/nsHistory.cpp +++ b/dom/base/nsHistory.cpp @@ -159,7 +159,7 @@ nsHistory::Go(int32_t aDelta, ErrorResult& aRv) // 4.x needed it, but we don't, and it's a horrible experience // for nothing. In stead of reloading the page, just clear // style data and reflow the page since some sites may use this - // trick to work around gecko reflow bugs, and this should have + // trick to work around goanna reflow bugs, and this should have // the same effect. nsCOMPtr doc = window->GetExtantDoc(); diff --git a/dom/base/nsIContentPolicy.idl b/dom/base/nsIContentPolicy.idl index ea08c85f1b..7995ff98d7 100644 --- a/dom/base/nsIContentPolicy.idl +++ b/dom/base/nsIContentPolicy.idl @@ -55,7 +55,7 @@ interface nsIContentPolicy : nsIContentPolicyBase * * @param aRequestPrincipal an OPTIONAL argument, defines the principal that * caused the load. This is optional only for - * non-gecko code: all gecko code should set this + * non-goanna code: all goanna code should set this * argument. For navigation events, this is * the principal of the page that caused this load. * diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h index 76d38c3971..793b8a038a 100644 --- a/dom/base/nsIDocument.h +++ b/dom/base/nsIDocument.h @@ -845,7 +845,7 @@ public: * front. * * By "built-in" user-agent style sheets we mean the user-agent style sheets - * that gecko itself supplies (such as html.css and svg.css) as opposed to + * that goanna itself supplies (such as html.css and svg.css) as opposed to * user-agent level style sheets inserted by add-ons or the like. * * This function prepends the given style sheet to the document's style set diff --git a/dom/base/nsISimpleContentPolicy.idl b/dom/base/nsISimpleContentPolicy.idl index 4dc28f6e34..48172a2b2d 100644 --- a/dom/base/nsISimpleContentPolicy.idl +++ b/dom/base/nsISimpleContentPolicy.idl @@ -65,7 +65,7 @@ interface nsISimpleContentPolicy : nsIContentPolicyBase * * @param aRequestPrincipal an OPTIONAL argument, defines the principal that * caused the load. This is optional only for - * non-gecko code: all gecko code should set this + * non-goanna code: all goanna code should set this * argument. For navigation events, this is * the principal of the page that caused this load. * diff --git a/dom/base/nsLocation.cpp b/dom/base/nsLocation.cpp index d355a144e0..a4c3510e22 100644 --- a/dom/base/nsLocation.cpp +++ b/dom/base/nsLocation.cpp @@ -928,7 +928,7 @@ nsLocation::Reload(bool aForceget) // resize event. Sites do this since Netscape 4.x needed it, but // we don't, and it's a horrible experience for nothing. In stead // of reloading the page, just clear style data and reflow the - // page since some sites may use this trick to work around gecko + // page since some sites may use this trick to work around goanna // reflow bugs, and this should have the same effect. nsCOMPtr doc = window->GetExtantDoc(); diff --git a/dom/base/test/test_bug345339.html b/dom/base/test/test_bug345339.html index 2a5d05f24f..4439331199 100644 --- a/dom/base/test/test_bug345339.html +++ b/dom/base/test/test_bug345339.html @@ -30,7 +30,7 @@ function afterLoad() { iframeDoc.getElementById("select").selectedIndex = 1; iframeDoc.getElementById("radio2").checked = true; iframeDoc.getElementById("password").value = "123456"; - iframeDoc.getElementById("hidden").value = "gecko"; + iframeDoc.getElementById("hidden").value = "goanna"; var file = SpecialPowers.Cc["@mozilla.org/file/directory_service;1"] .getService(SpecialPowers.Ci.nsIProperties) @@ -60,7 +60,7 @@ function afterReload() { "radio button #2 value preserved"); isnot(iframeDoc.getElementById("password").value, "123456", "password field value forgotten"); - is(iframeDoc.getElementById("hidden").value, "gecko", + is(iframeDoc.getElementById("hidden").value, "goanna", "hidden field value preserved"); is(SpecialPowers.wrap(iframeDoc).getElementById("file").value, filePath, "file field value preserved"); diff --git a/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_enabled.js b/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_enabled.js index 80febbc054..996eac6213 100644 --- a/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_enabled.js +++ b/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_enabled.js @@ -18,7 +18,7 @@ function waitEitherEnabledOrDisabled() { // Listen 'adapteradded' rather than 'enabled' since the current API can't // disable BT before the BT adapter is initialized. - // We should listen to 'enabled' when gecko can handle the case I mentioned + // We should listen to 'enabled' when goanna can handle the case I mentioned // above, please refer to the follow-up bug 973482. bluetoothManager.addEventListener("adapteradded", onEnabledDisabled); bluetoothManager.addEventListener("disabled", onEnabledDisabled); diff --git a/dom/bluetooth2/BluetoothUtils.h b/dom/bluetooth2/BluetoothUtils.h index ff60b9afb9..0670f4cef9 100644 --- a/dom/bluetooth2/BluetoothUtils.h +++ b/dom/bluetooth2/BluetoothUtils.h @@ -21,8 +21,8 @@ UuidToString(const BluetoothUuid& aUuid, nsAString& aString); /** * Convert xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx uuid string to BluetoothUuid object. - * This utility function is used by gecko internal only to convert uuid string - * created by gecko back to BluetoothUuid representation. + * This utility function is used by goanna internal only to convert uuid string + * created by goanna back to BluetoothUuid representation. */ void StringToUuid(const char* aString, BluetoothUuid& aUuid); diff --git a/dom/browser-element/BrowserElementPanning.js b/dom/browser-element/BrowserElementPanning.js index 828a430b10..14efdc9319 100644 --- a/dom/browser-element/BrowserElementPanning.js +++ b/dom/browser-element/BrowserElementPanning.js @@ -236,7 +236,7 @@ const ContentPanning = { } // !isPan() and evt.detail should always give the same answer here - // since they use the same heuristics, but use the native gecko + // since they use the same heuristics, but use the native goanna // computation when possible. // // NB: when we're using touch events, then !KineticPanning.isPan() diff --git a/dom/camera/GonkCameraHwMgr.cpp b/dom/camera/GonkCameraHwMgr.cpp index 50b74b0e32..6781f30354 100644 --- a/dom/camera/GonkCameraHwMgr.cpp +++ b/dom/camera/GonkCameraHwMgr.cpp @@ -165,7 +165,7 @@ GonkCameraHardware::Init() /** * Non-V4L2-based camera driver adds extra offset onto picture orientation - * set by gecko, so we have to adjust it back. + * set by goanna, so we have to adjust it back. */ char propname[PROP_NAME_MAX]; char prop[PROP_VALUE_MAX]; diff --git a/dom/events/EventStates.h b/dom/events/EventStates.h index 2a90e737a8..70b8ca0b0d 100644 --- a/dom/events/EventStates.h +++ b/dom/events/EventStates.h @@ -219,7 +219,7 @@ private: // Content is still loading such that there is nothing to show the // user (eg an image which hasn't started coming in yet). #define NS_EVENT_STATE_LOADING NS_DEFINE_EVENT_STATE_MACRO(22) -// Content is of a type that gecko can't handle. +// Content is of a type that goanna can't handle. #define NS_EVENT_STATE_TYPE_UNSUPPORTED NS_DEFINE_EVENT_STATE_MACRO(23) #define NS_EVENT_STATE_INCREMENT_SCRIPT_LEVEL NS_DEFINE_EVENT_STATE_MACRO(24) // Handler for the content has been blocked. diff --git a/dom/html/test/file_iframe_sandbox_d_if13.html b/dom/html/test/file_iframe_sandbox_d_if13.html index 275490f874..129ab27eff 100644 --- a/dom/html/test/file_iframe_sandbox_d_if13.html +++ b/dom/html/test/file_iframe_sandbox_d_if13.html @@ -25,7 +25,7 @@ function ok_wrapper(result, msg) { function doIf11TestPart2() { var if_11 = document.getElementById('if_11'); if_11.sandbox = 'allow-scripts allow-same-origin'; - // window.history is no longer cross-origin accessible in gecko. + // window.history is no longer cross-origin accessible in goanna. SpecialPowers.wrap(if_11).contentWindow.history.back(); } diff --git a/dom/inputmethod/forms.js b/dom/inputmethod/forms.js index 2ae0a185c8..b6cb35cbbe 100644 --- a/dom/inputmethod/forms.js +++ b/dom/inputmethod/forms.js @@ -737,7 +737,7 @@ let FormAssistant = { sendInputState: function(element) { // FIXME/bug 729623: work around apparent bug in the IME manager - // in gecko. + // in goanna. let readonly = element.getAttribute("readonly"); if (readonly) { return false; diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl index 4352eb0b8a..b2b4f57d98 100644 --- a/dom/ipc/PBrowser.ipdl +++ b/dom/ipc/PBrowser.ipdl @@ -432,7 +432,7 @@ parent: ContentReceivedInputBlock(ScrollableLayerGuid aGuid, uint64_t aInputBlockId, bool aPreventDefault); /** - * Notifies the APZ code of the results of the gecko hit-test for a + * Notifies the APZ code of the results of the goanna hit-test for a * particular input block. Each target corresponds to one touch point in the * touch event. */ diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 62636edfb4..3cb690bcc5 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -202,7 +202,7 @@ TabChildBase::InitializeRootMetrics() mLastRootMetrics.SetZoom(mLastRootMetrics.CalculateIntrinsicScale()); mLastRootMetrics.SetDevPixelsPerCSSPixel(WebWidget()->GetDefaultScale()); // We use ParentLayerToLayerScale(1) below in order to turn the - // async zoom amount into the gecko zoom amount. + // async zoom amount into the goanna zoom amount. mLastRootMetrics.SetCumulativeResolution(mLastRootMetrics.GetZoom() / mLastRootMetrics.GetDevPixelsPerCSSPixel() * ParentLayerToLayerScale(1)); // This is the root layer, so the cumulative resolution is the same // as the resolution. diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp index 1aefbfbffd..194e414cd4 100644 --- a/dom/media/MediaRecorder.cpp +++ b/dom/media/MediaRecorder.cpp @@ -149,7 +149,7 @@ NS_IMPL_RELEASE_INHERITED(MediaRecorder, DOMEventTargetHelper) * 1) MediaRecorder creates a Session in MediaRecorder::Start function and holds * a reference to Session. Then the Session registers itself to * ShutdownObserver and also holds a reference to MediaRecorder. - * Therefore, the reference dependency in gecko is: + * Therefore, the reference dependency in goanna is: * ShutdownObserver -> Session <-> MediaRecorder, note that there is a cycle * reference between Session and MediaRecorder. * 2) A Session is destroyed in DestroyRunnable after MediaRecorder::Stop being called diff --git a/dom/media/android/MPAPI.h b/dom/media/android/MPAPI.h index 9b289ca09c..77f0d969af 100644 --- a/dom/media/android/MPAPI.h +++ b/dom/media/android/MPAPI.h @@ -16,7 +16,7 @@ enum ColorFormat { }; /* - * A callback for the plugin to use to request a buffer owned by gecko. This can + * A callback for the plugin to use to request a buffer owned by goanna. This can * save us a copy or two down the line. */ class BufferCallback { diff --git a/dom/media/eme/CDMProxy.cpp b/dom/media/eme/CDMProxy.cpp index 0cdb1f64c6..ce6e7bb2bd 100644 --- a/dom/media/eme/CDMProxy.cpp +++ b/dom/media/eme/CDMProxy.cpp @@ -51,7 +51,7 @@ CDMProxy::Init(PromiseId aPromiseId, if (!mGMPThread) { nsCOMPtr mps = - do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + do_GetService("@mozilla.org/goanna-media-plugin-service;1"); if (!mps) { RejectPromise(aPromiseId, NS_ERROR_DOM_INVALID_STATE_ERR); return; @@ -88,7 +88,7 @@ CDMProxy::gmp_Init(nsAutoPtr aData) MOZ_ASSERT(IsOnGMPThread()); nsCOMPtr mps = - do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + do_GetService("@mozilla.org/goanna-media-plugin-service;1"); if (!mps) { RejectPromise(aData->mPromiseId, NS_ERROR_DOM_INVALID_STATE_ERR); return; diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp index d66312b8cd..28a10b00cd 100644 --- a/dom/media/eme/MediaKeySystemAccess.cpp +++ b/dom/media/eme/MediaKeySystemAccess.cpp @@ -130,7 +130,7 @@ MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem, { MOZ_ASSERT(Preferences::GetBool("media.eme.enabled", false)); nsCOMPtr mps = - do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + do_GetService("@mozilla.org/goanna-media-plugin-service;1"); if (NS_WARN_IF(!mps)) { return MediaKeySystemStatus::Error; } @@ -245,7 +245,7 @@ MediaKeySystemAccess::IsSupported(const nsAString& aKeySystem, const Sequence& aOptions) { nsCOMPtr mps = - do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + do_GetService("@mozilla.org/goanna-media-plugin-service;1"); if (NS_WARN_IF(!mps)) { return false; } diff --git a/dom/media/fmp4/eme/EMEDecoderModule.cpp b/dom/media/fmp4/eme/EMEDecoderModule.cpp index 8397ea6465..59583f826b 100644 --- a/dom/media/fmp4/eme/EMEDecoderModule.cpp +++ b/dom/media/fmp4/eme/EMEDecoderModule.cpp @@ -220,7 +220,7 @@ EMEDecoderModule::~EMEDecoderModule() static already_AddRefed CreateDecoderWrapper(MediaDataDecoderCallback* aCallback, CDMProxy* aProxy, FlushableMediaTaskQueue* aTaskQueue) { - nsCOMPtr gmpService = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + nsCOMPtr gmpService = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); if (!gmpService) { return nullptr; } diff --git a/dom/media/fmp4/gmp/GMPAudioDecoder.cpp b/dom/media/fmp4/gmp/GMPAudioDecoder.cpp index bcea360753..b4495552ca 100644 --- a/dom/media/fmp4/gmp/GMPAudioDecoder.cpp +++ b/dom/media/fmp4/gmp/GMPAudioDecoder.cpp @@ -11,7 +11,7 @@ namespace mozilla { #if defined(DEBUG) bool IsOnGMPThread() { - nsCOMPtr mps = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + nsCOMPtr mps = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); MOZ_ASSERT(mps); nsCOMPtr gmpThread; @@ -137,7 +137,7 @@ GMPAudioDecoder::Init() { MOZ_ASSERT(IsOnGMPThread()); - mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + mMPS = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); MOZ_ASSERT(mMPS); nsTArray tags; diff --git a/dom/media/fmp4/gmp/GMPDecoderModule.cpp b/dom/media/fmp4/gmp/GMPDecoderModule.cpp index 9af447265e..88d45ad3a5 100644 --- a/dom/media/fmp4/gmp/GMPDecoderModule.cpp +++ b/dom/media/fmp4/gmp/GMPDecoderModule.cpp @@ -24,7 +24,7 @@ GMPDecoderModule::~GMPDecoderModule() static already_AddRefed CreateDecoderWrapper(MediaDataDecoderCallback* aCallback) { - nsCOMPtr gmpService = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + nsCOMPtr gmpService = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); if (!gmpService) { return nullptr; } diff --git a/dom/media/fmp4/gmp/GMPVideoDecoder.cpp b/dom/media/fmp4/gmp/GMPVideoDecoder.cpp index cb4b65a902..34273fd654 100644 --- a/dom/media/fmp4/gmp/GMPVideoDecoder.cpp +++ b/dom/media/fmp4/gmp/GMPVideoDecoder.cpp @@ -162,7 +162,7 @@ GMPVideoDecoder::Init() { MOZ_ASSERT(IsOnGMPThread()); - mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + mMPS = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); MOZ_ASSERT(mMPS); nsTArray tags; diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp index 2c87703849..6479c99392 100644 --- a/dom/media/gmp/GMPParent.cpp +++ b/dom/media/gmp/GMPParent.cpp @@ -515,7 +515,7 @@ nsIThread* GMPParent::GMPThread() { if (!mGMPThread) { - nsCOMPtr mps = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + nsCOMPtr mps = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); MOZ_ASSERT(mps); if (!mps) { return nullptr; diff --git a/dom/media/gmp/GMPStorageParent.cpp b/dom/media/gmp/GMPStorageParent.cpp index b3ab4ec846..e9bf852684 100644 --- a/dom/media/gmp/GMPStorageParent.cpp +++ b/dom/media/gmp/GMPStorageParent.cpp @@ -53,7 +53,7 @@ GetGMPStorageDir(nsIFile** aTempDir, const nsCString& aNodeId) } nsCOMPtr mps = - do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + do_GetService("@mozilla.org/goanna-media-plugin-service;1"); if (NS_WARN_IF(!mps)) { return NS_ERROR_FAILURE; } @@ -469,7 +469,7 @@ GMPStorageParent::Init() return NS_ERROR_FAILURE; } nsCOMPtr mps = - do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + do_GetService("@mozilla.org/goanna-media-plugin-service;1"); if (NS_WARN_IF(!mps)) { return NS_ERROR_FAILURE; } diff --git a/dom/media/gmp/moz.build b/dom/media/gmp/moz.build index b65b60b8bd..34bfca1493 100644 --- a/dom/media/gmp/moz.build +++ b/dom/media/gmp/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -XPIDL_MODULE = 'content_geckomediaplugins' +XPIDL_MODULE = 'content_goannamediaplugins' XPIDL_SOURCES += [ 'mozIGoannaMediaPluginService.idl', diff --git a/dom/media/gmp/mozIGeckoMediaPluginService.idl b/dom/media/gmp/mozIGeckoMediaPluginService.idl index bf0b0f591b..3ea6944a40 100644 --- a/dom/media/gmp/mozIGeckoMediaPluginService.idl +++ b/dom/media/gmp/mozIGeckoMediaPluginService.idl @@ -86,19 +86,19 @@ interface mozIGoannaMediaPluginService : nsISupports GMPDecryptorProxy getGMPDecryptor(in TagArray tags, in ACString nodeId); /** - * Add a directory to scan for gecko media plugins. + * Add a directory to scan for goanna media plugins. * @note Main-thread API. */ void addPluginDirectory(in AString directory); /** - * Remove a directory for gecko media plugins. + * Remove a directory for goanna media plugins. * @note Main-thread API. */ void removePluginDirectory(in AString directory); /** - * Remove a directory for gecko media plugins and delete it from disk. + * Remove a directory for goanna media plugins and delete it from disk. * If |defer| is true, wait until the plugin is unused before removing. * @note Main-thread API. */ diff --git a/dom/media/gstreamer/GStreamerReader.h b/dom/media/gstreamer/GStreamerReader.h index 000828f159..395a852d4d 100644 --- a/dom/media/gstreamer/GStreamerReader.h +++ b/dom/media/gstreamer/GStreamerReader.h @@ -247,7 +247,7 @@ private: GstAppSrcCallbacks mSrcCallbacks; GstAppSinkCallbacks mSinkCallbacks; /* monitor used to synchronize access to shared state between gstreamer - * threads and other gecko threads */ + * threads and other goanna threads */ ReentrantMonitor mGstThreadsMonitor; /* video and audio segments we use to convert absolute timestamps to [0, * stream_duration]. They're set when the pipeline is started or after a seek. diff --git a/dom/media/imagecapture/ImageCapture.cpp b/dom/media/imagecapture/ImageCapture.cpp index dcc02535ec..680f6b5039 100644 --- a/dom/media/imagecapture/ImageCapture.cpp +++ b/dom/media/imagecapture/ImageCapture.cpp @@ -146,7 +146,7 @@ void ImageCapture::TakePhoto(ErrorResult& aResult) { // According to spec, VideoStreamTrack.readyState must be "live"; however - // gecko doesn't implement it yet (bug 910249). Instead of readyState, we + // goanna doesn't implement it yet (bug 910249). Instead of readyState, we // check VideoStreamTrack.enable before bug 910249 is fixed. // The error code should be INVALID_TRACK, but spec doesn't define it in // ImageCaptureError. So it returns PHOTO_ERROR here before spec updates. diff --git a/dom/media/webspeech/synth/pico/nsPicoService.cpp b/dom/media/webspeech/synth/pico/nsPicoService.cpp index 8acf733df9..6f53da4343 100644 --- a/dom/media/webspeech/synth/pico/nsPicoService.cpp +++ b/dom/media/webspeech/synth/pico/nsPicoService.cpp @@ -715,7 +715,7 @@ nsPicoService::GetInstance() { MOZ_ASSERT(NS_IsMainThread()); if (XRE_GetProcessType() != GoannaProcessType_Default) { - MOZ_ASSERT(false, "nsPicoService can only be started on main gecko process"); + MOZ_ASSERT(false, "nsPicoService can only be started on main goanna process"); return nullptr; } diff --git a/dom/mobileconnection/tests/marionette/test_mobile_call_forwarding.js b/dom/mobileconnection/tests/marionette/test_mobile_call_forwarding.js index 0a35a01fe1..78fcb8f93c 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_call_forwarding.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_call_forwarding.js @@ -10,14 +10,14 @@ const TEST_DATA = [ reason: MozMobileConnection.CALL_FORWARD_REASON_MOBILE_BUSY, number: "0912345678", timeSeconds: 5, - // Currently gecko only support ICC_SERVICE_CLASS_VOICE. + // Currently goanna only support ICC_SERVICE_CLASS_VOICE. serviceClass: MozMobileConnection.ICC_SERVICE_CLASS_VOICE }, { action: MozMobileConnection.CALL_FORWARD_ACTION_ENABLE, reason: MozMobileConnection.CALL_FORWARD_REASON_NO_REPLY, number: "+886912345678", timeSeconds: 20, - // Currently gecko only support ICC_SERVICE_CLASS_VOICE. + // Currently goanna only support ICC_SERVICE_CLASS_VOICE. serviceClass: MozMobileConnection.ICC_SERVICE_CLASS_VOICE } ]; diff --git a/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js b/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js index 093244e581..e227eae4e9 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js @@ -50,7 +50,7 @@ function testRegisterDataWhileDataEnabled() { log("Set data registration home while data enabled."); // When data registration is registered, data call will be (re)activated by - // gecko if ril.data.enabled is set to true. + // goanna if ril.data.enabled is set to true. return setEmulatorVoiceDataStateAndWait("data", "home") .then(() => checkOrWaitForDataState(true)); } diff --git a/dom/secureelement/gonk/UiccConnector.js b/dom/secureelement/gonk/UiccConnector.js index 059e63da02..80da941426 100644 --- a/dom/secureelement/gonk/UiccConnector.js +++ b/dom/secureelement/gonk/UiccConnector.js @@ -221,7 +221,7 @@ UiccConnector.prototype = { // TODO: Bug 1118106: Handle Resource management / leaks by persisting // the newly opened channel in some persistent storage so that when this // module gets restarted (say after opening a channel) in the event of - // some erroneous conditions such as gecko restart /, crash it can read + // some erroneous conditions such as goanna restart /, crash it can read // the persistent storage to check if there are any held resources // (opened channels) and close them. iccProvider.iccOpenChannel(PREFERRED_UICC_CLIENTID, aid, { diff --git a/dom/svg/test/object-delayed-intrinsic-size.sjs b/dom/svg/test/object-delayed-intrinsic-size.sjs index 0f98c4dc1e..2a347843eb 100644 --- a/dom/svg/test/object-delayed-intrinsic-size.sjs +++ b/dom/svg/test/object-delayed-intrinsic-size.sjs @@ -8,7 +8,7 @@ function handleRequest(request, response) response.setStatusLine(null, 200, "OK"); response.setHeader("Content-Type", "image/svg+xml", false); - // We need some body output or else gecko will not do an initial reflow + // We need some body output or else goanna will not do an initial reflow // while waiting for the rest of the document to load: response.bodyOutputStream.write("\n", 1); diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 30470a94b7..9eb57c9193 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -11974,17 +11974,17 @@ ComprehensionTlvHelperObject.prototype = { }, /** - * Given a geckoError string, this function translates it into cause value + * Given a goannaError string, this function translates it into cause value * and write the value into buffer. * - * @param geckoError Error string that is passed to gecko. + * @param goannaError Error string that is passed to goanna. */ - writeCauseTlv: function(geckoError) { + writeCauseTlv: function(goannaError) { let GsmPDUHelper = this.context.GsmPDUHelper; let cause = -1; for (let errorNo in RIL_ERROR_TO_GECKO_ERROR) { - if (geckoError == RIL_ERROR_TO_GECKO_ERROR[errorNo]) { + if (goannaError == RIL_ERROR_TO_GECKO_ERROR[errorNo]) { cause = errorNo; break; } @@ -15029,12 +15029,12 @@ ICCUtilsHelperObject.prototype = { /** * Get whether specificed (U)SIM service is available. * - * @param geckoService + * @param goannaService * Service name like "ADN", "BDN", etc. * * @return true if the service is enabled, false otherwise. */ - isICCServiceAvailable: function(geckoService) { + isICCServiceAvailable: function(goannaService) { let RIL = this.context.RIL; let serviceTable = RIL._isCdma ? RIL.iccInfoPrivate.cst: RIL.iccInfoPrivate.sst; @@ -15056,9 +15056,9 @@ ICCUtilsHelperObject.prototype = { */ let simService; if (RIL.appType == CARD_APPTYPE_SIM) { - simService = GECKO_ICC_SERVICES.sim[geckoService]; + simService = GECKO_ICC_SERVICES.sim[goannaService]; } else { - simService = GECKO_ICC_SERVICES.ruim[geckoService]; + simService = GECKO_ICC_SERVICES.ruim[goannaService]; } if (!simService) { return false; @@ -15079,7 +15079,7 @@ ICCUtilsHelperObject.prototype = { * * @see 3GPP TS 31.102 4.2.8. */ - let usimService = GECKO_ICC_SERVICES.usim[geckoService]; + let usimService = GECKO_ICC_SERVICES.usim[goannaService]; if (!usimService) { return false; } @@ -15096,12 +15096,12 @@ ICCUtilsHelperObject.prototype = { /** * Get whether specificed CPHS service is available. * - * @param geckoService + * @param goannaService * Service name like "MDN", etc. * * @return true if the service is enabled, false otherwise. */ - isCphsServiceAvailable: function(geckoService) { + isCphsServiceAvailable: function(goannaService) { let RIL = this.context.RIL; let serviceTable = RIL.iccInfoPrivate.cphsSt; @@ -15123,7 +15123,7 @@ ICCUtilsHelperObject.prototype = { * * @See B.3.1.1 CPHS Information in CPHS Phase 2. */ - let cphsService = GECKO_ICC_SERVICES.cphs[geckoService]; + let cphsService = GECKO_ICC_SERVICES.cphs[goannaService]; if (!cphsService) { return false; diff --git a/dom/system/gonk/tests/marionette/ril_jshint/README.md b/dom/system/gonk/tests/marionette/ril_jshint/README.md index 35142ee4cb..338a35eea7 100644 --- a/dom/system/gonk/tests/marionette/ril_jshint/README.md +++ b/dom/system/gonk/tests/marionette/ril_jshint/README.md @@ -3,7 +3,7 @@ Test RIL Code Quality For more information, please refer to -* Bug 880643 - B2G RIL: Add a code quality test on try server for RIL javascript code in gecko +* Bug 880643 - B2G RIL: Add a code quality test on try server for RIL javascript code in goanna * Slide: https://speakerdeck.com/aknow/improve-code-quality-of-ril-code-by-jshint * Document: https://hackpad.com/Code-Quality-Test-For-RIL-Javascript-Code-In-Goanna-cz5j7YIGiw8 diff --git a/dom/system/gonk/tests/test_ril_worker_icc_CardState.js b/dom/system/gonk/tests/test_ril_worker_icc_CardState.js index 5abcb80efc..1552fc7eba 100644 --- a/dom/system/gonk/tests/test_ril_worker_icc_CardState.js +++ b/dom/system/gonk/tests/test_ril_worker_icc_CardState.js @@ -14,7 +14,7 @@ add_test(function test_personalization_state() { context.ICCRecordHelper.readICCID = function fakeReadICCID() {}; - function testPersonalization(isCdma, cardPersoState, geckoCardState) { + function testPersonalization(isCdma, cardPersoState, goannaCardState) { let iccStatus = { cardState: CARD_STATE_PRESENT, gsmUmtsSubscriptionAppIndex: (!isCdma) ? 0 : -1, @@ -28,7 +28,7 @@ add_test(function test_personalization_state() { ril._isCdma = isCdma; ril._processICCStatus(iccStatus); - do_check_eq(ril.cardState, geckoCardState); + do_check_eq(ril.cardState, goannaCardState); } // Test GSM personalization state. @@ -106,7 +106,7 @@ add_test(function test_card_app_state() { context.ICCRecordHelper.readICCID = function fakeReadICCID() {}; - function testCardAppState(cardAppState, geckoCardState) { + function testCardAppState(cardAppState, goannaCardState) { let iccStatus = { cardState: CARD_STATE_PRESENT, gsmUmtsSubscriptionAppIndex: 0, @@ -117,7 +117,7 @@ add_test(function test_card_app_state() { }; ril._processICCStatus(iccStatus); - do_check_eq(ril.cardState, geckoCardState); + do_check_eq(ril.cardState, goannaCardState); } testCardAppState(CARD_APPSTATE_ILLEGAL, diff --git a/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js b/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js index 3a4ee687ef..a056dab981 100644 --- a/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js +++ b/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js @@ -16,12 +16,12 @@ add_test(function test_is_icc_service_available() { let ICCUtilsHelper = context.ICCUtilsHelper; let RIL = context.RIL; - function test_table(sst, geckoService, simEnabled, usimEnabled) { + function test_table(sst, goannaService, simEnabled, usimEnabled) { RIL.iccInfoPrivate.sst = sst; RIL.appType = CARD_APPTYPE_SIM; - do_check_eq(ICCUtilsHelper.isICCServiceAvailable(geckoService), simEnabled); + do_check_eq(ICCUtilsHelper.isICCServiceAvailable(goannaService), simEnabled); RIL.appType = CARD_APPTYPE_USIM; - do_check_eq(ICCUtilsHelper.isICCServiceAvailable(geckoService), usimEnabled); + do_check_eq(ICCUtilsHelper.isICCServiceAvailable(goannaService), usimEnabled); } test_table([0x08], "ADN", true, false); @@ -307,12 +307,12 @@ add_test(function test_is_cphs_service_available() { let RIL = context.RIL; RIL.iccInfoPrivate.cphsSt = Uint8Array(2); - function test_table(cphsSt, geckoService) { + function test_table(cphsSt, goannaService) { RIL.iccInfoPrivate.cphsSt.set(cphsSt); for (let service in GECKO_ICC_SERVICES.cphs) { do_check_eq(ICCUtilsHelper.isCphsServiceAvailable(service), - geckoService == service); + goannaService == service); } } diff --git a/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js b/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js index 8055ef4a96..13344af94b 100644 --- a/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js +++ b/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js @@ -1487,8 +1487,8 @@ add_test(function test_read_mbdn_recovered_from_cphs_mbn() { } }; - iccUtilsHelper.isCphsServiceAvailable = function(geckoService) { - return geckoService == "MBN"; + iccUtilsHelper.isCphsServiceAvailable = function(goannaService) { + return goannaService == "MBN"; }; let isRecovered = false; diff --git a/dom/system/gonk/tests/test_ril_worker_ruim.js b/dom/system/gonk/tests/test_ril_worker_ruim.js index 52192e8259..497613728f 100644 --- a/dom/system/gonk/tests/test_ril_worker_ruim.js +++ b/dom/system/gonk/tests/test_ril_worker_ruim.js @@ -16,9 +16,9 @@ add_test(function test_is_ruim_service_available() { context.RIL._isCdma = true; context.RIL.appType = CARD_APPTYPE_RUIM; - function test_table(cst, geckoService, enabled) { + function test_table(cst, goannaService, enabled) { context.RIL.iccInfoPrivate.cst = cst; - do_check_eq(context.ICCUtilsHelper.isICCServiceAvailable(geckoService), + do_check_eq(context.ICCUtilsHelper.isICCServiceAvailable(goannaService), enabled); } diff --git a/dom/tests/mochitest/ajax/mochikit/MochiKit/DragAndDrop.js b/dom/tests/mochitest/ajax/mochikit/MochiKit/DragAndDrop.js index c471ffe900..0235a789a7 100644 --- a/dom/tests/mochitest/ajax/mochikit/MochiKit/DragAndDrop.js +++ b/dom/tests/mochitest/ajax/mochikit/MochiKit/DragAndDrop.js @@ -722,7 +722,7 @@ MochiKit.DragAndDrop.Draggable.prototype = { style.top = p[1] + 'px'; } if (style.visibility == 'hidden') { - style.visibility = ''; // fix gecko rendering + style.visibility = ''; // fix goanna rendering } }, diff --git a/dom/tests/mochitest/ajax/mochikit/MochiKit/Sortable.js b/dom/tests/mochitest/ajax/mochikit/MochiKit/Sortable.js index 8976ec0b27..98dbfc4959 100644 --- a/dom/tests/mochitest/ajax/mochikit/MochiKit/Sortable.js +++ b/dom/tests/mochitest/ajax/mochikit/MochiKit/Sortable.js @@ -216,7 +216,7 @@ MochiKit.Base.update(MochiKit.Sortable, { accept: options.accept } - // fix for gecko engine + // fix for goanna engine MochiKit.DOM.removeEmptyTextNodes(element); options.draggables = []; @@ -334,7 +334,7 @@ MochiKit.Base.update(MochiKit.Sortable, { self.mark(dropon, 'before'); if (dropon.previousSibling != element) { var oldParentNode = element.parentNode; - element.style.visibility = 'hidden'; // fix gecko rendering + element.style.visibility = 'hidden'; // fix goanna rendering dropon.parentNode.insertBefore(element, dropon); if (dropon.parentNode != oldParentNode) { self.options(oldParentNode).onChange(element); @@ -346,7 +346,7 @@ MochiKit.Base.update(MochiKit.Sortable, { var nextElement = dropon.nextSibling || null; if (nextElement != element) { var oldParentNode = element.parentNode; - element.style.visibility = 'hidden'; // fix gecko rendering + element.style.visibility = 'hidden'; // fix goanna rendering dropon.parentNode.insertBefore(element, nextElement); if (dropon.parentNode != oldParentNode) { self.options(oldParentNode).onChange(element); diff --git a/dom/tests/mochitest/ajax/scriptaculous/src/dragdrop.js b/dom/tests/mochitest/ajax/scriptaculous/src/dragdrop.js index 10c7c93264..0838aeb2a6 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/src/dragdrop.js +++ b/dom/tests/mochitest/ajax/scriptaculous/src/dragdrop.js @@ -490,7 +490,7 @@ Draggable.prototype = { if((!this.options.constraint) || (this.options.constraint=='vertical')) style.top = p[1] + "px"; - if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering + if(style.visibility=="hidden") style.visibility = ""; // fix goanna rendering }, stopScrolling: function() { @@ -696,7 +696,7 @@ var Sortable = { hoverclass: options.hoverclass } - // fix for gecko engine + // fix for goanna engine Element.cleanWhitespace(element); options.draggables = []; @@ -754,7 +754,7 @@ var Sortable = { Sortable.mark(dropon, 'before'); if(dropon.previousSibling != element) { var oldParentNode = element.parentNode; - element.style.visibility = "hidden"; // fix gecko rendering + element.style.visibility = "hidden"; // fix goanna rendering dropon.parentNode.insertBefore(element, dropon); if(dropon.parentNode!=oldParentNode) Sortable.options(oldParentNode).onChange(element); @@ -765,7 +765,7 @@ var Sortable = { var nextElement = dropon.nextSibling || null; if(nextElement != element) { var oldParentNode = element.parentNode; - element.style.visibility = "hidden"; // fix gecko rendering + element.style.visibility = "hidden"; // fix goanna rendering dropon.parentNode.insertBefore(element, nextElement); if(dropon.parentNode!=oldParentNode) Sortable.options(oldParentNode).onChange(element); diff --git a/dom/webidl/MozSelfSupport.webidl b/dom/webidl/MozSelfSupport.webidl index 12be4b67ef..160141d76b 100644 --- a/dom/webidl/MozSelfSupport.webidl +++ b/dom/webidl/MozSelfSupport.webidl @@ -28,7 +28,7 @@ interface MozSelfSupport * clientID: String, * clientIDVersion: Number, * thisPingDate: String, - * geckoAppInfo: Object, + * goannaAppInfo: Object, * data: Object * } * diff --git a/dom/wifi/WifiWorker.js b/dom/wifi/WifiWorker.js index 7308b60f92..112f9ab8a0 100755 --- a/dom/wifi/WifiWorker.js +++ b/dom/wifi/WifiWorker.js @@ -2991,10 +2991,10 @@ WifiWorker.prototype = { /** * Compatibility flags for detecting if Gaia is controlling wifi by settings - * or API, once API is called, gecko will no longer accept wifi enable + * or API, once API is called, goanna will no longer accept wifi enable * control from settings. * This is used to deal with compatibility issue while Gaia adopted to use - * API but gecko doesn't remove the settings code in time. + * API but goanna doesn't remove the settings code in time. * TODO: Remove this flag in Bug 1050147 */ ignoreWifiEnabledFromSettings: false, diff --git a/dom/xul/nsIXULOverlayProvider.idl b/dom/xul/nsIXULOverlayProvider.idl index f74a1717dc..2c17db9e54 100644 --- a/dom/xul/nsIXULOverlayProvider.idl +++ b/dom/xul/nsIXULOverlayProvider.idl @@ -10,7 +10,7 @@ interface nsIURI; /** * The chrome registry implements this interface to give overlays - * to the gecko XUL engine. + * to the goanna XUL engine. */ [scriptable, uuid(1d5b5b94-dc47-4050-93b7-ac092e383cad)] diff --git a/embedding/android/GeckoSmsManager.java b/embedding/android/GeckoSmsManager.java index b96feb8e4f..85fe863364 100644 --- a/embedding/android/GeckoSmsManager.java +++ b/embedding/android/GeckoSmsManager.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.ArrayList; import java.util.Iterator; @@ -293,8 +293,8 @@ public class GoannaSmsManager implements ISmsManager { public final static String ACTION_SMS_RECEIVED = "android.provider.Telephony.SMS_RECEIVED"; - public final static String ACTION_SMS_SENT = "org.mozilla.gecko.SMS_SENT"; - public final static String ACTION_SMS_DELIVERED = "org.mozilla.gecko.SMS_DELIVERED"; + public final static String ACTION_SMS_SENT = "org.mozilla.goanna.SMS_SENT"; + public final static String ACTION_SMS_DELIVERED = "org.mozilla.goanna.SMS_DELIVERED"; /* * Make sure that the following error codes are in sync with the ones diff --git a/embedding/android/geckoview_example/AndroidManifest.xml.in b/embedding/android/geckoview_example/AndroidManifest.xml.in index 2055b7469d..8dd68b604e 100644 --- a/embedding/android/geckoview_example/AndroidManifest.xml.in +++ b/embedding/android/geckoview_example/AndroidManifest.xml.in @@ -1,7 +1,7 @@ #filter substitution - + goanna:url="about:mozilla"/> diff --git a/embedding/moz.build b/embedding/moz.build index a3bcedfcfb..a5078ba4e9 100644 --- a/embedding/moz.build +++ b/embedding/moz.build @@ -7,7 +7,7 @@ DIRS += ['components', 'browser'] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - DIRS += ['android/geckoview_example'] + DIRS += ['android/goannaview_example'] TEST_DIRS += ['test'] diff --git a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/hunspell-en_US-20081205.dic b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/hunspell-en_US-20081205.dic index d44ef51994..0ffc9f1d07 100644 --- a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/hunspell-en_US-20081205.dic +++ b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/hunspell-en_US-20081205.dic @@ -25250,7 +25250,7 @@ gearing/M gearshift/MS gearstick gearwheel/SM -gecko/SM +goanna/SM geddit gee/DS geegaw/SM diff --git a/extensions/spellcheck/locales/en-US/hunspell/en-US.dic b/extensions/spellcheck/locales/en-US/hunspell/en-US.dic index 38ad21ca04..2b91f285b7 100644 --- a/extensions/spellcheck/locales/en-US/hunspell/en-US.dic +++ b/extensions/spellcheck/locales/en-US/hunspell/en-US.dic @@ -31266,7 +31266,7 @@ gearing/M gearshift/MS gearstick gearwheel/SM -gecko/SM +goanna/SM geddit gee/DS geegaw/SM diff --git a/gfx/doc/AsyncPanZoom.md b/gfx/doc/AsyncPanZoom.md index f08506c8c4..bddfb14119 100644 --- a/gfx/doc/AsyncPanZoom.md +++ b/gfx/doc/AsyncPanZoom.md @@ -283,7 +283,7 @@ The layout code also adds the area (or bounding region in case of weird shapes) When the user starts interacting with that content, the hit-test in the APZ code finds the dispatch-to-content region of P. The input block therefore has a tentative target of P when it goes into step 4(ii) in the flow above. -When gecko processes the input event, it must detect the inactive scrollframe and activate it, as part of step 7. +When goanna processes the input event, it must detect the inactive scrollframe and activate it, as part of step 7. Finally, the widget code sends the SetTargetAPZC notification in step 8 to notify the APZ that the input block should really apply to this new layer. The issue here is that the layer transaction containing the new layer must reach the compositor and APZ before the SetTargetAPZC notification. If this does not occur within the 300ms timeout, the APZ code will be unable to update the tentative target, and will continue to use P for that input block. @@ -291,5 +291,5 @@ Input blocks that start after the layer transaction will get correctly routed to This model implies that when the user initially attempts to scroll an inactive scrollframe, it may end up scrolling an ancestor scrollframe. (This is because in the absence of the SetTargetAPZC notification, the input events will get applied to the closest ancestor scrollframe's APZC.) -Only after the round-trip to the gecko thread is complete is there a layer for async scrolling to actually occur on the scrollframe itself. +Only after the round-trip to the goanna thread is complete is there a layer for async scrolling to actually occur on the scrollframe itself. At that point the scrollframe will start receiving new input blocks and will scroll normally. diff --git a/gfx/layers/FrameMetrics.h b/gfx/layers/FrameMetrics.h index 0808c7d828..e6f0f6f8de 100644 --- a/gfx/layers/FrameMetrics.h +++ b/gfx/layers/FrameMetrics.h @@ -615,7 +615,7 @@ private: // not any parents, regardless of parent transforms. CSSPoint mScrollOffset; - // The "user zoom". Content is painted by gecko at mResolution * mDevPixelsPerCSSPixel, + // The "user zoom". Content is painted by goanna at mResolution * mDevPixelsPerCSSPixel, // but will be drawn to the screen at mZoom. In the steady state, the // two will be the same, but during an async zoom action the two may // diverge. This information is initialized in Goanna but updated in the APZC. diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp index e8db112775..3d7a69bea5 100644 --- a/gfx/layers/apz/src/APZCTreeManager.cpp +++ b/gfx/layers/apz/src/APZCTreeManager.cpp @@ -684,11 +684,11 @@ APZCTreeManager::GetTouchInputBlockAPZC(const MultiTouchInput& aEvent, { // In this block we flush repaint requests for the entire APZ tree. We need to do this // at the start of an input block for a number of reasons. One of the reasons is so that - // after we untransform the event into gecko space, it doesn't end up under something + // after we untransform the event into goanna space, it doesn't end up under something // else. Another reason is that if we hit-test this event and end up on a layer's // dispatch-to-content region we cannot be sure we actually got the correct layer. We - // have to fall back to the gecko hit-test to handle this case, but we can't untransform - // the event we send to gecko because we don't know the layer to untransform with + // have to fall back to the goanna hit-test to handle this case, but we can't untransform + // the event we send to goanna because we don't know the layer to untransform with // respect to. MonitorAutoLock lock(mTreeLock); FlushRepaintsRecursively(mRootNode); @@ -1450,15 +1450,15 @@ APZCTreeManager::GetAPZCAtPoint(HitTestingTreeNode* aNode, MC.Inverse() This combined transformation is returned by GetScreenToApzcTransform(). - Next, if we want user inputs sent to gecko for event-dispatching, we will need to strip + Next, if we want user inputs sent to goanna for event-dispatching, we will need to strip out all of the async transforms that are involved in this chain. This is because async - transforms are stored only in the compositor and gecko does not account for them when + transforms are stored only in the compositor and goanna does not account for them when doing display-list-based hit-testing for event dispatching. Furthermore, because these input events are processed by Goanna in a FIFO queue that includes other things (specifically paint requests), it is possible that by time the - input event reaches gecko, it will have painted something else. Therefore, we need to + input event reaches goanna, it will have painted something else. Therefore, we need to apply another transform to the input events to account for the possible disparity between - what we know gecko last painted and the last paint request we sent to gecko. Let this + what we know goanna last painted and the last paint request we sent to goanna. Let this transform be represented by LD, MD, ... RD. Therefore, given a user input in screen space, the following transforms need to be applied (in order from top to bottom): diff --git a/gfx/layers/apz/src/APZCTreeManager.h b/gfx/layers/apz/src/APZCTreeManager.h index 73e83e91d7..a62310bb6a 100644 --- a/gfx/layers/apz/src/APZCTreeManager.h +++ b/gfx/layers/apz/src/APZCTreeManager.h @@ -196,7 +196,7 @@ public: uint64_t* aOutInputBlockId); /** - * A helper for transforming coordinates to gecko coordinate space. + * A helper for transforming coordinates to goanna coordinate space. * * @param aPoint point to transform * @param aOutTransformedPoint resulting transformed point diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp index c10e6a8955..0351b0557c 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.cpp +++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp @@ -1654,14 +1654,14 @@ nsEventStatus AsyncPanZoomController::OnLongPress(const TapGestureInput& aEvent) nsRefPtr controller = GetGoannaContentController(); if (controller) { int32_t modifiers = WidgetModifiersToDOMModifiers(aEvent.modifiers); - CSSPoint geckoScreenPoint; - if (ConvertToGoanna(aEvent.mLocalPoint, &geckoScreenPoint)) { + CSSPoint goannaScreenPoint; + if (ConvertToGoanna(aEvent.mLocalPoint, &goannaScreenPoint)) { if (CurrentTouchBlock()->IsDuringFastMotion()) { APZC_LOG("%p dropping long-press because of fast motion\n", this); return nsEventStatus_eIgnore; } uint64_t blockId = GetInputQueue()->InjectNewTouchBlock(this); - controller->HandleLongTap(geckoScreenPoint, modifiers, GetGuid(), blockId); + controller->HandleLongTap(goannaScreenPoint, modifiers, GetGuid(), blockId); return nsEventStatus_eConsumeNoDefault; } } @@ -1673,9 +1673,9 @@ nsEventStatus AsyncPanZoomController::OnLongPressUp(const TapGestureInput& aEven nsRefPtr controller = GetGoannaContentController(); if (controller) { int32_t modifiers = WidgetModifiersToDOMModifiers(aEvent.modifiers); - CSSPoint geckoScreenPoint; - if (ConvertToGoanna(aEvent.mLocalPoint, &geckoScreenPoint)) { - controller->HandleLongTapUp(geckoScreenPoint, modifiers, GetGuid()); + CSSPoint goannaScreenPoint; + if (ConvertToGoanna(aEvent.mLocalPoint, &goannaScreenPoint)) { + controller->HandleLongTapUp(goannaScreenPoint, modifiers, GetGuid()); return nsEventStatus_eConsumeNoDefault; } } @@ -1685,8 +1685,8 @@ nsEventStatus AsyncPanZoomController::OnLongPressUp(const TapGestureInput& aEven nsEventStatus AsyncPanZoomController::GenerateSingleTap(const ParentLayerPoint& aPoint, mozilla::Modifiers aModifiers) { nsRefPtr controller = GetGoannaContentController(); if (controller) { - CSSPoint geckoScreenPoint; - if (ConvertToGoanna(aPoint, &geckoScreenPoint)) { + CSSPoint goannaScreenPoint; + if (ConvertToGoanna(aPoint, &goannaScreenPoint)) { if (!CurrentTouchBlock()->SetSingleTapOccurred()) { return nsEventStatus_eIgnore; } @@ -1697,7 +1697,7 @@ nsEventStatus AsyncPanZoomController::GenerateSingleTap(const ParentLayerPoint& // See bug 965381 for the issue this was causing. controller->PostDelayedTask( NewRunnableMethod(controller.get(), &GoannaContentController::HandleSingleTap, - geckoScreenPoint, WidgetModifiersToDOMModifiers(aModifiers), + goannaScreenPoint, WidgetModifiersToDOMModifiers(aModifiers), GetGuid()), 0); return nsEventStatus_eConsumeNoDefault; @@ -1734,9 +1734,9 @@ nsEventStatus AsyncPanZoomController::OnDoubleTap(const TapGestureInput& aEvent) if (controller) { if (mZoomConstraints.mAllowDoubleTapZoom && CurrentTouchBlock()->TouchActionAllowsDoubleTapZoom()) { int32_t modifiers = WidgetModifiersToDOMModifiers(aEvent.modifiers); - CSSPoint geckoScreenPoint; - if (ConvertToGoanna(aEvent.mLocalPoint, &geckoScreenPoint)) { - controller->HandleDoubleTap(geckoScreenPoint, modifiers, GetGuid()); + CSSPoint goannaScreenPoint; + if (ConvertToGoanna(aEvent.mLocalPoint, &goannaScreenPoint)) { + controller->HandleDoubleTap(goannaScreenPoint, modifiers, GetGuid()); } } return nsEventStatus_eConsumeNoDefault; diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h index b6e11bd216..209914de79 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.h +++ b/gfx/layers/apz/src/AsyncPanZoomController.h @@ -104,12 +104,12 @@ public: GestureBehavior aGestures = DEFAULT_GESTURES); // -------------------------------------------------------------------------- - // These methods must only be called on the gecko thread. + // These methods must only be called on the goanna thread. // /** * Read the various prefs and do any global initialization for all APZC instances. - * This must be run on the gecko thread before any APZC instances are actually + * This must be run on the goanna thread before any APZC instances are actually * used for anything meaningful. */ static void InitializeGlobalState(); @@ -226,10 +226,10 @@ public: /** * Returns the transform to take something from the coordinate space of the - * last thing we know gecko painted, to the coordinate space of the last thing - * we asked gecko to paint. In cases where that last request has not yet been + * last thing we know goanna painted, to the coordinate space of the last thing + * we asked goanna to paint. In cases where that last request has not yet been * processed, this is needed to transform input events properly into a space - * gecko will understand. + * goanna will understand. */ Matrix4x4 GetTransformToLastDispatchedPaint() const; @@ -564,7 +564,7 @@ protected: void RequestContentRepaint(FrameMetrics& aFrameMetrics, bool aThrottled = true); /** - * Actually send the next pending paint request to gecko. + * Actually send the next pending paint request to goanna. */ void DispatchRepaintRequest(const FrameMetrics& aFrameMetrics); diff --git a/gfx/layers/apz/testutil/APZTestData.h b/gfx/layers/apz/testutil/APZTestData.h index e31d730179..e96f0b9865 100644 --- a/gfx/layers/apz/testutil/APZTestData.h +++ b/gfx/layers/apz/testutil/APZTestData.h @@ -22,7 +22,7 @@ namespace layers { typedef uint32_t SequenceNumber; /** - * This structure is used to store information logged by various gecko + * This structure is used to store information logged by various goanna * components for later examination by test code. * It consists of a bucket for every paint (initiated on the client side), * and every repaint request (initiated on the compositor side by diff --git a/gfx/layers/apz/util/APZCCallbackHelper.cpp b/gfx/layers/apz/util/APZCCallbackHelper.cpp index 4be905ee6c..65f5063c6a 100644 --- a/gfx/layers/apz/util/APZCCallbackHelper.cpp +++ b/gfx/layers/apz/util/APZCCallbackHelper.cpp @@ -75,16 +75,16 @@ ScrollFrameTo(nsIScrollableFrame* aFrame, const CSSPoint& aPoint, bool& aSuccess // If the frame is overflow:hidden on a particular axis, we don't want to allow // user-driven scroll on that axis. Simply set the scroll position on that axis // to whatever it already is. Note that this will leave the APZ's async scroll - // position out of sync with the gecko scroll position, but APZ can deal with that + // position out of sync with the goanna scroll position, but APZ can deal with that // (by design). Note also that when we run into this case, even if both axes // have overflow:hidden, we want to set aSuccessOut to true, so that the displayport - // follows the async scroll position rather than the gecko scroll position. - CSSPoint geckoScrollPosition = CSSPoint::FromAppUnits(aFrame->GetScrollPosition()); + // follows the async scroll position rather than the goanna scroll position. + CSSPoint goannaScrollPosition = CSSPoint::FromAppUnits(aFrame->GetScrollPosition()); if (aFrame->GetScrollbarStyles().mVertical == NS_STYLE_OVERFLOW_HIDDEN) { - targetScrollPosition.y = geckoScrollPosition.y; + targetScrollPosition.y = goannaScrollPosition.y; } if (aFrame->GetScrollbarStyles().mHorizontal == NS_STYLE_OVERFLOW_HIDDEN) { - targetScrollPosition.x = geckoScrollPosition.x; + targetScrollPosition.x = goannaScrollPosition.x; } // If the scrollable frame is currently in the middle of an async or smooth @@ -97,13 +97,13 @@ ScrollFrameTo(nsIScrollableFrame* aFrame, const CSSPoint& aPoint, bool& aSuccess || aFrame->LastSmoothScrollOrigin(); if (!scrollInProgress) { aFrame->ScrollToCSSPixelsApproximate(targetScrollPosition, nsGkAtoms::apz); - geckoScrollPosition = CSSPoint::FromAppUnits(aFrame->GetScrollPosition()); + goannaScrollPosition = CSSPoint::FromAppUnits(aFrame->GetScrollPosition()); aSuccessOut = true; } // Return the final scroll position after setting it so that anything that relies // on it can have an accurate value. Note that even if we set it above re-querying it // is a good idea because it may have gotten clamped or rounded. - return geckoScrollPosition; + return goannaScrollPosition; } /** @@ -191,7 +191,7 @@ APZCCallbackHelper::UpdateRootFrame(nsIDOMWindowUtils* aUtils, // Set the scroll port size, which determines the scroll range. For example if // a 500-pixel document is shown in a 100-pixel frame, the scroll port length would - // be 100, and gecko would limit the maximum scroll offset to 400 (so as to prevent + // be 100, and goanna would limit the maximum scroll offset to 400 (so as to prevent // overscroll). Note that if the content here was zoomed to 2x, the document would // be 1000 pixels long but the frame would still be 100 pixels, and so the maximum // scroll range would be 900. Therefore this calculation depends on the zoom applied diff --git a/gfx/layers/composite/AsyncCompositionManager.cpp b/gfx/layers/composite/AsyncCompositionManager.cpp index 43d583ea00..7f6a7e911b 100644 --- a/gfx/layers/composite/AsyncCompositionManager.cpp +++ b/gfx/layers/composite/AsyncCompositionManager.cpp @@ -898,14 +898,14 @@ AsyncCompositionManager::TransformScrollableLayer(Layer* aLayer) // GetTransform here. Matrix4x4 oldTransform = aLayer->GetTransform(); - CSSToLayerScale geckoZoom = metrics.LayersPixelsPerCSSPixel(); + CSSToLayerScale goannaZoom = metrics.LayersPixelsPerCSSPixel(); - LayerIntPoint scrollOffsetLayerPixels = RoundedToInt(metrics.GetScrollOffset() * geckoZoom); + LayerIntPoint scrollOffsetLayerPixels = RoundedToInt(metrics.GetScrollOffset() * goannaZoom); if (mIsFirstPaint) { mContentRect = metrics.GetScrollableRect(); SetFirstPaintViewport(scrollOffsetLayerPixels, - geckoZoom, + goannaZoom, mContentRect); mIsFirstPaint = false; } else if (!metrics.GetScrollableRect().IsEqualEdges(mContentRect)) { @@ -920,7 +920,7 @@ AsyncCompositionManager::TransformScrollableLayer(Layer* aLayer) (metrics.GetCriticalDisplayPort().IsEmpty() ? metrics.GetDisplayPort() : metrics.GetCriticalDisplayPort() - ) * geckoZoom); + ) * goannaZoom); displayPort += scrollOffsetLayerPixels; LayerMargin fixedLayerMargins(0, 0, 0, 0); @@ -933,7 +933,7 @@ AsyncCompositionManager::TransformScrollableLayer(Layer* aLayer) // works fine. CSSToParentLayerScale userZoom(metrics.GetDevPixelsPerCSSPixel() * metrics.GetCumulativeResolution() * LayerToParentLayerScale(1)); ParentLayerPoint userScroll = metrics.GetScrollOffset() * userZoom; - SyncViewportInfo(displayPort, geckoZoom, mLayersUpdated, + SyncViewportInfo(displayPort, goannaZoom, mLayersUpdated, userScroll, userZoom, fixedLayerMargins, offset); mLayersUpdated = false; @@ -947,13 +947,13 @@ AsyncCompositionManager::TransformScrollableLayer(Layer* aLayer) // primary scrollable layer. We compare this to the user zoom and scroll // offset in the view transform we obtained from Java in order to compute the // transformation we need to apply. - ParentLayerPoint geckoScroll(0, 0); + ParentLayerPoint goannaScroll(0, 0); if (metrics.IsScrollable()) { - geckoScroll = metrics.GetScrollOffset() * userZoom; + goannaScroll = metrics.GetScrollOffset() * userZoom; } LayerToParentLayerScale asyncZoom = userZoom / metrics.LayersPixelsPerCSSPixel(); - ParentLayerPoint translation = userScroll - geckoScroll; + ParentLayerPoint translation = userScroll - goannaScroll; Matrix4x4 treeTransform = ViewTransform(asyncZoom, -translation); SetShadowTransform(aLayer, oldTransform * treeTransform); diff --git a/gfx/layers/ipc/AsyncTransactionTracker.h b/gfx/layers/ipc/AsyncTransactionTracker.h index de5c56fc79..56c6a28cd2 100644 --- a/gfx/layers/ipc/AsyncTransactionTracker.h +++ b/gfx/layers/ipc/AsyncTransactionTracker.h @@ -104,7 +104,7 @@ protected: bool mCompleted; /** - * gecko does not provide atomic operation for uint64_t. + * goanna does not provide atomic operation for uint64_t. * Ensure atomicity by using Mutex. */ static uint64_t sSerialCounter; @@ -173,7 +173,7 @@ protected: std::map > mAsyncTransactionTrackeres; /** - * gecko does not provide atomic operation for uint64_t. + * goanna does not provide atomic operation for uint64_t. * Ensure atomicity by using Mutex. */ static uint64_t sSerialCounter; diff --git a/gfx/layers/ipc/CompositableTransactionParent.cpp b/gfx/layers/ipc/CompositableTransactionParent.cpp index 81eeaa8c94..fbfdc74861 100644 --- a/gfx/layers/ipc/CompositableTransactionParent.cpp +++ b/gfx/layers/ipc/CompositableTransactionParent.cpp @@ -266,7 +266,7 @@ CompositableParentManager::SendPendingAsyncMessges() // Some type of AsyncParentMessageData message could have // one file descriptor (e.g. OpDeliverFence). - // A number of file descriptors per gecko ipc message have a limitation + // A number of file descriptors per goanna ipc message have a limitation // on OS_POSIX (MACOSX or LINUX). #if defined(OS_POSIX) static const uint32_t kMaxMessageNumber = FileDescriptorSet::MAX_DESCRIPTORS_PER_MESSAGE; diff --git a/gfx/layers/ipc/LayerTransactionParent.cpp b/gfx/layers/ipc/LayerTransactionParent.cpp index aa2209a52b..9a6362f2bb 100644 --- a/gfx/layers/ipc/LayerTransactionParent.cpp +++ b/gfx/layers/ipc/LayerTransactionParent.cpp @@ -610,7 +610,7 @@ LayerTransactionParent::RecvUpdate(InfallibleTArray&& cset, #ifdef COMPOSITOR_PERFORMANCE_WARNING int compositeTime = (int)(mozilla::TimeStamp::Now() - updateStart).ToMilliseconds(); if (compositeTime > 15) { - printf_stderr("Compositor: Layers update took %i ms (blocking gecko).\n", compositeTime); + printf_stderr("Compositor: Layers update took %i ms (blocking goanna).\n", compositeTime); } #endif diff --git a/gfx/layers/opengl/TextureHostOGL.cpp b/gfx/layers/opengl/TextureHostOGL.cpp index d33587a7c5..37fced4d49 100644 --- a/gfx/layers/opengl/TextureHostOGL.cpp +++ b/gfx/layers/opengl/TextureHostOGL.cpp @@ -142,7 +142,7 @@ TextureHostOGL::SetReleaseFence(const android::sp& aReleaseFence android::sp TextureHostOGL::GetAndResetReleaseFence() { - // Hold previous ReleaseFence to prevent Fence delivery failure via gecko IPC. + // Hold previous ReleaseFence to prevent Fence delivery failure via goanna IPC. mPrevReleaseFence = mReleaseFence; // Reset current ReleaseFence. mReleaseFence = android::Fence::NO_FENCE; diff --git a/gfx/layers/opengl/TextureHostOGL.h b/gfx/layers/opengl/TextureHostOGL.h index 0e874fcd1c..19592a6ebb 100644 --- a/gfx/layers/opengl/TextureHostOGL.h +++ b/gfx/layers/opengl/TextureHostOGL.h @@ -167,7 +167,7 @@ protected: android::sp mAcquireFence; /** - * Hold previous ReleaseFence to prevent Fence delivery failure via gecko IPC. + * Hold previous ReleaseFence to prevent Fence delivery failure via goanna IPC. * Fence is a kernel object and its lifetime is managed by a reference count. * Until the Fence is delivered to client side, need to hold Fence on host side. */ diff --git a/gfx/tests/gtest/TestAsyncPanZoomController.cpp b/gfx/tests/gtest/TestAsyncPanZoomController.cpp index c205149c3a..7c44b154ec 100644 --- a/gfx/tests/gtest/TestAsyncPanZoomController.cpp +++ b/gfx/tests/gtest/TestAsyncPanZoomController.cpp @@ -2136,7 +2136,7 @@ TEST_F(APZHitTestingTester, TestRepaintFlushOnNewInputBlock) { // The main purpose of this test is to verify that touch-start events (or anything // that starts a new input block) don't ever get untransformed. This should always // hold because the APZ code should flush repaints when we start a new input block - // and the transform to gecko space should be empty. + // and the transform to goanna space should be empty. CreateSimpleScrollingLayer(); ScopedLayerTreeRegistration registration(0, root, mcc); @@ -2577,7 +2577,7 @@ protected: // LayerID 0 1 2 3 // 0 is the root // 1 is a container layer whose sole purpose to make a non-empty ancestor - // transform for 2, so that 2's screen-to-apzc and apzc-to-gecko + // transform for 2, so that 2's screen-to-apzc and apzc-to-goanna // transforms are different from 3's. // 2 is a small layer that is the actual target // 3 is a big layer obscuring 2 with a dispatch-to-content region diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp index 450b84569e..284676eb49 100644 --- a/gfx/thebes/gfxAndroidPlatform.cpp +++ b/gfx/thebes/gfxAndroidPlatform.cpp @@ -354,11 +354,11 @@ gfxAndroidPlatform::FontHintingEnabled() // might not want hinting. Let's see. #ifdef MOZ_USING_ANDROID_JAVA_WIDGETS - // On android-java, we currently only use gecko to render web + // On android-java, we currently only use goanna to render web // content that can always be be non-reflow-zoomed. So turn off // hinting. // - // XXX when gecko-android-java is used as an "app runtime", we may + // XXX when goanna-android-java is used as an "app runtime", we may // want to re-enable hinting for non-browser processes there. return false; #endif // MOZ_USING_ANDROID_JAVA_WIDGETS @@ -380,10 +380,10 @@ bool gfxAndroidPlatform::RequiresLinearZoom() { #ifdef MOZ_USING_ANDROID_JAVA_WIDGETS - // On android-java, we currently only use gecko to render web + // On android-java, we currently only use goanna to render web // content that can always be be non-reflow-zoomed. // - // XXX when gecko-android-java is used as an "app runtime", we may + // XXX when goanna-android-java is used as an "app runtime", we may // want to treat it like B2G and use linear zoom only for the web // browser process, not other apps. return true; diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h index 10a84d9ee1..3fca457fb7 100644 --- a/gfx/thebes/gfxPlatform.h +++ b/gfx/thebes/gfxPlatform.h @@ -393,7 +393,7 @@ public: /** * True when hinting should be enabled. This setting shouldn't - * change per gecko process, while the process is live. If so the + * change per goanna process, while the process is live. If so the * results are not defined. * * NB: this bit is only honored by the FT2 backend, currently. @@ -409,7 +409,7 @@ public: * is only true for the browser process, not Gaia or other apps. * * Like FontHintingEnabled (above), this setting shouldn't - * change per gecko process, while the process is live. If so the + * change per goanna process, while the process is live. If so the * results are not defined. * * NB: this bit is only honored by the FT2 backend, currently. diff --git a/hal/gonk/GonkHal.cpp b/hal/gonk/GonkHal.cpp index 94af49ed79..96af42da3a 100644 --- a/hal/gonk/GonkHal.cpp +++ b/hal/gonk/GonkHal.cpp @@ -760,7 +760,7 @@ UpdateCpuSleepState() sInternalLockCpuMonitor->AssertCurrentThreadOwns(); bool allowed = sCpuSleepAllowed && !sInternalLockCpuCount; - WriteToFile(allowed ? wakeUnlockFilename : wakeLockFilename, "gecko"); + WriteToFile(allowed ? wakeUnlockFilename : wakeLockFilename, "goanna"); } static void diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp index 708101ea6f..c9d888f6eb 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -1616,7 +1616,7 @@ bool imgLoader::ValidateEntry(imgCacheEntry *aEntry, // data URIs are immutable and by their nature can't leak data, so we can // just return true in that case. Doing so would mean that shift-reload // doesn't reload data URI documents/images though (which is handy for - // debugging during gecko development) so we make an exception in that case. + // debugging during goanna development) so we make an exception in that case. nsAutoCString scheme; aURI->GetScheme(scheme); if (scheme.EqualsLiteral("data") && diff --git a/ipc/chromium/src/base/message_loop.h b/ipc/chromium/src/base/message_loop.h index 0f5916b389..be8cd20850 100644 --- a/ipc/chromium/src/base/message_loop.h +++ b/ipc/chromium/src/base/message_loop.h @@ -197,11 +197,11 @@ public: // // TYPE_MOZILLA_CHILD // This type of ML is used in Mozilla child processes which initialize - // XPCOM and use the gecko event loop. + // XPCOM and use the goanna event loop. // // TYPE_MOZILLA_UI // This type of ML is used in Mozilla parent processes which initialize - // XPCOM and use the gecko event loop. + // XPCOM and use the goanna event loop. // // TYPE_MOZILLA_NONMAINTHREAD // This type of ML is used in Mozilla parent processes which initialize diff --git a/ipc/glue/WindowsMessageLoop.cpp b/ipc/glue/WindowsMessageLoop.cpp index 04066c1c5e..69b6c384f1 100644 --- a/ipc/glue/WindowsMessageLoop.cpp +++ b/ipc/glue/WindowsMessageLoop.cpp @@ -778,9 +778,9 @@ MessageChannel::SyncStackFrame::~SyncStackFrame() MessageChannel::SyncStackFrame* MessageChannel::sStaticTopFrame; -// nsAppShell's notification that gecko events are being processed. +// nsAppShell's notification that goanna events are being processed. // If we are here and there is an Interrupt Incall active, we are spinning -// a nested gecko event loop. In which case the remote process needs +// a nested goanna event loop. In which case the remote process needs // to know about it. void /* static */ MessageChannel::NotifyGoannaEventDispatch() diff --git a/js/src/doc/Debugger/Tutorial-Alloc-Log-Tree.md b/js/src/doc/Debugger/Tutorial-Alloc-Log-Tree.md index d9a92769ac..3dce98e848 100644 --- a/js/src/doc/Debugger/Tutorial-Alloc-Log-Tree.md +++ b/js/src/doc/Debugger/Tutorial-Alloc-Log-Tree.md @@ -1,7 +1,7 @@ Tutorial: Show Allocations Per Call Path ======================================== -{{ gecko_minversion_header(\'34\') }} +{{ goanna_minversion_header(\'34\') }} This page shows how to use the [`Debugger` API][debugger] to show how many objects a web page allocates, sorted by the function call path that allocated diff --git a/js/src/tests/js1_5/extensions/regress-355820.js b/js/src/tests/js1_5/extensions/regress-355820.js index dd5de38ea9..aab8e643ed 100644 --- a/js/src/tests/js1_5/extensions/regress-355820.js +++ b/js/src/tests/js1_5/extensions/regress-355820.js @@ -20,7 +20,7 @@ function test() printBugNumber(BUGNUMBER); printStatus (summary); - print('This test will fail in gecko prior to 1.9'); + print('This test will fail in goanna prior to 1.9'); expect = 'undefined'; actual = typeof Script; diff --git a/js/xpconnect/idl/xpccomponents.idl b/js/xpconnect/idl/xpccomponents.idl index bdf88fb356..26c34c4869 100644 --- a/js/xpconnect/idl/xpccomponents.idl +++ b/js/xpconnect/idl/xpccomponents.idl @@ -466,7 +466,7 @@ interface nsIXPCComponents_Utils : nsISupports void setWantXrays(in jsval vscope); /* - * For gecko internal automation use only. Calling this in production code + * For goanna internal automation use only. Calling this in production code * would result in security vulnerabilities, so it will crash if used outside * of automation. */ diff --git a/layout/base/TouchCaret.cpp b/layout/base/TouchCaret.cpp index 90e9053c9d..5bf5a3ddb3 100644 --- a/layout/base/TouchCaret.cpp +++ b/layout/base/TouchCaret.cpp @@ -364,7 +364,7 @@ TouchCaret::NotifySelectionChanged(nsIDOMDocument* aDoc, nsISelection* aSel, // Update touch caret position and visibility. // Hide touch caret while key event causes selection change. - // Also hide touch caret when gecko or javascript collapse the selection. + // Also hide touch caret when goanna or javascript collapse the selection. if (aReason & nsISelectionListener::KEYPRESS_REASON || aReason & nsISelectionListener::COLLAPSETOSTART_REASON || aReason & nsISelectionListener::COLLAPSETOEND_REASON) { diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index cfd5fbe7ce..ba28c229c3 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -1270,7 +1270,7 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = { { TV_TUNER_DATA_CONTRACTID, &kTV_TUNER_DATA_CID }, { TV_CHANNEL_DATA_CONTRACTID, &kTV_CHANNEL_DATA_CID }, { TV_PROGRAM_DATA_CONTRACTID, &kTV_PROGRAM_DATA_CID }, - { "@mozilla.org/gecko-media-plugin-service;1", &kGECKO_MEDIA_PLUGIN_SERVICE_CID }, + { "@mozilla.org/goanna-media-plugin-service;1", &kGECKO_MEDIA_PLUGIN_SERVICE_CID }, { NS_MOBILE_CONNECTION_SERVICE_CONTRACTID, &kNS_MOBILE_CONNECTION_SERVICE_CID }, { NS_VOICEMAIL_SERVICE_CONTRACTID, &kNS_VOICEMAIL_SERVICE_CID }, { PRESENTATION_DEVICE_MANAGER_CONTRACTID, &kPRESENTATION_DEVICE_MANAGER_CID }, diff --git a/layout/svg/crashtests/767056-1.svg b/layout/svg/crashtests/767056-1.svg index b813d784b3..36f837b5cd 100644 --- a/layout/svg/crashtests/767056-1.svg +++ b/layout/svg/crashtests/767056-1.svg @@ -14,7 +14,7 @@ function resize() { } document.addEventListener("MozReftestInvalidate", resize, false); -setTimeout(resize, 3000); // For non-gecko +setTimeout(resize, 3000); // For non-goanna diff --git a/layout/tools/reftest/runreftestb2g.py b/layout/tools/reftest/runreftestb2g.py index a40565de18..6ad6aee3a2 100644 --- a/layout/tools/reftest/runreftestb2g.py +++ b/layout/tools/reftest/runreftestb2g.py @@ -98,11 +98,11 @@ class B2GOptions(ReftestOptions): type = "string", dest = "pidFile", help = "name of the pidfile to generate") defaults["pidFile"] = "" - self.add_option("--gecko-path", action="store", - type="string", dest="geckoPath", - help="the path to a gecko distribution that should " + self.add_option("--goanna-path", action="store", + type="string", dest="goannaPath", + help="the path to a goanna distribution that should " "be installed on the emulator prior to test") - defaults["geckoPath"] = None + defaults["goannaPath"] = None self.add_option("--logdir", action="store", type="string", dest="logdir", help="directory to store log files") @@ -169,8 +169,8 @@ class B2GOptions(ReftestOptions): if not options.sslPort: options.sslPort = auto.DEFAULT_SSL_PORT - if options.geckoPath and not options.emulator: - self.error("You must specify --emulator if you specify --gecko-path") + if options.goannaPath and not options.emulator: + self.error("You must specify --emulator if you specify --goanna-path") if options.logdir and not options.emulator: self.error("You must specify --emulator if you specify --logdir") @@ -524,8 +524,8 @@ def run_remote_reftests(parser, options, args): auto.setEmulator(True) if options.noWindow: kwargs['noWindow'] = True - if options.geckoPath: - kwargs['gecko_path'] = options.geckoPath + if options.goannaPath: + kwargs['goanna_path'] = options.goannaPath if options.logdir: kwargs['logdir'] = options.logdir if options.busybox: diff --git a/layout/xul/tree/nsTreeBodyFrame.cpp b/layout/xul/tree/nsTreeBodyFrame.cpp index 6e964127ec..fad899fea5 100644 --- a/layout/xul/tree/nsTreeBodyFrame.cpp +++ b/layout/xul/tree/nsTreeBodyFrame.cpp @@ -3396,7 +3396,7 @@ nsTreeBodyFrame::PaintTwisty(int32_t aRowIndex, if (isRTL) twistyRect.x = rightEdge - twistyRect.width; // yeah, I know it says we're drawing a background, but a twisty is really a fg - // object since it doesn't have anything that gecko would want to draw over it. Besides, + // object since it doesn't have anything that goanna would want to draw over it. Besides, // we have to prevent imagelib from drawing it. nsRect dirty; dirty.IntersectRect(twistyRect, aDirtyRect); diff --git a/media/libmkv/update.sh b/media/libmkv/update.sh index 8f5e34c460..11fbc6882f 100644 --- a/media/libmkv/update.sh +++ b/media/libmkv/update.sh @@ -32,7 +32,7 @@ fi # Apply any patches against upstream here. patch -p1 < source_fix.patch -patch -p1 < gecko_fix.patch +patch -p1 < goanna_fix.patch patch -p1 < const_fix.patch patch -p3 < bock_fix.patch patch -p3 < bug970774.patch diff --git a/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp b/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp index 96c1d71933..5ad49b3e3b 100644 --- a/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp +++ b/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp @@ -141,7 +141,7 @@ WebrtcGmpVideoEncoder::InitEncode(const webrtc::VideoCodec* aCodecSettings, uint32_t aMaxPayloadSize) { if (!mMPS) { - mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + mMPS = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); } MOZ_ASSERT(mMPS); @@ -551,7 +551,7 @@ int32_t WebrtcGmpVideoDecoder::InitDecode(const webrtc::VideoCodec* aCodecSettings, int32_t aNumberOfCores) { - mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + mMPS = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); MOZ_ASSERT(mMPS); if (!mGMPThread) { diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp index 0d3eea705a..ea11847cb8 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp @@ -341,10 +341,10 @@ static void GMPReady() { void PeerConnectionCtx::initGMP() { - mGMPService = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); + mGMPService = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); if (!mGMPService) { - CSFLogError(logTag, "%s failed to get the gecko-media-plugin-service", + CSFLogError(logTag, "%s failed to get the goanna-media-plugin-service", __FUNCTION__); return; } @@ -355,7 +355,7 @@ void PeerConnectionCtx::initGMP() if (NS_FAILED(rv)) { mGMPService = nullptr; CSFLogError(logTag, - "%s failed to get the gecko-media-plugin thread, err=%u", + "%s failed to get the goanna-media-plugin thread, err=%u", __FUNCTION__, static_cast(rv)); return; diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/AudioManagerAndroid.java b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/AudioManagerAndroid.java index 5067b7c87b..88debd5cc5 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/AudioManagerAndroid.java +++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/AudioManagerAndroid.java @@ -21,7 +21,7 @@ import android.util.Log; import java.lang.reflect.Field; import java.lang.reflect.Method; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.goanna.mozglue.WebRTCJNITarget; @WebRTCJNITarget class AudioManagerAndroid { diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java index ef8b976f11..e6339ab6cb 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java +++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java @@ -20,7 +20,7 @@ import android.media.AudioRecord; import android.media.MediaRecorder.AudioSource; import android.util.Log; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.goanna.mozglue.WebRTCJNITarget; @WebRTCJNITarget class WebRtcAudioRecord { diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java index f525d97672..eff00adc3e 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java +++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java @@ -20,7 +20,7 @@ import android.media.AudioRecord; import android.media.AudioTrack; import android.util.Log; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.goanna.mozglue.WebRTCJNITarget; @WebRTCJNITarget class WebRtcAudioTrack { diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java index 6cefced35a..5cc37f138d 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java +++ b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java @@ -10,7 +10,7 @@ package org.webrtc.videoengine; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.goanna.mozglue.WebRTCJNITarget; @WebRTCJNITarget public class CaptureCapabilityAndroid { diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java index 9a47c3a9ed..61bae6e171 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java +++ b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java @@ -32,9 +32,9 @@ import android.view.SurfaceHolder.Callback; import android.view.SurfaceHolder; import android.view.WindowManager; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaAppShell.AppStateListener; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaAppShell.AppStateListener; +import org.mozilla.goanna.mozglue.WebRTCJNITarget; // Wrapper for android Camera, with support for direct local preview rendering. // Threading notes: this class is called from ViE C++ code, and from Camera & diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java index 082f0fdde8..37b6f1ba16 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java +++ b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java @@ -19,7 +19,7 @@ import android.hardware.Camera.Size; import android.hardware.Camera; import android.util.Log; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.goanna.mozglue.WebRTCJNITarget; public class VideoCaptureDeviceInfoAndroid { private final static String TAG = "WEBRTC-JC"; diff --git a/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java b/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java index 788c71016d..b7f9da9272 100644 --- a/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java +++ b/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java @@ -25,7 +25,7 @@ import android.graphics.PixelFormat; import android.opengl.GLSurfaceView; import android.util.Log; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.goanna.mozglue.WebRTCJNITarget; public class ViEAndroidGLES20 extends GLSurfaceView implements GLSurfaceView.Renderer { diff --git a/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java b/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java index 3074240232..40137426d0 100644 --- a/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java +++ b/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java @@ -17,9 +17,9 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; -import org.mozilla.gecko.GoannaApp; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.GoannaApp; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.util.ThreadUtils; public class ViERenderer { private final static String TAG = "WEBRTC-ViEREnderer"; diff --git a/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java b/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java index 11fcd3da5c..09d198432a 100644 --- a/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java +++ b/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java @@ -26,7 +26,7 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.SurfaceHolder.Callback; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.goanna.mozglue.WebRTCJNITarget; public class ViESurfaceRenderer implements Callback { diff --git a/memory/replace/logalloc/replay/Replay.cpp b/memory/replace/logalloc/replay/Replay.cpp index 75db8fb1e7..0448d2e485 100644 --- a/memory/replace/logalloc/replay/Replay.cpp +++ b/memory/replace/logalloc/replay/Replay.cpp @@ -300,7 +300,7 @@ void MozTagAnonymousMemory(const void* aPtr, size_t aLength, const char* aTag) {} /* mozjemalloc and jemalloc use pthread_atfork, which Android doesn't have. - * While gecko has one in libmozglue, the replay program can't use that. + * While goanna has one in libmozglue, the replay program can't use that. * Since we're not going to fork anyways, make it a dummy function. */ int pthread_atfork(void (*aPrepare)(void), void (*aParent)(void), diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index a42d3c0968..a848fb80ba 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -554,7 +554,7 @@ pref("media.cache_readahead_limit", 30); // Number of video frames we buffer while decoding video. // On Android this is decided by a similar value which varies for // each OMX decoder |OMX_PARAM_PORTDEFINITIONTYPE::nBufferCountMin|. This -// number must be less than the OMX equivalent or gecko will think it is +// number must be less than the OMX equivalent or goanna will think it is // chronically starved of video frames. All decoders seen so far have a value // of at least 4. pref("media.video-queue.default-size", 3); diff --git a/mobile/android/base/ANRReporter.java b/mobile/android/base/ANRReporter.java index c6e1988151..0dcce4cb05 100644 --- a/mobile/android/base/ANRReporter.java +++ b/mobile/android/base/ANRReporter.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -20,8 +20,8 @@ import java.util.UUID; import java.util.regex.Pattern; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.util.ThreadUtils; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/AboutPages.java b/mobile/android/base/AboutPages.java index 7154e89384..3e4fc552bc 100644 --- a/mobile/android/base/AboutPages.java +++ b/mobile/android/base/AboutPages.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.home.HomeConfig; -import org.mozilla.gecko.home.HomeConfig.PanelType; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.util.StringUtils; +import org.mozilla.goanna.home.HomeConfig; +import org.mozilla.goanna.home.HomeConfig.PanelType; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.util.StringUtils; public class AboutPages { // All of our special pages. diff --git a/mobile/android/base/ActionModeCompat.java b/mobile/android/base/ActionModeCompat.java index cdce683373..7c0314c4dd 100644 --- a/mobile/android/base/ActionModeCompat.java +++ b/mobile/android/base/ActionModeCompat.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.widget.GoannaPopupMenu; -import org.mozilla.gecko.menu.GoannaMenuItem; +import org.mozilla.goanna.widget.GoannaPopupMenu; +import org.mozilla.goanna.menu.GoannaMenuItem; import android.view.Gravity; import android.view.Menu; diff --git a/mobile/android/base/ActionModeCompatView.java b/mobile/android/base/ActionModeCompatView.java index 730f5b315a..57244f944e 100644 --- a/mobile/android/base/ActionModeCompatView.java +++ b/mobile/android/base/ActionModeCompatView.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.animation.AnimationUtils; -import org.mozilla.gecko.menu.GoannaMenu; -import org.mozilla.gecko.widget.GoannaPopupMenu; +import org.mozilla.goanna.animation.AnimationUtils; +import org.mozilla.goanna.menu.GoannaMenu; +import org.mozilla.goanna.widget.GoannaPopupMenu; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/ActivityHandlerHelper.java b/mobile/android/base/ActivityHandlerHelper.java index e6d80c1f52..3748df8b4d 100644 --- a/mobile/android/base/ActivityHandlerHelper.java +++ b/mobile/android/base/ActivityHandlerHelper.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.util.ActivityResultHandler; -import org.mozilla.gecko.util.ActivityResultHandlerMap; +import org.mozilla.goanna.util.ActivityResultHandler; +import org.mozilla.goanna.util.ActivityResultHandlerMap; import android.app.Activity; import android.content.Intent; diff --git a/mobile/android/base/AlertNotification.java b/mobile/android/base/AlertNotification.java index 1be0231170..88f4825d2a 100644 --- a/mobile/android/base/AlertNotification.java +++ b/mobile/android/base/AlertNotification.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.gfx.BitmapUtils; +import org.mozilla.goanna.gfx.BitmapUtils; import android.app.Notification; import android.app.NotificationManager; diff --git a/mobile/android/base/AndroidGamepadManager.java b/mobile/android/base/AndroidGamepadManager.java index 6217f4abd1..6687696910 100644 --- a/mobile/android/base/AndroidGamepadManager.java +++ b/mobile/android/base/AndroidGamepadManager.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.ArrayList; import java.util.HashMap; @@ -11,9 +11,9 @@ import java.util.List; import java.util.Timer; import java.util.TimerTask; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.util.GamepadUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.util.GamepadUtils; +import org.mozilla.goanna.util.ThreadUtils; import android.content.Context; import android.hardware.input.InputManager; diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index 47a3d1f53e..adda8cbf7a 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -82,7 +82,7 @@ - + android:targetActivity="org.mozilla.goanna.BrowserApp"> @@ -147,11 +147,11 @@ android:resource="@drawable/icon" /> - + - + @@ -163,7 +163,7 @@ - + @@ -235,16 +235,16 @@ - + - - @@ -254,14 +254,14 @@ - + - + @@ -269,12 +269,12 @@ - + to launch with the fully qualified name "org.mozilla.goanna.Webapp". --> + android:targetActivity="org.mozilla.goanna.Webapp"> - + - + @@ -309,37 +309,37 @@ - + - - + - - - - + + @@ -351,7 +351,7 @@ #endif #if MOZ_CRASHREPORTER - - + #endif - - @@ -383,7 +383,7 @@ Setting launchMode="singleTop" ensures onNewIntent is called when the Activity is reused. Ideally we create a new instance but Android L breaks this (bug 1137928). --> - - + #endif - - - - - - - + android:name="org.mozilla.goanna.NotificationService"> diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in index a5020ecccb..07e64fb0a2 100644 --- a/mobile/android/base/AppConstants.java.in +++ b/mobile/android/base/AppConstants.java.in @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.os.Build; @@ -75,7 +75,7 @@ public class AppConstants { /** * The name of the Java class that launches the browser. */ - public static final String BROWSER_INTENT_CLASS_NAME = "org.mozilla.gecko.BrowserApp"; + public static final String BROWSER_INTENT_CLASS_NAME = "org.mozilla.goanna.BrowserApp"; public static final String SEARCH_INTENT_CLASS_NAME = "org.mozilla.search.SearchActivity"; public static final String GRE_MILESTONE = "@GRE_MILESTONE@"; diff --git a/mobile/android/base/AppNotificationClient.java b/mobile/android/base/AppNotificationClient.java index 471aeaa0cd..b4365c8ada 100644 --- a/mobile/android/base/AppNotificationClient.java +++ b/mobile/android/base/AppNotificationClient.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.Context; diff --git a/mobile/android/base/Assert.java b/mobile/android/base/Assert.java index 5c10eea77c..4b6b17b57a 100644 --- a/mobile/android/base/Assert.java +++ b/mobile/android/base/Assert.java @@ -1,4 +1,4 @@ -package org.mozilla.gecko; +package org.mozilla.goanna; /** * Static helper class to provide debug assertions for Java. diff --git a/mobile/android/base/BaseGeckoInterface.java b/mobile/android/base/BaseGeckoInterface.java index a68f9bdbdc..a46d1ec1cd 100644 --- a/mobile/android/base/BaseGeckoInterface.java +++ b/mobile/android/base/BaseGeckoInterface.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.prompts.PromptService; -import org.mozilla.gecko.util.ActivityUtils; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.prompts.PromptService; +import org.mozilla.goanna.util.ActivityUtils; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.ThreadUtils; import android.app.Activity; import android.content.Context; diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java index b478375cef..8879da0bf0 100644 --- a/mobile/android/base/BrowserApp.java +++ b/mobile/android/base/BrowserApp.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.ByteArrayOutputStream; import java.io.File; @@ -19,76 +19,76 @@ import java.util.Vector; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.DynamicToolbar.PinReason; -import org.mozilla.gecko.DynamicToolbar.VisibilityTransition; -import org.mozilla.gecko.GoannaProfileDirectories.NoMozillaDirectoryException; -import org.mozilla.gecko.Tabs.TabEvents; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.TransitionsTracker; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.db.BrowserContract.Combined; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.SuggestedSites; -import org.mozilla.gecko.distribution.Distribution; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.favicons.LoadFaviconTask; -import org.mozilla.gecko.favicons.OnFaviconLoadedListener; -import org.mozilla.gecko.favicons.decoders.IconDirectoryEntry; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.activities.FxAccountGetStartedActivity; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.gfx.ImmutableViewportMetrics; -import org.mozilla.gecko.gfx.LayerMarginsAnimator; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.health.BrowserHealthRecorder; -import org.mozilla.gecko.health.BrowserHealthReporter; -import org.mozilla.gecko.health.HealthRecorder; -import org.mozilla.gecko.health.SessionInformation; -import org.mozilla.gecko.home.BrowserSearch; -import org.mozilla.gecko.home.HomeBanner; -import org.mozilla.gecko.home.HomePager; -import org.mozilla.gecko.home.HomePager.OnUrlOpenInBackgroundListener; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.home.HomePanelsManager; -import org.mozilla.gecko.home.SearchEngine; -import org.mozilla.gecko.menu.GoannaMenu; -import org.mozilla.gecko.menu.GoannaMenuItem; -import org.mozilla.gecko.mozglue.ContextUtils; -import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.firstrun.FirstrunPane; -import org.mozilla.gecko.overlays.ui.ShareDialog; -import org.mozilla.gecko.preferences.ClearOnShutdownPref; -import org.mozilla.gecko.preferences.GoannaPreferences; -import org.mozilla.gecko.prompts.Prompt; -import org.mozilla.gecko.prompts.PromptListItem; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.tabs.TabHistoryController; -import org.mozilla.gecko.tabs.TabHistoryFragment; -import org.mozilla.gecko.tabs.TabHistoryPage; -import org.mozilla.gecko.tabs.TabsPanel; -import org.mozilla.gecko.tabs.TabHistoryController.OnShowTabHistory; -import org.mozilla.gecko.toolbar.AutocompleteHandler; -import org.mozilla.gecko.toolbar.BrowserToolbar; -import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState; -import org.mozilla.gecko.toolbar.ToolbarProgressView; -import org.mozilla.gecko.util.ActivityUtils; -import org.mozilla.gecko.util.Clipboard; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.GamepadUtils; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.MenuUtils; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.PrefUtils; -import org.mozilla.gecko.util.StringUtils; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.UIAsyncTask; -import org.mozilla.gecko.widget.ButtonToast; -import org.mozilla.gecko.widget.ButtonToast.ToastListener; -import org.mozilla.gecko.widget.GoannaActionProvider; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.DynamicToolbar.PinReason; +import org.mozilla.goanna.DynamicToolbar.VisibilityTransition; +import org.mozilla.goanna.GoannaProfileDirectories.NoMozillaDirectoryException; +import org.mozilla.goanna.Tabs.TabEvents; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.TransitionsTracker; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.db.BrowserContract.Combined; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.SuggestedSites; +import org.mozilla.goanna.distribution.Distribution; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.favicons.LoadFaviconTask; +import org.mozilla.goanna.favicons.OnFaviconLoadedListener; +import org.mozilla.goanna.favicons.decoders.IconDirectoryEntry; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.activities.FxAccountGetStartedActivity; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.gfx.ImmutableViewportMetrics; +import org.mozilla.goanna.gfx.LayerMarginsAnimator; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.health.BrowserHealthRecorder; +import org.mozilla.goanna.health.BrowserHealthReporter; +import org.mozilla.goanna.health.HealthRecorder; +import org.mozilla.goanna.health.SessionInformation; +import org.mozilla.goanna.home.BrowserSearch; +import org.mozilla.goanna.home.HomeBanner; +import org.mozilla.goanna.home.HomePager; +import org.mozilla.goanna.home.HomePager.OnUrlOpenInBackgroundListener; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.home.HomePanelsManager; +import org.mozilla.goanna.home.SearchEngine; +import org.mozilla.goanna.menu.GoannaMenu; +import org.mozilla.goanna.menu.GoannaMenuItem; +import org.mozilla.goanna.mozglue.ContextUtils; +import org.mozilla.goanna.mozglue.ContextUtils.SafeIntent; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.firstrun.FirstrunPane; +import org.mozilla.goanna.overlays.ui.ShareDialog; +import org.mozilla.goanna.preferences.ClearOnShutdownPref; +import org.mozilla.goanna.preferences.GoannaPreferences; +import org.mozilla.goanna.prompts.Prompt; +import org.mozilla.goanna.prompts.PromptListItem; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.tabs.TabHistoryController; +import org.mozilla.goanna.tabs.TabHistoryFragment; +import org.mozilla.goanna.tabs.TabHistoryPage; +import org.mozilla.goanna.tabs.TabsPanel; +import org.mozilla.goanna.tabs.TabHistoryController.OnShowTabHistory; +import org.mozilla.goanna.toolbar.AutocompleteHandler; +import org.mozilla.goanna.toolbar.BrowserToolbar; +import org.mozilla.goanna.toolbar.BrowserToolbar.TabEditingState; +import org.mozilla.goanna.toolbar.ToolbarProgressView; +import org.mozilla.goanna.util.ActivityUtils; +import org.mozilla.goanna.util.Clipboard; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.GamepadUtils; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.MenuUtils; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.PrefUtils; +import org.mozilla.goanna.util.StringUtils; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.UIAsyncTask; +import org.mozilla.goanna.widget.ButtonToast; +import org.mozilla.goanna.widget.ButtonToast.ToastListener; +import org.mozilla.goanna.widget.GoannaActionProvider; import android.app.Activity; import android.app.AlertDialog; @@ -504,7 +504,7 @@ public class BrowserApp extends GoannaApp } private void updateEditingModeForTab(final Tab selectedTab) { - // (bug 1086983 comment 11) Because the tab may be selected from the gecko thread and we're + // (bug 1086983 comment 11) Because the tab may be selected from the goanna thread and we're // running this code on the UI thread, the selected tab argument may not still refer to the // selected tab. However, that means this code should be run again and the initial state // changes will be overridden. As an optimization, we can skip this update, but it may have @@ -865,7 +865,7 @@ public class BrowserApp extends GoannaApp private Class getMediaPlayerManager() { if (AppConstants.MOZ_MEDIA_PLAYER) { try { - return Class.forName("org.mozilla.gecko.MediaPlayerManager"); + return Class.forName("org.mozilla.goanna.MediaPlayerManager"); } catch(Exception ex) { // Ignore failures Log.e(LOGTAG, "No native casting support", ex); @@ -3542,7 +3542,7 @@ public class BrowserApp extends GoannaApp } @Override - public int getLayout() { return R.layout.gecko_app; } + public int getLayout() { return R.layout.goanna_app; } @Override protected String getDefaultProfileName() throws NoMozillaDirectoryException { diff --git a/mobile/android/base/BrowserLocaleManager.java b/mobile/android/base/BrowserLocaleManager.java index f48d7cd55b..c078f30692 100644 --- a/mobile/android/base/BrowserLocaleManager.java +++ b/mobile/android/base/BrowserLocaleManager.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.File; import java.util.Collection; @@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.util.GoannaJarReader; +import org.mozilla.goanna.util.GoannaJarReader; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/ChromeCast.java b/mobile/android/base/ChromeCast.java index 9ecff85bf9..325805e1b3 100644 --- a/mobile/android/base/ChromeCast.java +++ b/mobile/android/base/ChromeCast.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.IOException; -import org.mozilla.gecko.util.EventCallback; +import org.mozilla.goanna.util.EventCallback; import org.json.JSONObject; import org.json.JSONException; diff --git a/mobile/android/base/ContactService.java b/mobile/android/base/ContactService.java index 6832f543d6..b979e78c9d 100644 --- a/mobile/android/base/ContactService.java +++ b/mobile/android/base/ContactService.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.ArrayList; import java.util.Collections; @@ -14,9 +14,9 @@ import java.util.Map.Entry; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; import android.accounts.Account; import android.accounts.AccountManager; @@ -68,11 +68,11 @@ public class ContactService implements GoannaEventListener { // assigned to by default for a given account. After Honeycomb, an AUTO_ADD database column // was added to denote groups that contacts are automatically added to private final static String PRE_HONEYCOMB_DEFAULT_GROUP = "System Group: My Contacts"; - private final static String MIMETYPE_ADDITIONAL_NAME = "org.mozilla.gecko/additional_name"; - private final static String MIMETYPE_SEX = "org.mozilla.gecko/sex"; - private final static String MIMETYPE_GENDER_IDENTITY = "org.mozilla.gecko/gender_identity"; - private final static String MIMETYPE_KEY = "org.mozilla.gecko/key"; - private final static String MIMETYPE_MOZILLA_CONTACTS_FLAG = "org.mozilla.gecko/contact_flag"; + private final static String MIMETYPE_ADDITIONAL_NAME = "org.mozilla.goanna/additional_name"; + private final static String MIMETYPE_SEX = "org.mozilla.goanna/sex"; + private final static String MIMETYPE_GENDER_IDENTITY = "org.mozilla.goanna/gender_identity"; + private final static String MIMETYPE_KEY = "org.mozilla.goanna/key"; + private final static String MIMETYPE_MOZILLA_CONTACTS_FLAG = "org.mozilla.goanna/contact_flag"; private final EventDispatcher mEventDispatcher; diff --git a/mobile/android/base/ContextGetter.java b/mobile/android/base/ContextGetter.java index 3158546334..1d1be8196b 100644 --- a/mobile/android/base/ContextGetter.java +++ b/mobile/android/base/ContextGetter.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.Context; import android.content.SharedPreferences; diff --git a/mobile/android/base/CrashHandler.java b/mobile/android/base/CrashHandler.java index 611a1f3682..910e998098 100644 --- a/mobile/android/base/CrashHandler.java +++ b/mobile/android/base/CrashHandler.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.BufferedWriter; import java.io.File; diff --git a/mobile/android/base/CrashReporter.java b/mobile/android/base/CrashReporter.java index 07bebe8d26..cfcf541054 100644 --- a/mobile/android/base/CrashReporter.java +++ b/mobile/android/base/CrashReporter.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.HashMap; import java.util.Map; @@ -21,7 +21,7 @@ import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.util.zip.GZIPOutputStream; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.AppConstants.Versions; import android.app.Activity; import android.app.AlertDialog; diff --git a/mobile/android/base/CustomEditText.java b/mobile/android/base/CustomEditText.java index 1a4401892b..e4e7e113ff 100644 --- a/mobile/android/base/CustomEditText.java +++ b/mobile/android/base/CustomEditText.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.widget.ThemedEditText; +import org.mozilla.goanna.widget.ThemedEditText; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/DataReportingNotification.java b/mobile/android/base/DataReportingNotification.java index 7a6fdd4b1b..281b9902c4 100644 --- a/mobile/android/base/DataReportingNotification.java +++ b/mobile/android/base/DataReportingNotification.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.preferences.GoannaPreferences; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.preferences.GoannaPreferences; import android.app.Notification; import android.app.NotificationManager; diff --git a/mobile/android/base/DoorHangerPopup.java b/mobile/android/base/DoorHangerPopup.java index 2f8a6ac946..13cb0520e3 100644 --- a/mobile/android/base/DoorHangerPopup.java +++ b/mobile/android/base/DoorHangerPopup.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.HashSet; import java.util.List; @@ -11,12 +11,12 @@ import java.util.List; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.prompts.PromptInput; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.widget.ArrowPopup; -import org.mozilla.gecko.widget.DoorHanger; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.prompts.PromptInput; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.widget.ArrowPopup; +import org.mozilla.goanna.widget.DoorHanger; import android.content.Context; import android.util.Log; @@ -73,14 +73,14 @@ public class DoorHangerPopup extends ArrowPopup } @Override - public void handleMessage(String event, JSONObject geckoObject) { + public void handleMessage(String event, JSONObject goannaObject) { try { if (event.equals("Doorhanger:Add")) { - final int tabId = geckoObject.getInt("tabID"); - final String value = geckoObject.getString("value"); - final String message = geckoObject.getString("message"); - final JSONArray buttons = geckoObject.getJSONArray("buttons"); - final JSONObject options = geckoObject.getJSONObject("options"); + final int tabId = goannaObject.getInt("tabID"); + final String value = goannaObject.getString("value"); + final String message = goannaObject.getString("message"); + final JSONArray buttons = goannaObject.getJSONArray("buttons"); + final JSONObject options = goannaObject.getJSONObject("options"); ThreadUtils.postToUiThread(new Runnable() { @Override @@ -89,8 +89,8 @@ public class DoorHangerPopup extends ArrowPopup } }); } else if (event.equals("Doorhanger:Remove")) { - final int tabId = geckoObject.getInt("tabID"); - final String value = geckoObject.getString("value"); + final int tabId = goannaObject.getInt("tabID"); + final String value = goannaObject.getString("value"); ThreadUtils.postToUiThread(new Runnable() { @Override diff --git a/mobile/android/base/DownloadsIntegration.java b/mobile/android/base/DownloadsIntegration.java index d18dfc196b..ff40c2bf22 100644 --- a/mobile/android/base/DownloadsIntegration.java +++ b/mobile/android/base/DownloadsIntegration.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; import java.io.File; import java.lang.IllegalArgumentException; diff --git a/mobile/android/base/DynamicToolbar.java b/mobile/android/base/DynamicToolbar.java index 426eaa6104..f5d012da1e 100644 --- a/mobile/android/base/DynamicToolbar.java +++ b/mobile/android/base/DynamicToolbar.java @@ -1,10 +1,10 @@ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.EnumSet; -import org.mozilla.gecko.PrefsHelper.PrefHandlerBase; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.PrefsHelper.PrefHandlerBase; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.util.ThreadUtils; import android.os.Bundle; diff --git a/mobile/android/base/EditBookmarkDialog.java b/mobile/android/base/EditBookmarkDialog.java index 8b8347db37..5ece597e7a 100644 --- a/mobile/android/base/EditBookmarkDialog.java +++ b/mobile/android/base/EditBookmarkDialog.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.BrowserContract.Bookmarks; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.UIAsyncTask; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.BrowserContract.Bookmarks; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.UIAsyncTask; import android.content.ContentResolver; import android.content.Context; @@ -25,7 +25,7 @@ import android.widget.Toast; /** * A dialog that allows editing a bookmarks url, title, or keywords *

- * Invoked by calling one of the {@link org.mozilla.gecko.EditBookmarkDialog#show(String)} + * Invoked by calling one of the {@link org.mozilla.goanna.EditBookmarkDialog#show(String)} * methods. */ public class EditBookmarkDialog { diff --git a/mobile/android/base/EventDispatcher.java b/mobile/android/base/EventDispatcher.java index 2428a36409..14a9d48508 100644 --- a/mobile/android/base/EventDispatcher.java +++ b/mobile/android/base/EventDispatcher.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSContainer; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSContainer; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.ThreadUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/FilePicker.java b/mobile/android/base/FilePicker.java index 39932cd9cd..29cf030ea7 100644 --- a/mobile/android/base/FilePicker.java +++ b/mobile/android/base/FilePicker.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.util.GoannaEventListener; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/FilePickerResultHandler.java b/mobile/android/base/FilePickerResultHandler.java index 8f89565052..3a5b4b7d8b 100644 --- a/mobile/android/base/FilePickerResultHandler.java +++ b/mobile/android/base/FilePickerResultHandler.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import org.mozilla.gecko.util.ActivityResultHandler; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.util.ActivityResultHandler; +import org.mozilla.goanna.util.ThreadUtils; import android.app.Activity; import android.content.ContentResolver; diff --git a/mobile/android/base/FindInPageBar.java b/mobile/android/base/FindInPageBar.java index 1e574ff8b4..1d944775c7 100644 --- a/mobile/android/base/FindInPageBar.java +++ b/mobile/android/base/FindInPageBar.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.GoannaRequest; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.GoannaRequest; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.ThreadUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/FormAssistPopup.java b/mobile/android/base/FormAssistPopup.java index c05c9f3772..985878a04d 100644 --- a/mobile/android/base/FormAssistPopup.java +++ b/mobile/android/base/FormAssistPopup.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.gfx.FloatSize; -import org.mozilla.gecko.gfx.ImmutableViewportMetrics; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.widget.SwipeDismissListViewTouchListener; -import org.mozilla.gecko.widget.SwipeDismissListViewTouchListener.OnDismissCallback; +import org.mozilla.goanna.gfx.FloatSize; +import org.mozilla.goanna.gfx.ImmutableViewportMetrics; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.widget.SwipeDismissListViewTouchListener; +import org.mozilla.goanna.widget.SwipeDismissListViewTouchListener.OnDismissCallback; import org.json.JSONArray; import org.json.JSONException; diff --git a/mobile/android/base/GeckoAccessibility.java b/mobile/android/base/GeckoAccessibility.java index 60ed7f507f..4b6812568a 100644 --- a/mobile/android/base/GeckoAccessibility.java +++ b/mobile/android/base/GeckoAccessibility.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.Arrays; import java.util.HashSet; @@ -12,10 +12,10 @@ import java.util.List; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.UIAsyncTask; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.UIAsyncTask; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; diff --git a/mobile/android/base/GeckoActivity.java b/mobile/android/base/GeckoActivity.java index 17ec7ae577..c835c85f37 100644 --- a/mobile/android/base/GeckoActivity.java +++ b/mobile/android/base/GeckoActivity.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.ComponentName; import android.content.Intent; diff --git a/mobile/android/base/GeckoActivityStatus.java b/mobile/android/base/GeckoActivityStatus.java index 267b06048c..db0c3bebfd 100644 --- a/mobile/android/base/GeckoActivityStatus.java +++ b/mobile/android/base/GeckoActivityStatus.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; public interface GoannaActivityStatus { public boolean isGoannaActivityOpened(); diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java index ec46d2db71..4ac83af49a 100644 --- a/mobile/android/base/GeckoApp.java +++ b/mobile/android/base/GeckoApp.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.ByteArrayOutputStream; import java.io.File; @@ -25,41 +25,41 @@ import java.util.regex.Pattern; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.GoannaProfileDirectories.NoMozillaDirectoryException; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.gfx.FullScreenState; -import org.mozilla.gecko.gfx.Layer; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.gfx.PluginLayer; -import org.mozilla.gecko.health.HealthRecorder; -import org.mozilla.gecko.health.SessionInformation; -import org.mozilla.gecko.health.StubbedHealthRecorder; -import org.mozilla.gecko.menu.GoannaMenu; -import org.mozilla.gecko.menu.GoannaMenuInflater; -import org.mozilla.gecko.menu.MenuPanel; -import org.mozilla.gecko.mozglue.ContextUtils; -import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent; -import org.mozilla.gecko.mozglue.GoannaLoader; -import org.mozilla.gecko.preferences.ClearOnShutdownPref; -import org.mozilla.gecko.preferences.GoannaPreferences; -import org.mozilla.gecko.prompts.PromptService; -import org.mozilla.gecko.updater.UpdateServiceHelper; -import org.mozilla.gecko.util.ActivityResultHandler; -import org.mozilla.gecko.util.ActivityUtils; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.FileUtils; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.PrefUtils; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.webapp.EventListener; -import org.mozilla.gecko.webapp.UninstallListener; -import org.mozilla.gecko.widget.ButtonToast; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.GoannaProfileDirectories.NoMozillaDirectoryException; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.gfx.FullScreenState; +import org.mozilla.goanna.gfx.Layer; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.gfx.PluginLayer; +import org.mozilla.goanna.health.HealthRecorder; +import org.mozilla.goanna.health.SessionInformation; +import org.mozilla.goanna.health.StubbedHealthRecorder; +import org.mozilla.goanna.menu.GoannaMenu; +import org.mozilla.goanna.menu.GoannaMenuInflater; +import org.mozilla.goanna.menu.MenuPanel; +import org.mozilla.goanna.mozglue.ContextUtils; +import org.mozilla.goanna.mozglue.ContextUtils.SafeIntent; +import org.mozilla.goanna.mozglue.GoannaLoader; +import org.mozilla.goanna.preferences.ClearOnShutdownPref; +import org.mozilla.goanna.preferences.GoannaPreferences; +import org.mozilla.goanna.prompts.PromptService; +import org.mozilla.goanna.updater.UpdateServiceHelper; +import org.mozilla.goanna.util.ActivityResultHandler; +import org.mozilla.goanna.util.ActivityUtils; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.FileUtils; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.PrefUtils; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.webapp.EventListener; +import org.mozilla.goanna.webapp.UninstallListener; +import org.mozilla.goanna.widget.ButtonToast; import android.app.Activity; import android.app.AlertDialog; @@ -135,12 +135,12 @@ public abstract class GoannaApp PREFETCH /* launched with a passed URL that we prefetch */ } - public static final String ACTION_ALERT_CALLBACK = "org.mozilla.gecko.ACTION_ALERT_CALLBACK"; - public static final String ACTION_HOMESCREEN_SHORTCUT = "org.mozilla.gecko.BOOKMARK"; - public static final String ACTION_DEBUG = "org.mozilla.gecko.DEBUG"; - public static final String ACTION_LAUNCH_SETTINGS = "org.mozilla.gecko.SETTINGS"; - public static final String ACTION_LOAD = "org.mozilla.gecko.LOAD"; - public static final String ACTION_INIT_PW = "org.mozilla.gecko.INIT_PW"; + public static final String ACTION_ALERT_CALLBACK = "org.mozilla.goanna.ACTION_ALERT_CALLBACK"; + public static final String ACTION_HOMESCREEN_SHORTCUT = "org.mozilla.goanna.BOOKMARK"; + public static final String ACTION_DEBUG = "org.mozilla.goanna.DEBUG"; + public static final String ACTION_LAUNCH_SETTINGS = "org.mozilla.goanna.SETTINGS"; + public static final String ACTION_LOAD = "org.mozilla.goanna.LOAD"; + public static final String ACTION_INIT_PW = "org.mozilla.goanna.INIT_PW"; public static final String EXTRA_STATE_BUNDLE = "stateBundle"; @@ -202,8 +202,8 @@ public abstract class GoannaApp abstract protected String getDefaultProfileName() throws NoMozillaDirectoryException; - private static final String RESTARTER_ACTION = "org.mozilla.gecko.restart"; - private static final String RESTARTER_CLASS = "org.mozilla.gecko.Restarter"; + private static final String RESTARTER_ACTION = "org.mozilla.goanna.restart"; + private static final String RESTARTER_CLASS = "org.mozilla.goanna.Restarter"; @SuppressWarnings("serial") class SessionRestoreException extends Exception { @@ -320,7 +320,7 @@ public abstract class GoannaApp mMenu = menu; MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.gecko_app_menu, mMenu); + inflater.inflate(R.menu.goanna_app_menu, mMenu); return true; } @@ -679,7 +679,7 @@ public abstract class GoannaApp ThreadUtils.postToBackgroundThread(new UninstallListener.DelayedStartupTask(this)); } else if (event.equals("Goanna:Ready")) { mGoannaReadyStartupTimer.stop(); - geckoConnected(); + goannaConnected(); // This method is already running on the background thread, so we // know that mHealthRecorder will exist. That doesn't stop us being @@ -1262,7 +1262,7 @@ public abstract class GoannaApp // Set up Goanna layout. mRootLayout = (OuterLayout) findViewById(R.id.root_layout); - mGoannaLayout = (RelativeLayout) findViewById(R.id.gecko_layout); + mGoannaLayout = (RelativeLayout) findViewById(R.id.goanna_layout); mMainLayout = (RelativeLayout) findViewById(R.id.main_layout); // Determine whether we should restore tabs. @@ -1602,7 +1602,7 @@ public abstract class GoannaApp Tab selectedTab = Tabs.getInstance().getSelectedTab(); if (selectedTab != null) Tabs.getInstance().notifyListeners(selectedTab, Tabs.TabEvents.SELECTED); - geckoConnected(); + goannaConnected(); GoannaAppShell.sendEventToGoanna(GoannaEvent.createBroadcastEvent("Viewport:Flush", null)); } @@ -2361,8 +2361,8 @@ public abstract class GoannaApp GoannaAppShell.sendEventToGoanna(GoannaEvent.createBroadcastEvent("Update:CheckResult", result)); } - protected void geckoConnected() { - mLayerView.geckoConnected(); + protected void goannaConnected() { + mLayerView.goannaConnected(); mLayerView.setOverScrollMode(View.OVER_SCROLL_NEVER); } diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java index b36360c157..9727470862 100644 --- a/mobile/android/base/GeckoAppShell.java +++ b/mobile/android/base/GeckoAppShell.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.BufferedReader; import java.io.Closeable; @@ -30,29 +30,29 @@ import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.favicons.OnFaviconLoadedListener; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.gfx.PanZoomController; -import org.mozilla.gecko.mozglue.ContextUtils; -import org.mozilla.gecko.mozglue.GoannaLoader; -import org.mozilla.gecko.mozglue.JNITarget; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.mozglue.generatorannotations.OptionalGeneratedParameter; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; -import org.mozilla.gecko.overlays.ui.ShareDialog; -import org.mozilla.gecko.prompts.PromptService; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.GoannaRequest; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSContainer; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.ProxySelector; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.favicons.OnFaviconLoadedListener; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.gfx.PanZoomController; +import org.mozilla.goanna.mozglue.ContextUtils; +import org.mozilla.goanna.mozglue.GoannaLoader; +import org.mozilla.goanna.mozglue.JNITarget; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.generatorannotations.OptionalGeneratedParameter; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.overlays.ui.ShareDialog; +import org.mozilla.goanna.prompts.PromptService; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.GoannaRequest; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSContainer; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.ProxySelector; +import org.mozilla.goanna.util.ThreadUtils; import android.app.Activity; import android.app.ActivityManager; @@ -338,11 +338,11 @@ public class GoannaAppShell // Preparation for pumpMessageLoop() MessageQueue.IdleHandler idleHandler = new MessageQueue.IdleHandler() { @Override public boolean queueIdle() { - final Handler geckoHandler = ThreadUtils.sGoannaHandler; - Message idleMsg = Message.obtain(geckoHandler); + final Handler goannaHandler = ThreadUtils.sGoannaHandler; + Message idleMsg = Message.obtain(goannaHandler); // Use |Message.obj == GoannaHandler| to identify our "queue is empty" message - idleMsg.obj = geckoHandler; - geckoHandler.sendMessageAtFrontOfQueue(idleMsg); + idleMsg.obj = goannaHandler; + goannaHandler.sendMessageAtFrontOfQueue(idleMsg); // Keep this IdleHandler return true; } @@ -508,7 +508,7 @@ public class GoannaAppShell synchronized (sEventAckLock) { if (sWaitingForEventAck) { // should never happen since we always leave it as false when we exit this function. - Log.e(LOGTAG, "geckoEventSync() may have been called twice concurrently!", new Exception()); + Log.e(LOGTAG, "goannaEventSync() may have been called twice concurrently!", new Exception()); // fall through for graceful handling } @@ -2468,14 +2468,14 @@ public class GoannaAppShell @WrapElementForJNI public static boolean pumpMessageLoop() { - Handler geckoHandler = ThreadUtils.sGoannaHandler; + Handler goannaHandler = ThreadUtils.sGoannaHandler; Message msg = getNextMessageFromQueue(ThreadUtils.sGoannaQueue); if (msg == null) { return false; } - if (msg.obj == geckoHandler && msg.getTarget() == geckoHandler) { + if (msg.obj == goannaHandler && msg.getTarget() == goannaHandler) { // Our "queue is empty" message; see runGoanna() return false; } diff --git a/mobile/android/base/GeckoApplication.java b/mobile/android/base/GeckoApplication.java index 78bfed08a2..e91d119457 100644 --- a/mobile/android/base/GeckoApplication.java +++ b/mobile/android/base/GeckoApplication.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.LocalBrowserDB; -import org.mozilla.gecko.home.HomePanelsManager; -import org.mozilla.gecko.lwt.LightweightTheme; -import org.mozilla.gecko.mozglue.GoannaLoader; -import org.mozilla.gecko.util.Clipboard; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.LocalBrowserDB; +import org.mozilla.goanna.home.HomePanelsManager; +import org.mozilla.goanna.lwt.LightweightTheme; +import org.mozilla.goanna.mozglue.GoannaLoader; +import org.mozilla.goanna.util.Clipboard; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.ThreadUtils; import android.app.Application; import android.content.Context; diff --git a/mobile/android/base/GeckoBatteryManager.java b/mobile/android/base/GeckoBatteryManager.java index 719bae92cf..3e0728eb4c 100644 --- a/mobile/android/base/GeckoBatteryManager.java +++ b/mobile/android/base/GeckoBatteryManager.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/GeckoConnectivityReceiver.java b/mobile/android/base/GeckoConnectivityReceiver.java index eee2badd8c..431156b250 100644 --- a/mobile/android/base/GeckoConnectivityReceiver.java +++ b/mobile/android/base/GeckoConnectivityReceiver.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/GeckoEditable.java b/mobile/android/base/GeckoEditable.java index e03ed589e1..3c8518a308 100644 --- a/mobile/android/base/GeckoEditable.java +++ b/mobile/android/base/GeckoEditable.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.lang.reflect.Array; import java.lang.reflect.Field; @@ -15,12 +15,12 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Semaphore; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.gfx.InputConnectionHandler; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.ThreadUtils.AssertBehavior; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.gfx.InputConnectionHandler; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.ThreadUtils.AssertBehavior; import android.os.Handler; import android.os.Looper; @@ -371,17 +371,17 @@ final class GoannaEditable ThreadUtils.assertOnThread(mIcRunHandler.getLooper().getThread(), AssertBehavior.THROW); } - private void geckoPostToIc(Runnable runnable) { + private void goannaPostToIc(Runnable runnable) { mIcPostHandler.post(runnable); } - private void geckoUpdateGoanna(final boolean force) { - /* We do not increment the seqno here, but only check it, because geckoUpdateGoanna is a - request for update. If we incremented the seqno here, geckoUpdateGoanna would have + private void goannaUpdateGoanna(final boolean force) { + /* We do not increment the seqno here, but only check it, because goannaUpdateGoanna is a + request for update. If we incremented the seqno here, goannaUpdateGoanna would have prevented other updates from occurring */ final int seqnoWhenPosted = mGoannaUpdateSeqno; - geckoPostToIc(new Runnable() { + goannaPostToIc(new Runnable() { @Override public void run() { mActionQueue.syncWithGoanna(); @@ -631,8 +631,8 @@ final class GoannaEditable return true; } - private void geckoSetIcHandler(final Handler newHandler) { - geckoPostToIc(new Runnable() { // posting to old IC thread + private void goannaSetIcHandler(final Handler newHandler) { + goannaPostToIc(new Runnable() { // posting to old IC thread @Override public void run() { synchronized (newHandler) { @@ -647,7 +647,7 @@ final class GoannaEditable // old IC thread still waiting to run. mIcPostHandler = newHandler; - geckoPostToIc(new Runnable() { // posting to new IC thread + goannaPostToIc(new Runnable() { // posting to new IC thread @Override public void run() { synchronized (newHandler) { @@ -664,7 +664,7 @@ final class GoannaEditable // GoannaEditableListener interface - private void geckoActionReply() { + private void goannaActionReply() { if (DEBUG) { // GoannaEditableListener methods should all be called from the Goanna thread ThreadUtils.assertOnGoannaThread(); @@ -689,7 +689,7 @@ final class GoannaEditable Log.w(LOGTAG, "IME sync error: selection out of bounds"); } Selection.setSelection(mText, selStart, selEnd); - geckoPostToIc(new Runnable() { + goannaPostToIc(new Runnable() { @Override public void run() { mActionQueue.syncWithGoanna(); @@ -713,11 +713,11 @@ final class GoannaEditable break; case Action.TYPE_SET_HANDLER: - geckoSetIcHandler(action.mHandler); + goannaSetIcHandler(action.mHandler); break; } if (action.mShouldUpdate) { - geckoUpdateGoanna(false); + goannaUpdateGoanna(false); } } @@ -726,7 +726,7 @@ final class GoannaEditable if (DEBUG) { // GoannaEditableListener methods should all be called from the Goanna thread ThreadUtils.assertOnGoannaThread(); - // NOTIFY_IME_REPLY_EVENT is logged separately, inside geckoActionReply() + // NOTIFY_IME_REPLY_EVENT is logged separately, inside goannaActionReply() if (type != NOTIFY_IME_REPLY_EVENT) { Log.d(LOGTAG, "notifyIME(" + getConstantName(GoannaEditableListener.class, "NOTIFY_IME_", type) + @@ -738,18 +738,18 @@ final class GoannaEditable if (mFocused) { // When mFocused is false, the reply is for a stale action, // and we should not do anything - geckoActionReply(); + goannaActionReply(); } else if (DEBUG) { Log.d(LOGTAG, "discarding stale reply"); } } finally { // Ensure action is always removed from queue - // even if stale action results in exception in geckoActionReply + // even if stale action results in exception in goannaActionReply mActionQueue.poll(); } return; } - geckoPostToIc(new Runnable() { + goannaPostToIc(new Runnable() { @Override public void run() { if (type == NOTIFY_IME_OF_BLUR) { @@ -794,7 +794,7 @@ final class GoannaEditable getConstantName(GoannaEditableListener.class, "IME_STATE_", state) + ", \"" + typeHint + "\", \"" + modeHint + "\", \"" + actionHint + "\")"); } - geckoPostToIc(new Runnable() { + goannaPostToIc(new Runnable() { @Override public void run() { // Make sure there are no other things going on @@ -835,7 +835,7 @@ final class GoannaEditable return; } - geckoPostToIc(new Runnable() { + goannaPostToIc(new Runnable() { @Override public void run() { mActionQueue.syncWithGoanna(); @@ -856,7 +856,7 @@ final class GoannaEditable }); } - private void geckoReplaceText(int start, int oldEnd, CharSequence newText) { + private void goannaReplaceText(int start, int oldEnd, CharSequence newText) { // Don't use replace() because Gingerbread has a bug where if the replaced text // has the same spans as the original text, the spans will end up being deleted mText.delete(start, oldEnd); @@ -919,7 +919,7 @@ final class GoannaEditable // Replace old spans with new spans mChangedText.replace(action.mStart - start, actionNewEnd - start, action.mSequence); - geckoReplaceText(start, oldEnd, mChangedText); + goannaReplaceText(start, oldEnd, mChangedText); // delete/insert above might have moved our selection to somewhere else // this happens when the Goanna text change covers a larger range than @@ -939,12 +939,12 @@ final class GoannaEditable Spanned.SPAN_POINT_POINT); } } else { - geckoReplaceText(start, oldEnd, mChangedText); + goannaReplaceText(start, oldEnd, mChangedText); } } else { - geckoReplaceText(start, oldEnd, mChangedText); + goannaReplaceText(start, oldEnd, mChangedText); } - geckoPostToIc(new Runnable() { + goannaPostToIc(new Runnable() { @Override public void run() { mListener.onTextChange(text, start, oldEnd, newEnd); diff --git a/mobile/android/base/GeckoEditableClient.java b/mobile/android/base/GeckoEditableClient.java index 852ba72719..1ec09f0e63 100644 --- a/mobile/android/base/GeckoEditableClient.java +++ b/mobile/android/base/GeckoEditableClient.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.os.Handler; import android.text.Editable; diff --git a/mobile/android/base/GeckoEditableListener.java b/mobile/android/base/GeckoEditableListener.java index 371204ddea..dbe6a1bfb6 100644 --- a/mobile/android/base/GeckoEditableListener.java +++ b/mobile/android/base/GeckoEditableListener.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; /** * Interface for the Editable to listen on the Goanna thread, as well as for the IC thread to listen diff --git a/mobile/android/base/GeckoEvent.java b/mobile/android/base/GeckoEvent.java index c089f698ce..8497c58894 100644 --- a/mobile/android/base/GeckoEvent.java +++ b/mobile/android/base/GeckoEvent.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.nio.ByteBuffer; import java.util.concurrent.ArrayBlockingQueue; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.gfx.DisplayPortMetrics; -import org.mozilla.gecko.gfx.ImmutableViewportMetrics; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.gfx.DisplayPortMetrics; +import org.mozilla.goanna.gfx.ImmutableViewportMetrics; import android.graphics.Point; import android.graphics.PointF; @@ -25,8 +25,8 @@ import android.util.Log; import android.util.SparseArray; import android.view.KeyEvent; import android.view.MotionEvent; -import org.mozilla.gecko.mozglue.JNITarget; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.JNITarget; +import org.mozilla.goanna.mozglue.RobocopTarget; /** * We're not allowed to hold on to most events given to us @@ -347,15 +347,15 @@ public class GoannaEvent { event.mCount = 1; event.mPoints = new Point[1]; - PointF geckoPoint = new PointF(pt.x, pt.y); - geckoPoint = GoannaAppShell.getLayerView().convertViewPointToLayerPoint(geckoPoint); + PointF goannaPoint = new PointF(pt.x, pt.y); + goannaPoint = GoannaAppShell.getLayerView().convertViewPointToLayerPoint(goannaPoint); - if (geckoPoint == null) { + if (goannaPoint == null) { // This could happen if Goanna isn't ready yet. return null; } - event.mPoints[0] = new Point(Math.round(geckoPoint.x), Math.round(geckoPoint.y)); + event.mPoints[0] = new Point(Math.round(goannaPoint.x), Math.round(goannaPoint.y)); event.mX = size; event.mTime = System.currentTimeMillis(); @@ -370,7 +370,7 @@ public class GoannaEvent { * Creates a GoannaEvent that contains the data from the MotionEvent. * The keepInViewCoordinates parameter can be set to false to convert from the Java * coordinate system (device pixels relative to the LayerView) to a coordinate system - * relative to gecko's coordinate system (CSS pixels relative to gecko scroll position). + * relative to goanna's coordinate system (CSS pixels relative to goanna scroll position). */ public static GoannaEvent createMotionEvent(MotionEvent m, boolean keepInViewCoordinates) { GoannaEvent event = GoannaEvent.get(NativeGoannaEvent.MOTION_EVENT); @@ -380,7 +380,7 @@ public class GoannaEvent { /** * Creates a GoannaEvent that contains the data from the LongPressEvent, to be - * dispatched in CSS pixels relative to gecko's scroll position. + * dispatched in CSS pixels relative to goanna's scroll position. */ public static GoannaEvent createLongPressEvent(MotionEvent m) { GoannaEvent event = GoannaEvent.get(NativeGoannaEvent.LONG_PRESS); @@ -431,12 +431,12 @@ public class GoannaEvent { private void addMotionPoint(int index, int eventIndex, MotionEvent event, boolean keepInViewCoordinates) { try { - PointF geckoPoint = new PointF(event.getX(eventIndex), event.getY(eventIndex)); + PointF goannaPoint = new PointF(event.getX(eventIndex), event.getY(eventIndex)); if (!keepInViewCoordinates) { - geckoPoint = GoannaAppShell.getLayerView().convertViewPointToLayerPoint(geckoPoint); + goannaPoint = GoannaAppShell.getLayerView().convertViewPointToLayerPoint(goannaPoint); } - mPoints[index] = new Point(Math.round(geckoPoint.x), Math.round(geckoPoint.y)); + mPoints[index] = new Point(Math.round(goannaPoint.x), Math.round(goannaPoint.y)); mPointIndicies[index] = event.getPointerId(eventIndex); double radians = event.getOrientation(eventIndex); @@ -463,7 +463,7 @@ public class GoannaEvent { } if (!keepInViewCoordinates) { - // If we are converting to gecko CSS pixels, then we should adjust the + // If we are converting to goanna CSS pixels, then we should adjust the // radii as well float zoom = GoannaAppShell.getLayerView().getViewportMetrics().zoomFactor; mPointRadii[index].x /= zoom; diff --git a/mobile/android/base/GeckoHalDefines.java b/mobile/android/base/GeckoHalDefines.java index cbc77d53c0..3d4672c03f 100644 --- a/mobile/android/base/GeckoHalDefines.java +++ b/mobile/android/base/GeckoHalDefines.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; public class GoannaHalDefines { diff --git a/mobile/android/base/GeckoInputConnection.java b/mobile/android/base/GeckoInputConnection.java index 86d6f69c2b..c46fce17d1 100644 --- a/mobile/android/base/GeckoInputConnection.java +++ b/mobile/android/base/GeckoInputConnection.java @@ -3,19 +3,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.concurrent.SynchronousQueue; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.gfx.InputConnectionHandler; -import org.mozilla.gecko.util.Clipboard; -import org.mozilla.gecko.util.GamepadUtils; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.ThreadUtils.AssertBehavior; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.gfx.InputConnectionHandler; +import org.mozilla.goanna.util.Clipboard; +import org.mozilla.goanna.util.GamepadUtils; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.ThreadUtils.AssertBehavior; import android.R; import android.content.Context; @@ -48,7 +48,7 @@ class GoannaInputConnection private static final String CUSTOM_HANDLER_TEST_METHOD = "testInputConnection"; private static final String CUSTOM_HANDLER_TEST_CLASS = - "org.mozilla.gecko.tests.components.GoannaViewComponent$TextInput"; + "org.mozilla.goanna.tests.components.GoannaViewComponent$TextInput"; private static final int INLINE_IME_MIN_DISPLAY_SIZE = 480; diff --git a/mobile/android/base/GeckoJavaSampler.java b/mobile/android/base/GeckoJavaSampler.java index db7f8e04ae..d133214b66 100644 --- a/mobile/android/base/GeckoJavaSampler.java +++ b/mobile/android/base/GeckoJavaSampler.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.os.SystemClock; import android.util.Log; import android.util.SparseArray; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; import java.lang.Thread; import java.util.Set; diff --git a/mobile/android/base/GeckoMediaPlayer.java b/mobile/android/base/GeckoMediaPlayer.java index f908c936cc..f6a56ac34f 100644 --- a/mobile/android/base/GeckoMediaPlayer.java +++ b/mobile/android/base/GeckoMediaPlayer.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import org.json.JSONObject; -import org.mozilla.gecko.util.EventCallback; +import org.mozilla.goanna.util.EventCallback; /** * Wrapper for MediaRouter types supported by Android, such as Chromecast, Miracast, etc. diff --git a/mobile/android/base/GeckoMessageReceiver.java b/mobile/android/base/GeckoMessageReceiver.java index 3a25c8a039..184fe1e4dc 100644 --- a/mobile/android/base/GeckoMessageReceiver.java +++ b/mobile/android/base/GeckoMessageReceiver.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/GeckoNetworkManager.java b/mobile/android/base/GeckoNetworkManager.java index 2f27969301..8ad0a84353 100644 --- a/mobile/android/base/GeckoNetworkManager.java +++ b/mobile/android/base/GeckoNetworkManager.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.mozglue.JNITarget; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.EventCallback; +import org.mozilla.goanna.mozglue.JNITarget; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.EventCallback; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/GeckoProfile.java b/mobile/android/base/GeckoProfile.java index 0b99a39380..b0a14d912d 100644 --- a/mobile/android/base/GeckoProfile.java +++ b/mobile/android/base/GeckoProfile.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.File; import java.io.FileOutputStream; @@ -17,17 +17,17 @@ import java.util.Hashtable; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.mozilla.gecko.GoannaProfileDirectories.NoMozillaDirectoryException; -import org.mozilla.gecko.GoannaProfileDirectories.NoSuchProfileException; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.LocalBrowserDB; -import org.mozilla.gecko.db.StubBrowserDB; -import org.mozilla.gecko.distribution.Distribution; -import org.mozilla.gecko.mozglue.ContextUtils; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.firstrun.FirstrunPane; -import org.mozilla.gecko.util.INIParser; -import org.mozilla.gecko.util.INISection; +import org.mozilla.goanna.GoannaProfileDirectories.NoMozillaDirectoryException; +import org.mozilla.goanna.GoannaProfileDirectories.NoSuchProfileException; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.LocalBrowserDB; +import org.mozilla.goanna.db.StubBrowserDB; +import org.mozilla.goanna.distribution.Distribution; +import org.mozilla.goanna.mozglue.ContextUtils; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.firstrun.FirstrunPane; +import org.mozilla.goanna.util.INIParser; +import org.mozilla.goanna.util.INISection; import android.app.Activity; import android.content.ContentResolver; @@ -142,9 +142,9 @@ public final class GoannaProfile { if (isGoannaApp) { // Check for a cached profile on this context already // TODO: We should not be caching profile information on the Activity context - final GoannaApp geckoApp = (GoannaApp) context; - if (geckoApp.mProfile != null) { - return geckoApp.mProfile; + final GoannaApp goannaApp = (GoannaApp) context; + if (goannaApp.mProfile != null) { + return goannaApp.mProfile; } } @@ -172,10 +172,10 @@ public final class GoannaProfile { } if (isGoannaApp) { - final GoannaApp geckoApp = (GoannaApp) context; + final GoannaApp goannaApp = (GoannaApp) context; String defaultProfileName; try { - defaultProfileName = geckoApp.getDefaultProfileName(); + defaultProfileName = goannaApp.getDefaultProfileName(); } catch (NoMozillaDirectoryException e) { // If this failed, we're screwed. But there are so many callers that // we'll just throw a RuntimeException. diff --git a/mobile/android/base/GeckoProfileDirectories.java b/mobile/android/base/GeckoProfileDirectories.java index e20eceeb9f..3799617a8b 100644 --- a/mobile/android/base/GeckoProfileDirectories.java +++ b/mobile/android/base/GeckoProfileDirectories.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.File; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.util.INIParser; -import org.mozilla.gecko.util.INISection; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.util.INIParser; +import org.mozilla.goanna.util.INISection; import android.content.Context; diff --git a/mobile/android/base/GeckoProfilesProvider.java b/mobile/android/base/GeckoProfilesProvider.java index 9ec3bb96fa..e413f1e27d 100644 --- a/mobile/android/base/GeckoProfilesProvider.java +++ b/mobile/android/base/GeckoProfilesProvider.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.File; import java.util.Map; import java.util.Map.Entry; -import org.mozilla.gecko.GoannaProfileDirectories.NoMozillaDirectoryException; -import org.mozilla.gecko.db.BrowserContract; +import org.mozilla.goanna.GoannaProfileDirectories.NoMozillaDirectoryException; +import org.mozilla.goanna.db.BrowserContract; import android.content.ContentProvider; import android.content.ContentValues; diff --git a/mobile/android/base/GeckoScreenOrientation.java b/mobile/android/base/GeckoScreenOrientation.java index 0ba29dd69e..0041aeed11 100644 --- a/mobile/android/base/GeckoScreenOrientation.java +++ b/mobile/android/base/GeckoScreenOrientation.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.pm.ActivityInfo; import android.content.res.Configuration; diff --git a/mobile/android/base/GeckoSharedPrefs.java b/mobile/android/base/GeckoSharedPrefs.java index 13e0969965..836b622d58 100644 --- a/mobile/android/base/GeckoSharedPrefs.java +++ b/mobile/android/base/GeckoSharedPrefs.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.Arrays; import java.util.EnumSet; import java.util.List; import java.util.Map; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; import android.content.Context; import android.content.SharedPreferences; @@ -51,7 +51,7 @@ public final class GoannaSharedPrefs { public static final String PROFILE_PREFS_NAME_PREFIX = "GoannaProfile-"; // The prefs key that holds the current migration - private static final String PREFS_VERSION_KEY = "gecko_shared_prefs_migration"; + private static final String PREFS_VERSION_KEY = "goanna_shared_prefs_migration"; // For disabling migration when getting a SharedPreferences instance private static final EnumSet disableMigrations = EnumSet.of(Flags.DISABLE_MIGRATIONS); diff --git a/mobile/android/base/GeckoSmsManager.java b/mobile/android/base/GeckoSmsManager.java index 99d4081def..ea3b5ad47e 100644 --- a/mobile/android/base/GeckoSmsManager.java +++ b/mobile/android/base/GeckoSmsManager.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.app.Activity; import android.app.PendingIntent; @@ -24,7 +24,7 @@ import android.telephony.SmsMessage; import android.util.Log; import static android.telephony.SmsMessage.MessageClass; -import static org.mozilla.gecko.SmsManager.ISmsManager; +import static org.mozilla.goanna.SmsManager.ISmsManager; import java.util.ArrayList; import java.util.concurrent.atomic.AtomicInteger; @@ -276,8 +276,8 @@ public class GoannaSmsManager implements ISmsManager { public final static String ACTION_SMS_RECEIVED = "android.provider.Telephony.SMS_RECEIVED"; - public final static String ACTION_SMS_SENT = "org.mozilla.gecko.SMS_SENT"; - public final static String ACTION_SMS_DELIVERED = "org.mozilla.gecko.SMS_DELIVERED"; + public final static String ACTION_SMS_SENT = "org.mozilla.goanna.SMS_SENT"; + public final static String ACTION_SMS_DELIVERED = "org.mozilla.goanna.SMS_DELIVERED"; /* * Make sure that the following error codes are in sync with |ErrorType| in: diff --git a/mobile/android/base/GeckoThread.java b/mobile/android/base/GeckoThread.java index 0a719e507f..453c629759 100644 --- a/mobile/android/base/GeckoThread.java +++ b/mobile/android/base/GeckoThread.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.mozglue.GoannaLoader; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.mozglue.GoannaLoader; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; import org.json.JSONObject; diff --git a/mobile/android/base/GeckoUpdateReceiver.java b/mobile/android/base/GeckoUpdateReceiver.java index a7ed5f507e..751ece63ce 100644 --- a/mobile/android/base/GeckoUpdateReceiver.java +++ b/mobile/android/base/GeckoUpdateReceiver.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.updater.UpdateServiceHelper; +import org.mozilla.goanna.updater.UpdateServiceHelper; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/GeckoView.java b/mobile/android/base/GeckoView.java index eedfa28998..43a9dc0347 100644 --- a/mobile/android/base/GeckoView.java +++ b/mobile/android/base/GeckoView.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.ArrayList; import java.util.Collections; @@ -12,15 +12,15 @@ import java.util.Set; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.mozglue.GoannaLoader; -import org.mozilla.gecko.util.Clipboard; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.mozglue.GoannaLoader; +import org.mozilla.goanna.util.Clipboard; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.ThreadUtils; import android.app.Activity; import android.content.Context; @@ -268,7 +268,7 @@ public class GoannaView extends LayerView Tab selectedTab = Tabs.getInstance().getSelectedTab(); if (selectedTab != null) Tabs.getInstance().notifyListeners(selectedTab, Tabs.TabEvents.SELECTED); - geckoConnected(); + goannaConnected(); GoannaAppShell.sendEventToGoanna(GoannaEvent.createBroadcastEvent("Viewport:Flush", null)); } @@ -372,8 +372,8 @@ public class GoannaView extends LayerView mContentDelegate = content; } - public static void setGoannaInterface(final BaseGoannaInterface geckoInterface) { - GoannaAppShell.setGoannaInterface(geckoInterface); + public static void setGoannaInterface(final BaseGoannaInterface goannaInterface) { + GoannaAppShell.setGoannaInterface(goannaInterface); } public static GoannaAppShell.GoannaInterface getGoannaInterface() { diff --git a/mobile/android/base/GeckoViewChrome.java b/mobile/android/base/GeckoViewChrome.java index 73372d4623..4d0b3b61ed 100644 --- a/mobile/android/base/GeckoViewChrome.java +++ b/mobile/android/base/GeckoViewChrome.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.os.Bundle; diff --git a/mobile/android/base/GeckoViewContent.java b/mobile/android/base/GeckoViewContent.java index 6852808229..ba750af16c 100644 --- a/mobile/android/base/GeckoViewContent.java +++ b/mobile/android/base/GeckoViewContent.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; public class GoannaViewContent implements GoannaView.ContentDelegate { /** diff --git a/mobile/android/base/GlobalHistory.java b/mobile/android/base/GlobalHistory.java index f2949dc029..42194f540a 100644 --- a/mobile/android/base/GlobalHistory.java +++ b/mobile/android/base/GlobalHistory.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.lang.ref.SoftReference; import java.util.HashSet; @@ -11,8 +11,8 @@ import java.util.LinkedList; import java.util.Queue; import java.util.Set; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.util.ThreadUtils; import android.content.ContentResolver; import android.content.Context; diff --git a/mobile/android/base/GuestSession.java b/mobile/android/base/GuestSession.java index 02ec5d02c5..50f9629ccc 100644 --- a/mobile/android/base/GuestSession.java +++ b/mobile/android/base/GuestSession.java @@ -2,7 +2,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.app.KeyguardManager; import android.app.NotificationManager; @@ -16,7 +16,7 @@ import android.view.WindowManager; // Utility methods for entering/exiting guest mode. public class GuestSession { - public static final String NOTIFICATION_INTENT = "org.mozilla.gecko.GUEST_SESSION_INPROGRESS"; + public static final String NOTIFICATION_INTENT = "org.mozilla.goanna.GUEST_SESSION_INPROGRESS"; private static final String LOGTAG = "GoannaGuestSession"; /* Returns true if you should be in guest mode. This can be because a secure keyguard diff --git a/mobile/android/base/InputMethods.java b/mobile/android/base/InputMethods.java index 57649b0da3..ad7e157beb 100644 --- a/mobile/android/base/InputMethods.java +++ b/mobile/android/base/InputMethods.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.Collection; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.AppConstants.Versions; import android.content.Context; import android.provider.Settings.Secure; diff --git a/mobile/android/base/IntentHelper.java b/mobile/android/base/IntentHelper.java index b9fec8cfe6..c6b527978d 100644 --- a/mobile/android/base/IntentHelper.java +++ b/mobile/android/base/IntentHelper.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.util.ActivityResultHandler; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.JSONUtils; -import org.mozilla.gecko.util.WebActivityMapper; +import org.mozilla.goanna.util.ActivityResultHandler; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.JSONUtils; +import org.mozilla.goanna.util.WebActivityMapper; import org.json.JSONArray; import org.json.JSONException; diff --git a/mobile/android/base/JavaAddonManager.java b/mobile/android/base/JavaAddonManager.java index d5cb5f5b95..61ce319e01 100644 --- a/mobile/android/base/JavaAddonManager.java +++ b/mobile/android/base/JavaAddonManager.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.util.GoannaEventListener; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/LayoutInterceptor.java b/mobile/android/base/LayoutInterceptor.java index be80ea5752..dc52f26b71 100644 --- a/mobile/android/base/LayoutInterceptor.java +++ b/mobile/android/base/LayoutInterceptor.java @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; public interface LayoutInterceptor { public void onLayout(); diff --git a/mobile/android/base/LocaleManager.java b/mobile/android/base/LocaleManager.java index 795caa925a..6439fd3d6b 100644 --- a/mobile/android/base/LocaleManager.java +++ b/mobile/android/base/LocaleManager.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.Locale; diff --git a/mobile/android/base/Locales.java b/mobile/android/base/Locales.java index b5860863c4..04a33421a0 100644 --- a/mobile/android/base/Locales.java +++ b/mobile/android/base/Locales.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.Locale; -import org.mozilla.gecko.BrowserLocaleManager; -import org.mozilla.gecko.LocaleManager; +import org.mozilla.goanna.BrowserLocaleManager; +import org.mozilla.goanna.LocaleManager; import android.app.Activity; import android.content.Context; diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 53a32e30ce..8f5f3f068f 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -43,7 +43,7 @@ GARBAGE += \ AndroidManifest.xml \ WebappManifestFragment.xml.frag \ classes.dex \ - gecko.ap_ \ + goanna.ap_ \ res/values/strings.xml \ res/raw/browsersearch.json \ res/raw/suggestedsites.json \ @@ -101,11 +101,11 @@ java_bundled_libs := $(subst $(NULL) ,:,$(strip $(java_bundled_libs))) # java_bundled_libs, which holds the jars which we're including as binaries). ALL_JARS = \ constants.jar \ - gecko-R.jar \ - gecko-browser.jar \ - gecko-mozglue.jar \ - gecko-thirdparty.jar \ - gecko-util.jar \ + goanna-R.jar \ + goanna-browser.jar \ + goanna-mozglue.jar \ + goanna-thirdparty.jar \ + goanna-util.jar \ sync-thirdparty.jar \ $(NULL) @@ -159,7 +159,7 @@ proguard_config_dir=$(topsrcdir)/mobile/android/config/proguard # non-GoannaView classes that GoannaView already depended on at a certain point in # time. The idea is to set a high-water mark that is not to be crossed. classycle_jar := $(topsrcdir)/mobile/android/build/classycle/classycle-1.4.1.jar -.geckoview.deps: geckoview.ddf $(classycle_jar) $(ALL_JARS) +.goannaview.deps: goannaview.ddf $(classycle_jar) $(ALL_JARS) java -cp $(classycle_jar) \ classycle.dependency.DependencyChecker \ -mergeInnerClasses \ @@ -176,9 +176,9 @@ classycle_jar := $(topsrcdir)/mobile/android/build/classycle/classycle-1.4.1.jar # for stack frames inside libraries. # # This step can occur much earlier than the main Proguard pass: it needs only -# gecko-R.jar to have been compiled (as that's where the library R.java files +# goanna-R.jar to have been compiled (as that's where the library R.java files # end up), but it does block the main Proguard pass. -.bundled.proguard.deps: gecko-R.jar $(proguard_config_dir)/strip-libs.cfg +.bundled.proguard.deps: goanna-R.jar $(proguard_config_dir)/strip-libs.cfg $(REPORT_BUILD) @$(TOUCH) $@ java \ @@ -187,13 +187,13 @@ classycle_jar := $(topsrcdir)/mobile/android/build/classycle/classycle-1.4.1.jar @$(proguard_config_dir)/strip-libs.cfg \ -injars $(subst ::,:,$(java_bundled_libs))\ -outjars bundled-jars-nodebug \ - -libraryjars $(library_jars):gecko-R.jar + -libraryjars $(library_jars):goanna-R.jar # We touch the target file before invoking Proguard so that Proguard's # outputs are fresher than the target, preventing a subsequent # invocation from thinking Proguard's outputs are stale. This is safe # because Make removes the target file if any recipe command fails. -.proguard.deps: .geckoview.deps .bundled.proguard.deps $(ALL_JARS) $(proguard_config_dir)/proguard.cfg +.proguard.deps: .goannaview.deps .bundled.proguard.deps $(ALL_JARS) $(proguard_config_dir)/proguard.cfg $(REPORT_BUILD) @$(TOUCH) $@ java \ @@ -206,12 +206,12 @@ classycle_jar := $(topsrcdir)/mobile/android/build/classycle/classycle-1.4.1.jar -libraryjars $(library_jars) CLASSES_WITH_JNI= \ - org.mozilla.gecko.ANRReporter \ - org.mozilla.gecko.GoannaAppShell \ - org.mozilla.gecko.GoannaJavaSampler \ - org.mozilla.gecko.gfx.NativePanZoomController \ - org.mozilla.gecko.util.NativeJSContainer \ - org.mozilla.gecko.util.NativeJSObject \ + org.mozilla.goanna.ANRReporter \ + org.mozilla.goanna.GoannaAppShell \ + org.mozilla.goanna.GoannaJavaSampler \ + org.mozilla.goanna.gfx.NativePanZoomController \ + org.mozilla.goanna.util.NativeJSContainer \ + org.mozilla.goanna.util.NativeJSObject \ $(NULL) ifdef MOZ_WEBSMS_BACKEND @@ -220,10 +220,10 @@ ifdef MOZ_WEBSMS_BACKEND # be different than the one checked in (i.e. it will have the sms-related # JNI stubs as well). Just copy the generated file to mozglue/android/ # like the error message says and rebuild. All should be well after that. -CLASSES_WITH_JNI += org.mozilla.gecko.GoannaSmsManager +CLASSES_WITH_JNI += org.mozilla.goanna.GoannaSmsManager endif -jni-stubs.inc: gecko-browser.jar gecko-mozglue.jar gecko-util.jar sync-thirdparty.jar +jni-stubs.inc: goanna-browser.jar goanna-mozglue.jar goanna-util.jar sync-thirdparty.jar $(JAVAH) -o javah.out -bootclasspath $(JAVA_BOOTCLASSPATH) -classpath $(subst $(NULL) $(NULL),:,$^) $(CLASSES_WITH_JNI) $(PYTHON) $(topsrcdir)/mobile/android/base/jni-generator.py javah.out $@ @@ -231,7 +231,7 @@ ANNOTATION_PROCESSOR_JAR_FILES := $(DEPTH)/build/annotationProcessors/annotation GeneratedJNIWrappers.cpp: $(ANNOTATION_PROCESSOR_JAR_FILES) GeneratedJNIWrappers.cpp: $(ALL_JARS) - $(JAVA) -classpath gecko-mozglue.jar:$(JAVA_BOOTCLASSPATH):$(JAVA_CLASSPATH):$(ANNOTATION_PROCESSOR_JAR_FILES) org.mozilla.gecko.annotationProcessors.AnnotationProcessor $(ALL_JARS) + $(JAVA) -classpath goanna-mozglue.jar:$(JAVA_BOOTCLASSPATH):$(JAVA_CLASSPATH):$(ANNOTATION_PROCESSOR_JAR_FILES) org.mozilla.goanna.annotationProcessors.AnnotationProcessor $(ALL_JARS) manifest := \ AndroidManifest.xml.in \ @@ -241,18 +241,18 @@ manifest := \ PP_TARGETS += manifest # Certain source files need to be preprocessed. This special rule -# generates these files into generated/org/mozilla/gecko for +# generates these files into generated/org/mozilla/goanna for # consumption by the build system and IDEs. # The list in moz.build looks like -# 'preprocessed/org/mozilla/gecko/AppConstants.java'. The list in +# 'preprocessed/org/mozilla/goanna/AppConstants.java'. The list in # constants_PP_JAVAFILES looks like -# 'generated/preprocessed/org/mozilla/gecko/AppConstants.java'. We +# 'generated/preprocessed/org/mozilla/goanna/AppConstants.java'. We # need to write AppConstants.java.in to -# generated/preprocessed/org/mozilla/gecko. -preprocessed := $(addsuffix .in,$(subst generated/preprocessed/org/mozilla/gecko/,,$(filter generated/preprocessed/org/mozilla/gecko/%,$(constants_PP_JAVAFILES)))) +# generated/preprocessed/org/mozilla/goanna. +preprocessed := $(addsuffix .in,$(subst generated/preprocessed/org/mozilla/goanna/,,$(filter generated/preprocessed/org/mozilla/goanna/%,$(constants_PP_JAVAFILES)))) -preprocessed_PATH := generated/preprocessed/org/mozilla/gecko +preprocessed_PATH := generated/preprocessed/org/mozilla/goanna preprocessed_KEEP_PATH := 1 preprocessed_FLAGS := --marker='//\\\#' @@ -277,12 +277,12 @@ $(ANDROID_GENERATED_RESFILES): $(call mkdir_deps,$(sort $(dir $(ANDROID_GENERATE # [Comment 1/3] We don't have correct dependencies for strings.xml at # this point, so we always recursively invoke the submake to check the # dependencies. Sigh. And, with multilocale builds, there will be -# multiple strings.xml files, and we need to rebuild gecko.ap_ if any +# multiple strings.xml files, and we need to rebuild goanna.ap_ if any # of them change. But! mobile/android/base/locales does not have # enough information to actually build res/values/strings.xml during a # language repack. So rather than adding rules into the main # makefile, and trying to work around the lack of information, we -# force a rebuild of gecko.ap_ during packaging. See below. +# force a rebuild of goanna.ap_ during packaging. See below. # Since the sub-Make is forced, it doesn't matter that we touch the # target file before the command. If in the future we stop forcing @@ -334,18 +334,18 @@ endef # We delete the archive before updating so that resources removed from # the filesystem are removed from the archive. -geckoview_resources.zip: $(all_resources) $(GLOBAL_DEPS) +goannaview_resources.zip: $(all_resources) $(GLOBAL_DEPS) $(REPORT_BUILD) $(RM) -rf $@ $(foreach dir,$(ANDROID_RES_DIRS),$(call zip_directory_with_relative_paths,$(CURDIR)/$@,$(dir))) -# All of generated/org/mozilla/gecko/R.java, gecko.ap_, and R.txt are +# All of generated/org/mozilla/goanna/R.java, goanna.ap_, and R.txt are # produced by aapt; this saves aapt invocations. The trailing # semi-colon defines an empty recipe; defining no recipe at all causes # Make to treat the target differently, in a way that defeats our # dependencies. -generated/org/mozilla/gecko/R.java: .aapt.deps ; +generated/org/mozilla/goanna/R.java: .aapt.deps ; # If native devices are enabled, add Google Play Services, build their resources generated/android/support/v7/appcompat/R.java: .aapt.deps ; @@ -363,17 +363,17 @@ ifdef MOZ_NATIVE_DEVICES extra_res_dirs += $(GOOGLE_PLAY_SERVICES_RES) endif -gecko.ap_: .aapt.deps ; +goanna.ap_: .aapt.deps ; R.txt: .aapt.deps ; # [Comment 2/3] This tom-foolery provides a target that forces a -# rebuild of gecko.ap_. This is used during packaging to ensure that +# rebuild of goanna.ap_. This is used during packaging to ensure that # resources are fresh. The alternative would be complicated; see # [Comment 1/3]. -gecko-nodeps/R.java: .aapt.nodeps ; -gecko-nodeps.ap_: .aapt.nodeps ; -gecko-nodeps/R.txt: .aapt.nodeps ; +goanna-nodeps/R.java: .aapt.nodeps ; +goanna-nodeps.ap_: .aapt.nodeps ; +goanna-nodeps/R.txt: .aapt.nodeps ; # This ignores the default set of resources ignored by aapt, plus # files starting with '#'. (Emacs produces temp files named #temp#.) @@ -408,7 +408,7 @@ $(1): $$(call mkdir_deps,$(filter-out ./,$(dir $(3) $(4) $(5)))) $(2) $$(addprefix -S ,$$(ANDROID_RES_DIRS)) \ $(if $(extra_res_dirs),$$(addprefix -S ,$$(extra_res_dirs)),) \ $(if $(extra_packages),--extra-packages $$(extra_packages),) \ - --custom-package org.mozilla.gecko \ + --custom-package org.mozilla.goanna \ --non-constant-id \ -F $(3) \ -J $(4) \ @@ -425,12 +425,12 @@ endef # toolkit/mozapps/installer/packager.mk. # .aapt.deps: $(all_resources) -$(eval $(call aapt_command,.aapt.deps,$(all_resources),gecko.ap_,generated/,./)) +$(eval $(call aapt_command,.aapt.deps,$(all_resources),goanna.ap_,generated/,./)) # .aapt.nodeps: $(CURDIR)/AndroidManifest.xml FORCE -$(eval $(call aapt_command,.aapt.nodeps,$(CURDIR)/AndroidManifest.xml FORCE,gecko-nodeps.ap_,gecko-nodeps/,gecko-nodeps/)) +$(eval $(call aapt_command,.aapt.nodeps,$(CURDIR)/AndroidManifest.xml FORCE,goanna-nodeps.ap_,goanna-nodeps/,goanna-nodeps/)) -fennec_ids.txt: generated/org/mozilla/gecko/R.java fennec-ids-generator.py +fennec_ids.txt: generated/org/mozilla/goanna/R.java fennec-ids-generator.py $(PYTHON) $(topsrcdir)/mobile/android/base/fennec-ids-generator.py -i $< -o $@ # Override the Java settings with some specific android settings @@ -469,8 +469,8 @@ gradle-omnijar: $(abspath $(DIST)/fennec/$(OMNIJAR_NAME)) .PHONY: gradle-targets gradle-omnijar -libs:: geckoview_resources.zip classes.dex jni-stubs.inc GeneratedJNIWrappers.cpp fennec_ids.txt - $(INSTALL) geckoview_resources.zip $(FINAL_TARGET) +libs:: goannaview_resources.zip classes.dex jni-stubs.inc GeneratedJNIWrappers.cpp fennec_ids.txt + $(INSTALL) goannaview_resources.zip $(FINAL_TARGET) $(INSTALL) classes.dex $(FINAL_TARGET) @(diff jni-stubs.inc $(topsrcdir)/mozglue/android/jni-stubs.inc >/dev/null && diff GeneratedJNIWrappers.cpp $(topsrcdir)/widget/android/GeneratedJNIWrappers.cpp >/dev/null) || \ (echo '*****************************************************' && \ diff --git a/mobile/android/base/MediaCastingBar.java b/mobile/android/base/MediaCastingBar.java index b7fea66dde..5c6b368fb3 100644 --- a/mobile/android/base/MediaCastingBar.java +++ b/mobile/android/base/MediaCastingBar.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; import org.json.JSONObject; diff --git a/mobile/android/base/MediaPlayerManager.java b/mobile/android/base/MediaPlayerManager.java index 5b28aeeae9..dd2881e5a9 100644 --- a/mobile/android/base/MediaPlayerManager.java +++ b/mobile/android/base/MediaPlayerManager.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -18,10 +18,10 @@ import com.google.android.gms.cast.CastMediaControlIntent; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.mozglue.JNITarget; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; +import org.mozilla.goanna.mozglue.JNITarget; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; import java.util.HashMap; import java.util.Iterator; diff --git a/mobile/android/base/MemoryMonitor.java b/mobile/android/base/MemoryMonitor.java index 38df2f624c..e7cfcb0ffc 100644 --- a/mobile/android/base/MemoryMonitor.java +++ b/mobile/android/base/MemoryMonitor.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.util.ThreadUtils; import android.content.BroadcastReceiver; import android.content.ComponentCallbacks2; @@ -38,8 +38,8 @@ import android.util.Log; */ class MemoryMonitor extends BroadcastReceiver { private static final String LOGTAG = "GoannaMemoryMonitor"; - private static final String ACTION_MEMORY_DUMP = "org.mozilla.gecko.MEMORY_DUMP"; - private static final String ACTION_FORCE_PRESSURE = "org.mozilla.gecko.FORCE_MEMORY_PRESSURE"; + private static final String ACTION_MEMORY_DUMP = "org.mozilla.goanna.MEMORY_DUMP"; + private static final String ACTION_FORCE_PRESSURE = "org.mozilla.goanna.FORCE_MEMORY_PRESSURE"; // Memory pressure levels. Keep these in sync with those in AndroidJavaWrappers.h private static final int MEMORY_PRESSURE_NONE = 0; @@ -102,7 +102,7 @@ class MemoryMonitor extends BroadcastReceiver { // includes TRIM_MEMORY_BACKGROUND increaseMemoryPressure(MEMORY_PRESSURE_CLEANUP); } else { - // levels down here mean gecko is the foreground process so we + // levels down here mean goanna is the foreground process so we // should be less aggressive with wiping memory as it may impact // user experience. increaseMemoryPressure(MEMORY_PRESSURE_LOW); diff --git a/mobile/android/base/MotionEventInterceptor.java b/mobile/android/base/MotionEventInterceptor.java index 814c09995c..b7f9d648f1 100644 --- a/mobile/android/base/MotionEventInterceptor.java +++ b/mobile/android/base/MotionEventInterceptor.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.view.MotionEvent; import android.view.View; diff --git a/mobile/android/base/NSSBridge.java b/mobile/android/base/NSSBridge.java index 018dbf2df1..5b1dfc941d 100644 --- a/mobile/android/base/NSSBridge.java +++ b/mobile/android/base/NSSBridge.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.mozglue.GoannaLoader; +import org.mozilla.goanna.mozglue.GoannaLoader; import android.content.Context; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; public class NSSBridge { private static final String LOGTAG = "NSSBridge"; diff --git a/mobile/android/base/NewTabletUI.java b/mobile/android/base/NewTabletUI.java index 1282b304d6..e313425966 100644 --- a/mobile/android/base/NewTabletUI.java +++ b/mobile/android/base/NewTabletUI.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.Context; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.util.HardwareUtils; @RobocopTarget public class NewTabletUI { diff --git a/mobile/android/base/NotificationClient.java b/mobile/android/base/NotificationClient.java index fd7c362def..053c0dc478 100644 --- a/mobile/android/base/NotificationClient.java +++ b/mobile/android/base/NotificationClient.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.app.Notification; import android.app.PendingIntent; diff --git a/mobile/android/base/NotificationHandler.java b/mobile/android/base/NotificationHandler.java index d93776b9cd..1c85d28c58 100644 --- a/mobile/android/base/NotificationHandler.java +++ b/mobile/android/base/NotificationHandler.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.gfx.BitmapUtils; +import org.mozilla.goanna.gfx.BitmapUtils; import android.app.Notification; import android.app.NotificationManager; diff --git a/mobile/android/base/NotificationHelper.java b/mobile/android/base/NotificationHelper.java index 6171d330b2..0246fb20b7 100644 --- a/mobile/android/base/NotificationHelper.java +++ b/mobile/android/base/NotificationHelper.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.HashMap; import java.util.Iterator; @@ -11,9 +11,9 @@ import java.util.Iterator; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.mozglue.ContextUtils.SafeIntent; +import org.mozilla.goanna.util.GoannaEventListener; import android.app.PendingIntent; import android.content.Context; @@ -306,7 +306,7 @@ public final class NotificationHelper implements GoannaEventListener { boolean persistent = message.optBoolean(PERSISTENT_ATTR); // We add only not persistent notifications to the list since we want to purge only - // them when geckoapp is destroyed. + // them when goannaapp is destroyed. if (!persistent && !mClearableNotifications.containsKey(id)) { mClearableNotifications.put(id, message.toString()); } diff --git a/mobile/android/base/NotificationService.java b/mobile/android/base/NotificationService.java index 838f64ef25..e2f55c92ae 100644 --- a/mobile/android/base/NotificationService.java +++ b/mobile/android/base/NotificationService.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.app.Notification; import android.app.Service; diff --git a/mobile/android/base/OrderedBroadcastHelper.java b/mobile/android/base/OrderedBroadcastHelper.java index 5bee4b7f50..489a168e76 100644 --- a/mobile/android/base/OrderedBroadcastHelper.java +++ b/mobile/android/base/OrderedBroadcastHelper.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.util.GoannaEventListener; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/OuterLayout.java b/mobile/android/base/OuterLayout.java index d8b0e8d302..23f6986b3b 100644 --- a/mobile/android/base/OuterLayout.java +++ b/mobile/android/base/OuterLayout.java @@ -1,7 +1,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.Context; import android.support.v4.view.ViewCompat; diff --git a/mobile/android/base/PrefsHelper.java b/mobile/android/base/PrefsHelper.java index 4c585ca6d5..bd4bfd2770 100644 --- a/mobile/android/base/PrefsHelper.java +++ b/mobile/android/base/PrefsHelper.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.util.GoannaEventListener; import org.json.JSONArray; import org.json.JSONException; @@ -17,7 +17,7 @@ import android.util.SparseArray; import java.util.ArrayList; /** - * Helper class to get/set gecko prefs. + * Helper class to get/set goanna prefs. */ public final class PrefsHelper { private static final String LOGTAG = "GoannaPrefsHelper"; diff --git a/mobile/android/base/PrivateTab.java b/mobile/android/base/PrivateTab.java index 288c26c84e..16b0dbde0c 100644 --- a/mobile/android/base/PrivateTab.java +++ b/mobile/android/base/PrivateTab.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.Context; -import org.mozilla.gecko.db.BrowserDB; +import org.mozilla.goanna.db.BrowserDB; public class PrivateTab extends Tab { public PrivateTab(Context context, int id, String url, boolean external, int parentId, String title) { diff --git a/mobile/android/base/ReaderModeUtils.java b/mobile/android/base/ReaderModeUtils.java index 5e4bcb460a..627e326fa8 100644 --- a/mobile/android/base/ReaderModeUtils.java +++ b/mobile/android/base/ReaderModeUtils.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.util.StringUtils; +import org.mozilla.goanna.util.StringUtils; import android.net.Uri; diff --git a/mobile/android/base/ReadingListHelper.java b/mobile/android/base/ReadingListHelper.java index 48f4382a85..e0bd94a8a3 100644 --- a/mobile/android/base/ReadingListHelper.java +++ b/mobile/android/base/ReadingListHelper.java @@ -2,21 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.DBUtils; -import org.mozilla.gecko.db.ReadingListAccessor; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.UIAsyncTask; +import org.mozilla.goanna.db.BrowserContract.ReadingListItems; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.DBUtils; +import org.mozilla.goanna.db.ReadingListAccessor; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.UIAsyncTask; import android.content.ContentResolver; import android.content.ContentValues; diff --git a/mobile/android/base/RemoteClientsDialogFragment.java b/mobile/android/base/RemoteClientsDialogFragment.java index a43c1b6099..21e0c93977 100644 --- a/mobile/android/base/RemoteClientsDialogFragment.java +++ b/mobile/android/base/RemoteClientsDialogFragment.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.ArrayList; import java.util.List; -import org.mozilla.gecko.db.RemoteClient; +import org.mozilla.goanna.db.RemoteClient; import android.app.AlertDialog; import android.app.AlertDialog.Builder; diff --git a/mobile/android/base/RemoteTabsExpandableListAdapter.java b/mobile/android/base/RemoteTabsExpandableListAdapter.java index 2efaedeba5..0ae8e343bf 100644 --- a/mobile/android/base/RemoteTabsExpandableListAdapter.java +++ b/mobile/android/base/RemoteTabsExpandableListAdapter.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.text.format.DateUtils; -import org.mozilla.gecko.db.RemoteClient; -import org.mozilla.gecko.db.RemoteTab; -import org.mozilla.gecko.home.TwoLinePageRow; +import org.mozilla.goanna.db.RemoteClient; +import org.mozilla.goanna.db.RemoteTab; +import org.mozilla.goanna.home.TwoLinePageRow; import android.content.Context; import android.text.TextUtils; diff --git a/mobile/android/base/Restarter.java b/mobile/android/base/Restarter.java index b3f9ff425a..da8d20ee2d 100644 --- a/mobile/android/base/Restarter.java +++ b/mobile/android/base/Restarter.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.app.Activity; import android.content.Intent; @@ -39,7 +39,7 @@ public class Restarter extends Activity { } } } catch (Exception e) { - Log.i(LOGTAG, "Error killing gecko", e); + Log.i(LOGTAG, "Error killing goanna", e); } try { diff --git a/mobile/android/base/RestrictedProfiles.java b/mobile/android/base/RestrictedProfiles.java index a8075b4a8d..63552f3647 100644 --- a/mobile/android/base/RestrictedProfiles.java +++ b/mobile/android/base/RestrictedProfiles.java @@ -3,16 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.ArrayList; import java.util.List; import java.util.Set; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; import android.annotation.TargetApi; import android.content.Context; import android.net.Uri; @@ -85,7 +85,7 @@ public class RestrictedProfiles { } } - private static Restriction geckoActionToRestriction(int action) { + private static Restriction goannaActionToRestriction(int action) { for (Restriction rest : Restriction.values()) { if (rest.id == action) { return rest; @@ -182,7 +182,7 @@ public class RestrictedProfiles { private static boolean isAllowed(final Context context, int action, String url) { final Restriction restriction; try { - restriction = geckoActionToRestriction(action); + restriction = goannaActionToRestriction(action); } catch (IllegalArgumentException ex) { // Unknown actions represent a coding error, so we // refuse the action and log. diff --git a/mobile/android/base/ScrollAnimator.java b/mobile/android/base/ScrollAnimator.java index e170e53972..2f87c509c8 100644 --- a/mobile/android/base/ScrollAnimator.java +++ b/mobile/android/base/ScrollAnimator.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.Timer; import java.util.TimerTask; -import org.mozilla.gecko.util.GamepadUtils; +import org.mozilla.goanna.util.GamepadUtils; import android.view.InputDevice; import android.view.MotionEvent; diff --git a/mobile/android/base/ServiceNotificationClient.java b/mobile/android/base/ServiceNotificationClient.java index a02d64628c..e78a8ac1d1 100644 --- a/mobile/android/base/ServiceNotificationClient.java +++ b/mobile/android/base/ServiceNotificationClient.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.ComponentName; import android.content.Context; diff --git a/mobile/android/base/SessionParser.java b/mobile/android/base/SessionParser.java index 0e125ec04f..a9d0f6fb6d 100644 --- a/mobile/android/base/SessionParser.java +++ b/mobile/android/base/SessionParser.java @@ -7,7 +7,7 @@ * * ***** END LICENSE BLOCK ***** */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.LinkedList; diff --git a/mobile/android/base/SharedPreferencesHelper.java b/mobile/android/base/SharedPreferencesHelper.java index 63ab77f6c1..6dfe596af0 100644 --- a/mobile/android/base/SharedPreferencesHelper.java +++ b/mobile/android/base/SharedPreferencesHelper.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.util.GoannaEventListener; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/SiteIdentity.java b/mobile/android/base/SiteIdentity.java index b4553c5909..96ec5afda1 100644 --- a/mobile/android/base/SiteIdentity.java +++ b/mobile/android/base/SiteIdentity.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import org.json.JSONObject; diff --git a/mobile/android/base/SmsManager.java b/mobile/android/base/SmsManager.java index 60160f6a46..cd7c2e4114 100644 --- a/mobile/android/base/SmsManager.java +++ b/mobile/android/base/SmsManager.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; public class SmsManager { private static final ISmsManager sInstance; diff --git a/mobile/android/base/SuggestClient.java b/mobile/android/base/SuggestClient.java index 831489ed23..8abc6daf1b 100644 --- a/mobile/android/base/SuggestClient.java +++ b/mobile/android/base/SuggestClient.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.io.BufferedInputStream; import java.io.IOException; @@ -13,8 +13,8 @@ import java.net.URLEncoder; import java.util.ArrayList; import org.json.JSONArray; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.util.HardwareUtils; import android.content.Context; import android.net.ConnectivityManager; diff --git a/mobile/android/base/SurfaceBits.java b/mobile/android/base/SurfaceBits.java index 5d481e1fb3..864ddd9ead 100644 --- a/mobile/android/base/SurfaceBits.java +++ b/mobile/android/base/SurfaceBits.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.mozglue.generatorannotations.WrapEntireClassForJNI; +import org.mozilla.goanna.mozglue.generatorannotations.WrapEntireClassForJNI; import java.nio.ByteBuffer; diff --git a/mobile/android/base/SysInfo.java b/mobile/android/base/SysInfo.java index da33ef05d7..6450d40a51 100644 --- a/mobile/android/base/SysInfo.java +++ b/mobile/android/base/SysInfo.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.os.StrictMode; import android.util.Log; diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java index f4b8bc6500..4a230888e4 100644 --- a/mobile/android/base/Tab.java +++ b/mobile/android/base/Tab.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.ArrayList; import java.util.Collection; @@ -15,16 +15,16 @@ import java.util.regex.Pattern; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.URLMetadata; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.favicons.LoadFaviconTask; -import org.mozilla.gecko.favicons.OnFaviconLoadedListener; -import org.mozilla.gecko.favicons.RemoteFavicon; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.gfx.Layer; -import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.URLMetadata; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.favicons.LoadFaviconTask; +import org.mozilla.goanna.favicons.OnFaviconLoadedListener; +import org.mozilla.goanna.favicons.RemoteFavicon; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.gfx.Layer; +import org.mozilla.goanna.toolbar.BrowserToolbar.TabEditingState; +import org.mozilla.goanna.util.ThreadUtils; import android.content.ContentResolver; import android.content.Context; diff --git a/mobile/android/base/Tabs.java b/mobile/android/base/Tabs.java index e80490d854..d6dcf5592a 100644 --- a/mobile/android/base/Tabs.java +++ b/mobile/android/base/Tabs.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import java.util.HashMap; import java.util.Iterator; @@ -13,14 +13,14 @@ import java.util.concurrent.atomic.AtomicInteger; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.mozglue.JNITarget; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.mozglue.JNITarget; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/Telemetry.java b/mobile/android/base/Telemetry.java index 0f922445e1..59001c6cad 100644 --- a/mobile/android/base/Telemetry.java +++ b/mobile/android/base/Telemetry.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.TelemetryContract.Event; -import org.mozilla.gecko.TelemetryContract.Method; -import org.mozilla.gecko.TelemetryContract.Reason; -import org.mozilla.gecko.TelemetryContract.Session; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.TelemetryContract.Event; +import org.mozilla.goanna.TelemetryContract.Method; +import org.mozilla.goanna.TelemetryContract.Reason; +import org.mozilla.goanna.TelemetryContract.Session; import android.os.SystemClock; import android.util.Log; @@ -115,9 +115,9 @@ public class Telemetry { final String sessionName = getSessionName(session, sessionNameSuffix); Log.d(LOGTAG, "StartUISession: " + sessionName); - final GoannaEvent geckoEvent = + final GoannaEvent goannaEvent = GoannaEvent.createTelemetryUISessionStartEvent(sessionName, realtime()); - GoannaAppShell.sendEventToGoanna(geckoEvent); + GoannaAppShell.sendEventToGoanna(goannaEvent); } public static void startUISession(final Session session) { @@ -129,9 +129,9 @@ public class Telemetry { final String sessionName = getSessionName(session, sessionNameSuffix); Log.d(LOGTAG, "StopUISession: " + sessionName + ", reason=" + reason); - final GoannaEvent geckoEvent = GoannaEvent.createTelemetryUISessionStopEvent( + final GoannaEvent goannaEvent = GoannaEvent.createTelemetryUISessionStopEvent( sessionName, reason.toString(), realtime()); - GoannaAppShell.sendEventToGoanna(geckoEvent); + GoannaAppShell.sendEventToGoanna(goannaEvent); } public static void stopUISession(final Session session, final Reason reason) { @@ -165,9 +165,9 @@ public class Telemetry { Log.d(LOGTAG, "SendUIEvent: event = " + eventName + " method = " + method + " timestamp = " + timestamp + " extras = " + extras); - final GoannaEvent geckoEvent = GoannaEvent.createTelemetryUIEvent( + final GoannaEvent goannaEvent = GoannaEvent.createTelemetryUIEvent( eventName, method.toString(), timestamp, extras); - GoannaAppShell.sendEventToGoanna(geckoEvent); + GoannaAppShell.sendEventToGoanna(goannaEvent); } public static void sendUIEvent(final Event event, final Method method, final long timestamp, diff --git a/mobile/android/base/TelemetryContract.java b/mobile/android/base/TelemetryContract.java index 494db71e69..d1b64c6df4 100644 --- a/mobile/android/base/TelemetryContract.java +++ b/mobile/android/base/TelemetryContract.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; /** * Holds data definitions for our UI Telemetry implementation. diff --git a/mobile/android/base/TextSelection.java b/mobile/android/base/TextSelection.java index abf9733e3f..9cd2f67352 100644 --- a/mobile/android/base/TextSelection.java +++ b/mobile/android/base/TextSelection.java @@ -2,22 +2,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.content.res.Resources; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.gfx.BitmapUtils.BitmapLoader; -import org.mozilla.gecko.gfx.Layer; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.gfx.LayerView.DrawListener; -import org.mozilla.gecko.menu.GoannaMenu; -import org.mozilla.gecko.menu.GoannaMenuItem; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.util.FloatUtils; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.ActionModeCompat.Callback; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.gfx.BitmapUtils.BitmapLoader; +import org.mozilla.goanna.gfx.Layer; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.gfx.LayerView.DrawListener; +import org.mozilla.goanna.menu.GoannaMenu; +import org.mozilla.goanna.menu.GoannaMenuItem; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.util.FloatUtils; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.ActionModeCompat.Callback; +import org.mozilla.goanna.AppConstants.Versions; import android.content.Context; import android.app.Activity; diff --git a/mobile/android/base/TextSelectionHandle.java b/mobile/android/base/TextSelectionHandle.java index 9abdfa02c0..361ba92901 100644 --- a/mobile/android/base/TextSelectionHandle.java +++ b/mobile/android/base/TextSelectionHandle.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.gfx.ImmutableViewportMetrics; -import org.mozilla.gecko.gfx.LayerView; +import org.mozilla.goanna.gfx.ImmutableViewportMetrics; +import org.mozilla.goanna.gfx.LayerView; import org.json.JSONObject; @@ -135,14 +135,14 @@ class TextSelectionHandle extends ImageView implements View.OnTouchListener { // Send x coordinate on the right side of the start handle, left side of the end handle. float left = mLeft + adjustLeftForHandle(); - PointF geckoPoint = new PointF(left, mTop); - geckoPoint = layerView.convertViewPointToLayerPoint(geckoPoint); + PointF goannaPoint = new PointF(left, mTop); + goannaPoint = layerView.convertViewPointToLayerPoint(goannaPoint); JSONObject args = new JSONObject(); try { args.put("handleType", mHandleType.toString()); - args.put("x", (int) geckoPoint.x); - args.put("y", (int) geckoPoint.y); + args.put("x", (int) goannaPoint.x); + args.put("y", (int) goannaPoint.y); } catch (Exception e) { Log.e(LOGTAG, "Error building JSON arguments for TextSelection:Move"); } diff --git a/mobile/android/base/ThumbnailHelper.java b/mobile/android/base/ThumbnailHelper.java index a469347a09..3955e12a59 100644 --- a/mobile/android/base/ThumbnailHelper.java +++ b/mobile/android/base/ThumbnailHelper.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.mozglue.DirectBufferAllocator; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.mozglue.DirectBufferAllocator; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; import android.graphics.Bitmap; import android.util.Log; diff --git a/mobile/android/base/TouchEventInterceptor.java b/mobile/android/base/TouchEventInterceptor.java index 41a71dfa5f..b6ade688af 100644 --- a/mobile/android/base/TouchEventInterceptor.java +++ b/mobile/android/base/TouchEventInterceptor.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; import android.view.MotionEvent; import android.view.View; diff --git a/mobile/android/base/Webapp.java b/mobile/android/base/Webapp.java index b97ed58dcd..b6016f9af1 100644 --- a/mobile/android/base/Webapp.java +++ b/mobile/android/base/Webapp.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.goanna; -import org.mozilla.gecko.webapp.WebappImpl; +import org.mozilla.goanna.webapp.WebappImpl; /** * This class serves only as a namespace wrapper for WebappImpl. diff --git a/mobile/android/base/WebappManifestFragment.xml.frag.in b/mobile/android/base/WebappManifestFragment.xml.frag.in index 3ce6bdcbaa..fef197cbe6 100644 --- a/mobile/android/base/WebappManifestFragment.xml.frag.in +++ b/mobile/android/base/WebappManifestFragment.xml.frag.in @@ -1,4 +1,4 @@ - geckoPreferences = Class.forName(className); - Method broadcastSnippetsPref = geckoPreferences.getMethod(methodName, Context.class); + Class goannaPreferences = Class.forName(className); + Method broadcastSnippetsPref = goannaPreferences.getMethod(methodName, Context.class); broadcastSnippetsPref.invoke(null, context); return; } catch (ClassNotFoundException e) { diff --git a/mobile/android/base/background/ReadingListConstants.java b/mobile/android/base/background/ReadingListConstants.java index 37d9a564e7..b7b69d875a 100644 --- a/mobile/android/base/background/ReadingListConstants.java +++ b/mobile/android/base/background/ReadingListConstants.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background; +package org.mozilla.goanna.background; -import org.mozilla.gecko.AppConstants; +import org.mozilla.goanna.AppConstants; /** * This is in 'background' not 'reading' so that it's still usable even when the diff --git a/mobile/android/base/background/bagheera/BagheeraClient.java b/mobile/android/base/background/bagheera/BagheeraClient.java index f8a3d6c4e5..ebea280a19 100644 --- a/mobile/android/base/background/bagheera/BagheeraClient.java +++ b/mobile/android/base/background/bagheera/BagheeraClient.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.bagheera; +package org.mozilla.goanna.background.bagheera; import java.io.IOException; import java.net.URISyntaxException; @@ -12,10 +12,10 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.regex.Pattern; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.net.Resource; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.net.Resource; import ch.boye.httpclientandroidlib.HttpEntity; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/background/bagheera/BagheeraRequestDelegate.java b/mobile/android/base/background/bagheera/BagheeraRequestDelegate.java index 19a45dcc32..686b8e947b 100644 --- a/mobile/android/base/background/bagheera/BagheeraRequestDelegate.java +++ b/mobile/android/base/background/bagheera/BagheeraRequestDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.bagheera; +package org.mozilla.goanna.background.bagheera; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/background/bagheera/BoundedByteArrayEntity.java b/mobile/android/base/background/bagheera/BoundedByteArrayEntity.java index c802d38a8b..aa640b9dbd 100644 --- a/mobile/android/base/background/bagheera/BoundedByteArrayEntity.java +++ b/mobile/android/base/background/bagheera/BoundedByteArrayEntity.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.bagheera; +package org.mozilla.goanna.background.bagheera; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/mobile/android/base/background/bagheera/DeflateHelper.java b/mobile/android/base/background/bagheera/DeflateHelper.java index 5dda23ca0d..e3584704cb 100644 --- a/mobile/android/base/background/bagheera/DeflateHelper.java +++ b/mobile/android/base/background/bagheera/DeflateHelper.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.bagheera; +package org.mozilla.goanna.background.bagheera; import java.io.UnsupportedEncodingException; import java.util.zip.Deflater; diff --git a/mobile/android/base/background/common/DateUtils.java b/mobile/android/base/background/common/DateUtils.java index 05412224d7..6162c172fb 100644 --- a/mobile/android/base/background/common/DateUtils.java +++ b/mobile/android/base/background/common/DateUtils.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common; +package org.mozilla.goanna.background.common; import java.util.Calendar; import java.util.Formatter; diff --git a/mobile/android/base/background/common/EditorBranch.java b/mobile/android/base/background/common/EditorBranch.java index 1ead09afae..dbbd7f9708 100644 --- a/mobile/android/base/background/common/EditorBranch.java +++ b/mobile/android/base/background/common/EditorBranch.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common; +package org.mozilla.goanna.background.common; import java.util.Set; diff --git a/mobile/android/base/background/common/GlobalConstants.java b/mobile/android/base/background/common/GlobalConstants.java index fda56a5c14..c0289c2b9a 100644 --- a/mobile/android/base/background/common/GlobalConstants.java +++ b/mobile/android/base/background/common/GlobalConstants.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common; +package org.mozilla.goanna.background.common; -import org.mozilla.gecko.AppConstants; +import org.mozilla.goanna.AppConstants; /** * Preprocessed class for storing preprocessed values common to all @@ -28,7 +28,7 @@ public class GlobalConstants { // Fennec's prefs branch and pref name. // Eventually Fennec might listen to startup notifications and // do this automatically, but this will do for now. See Bug 800244. - public static String GECKO_PREFERENCES_CLASS = "org.mozilla.gecko.preferences.GoannaPreferences"; + public static String GECKO_PREFERENCES_CLASS = "org.mozilla.goanna.preferences.GoannaPreferences"; public static String GECKO_BROADCAST_HEALTHREPORT_UPLOAD_PREF_METHOD = "broadcastHealthReportUploadPref"; public static String GECKO_BROADCAST_HEALTHREPORT_PRUNE_METHOD = "broadcastHealthReportPrune"; diff --git a/mobile/android/base/background/common/PrefsBranch.java b/mobile/android/base/background/common/PrefsBranch.java index 78d5f61a1f..05f683f94a 100644 --- a/mobile/android/base/background/common/PrefsBranch.java +++ b/mobile/android/base/background/common/PrefsBranch.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common; +package org.mozilla.goanna.background.common; import java.util.Map; import java.util.Set; diff --git a/mobile/android/base/background/common/log/Logger.java b/mobile/android/base/background/common/log/Logger.java index f8ff4cafdf..9403b26b9e 100644 --- a/mobile/android/base/background/common/log/Logger.java +++ b/mobile/android/base/background/common/log/Logger.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.log; +package org.mozilla.goanna.background.common.log; import java.io.PrintWriter; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Set; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.writers.AndroidLevelCachingLogWriter; -import org.mozilla.gecko.background.common.log.writers.AndroidLogWriter; -import org.mozilla.gecko.background.common.log.writers.LogWriter; -import org.mozilla.gecko.background.common.log.writers.PrintLogWriter; -import org.mozilla.gecko.background.common.log.writers.SimpleTagLogWriter; -import org.mozilla.gecko.background.common.log.writers.ThreadLocalTagLogWriter; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.writers.AndroidLevelCachingLogWriter; +import org.mozilla.goanna.background.common.log.writers.AndroidLogWriter; +import org.mozilla.goanna.background.common.log.writers.LogWriter; +import org.mozilla.goanna.background.common.log.writers.PrintLogWriter; +import org.mozilla.goanna.background.common.log.writers.SimpleTagLogWriter; +import org.mozilla.goanna.background.common.log.writers.ThreadLocalTagLogWriter; import android.util.Log; diff --git a/mobile/android/base/background/common/log/writers/AndroidLevelCachingLogWriter.java b/mobile/android/base/background/common/log/writers/AndroidLevelCachingLogWriter.java index ac4250a03d..dd29ffd87f 100644 --- a/mobile/android/base/background/common/log/writers/AndroidLevelCachingLogWriter.java +++ b/mobile/android/base/background/common/log/writers/AndroidLevelCachingLogWriter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.log.writers; +package org.mozilla.goanna.background.common.log.writers; import java.util.IdentityHashMap; import java.util.Map; diff --git a/mobile/android/base/background/common/log/writers/AndroidLogWriter.java b/mobile/android/base/background/common/log/writers/AndroidLogWriter.java index 9d309844da..782ee6c1df 100644 --- a/mobile/android/base/background/common/log/writers/AndroidLogWriter.java +++ b/mobile/android/base/background/common/log/writers/AndroidLogWriter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.log.writers; +package org.mozilla.goanna.background.common.log.writers; import android.util.Log; diff --git a/mobile/android/base/background/common/log/writers/LevelFilteringLogWriter.java b/mobile/android/base/background/common/log/writers/LevelFilteringLogWriter.java index 74c3608c45..baeabdabba 100644 --- a/mobile/android/base/background/common/log/writers/LevelFilteringLogWriter.java +++ b/mobile/android/base/background/common/log/writers/LevelFilteringLogWriter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.log.writers; +package org.mozilla.goanna.background.common.log.writers; import android.util.Log; diff --git a/mobile/android/base/background/common/log/writers/LogWriter.java b/mobile/android/base/background/common/log/writers/LogWriter.java index acfb099695..d33187aae3 100644 --- a/mobile/android/base/background/common/log/writers/LogWriter.java +++ b/mobile/android/base/background/common/log/writers/LogWriter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.log.writers; +package org.mozilla.goanna.background.common.log.writers; /** * An abstract object that logs information in some way. diff --git a/mobile/android/base/background/common/log/writers/PrintLogWriter.java b/mobile/android/base/background/common/log/writers/PrintLogWriter.java index 6e1f63de32..c719b2410a 100644 --- a/mobile/android/base/background/common/log/writers/PrintLogWriter.java +++ b/mobile/android/base/background/common/log/writers/PrintLogWriter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.log.writers; +package org.mozilla.goanna.background.common.log.writers; import java.io.PrintWriter; diff --git a/mobile/android/base/background/common/log/writers/SimpleTagLogWriter.java b/mobile/android/base/background/common/log/writers/SimpleTagLogWriter.java index a176543716..df849ded6c 100644 --- a/mobile/android/base/background/common/log/writers/SimpleTagLogWriter.java +++ b/mobile/android/base/background/common/log/writers/SimpleTagLogWriter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.log.writers; +package org.mozilla.goanna.background.common.log.writers; /** * Make a LogWriter only log with a single string tag. diff --git a/mobile/android/base/background/common/log/writers/StringLogWriter.java b/mobile/android/base/background/common/log/writers/StringLogWriter.java index d6a9f5eb88..60944658bb 100644 --- a/mobile/android/base/background/common/log/writers/StringLogWriter.java +++ b/mobile/android/base/background/common/log/writers/StringLogWriter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.log.writers; +package org.mozilla.goanna.background.common.log.writers; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/mobile/android/base/background/common/log/writers/TagLogWriter.java b/mobile/android/base/background/common/log/writers/TagLogWriter.java index fbcd94a91b..d09bab748e 100644 --- a/mobile/android/base/background/common/log/writers/TagLogWriter.java +++ b/mobile/android/base/background/common/log/writers/TagLogWriter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.log.writers; +package org.mozilla.goanna.background.common.log.writers; /** * A @link{LogWriter} that logs each message under a parent tag. diff --git a/mobile/android/base/background/common/log/writers/ThreadLocalTagLogWriter.java b/mobile/android/base/background/common/log/writers/ThreadLocalTagLogWriter.java index 0c83504a0b..e63d5a78ca 100644 --- a/mobile/android/base/background/common/log/writers/ThreadLocalTagLogWriter.java +++ b/mobile/android/base/background/common/log/writers/ThreadLocalTagLogWriter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.log.writers; +package org.mozilla.goanna.background.common.log.writers; /** * Log with a single global tag… but that tag can be different for each thread. diff --git a/mobile/android/base/background/common/telemetry/TelemetryWrapper.java b/mobile/android/base/background/common/telemetry/TelemetryWrapper.java index 435bd51d36..6a44c70e28 100644 --- a/mobile/android/base/background/common/telemetry/TelemetryWrapper.java +++ b/mobile/android/base/background/common/telemetry/TelemetryWrapper.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.common.telemetry; +package org.mozilla.goanna.background.common.telemetry; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; /** * Android Background Services are normally built into Fennec, but can also be @@ -34,13 +34,13 @@ public class TelemetryWrapper { public static void addToHistogram(String key, int value) { if (mAddToHistogram == null) { try { - final Class telemetry = Class.forName("org.mozilla.gecko.Telemetry"); + final Class telemetry = Class.forName("org.mozilla.goanna.Telemetry"); mAddToHistogram = telemetry.getMethod("addToHistogram", String.class, int.class); } catch (ClassNotFoundException e) { - Logger.warn(LOG_TAG, "org.mozilla.gecko.Telemetry class found!"); + Logger.warn(LOG_TAG, "org.mozilla.goanna.Telemetry class found!"); return; } catch (NoSuchMethodException e) { - Logger.warn(LOG_TAG, "org.mozilla.gecko.Telemetry.addToHistogram(String, int) method not found!"); + Logger.warn(LOG_TAG, "org.mozilla.goanna.Telemetry.addToHistogram(String, int) method not found!"); return; } } diff --git a/mobile/android/base/background/datareporting/TelemetryRecorder.java b/mobile/android/base/background/datareporting/TelemetryRecorder.java index 7d11a98724..ae8892cec2 100644 --- a/mobile/android/base/background/datareporting/TelemetryRecorder.java +++ b/mobile/android/base/background/datareporting/TelemetryRecorder.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.datareporting; +package org.mozilla.goanna.background.datareporting; import java.io.BufferedOutputStream; import java.io.File; @@ -14,7 +14,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import org.json.JSONObject; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; import android.util.Base64; diff --git a/mobile/android/base/background/db/CursorDumper.java b/mobile/android/base/background/db/CursorDumper.java index bce968b00e..ddd78d2e21 100644 --- a/mobile/android/base/background/db/CursorDumper.java +++ b/mobile/android/base/background/db/CursorDumper.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.db; +package org.mozilla.goanna.background.db; import android.database.Cursor; diff --git a/mobile/android/base/background/db/Tab.java b/mobile/android/base/background/db/Tab.java index f38cfdf0ea..dba24ca96e 100644 --- a/mobile/android/base/background/db/Tab.java +++ b/mobile/android/base/background/db/Tab.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.db; +package org.mozilla.goanna.background.db; import org.json.simple.JSONArray; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.Tabs; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.repositories.android.RepoUtils; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.Tabs; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.repositories.android.RepoUtils; import android.content.ContentValues; import android.database.Cursor; diff --git a/mobile/android/base/background/fxa/FxAccount10AuthDelegate.java b/mobile/android/base/background/fxa/FxAccount10AuthDelegate.java index 3777bd1366..a415bb4e4e 100644 --- a/mobile/android/base/background/fxa/FxAccount10AuthDelegate.java +++ b/mobile/android/base/background/fxa/FxAccount10AuthDelegate.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.security.NoSuchAlgorithmException; import org.json.simple.JSONObject; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.net.SRPConstants; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.net.SRPConstants; public class FxAccount10AuthDelegate implements FxAccountClient10.AuthDelegate { // Fixed by protocol. diff --git a/mobile/android/base/background/fxa/FxAccount10CreateDelegate.java b/mobile/android/base/background/fxa/FxAccount10CreateDelegate.java index 1aba58b05c..36d683b143 100644 --- a/mobile/android/base/background/fxa/FxAccount10CreateDelegate.java +++ b/mobile/android/base/background/fxa/FxAccount10CreateDelegate.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.security.NoSuchAlgorithmException; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.fxa.FxAccountClient10.CreateDelegate; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.net.SRPConstants; +import org.mozilla.goanna.background.fxa.FxAccountClient10.CreateDelegate; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.net.SRPConstants; public class FxAccount10CreateDelegate implements CreateDelegate { protected final String email; diff --git a/mobile/android/base/background/fxa/FxAccount20CreateDelegate.java b/mobile/android/base/background/fxa/FxAccount20CreateDelegate.java index e9f7556cfe..1ebc90cdf5 100644 --- a/mobile/android/base/background/fxa/FxAccount20CreateDelegate.java +++ b/mobile/android/base/background/fxa/FxAccount20CreateDelegate.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.io.UnsupportedEncodingException; import java.security.GeneralSecurityException; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.fxa.FxAccountClient10.CreateDelegate; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.background.fxa.FxAccountClient10.CreateDelegate; +import org.mozilla.goanna.sync.Utils; public class FxAccount20CreateDelegate implements CreateDelegate { protected final byte[] emailUTF8; diff --git a/mobile/android/base/background/fxa/FxAccount20LoginDelegate.java b/mobile/android/base/background/fxa/FxAccount20LoginDelegate.java index 015f698b95..7bb17c6b33 100644 --- a/mobile/android/base/background/fxa/FxAccount20LoginDelegate.java +++ b/mobile/android/base/background/fxa/FxAccount20LoginDelegate.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.io.UnsupportedEncodingException; import java.security.GeneralSecurityException; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.fxa.FxAccountClient10.CreateDelegate; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.background.fxa.FxAccountClient10.CreateDelegate; +import org.mozilla.goanna.sync.Utils; /** * An abstraction around providing an email and authorization token to the auth diff --git a/mobile/android/base/background/fxa/FxAccountAgeLockoutHelper.java b/mobile/android/base/background/fxa/FxAccountAgeLockoutHelper.java index 4b4ac22f3c..69949b6c2c 100644 --- a/mobile/android/base/background/fxa/FxAccountAgeLockoutHelper.java +++ b/mobile/android/base/background/fxa/FxAccountAgeLockoutHelper.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Calendar; import java.util.Locale; -import org.mozilla.gecko.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.FxAccountConstants; /** * Utility to manage COPPA age verification requirements. diff --git a/mobile/android/base/background/fxa/FxAccountClient.java b/mobile/android/base/background/fxa/FxAccountClient.java index 6d16f073f1..c21bda9f59 100644 --- a/mobile/android/base/background/fxa/FxAccountClient.java +++ b/mobile/android/base/background/fxa/FxAccountClient.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.util.Map; -import org.mozilla.gecko.background.fxa.FxAccountClient10.RequestDelegate; -import org.mozilla.gecko.background.fxa.FxAccountClient10.StatusResponse; -import org.mozilla.gecko.background.fxa.FxAccountClient10.TwoKeys; -import org.mozilla.gecko.background.fxa.FxAccountClient20.LoginResponse; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.background.fxa.FxAccountClient10.RequestDelegate; +import org.mozilla.goanna.background.fxa.FxAccountClient10.StatusResponse; +import org.mozilla.goanna.background.fxa.FxAccountClient10.TwoKeys; +import org.mozilla.goanna.background.fxa.FxAccountClient20.LoginResponse; +import org.mozilla.goanna.sync.ExtendedJSONObject; public interface FxAccountClient { public void createAccountAndGetKeys(final byte[] emailUTF8, final PasswordStretcher passwordStretcher, final Map queryParameters, final RequestDelegate delegate); diff --git a/mobile/android/base/background/fxa/FxAccountClient10.java b/mobile/android/base/background/fxa/FxAccountClient10.java index 5ed1ffcc0c..65f1f3d12d 100644 --- a/mobile/android/base/background/fxa/FxAccountClient10.java +++ b/mobile/android/base/background/fxa/FxAccountClient10.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -21,19 +21,19 @@ import java.util.concurrent.Executor; import javax.crypto.Mac; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientMalformedResponseException; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.crypto.HKDF; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.net.HawkAuthHeaderProvider; -import org.mozilla.gecko.sync.net.Resource; -import org.mozilla.gecko.sync.net.SyncResponse; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientMalformedResponseException; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientRemoteException; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.crypto.HKDF; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.net.HawkAuthHeaderProvider; +import org.mozilla.goanna.sync.net.Resource; +import org.mozilla.goanna.sync.net.SyncResponse; +import org.mozilla.goanna.sync.net.SyncStorageResponse; import ch.boye.httpclientandroidlib.HttpEntity; import ch.boye.httpclientandroidlib.HttpHeaders; diff --git a/mobile/android/base/background/fxa/FxAccountClient20.java b/mobile/android/base/background/fxa/FxAccountClient20.java index 52b6e42c95..8bc5c90822 100644 --- a/mobile/android/base/background/fxa/FxAccountClient20.java +++ b/mobile/android/base/background/fxa/FxAccountClient20.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executor; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.net.BaseResource; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientRemoteException; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.net.BaseResource; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/background/fxa/FxAccountClientException.java b/mobile/android/base/background/fxa/FxAccountClientException.java index 28ee5630ed..11723179c3 100644 --- a/mobile/android/base/background/fxa/FxAccountClientException.java +++ b/mobile/android/base/background/fxa/FxAccountClientException.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; -import org.mozilla.gecko.R; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.HTTPFailureException; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.R; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.HTTPFailureException; +import org.mozilla.goanna.sync.net.SyncStorageResponse; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.HttpStatus; diff --git a/mobile/android/base/background/fxa/FxAccountRemoteError.java b/mobile/android/base/background/fxa/FxAccountRemoteError.java index b89fb89dd2..6aea0da91f 100644 --- a/mobile/android/base/background/fxa/FxAccountRemoteError.java +++ b/mobile/android/base/background/fxa/FxAccountRemoteError.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; public interface FxAccountRemoteError { public static final int ATTEMPT_TO_CREATE_AN_ACCOUNT_THAT_ALREADY_EXISTS = 101; diff --git a/mobile/android/base/background/fxa/FxAccountUtils.java b/mobile/android/base/background/fxa/FxAccountUtils.java index 2d29725a07..b763fd7bc1 100644 --- a/mobile/android/base/background/fxa/FxAccountUtils.java +++ b/mobile/android/base/background/fxa/FxAccountUtils.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.io.UnsupportedEncodingException; import java.math.BigInteger; @@ -12,14 +12,14 @@ import java.security.GeneralSecurityException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.nativecode.NativeCrypto; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.crypto.HKDF; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.crypto.PBKDF2; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.nativecode.NativeCrypto; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.crypto.HKDF; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.crypto.PBKDF2; import android.content.Context; diff --git a/mobile/android/base/background/fxa/PasswordStretcher.java b/mobile/android/base/background/fxa/PasswordStretcher.java index 2debf3c77e..2f8808ba5c 100644 --- a/mobile/android/base/background/fxa/PasswordStretcher.java +++ b/mobile/android/base/background/fxa/PasswordStretcher.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.io.UnsupportedEncodingException; import java.security.GeneralSecurityException; diff --git a/mobile/android/base/background/fxa/QuickPasswordStretcher.java b/mobile/android/base/background/fxa/QuickPasswordStretcher.java index bf4b1bc975..f3a28d7fab 100644 --- a/mobile/android/base/background/fxa/QuickPasswordStretcher.java +++ b/mobile/android/base/background/fxa/QuickPasswordStretcher.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.io.UnsupportedEncodingException; import java.security.GeneralSecurityException; import java.util.HashMap; import java.util.Map; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.sync.Utils; public class QuickPasswordStretcher implements PasswordStretcher { protected final String password; diff --git a/mobile/android/base/background/fxa/SkewHandler.java b/mobile/android/base/background/fxa/SkewHandler.java index 9d0ad5e030..cc533ff1b8 100644 --- a/mobile/android/base/background/fxa/SkewHandler.java +++ b/mobile/android/base/background/fxa/SkewHandler.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa; +package org.mozilla.goanna.background.fxa; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.net.Resource; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.net.Resource; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.HttpHeaders; diff --git a/mobile/android/base/background/fxa/oauth/FxAccountAbstractClient.java b/mobile/android/base/background/fxa/oauth/FxAccountAbstractClient.java index bd7712ffe2..9c9b9ee525 100644 --- a/mobile/android/base/background/fxa/oauth/FxAccountAbstractClient.java +++ b/mobile/android/base/background/fxa/oauth/FxAccountAbstractClient.java @@ -2,25 +2,25 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa.oauth; +package org.mozilla.goanna.background.fxa.oauth; import java.io.IOException; import java.security.GeneralSecurityException; import java.util.Locale; import java.util.concurrent.Executor; -import org.mozilla.gecko.background.fxa.FxAccountClientException; -import org.mozilla.gecko.background.fxa.oauth.FxAccountAbstractClientException.FxAccountAbstractClientMalformedResponseException; -import org.mozilla.gecko.background.fxa.oauth.FxAccountAbstractClientException.FxAccountAbstractClientRemoteException; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.net.Resource; -import org.mozilla.gecko.sync.net.SyncResponse; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.background.fxa.FxAccountClientException; +import org.mozilla.goanna.background.fxa.oauth.FxAccountAbstractClientException.FxAccountAbstractClientMalformedResponseException; +import org.mozilla.goanna.background.fxa.oauth.FxAccountAbstractClientException.FxAccountAbstractClientRemoteException; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.net.Resource; +import org.mozilla.goanna.sync.net.SyncResponse; +import org.mozilla.goanna.sync.net.SyncStorageResponse; import ch.boye.httpclientandroidlib.HttpEntity; import ch.boye.httpclientandroidlib.HttpHeaders; diff --git a/mobile/android/base/background/fxa/oauth/FxAccountAbstractClientException.java b/mobile/android/base/background/fxa/oauth/FxAccountAbstractClientException.java index 21025af0a7..3048c2a16f 100644 --- a/mobile/android/base/background/fxa/oauth/FxAccountAbstractClientException.java +++ b/mobile/android/base/background/fxa/oauth/FxAccountAbstractClientException.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa.oauth; +package org.mozilla.goanna.background.fxa.oauth; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.HTTPFailureException; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.HTTPFailureException; +import org.mozilla.goanna.sync.net.SyncStorageResponse; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.HttpStatus; diff --git a/mobile/android/base/background/fxa/oauth/FxAccountOAuthClient10.java b/mobile/android/base/background/fxa/oauth/FxAccountOAuthClient10.java index c8480e73b5..45b9a6d2ba 100644 --- a/mobile/android/base/background/fxa/oauth/FxAccountOAuthClient10.java +++ b/mobile/android/base/background/fxa/oauth/FxAccountOAuthClient10.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa.oauth; +package org.mozilla.goanna.background.fxa.oauth; import java.net.URI; import java.net.URISyntaxException; import java.util.concurrent.Executor; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.net.BaseResource; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.net.BaseResource; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/background/fxa/oauth/FxAccountOAuthRemoteError.java b/mobile/android/base/background/fxa/oauth/FxAccountOAuthRemoteError.java index d949d316be..21ed65c2b5 100644 --- a/mobile/android/base/background/fxa/oauth/FxAccountOAuthRemoteError.java +++ b/mobile/android/base/background/fxa/oauth/FxAccountOAuthRemoteError.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa.oauth; +package org.mozilla.goanna.background.fxa.oauth; public interface FxAccountOAuthRemoteError { public static final int ATTEMPT_TO_CREATE_AN_ACCOUNT_THAT_ALREADY_EXISTS = 101; diff --git a/mobile/android/base/background/fxa/profile/FxAccountProfileClient10.java b/mobile/android/base/background/fxa/profile/FxAccountProfileClient10.java index cb851a8db3..c090c86429 100644 --- a/mobile/android/base/background/fxa/profile/FxAccountProfileClient10.java +++ b/mobile/android/base/background/fxa/profile/FxAccountProfileClient10.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.fxa.profile; +package org.mozilla.goanna.background.fxa.profile; import java.net.URI; import java.net.URISyntaxException; import java.util.concurrent.Executor; -import org.mozilla.gecko.background.fxa.oauth.FxAccountAbstractClient; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BearerAuthHeaderProvider; +import org.mozilla.goanna.background.fxa.oauth.FxAccountAbstractClient; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BearerAuthHeaderProvider; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/background/healthreport/AndroidConfigurationProvider.java b/mobile/android/base/background/healthreport/AndroidConfigurationProvider.java index 4c3427ac85..f488e4aa42 100644 --- a/mobile/android/base/background/healthreport/AndroidConfigurationProvider.java +++ b/mobile/android/base/background/healthreport/AndroidConfigurationProvider.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; -import org.mozilla.gecko.background.healthreport.Environment.UIType; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder.ConfigurationProvider; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.background.healthreport.Environment.UIType; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder.ConfigurationProvider; +import org.mozilla.goanna.util.HardwareUtils; import android.content.Context; import android.content.res.Configuration; diff --git a/mobile/android/base/background/healthreport/Environment.java b/mobile/android/base/background/healthreport/Environment.java index 00587c407b..2211f933c4 100644 --- a/mobile/android/base/background/healthreport/Environment.java +++ b/mobile/android/base/background/healthreport/Environment.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; /** * This captures all of the details that define an 'environment' for FHR's purposes. diff --git a/mobile/android/base/background/healthreport/EnvironmentBuilder.java b/mobile/android/base/background/healthreport/EnvironmentBuilder.java index ed9932124c..67ea8482d8 100644 --- a/mobile/android/base/background/healthreport/EnvironmentBuilder.java +++ b/mobile/android/base/background/healthreport/EnvironmentBuilder.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; import java.util.Iterator; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.SysInfo; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.Environment.UIType; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.SysInfo; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.Environment.UIType; import android.content.ContentProvider; import android.content.ContentProviderClient; diff --git a/mobile/android/base/background/healthreport/EnvironmentV1.java b/mobile/android/base/background/healthreport/EnvironmentV1.java index d37902796f..2d4618443c 100644 --- a/mobile/android/base/background/healthreport/EnvironmentV1.java +++ b/mobile/android/base/background/healthreport/EnvironmentV1.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; import java.io.UnsupportedEncodingException; import java.security.NoSuchAlgorithmException; @@ -12,8 +12,8 @@ import java.util.SortedSet; import org.json.JSONException; import org.json.JSONObject; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.nativecode.NativeCrypto; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.nativecode.NativeCrypto; public abstract class EnvironmentV1 { private static final String LOG_TAG = "GoannaEnvironment"; @@ -36,7 +36,7 @@ public abstract class EnvironmentV1 { public String sysName; public String sysVersion; // Kernel. - // geckoAppInfo. + // goannaAppInfo. public String vendor; public String appName; public String appID; diff --git a/mobile/android/base/background/healthreport/EnvironmentV2.java b/mobile/android/base/background/healthreport/EnvironmentV2.java index e531faa3d3..c7d13ccd99 100644 --- a/mobile/android/base/background/healthreport/EnvironmentV2.java +++ b/mobile/android/base/background/healthreport/EnvironmentV2.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; public abstract class EnvironmentV2 extends EnvironmentV1 { private static final int VERSION = 2; diff --git a/mobile/android/base/background/healthreport/HealthReportBroadcastReceiver.java b/mobile/android/base/background/healthreport/HealthReportBroadcastReceiver.java index 8a35ce854f..133a47fca4 100644 --- a/mobile/android/base/background/healthreport/HealthReportBroadcastReceiver.java +++ b/mobile/android/base/background/healthreport/HealthReportBroadcastReceiver.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/background/healthreport/HealthReportBroadcastService.java b/mobile/android/base/background/healthreport/HealthReportBroadcastService.java index 38efd8abb6..376e48e964 100644 --- a/mobile/android/base/background/healthreport/HealthReportBroadcastService.java +++ b/mobile/android/base/background/healthreport/HealthReportBroadcastService.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; -import org.mozilla.gecko.background.BackgroundService; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.prune.HealthReportPruneService; -import org.mozilla.gecko.background.healthreport.upload.HealthReportUploadService; -import org.mozilla.gecko.background.healthreport.upload.ObsoleteDocumentTracker; +import org.mozilla.goanna.background.BackgroundService; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.prune.HealthReportPruneService; +import org.mozilla.goanna.background.healthreport.upload.HealthReportUploadService; +import org.mozilla.goanna.background.healthreport.upload.ObsoleteDocumentTracker; import android.app.AlarmManager; import android.app.PendingIntent; diff --git a/mobile/android/base/background/healthreport/HealthReportConstants.java b/mobile/android/base/background/healthreport/HealthReportConstants.java index 6ce1f66a3a..1e1d7d51be 100644 --- a/mobile/android/base/background/healthreport/HealthReportConstants.java +++ b/mobile/android/base/background/healthreport/HealthReportConstants.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.AppConstants; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.AppConstants; public class HealthReportConstants { public static final String HEALTH_AUTHORITY = AppConstants.ANDROID_PACKAGE_NAME + ".health"; diff --git a/mobile/android/base/background/healthreport/HealthReportDatabaseStorage.java b/mobile/android/base/background/healthreport/HealthReportDatabaseStorage.java index f9b0244fae..93d6921551 100644 --- a/mobile/android/base/background/healthreport/HealthReportDatabaseStorage.java +++ b/mobile/android/base/background/healthreport/HealthReportDatabaseStorage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; import java.io.File; import java.util.Collection; @@ -12,9 +12,9 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; import org.json.JSONObject; -import org.mozilla.gecko.background.common.DateUtils; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.HealthReportStorage.MeasurementFields.FieldSpec; +import org.mozilla.goanna.background.common.DateUtils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.HealthReportStorage.MeasurementFields.FieldSpec; import android.content.ContentValues; import android.content.Context; diff --git a/mobile/android/base/background/healthreport/HealthReportDatabases.java b/mobile/android/base/background/healthreport/HealthReportDatabases.java index eb5930f09d..70fcd78f29 100644 --- a/mobile/android/base/background/healthreport/HealthReportDatabases.java +++ b/mobile/android/base/background/healthreport/HealthReportDatabases.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; import java.io.File; import java.util.HashMap; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; import android.content.Context; diff --git a/mobile/android/base/background/healthreport/HealthReportGenerator.java b/mobile/android/base/background/healthreport/HealthReportGenerator.java index 5c2402beed..2802be5a5f 100644 --- a/mobile/android/base/background/healthreport/HealthReportGenerator.java +++ b/mobile/android/base/background/healthreport/HealthReportGenerator.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; import java.util.HashSet; import java.util.Iterator; @@ -10,10 +10,10 @@ import java.util.Set; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.background.common.DateUtils.DateFormatter; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder.ConfigurationProvider; -import org.mozilla.gecko.background.healthreport.HealthReportStorage.Field; +import org.mozilla.goanna.background.common.DateUtils.DateFormatter; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder.ConfigurationProvider; +import org.mozilla.goanna.background.healthreport.HealthReportStorage.Field; import android.database.Cursor; import android.util.SparseArray; @@ -274,7 +274,7 @@ public class HealthReportGenerator { public static JSONObject jsonify(Environment e, Environment current) throws JSONException { JSONObject age = getProfileAge(e, current); JSONObject sysinfo = getSysInfo(e, current); - JSONObject gecko = getGoannaInfo(e, current); + JSONObject goanna = getGoannaInfo(e, current); JSONObject appinfo = getAppInfo(e, current); JSONObject counts = getAddonCounts(e, current); JSONObject config = getDeviceConfig(e, current); @@ -284,8 +284,8 @@ public class HealthReportGenerator { out.put("org.mozilla.profile.age", age); if (sysinfo != null) out.put("org.mozilla.sysinfo.sysinfo", sysinfo); - if (gecko != null) - out.put("geckoAppInfo", gecko); + if (goanna != null) + out.put("goannaAppInfo", goanna); if (appinfo != null) out.put("org.mozilla.appInfo.appinfo", appinfo); if (counts != null) @@ -399,53 +399,53 @@ public class HealthReportGenerator { } private static JSONObject getGoannaInfo(Environment e, Environment current) throws JSONException { - JSONObject gecko = new JSONObject(); + JSONObject goanna = new JSONObject(); int changes = 0; if (current == null || !current.vendor.equals(e.vendor)) { - gecko.put("vendor", e.vendor); + goanna.put("vendor", e.vendor); changes++; } if (current == null || !current.appName.equals(e.appName)) { - gecko.put("name", e.appName); + goanna.put("name", e.appName); changes++; } if (current == null || !current.appID.equals(e.appID)) { - gecko.put("id", e.appID); + goanna.put("id", e.appID); changes++; } if (current == null || !current.appVersion.equals(e.appVersion)) { - gecko.put("version", e.appVersion); + goanna.put("version", e.appVersion); changes++; } if (current == null || !current.appBuildID.equals(e.appBuildID)) { - gecko.put("appBuildID", e.appBuildID); + goanna.put("appBuildID", e.appBuildID); changes++; } if (current == null || !current.platformVersion.equals(e.platformVersion)) { - gecko.put("platformVersion", e.platformVersion); + goanna.put("platformVersion", e.platformVersion); changes++; } if (current == null || !current.platformBuildID.equals(e.platformBuildID)) { - gecko.put("platformBuildID", e.platformBuildID); + goanna.put("platformBuildID", e.platformBuildID); changes++; } if (current == null || !current.os.equals(e.os)) { - gecko.put("os", e.os); + goanna.put("os", e.os); changes++; } if (current == null || !current.xpcomabi.equals(e.xpcomabi)) { - gecko.put("xpcomabi", e.xpcomabi); + goanna.put("xpcomabi", e.xpcomabi); changes++; } if (current == null || !current.updateChannel.equals(e.updateChannel)) { - gecko.put("updateChannel", e.updateChannel); + goanna.put("updateChannel", e.updateChannel); changes++; } if (current != null && changes == 0) { return null; } - gecko.put("_v", 1); - return gecko; + goanna.put("_v", 1); + return goanna; } // Null-safe string comparison. diff --git a/mobile/android/base/background/healthreport/HealthReportProvider.java b/mobile/android/base/background/healthreport/HealthReportProvider.java index a7b4f81683..070fd3568d 100644 --- a/mobile/android/base/background/healthreport/HealthReportProvider.java +++ b/mobile/android/base/background/healthreport/HealthReportProvider.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; -import org.mozilla.gecko.background.healthreport.HealthReportDatabaseStorage.DatabaseEnvironment; -import org.mozilla.gecko.background.healthreport.HealthReportStorage.Field; -import org.mozilla.gecko.background.healthreport.HealthReportStorage.MeasurementFields; -import org.mozilla.gecko.background.healthreport.HealthReportStorage.MeasurementFields.FieldSpec; +import org.mozilla.goanna.background.healthreport.HealthReportDatabaseStorage.DatabaseEnvironment; +import org.mozilla.goanna.background.healthreport.HealthReportStorage.Field; +import org.mozilla.goanna.background.healthreport.HealthReportStorage.MeasurementFields; +import org.mozilla.goanna.background.healthreport.HealthReportStorage.MeasurementFields.FieldSpec; import android.content.ContentProvider; import android.content.ContentUris; @@ -29,16 +29,16 @@ import android.net.Uri; * each of these by integer ID. * * Insert = daily discrete. - * content://org.mozilla.gecko.health/events/env/measurement/v/field + * content://org.mozilla.goanna.health/events/env/measurement/v/field * * Update = daily last or daily counter - * content://org.mozilla.gecko.health/events/env/measurement/v/field/counter - * content://org.mozilla.gecko.health/events/env/measurement/v/field/last + * content://org.mozilla.goanna.health/events/env/measurement/v/field/counter + * content://org.mozilla.goanna.health/events/env/measurement/v/field/last * * Delete = drop today's row - * content://org.mozilla.gecko.health/events/env/measurement/v/field/ + * content://org.mozilla.goanna.health/events/env/measurement/v/field/ * - * Query, of course: content://org.mozilla.gecko.health/events/?since + * Query, of course: content://org.mozilla.goanna.health/events/?since * * Each operation accepts an optional `time` query parameter, formatted as * milliseconds since epoch. If omitted, it defaults to the current time. @@ -266,7 +266,7 @@ public class HealthReportProvider extends ContentProvider { /** * Assumes a URI structured like: * - * content://org.mozilla.gecko.health/events/env/measurement/v/field + * content://org.mozilla.goanna.health/events/env/measurement/v/field * * @param uri a URI formatted as expected. * @return a {@link Field} instance. diff --git a/mobile/android/base/background/healthreport/HealthReportStorage.java b/mobile/android/base/background/healthreport/HealthReportStorage.java index 4e9b9d641e..dd7b68abb4 100644 --- a/mobile/android/base/background/healthreport/HealthReportStorage.java +++ b/mobile/android/base/background/healthreport/HealthReportStorage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; import org.json.JSONObject; diff --git a/mobile/android/base/background/healthreport/HealthReportUtils.java b/mobile/android/base/background/healthreport/HealthReportUtils.java index 4c72b52d73..59e6840d97 100644 --- a/mobile/android/base/background/healthreport/HealthReportUtils.java +++ b/mobile/android/base/background/healthreport/HealthReportUtils.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; import java.util.HashSet; import java.util.Iterator; diff --git a/mobile/android/base/background/healthreport/ProfileInformationCache.java b/mobile/android/base/background/healthreport/ProfileInformationCache.java index 8c0a2e8256..5b40b00ef8 100644 --- a/mobile/android/base/background/healthreport/ProfileInformationCache.java +++ b/mobile/android/base/background/healthreport/ProfileInformationCache.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport; +package org.mozilla.goanna.background.healthreport; import java.io.File; import java.io.FileNotFoundException; @@ -15,8 +15,8 @@ import java.util.Scanner; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder.ProfileInformationProvider; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder.ProfileInformationProvider; /** * There are some parts of the FHR environment that can't be readily computed diff --git a/mobile/android/base/background/healthreport/prune/HealthReportPruneService.java b/mobile/android/base/background/healthreport/prune/HealthReportPruneService.java index 2427cc42c0..b5e1f8f4ab 100644 --- a/mobile/android/base/background/healthreport/prune/HealthReportPruneService.java +++ b/mobile/android/base/background/healthreport/prune/HealthReportPruneService.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport.prune; +package org.mozilla.goanna.background.healthreport.prune; -import org.mozilla.gecko.background.BackgroundService; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.HealthReportConstants; +import org.mozilla.goanna.background.BackgroundService; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.HealthReportConstants; import android.content.Intent; import android.content.SharedPreferences; diff --git a/mobile/android/base/background/healthreport/prune/PrunePolicy.java b/mobile/android/base/background/healthreport/prune/PrunePolicy.java index 01b1fe775d..918eef6f6d 100644 --- a/mobile/android/base/background/healthreport/prune/PrunePolicy.java +++ b/mobile/android/base/background/healthreport/prune/PrunePolicy.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport.prune; +package org.mozilla.goanna.background.healthreport.prune; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.HealthReportConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.HealthReportConstants; import android.content.SharedPreferences; diff --git a/mobile/android/base/background/healthreport/prune/PrunePolicyDatabaseStorage.java b/mobile/android/base/background/healthreport/prune/PrunePolicyDatabaseStorage.java index 7082babd94..9e978a98ce 100644 --- a/mobile/android/base/background/healthreport/prune/PrunePolicyDatabaseStorage.java +++ b/mobile/android/base/background/healthreport/prune/PrunePolicyDatabaseStorage.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport.prune; +package org.mozilla.goanna.background.healthreport.prune; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.AndroidConfigurationProvider; -import org.mozilla.gecko.background.healthreport.Environment; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder.ConfigurationProvider; -import org.mozilla.gecko.background.healthreport.HealthReportDatabaseStorage; -import org.mozilla.gecko.background.healthreport.ProfileInformationCache; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.AndroidConfigurationProvider; +import org.mozilla.goanna.background.healthreport.Environment; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder.ConfigurationProvider; +import org.mozilla.goanna.background.healthreport.HealthReportDatabaseStorage; +import org.mozilla.goanna.background.healthreport.ProfileInformationCache; import android.content.ContentProviderClient; import android.content.Context; diff --git a/mobile/android/base/background/healthreport/prune/PrunePolicyStorage.java b/mobile/android/base/background/healthreport/prune/PrunePolicyStorage.java index e8b3b013b3..1be5cab96e 100644 --- a/mobile/android/base/background/healthreport/prune/PrunePolicyStorage.java +++ b/mobile/android/base/background/healthreport/prune/PrunePolicyStorage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport.prune; +package org.mozilla.goanna.background.healthreport.prune; /** * Abstracts over the Storage instance behind the PrunePolicy. diff --git a/mobile/android/base/background/healthreport/upload/AndroidSubmissionClient.java b/mobile/android/base/background/healthreport/upload/AndroidSubmissionClient.java index b7ebfc28e1..54b89bb73a 100644 --- a/mobile/android/base/background/healthreport/upload/AndroidSubmissionClient.java +++ b/mobile/android/base/background/healthreport/upload/AndroidSubmissionClient.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport.upload; +package org.mozilla.goanna.background.healthreport.upload; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -12,23 +12,23 @@ import java.util.Collection; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.BrowserLocaleManager; -import org.mozilla.gecko.background.bagheera.BagheeraClient; -import org.mozilla.gecko.background.bagheera.BagheeraRequestDelegate; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.AndroidConfigurationProvider; -import org.mozilla.gecko.background.healthreport.Environment; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder.ConfigurationProvider; -import org.mozilla.gecko.background.healthreport.HealthReportConstants; -import org.mozilla.gecko.background.healthreport.HealthReportDatabaseStorage; -import org.mozilla.gecko.background.healthreport.HealthReportGenerator; -import org.mozilla.gecko.background.healthreport.HealthReportStorage; -import org.mozilla.gecko.background.healthreport.HealthReportStorage.Field; -import org.mozilla.gecko.background.healthreport.HealthReportStorage.MeasurementFields; -import org.mozilla.gecko.background.healthreport.ProfileInformationCache; -import org.mozilla.gecko.sync.net.BaseResource; +import org.mozilla.goanna.BrowserLocaleManager; +import org.mozilla.goanna.background.bagheera.BagheeraClient; +import org.mozilla.goanna.background.bagheera.BagheeraRequestDelegate; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.AndroidConfigurationProvider; +import org.mozilla.goanna.background.healthreport.Environment; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder.ConfigurationProvider; +import org.mozilla.goanna.background.healthreport.HealthReportConstants; +import org.mozilla.goanna.background.healthreport.HealthReportDatabaseStorage; +import org.mozilla.goanna.background.healthreport.HealthReportGenerator; +import org.mozilla.goanna.background.healthreport.HealthReportStorage; +import org.mozilla.goanna.background.healthreport.HealthReportStorage.Field; +import org.mozilla.goanna.background.healthreport.HealthReportStorage.MeasurementFields; +import org.mozilla.goanna.background.healthreport.ProfileInformationCache; +import org.mozilla.goanna.sync.net.BaseResource; import android.content.ContentProviderClient; import android.content.Context; diff --git a/mobile/android/base/background/healthreport/upload/HealthReportUploadService.java b/mobile/android/base/background/healthreport/upload/HealthReportUploadService.java index d83d848a19..e12609241d 100644 --- a/mobile/android/base/background/healthreport/upload/HealthReportUploadService.java +++ b/mobile/android/base/background/healthreport/upload/HealthReportUploadService.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport.upload; +package org.mozilla.goanna.background.healthreport.upload; -import org.mozilla.gecko.background.BackgroundService; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.HealthReportConstants; +import org.mozilla.goanna.background.BackgroundService; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.HealthReportConstants; import android.content.Intent; import android.content.SharedPreferences; diff --git a/mobile/android/base/background/healthreport/upload/ObsoleteDocumentTracker.java b/mobile/android/base/background/healthreport/upload/ObsoleteDocumentTracker.java index 0e03ddd2ce..067522b98f 100644 --- a/mobile/android/base/background/healthreport/upload/ObsoleteDocumentTracker.java +++ b/mobile/android/base/background/healthreport/upload/ObsoleteDocumentTracker.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport.upload; +package org.mozilla.goanna.background.healthreport.upload; import java.util.ArrayList; import java.util.Collection; @@ -13,9 +13,9 @@ import java.util.List; import java.util.Map.Entry; import java.util.Set; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.HealthReportConstants; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.HealthReportConstants; +import org.mozilla.goanna.sync.ExtendedJSONObject; import android.content.SharedPreferences; diff --git a/mobile/android/base/background/healthreport/upload/SubmissionClient.java b/mobile/android/base/background/healthreport/upload/SubmissionClient.java index a21394c908..3552873030 100644 --- a/mobile/android/base/background/healthreport/upload/SubmissionClient.java +++ b/mobile/android/base/background/healthreport/upload/SubmissionClient.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport.upload; +package org.mozilla.goanna.background.healthreport.upload; import java.util.Collection; diff --git a/mobile/android/base/background/healthreport/upload/SubmissionPolicy.java b/mobile/android/base/background/healthreport/upload/SubmissionPolicy.java index fbf6a7e134..85b685a2c9 100644 --- a/mobile/android/base/background/healthreport/upload/SubmissionPolicy.java +++ b/mobile/android/base/background/healthreport/upload/SubmissionPolicy.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.healthreport.upload; +package org.mozilla.goanna.background.healthreport.upload; import java.net.MalformedURLException; import java.net.SocketException; import java.net.UnknownHostException; import java.util.Collection; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.healthreport.HealthReportConstants; -import org.mozilla.gecko.background.healthreport.HealthReportUtils; -import org.mozilla.gecko.background.healthreport.upload.SubmissionClient.Delegate; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.healthreport.HealthReportConstants; +import org.mozilla.goanna.background.healthreport.HealthReportUtils; +import org.mozilla.goanna.background.healthreport.upload.SubmissionClient.Delegate; import android.content.SharedPreferences; diff --git a/mobile/android/base/background/nativecode/NativeCrypto.java b/mobile/android/base/background/nativecode/NativeCrypto.java index a48c486271..64ad3aaa99 100644 --- a/mobile/android/base/background/nativecode/NativeCrypto.java +++ b/mobile/android/base/background/nativecode/NativeCrypto.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.background.nativecode; +package org.mozilla.goanna.background.nativecode; import java.security.GeneralSecurityException; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.mozglue.RobocopTarget; import android.util.Log; diff --git a/mobile/android/base/background/preferences/PreferenceFragment.java b/mobile/android/base/background/preferences/PreferenceFragment.java index 1036d2abcf..f610f66f8e 100644 --- a/mobile/android/base/background/preferences/PreferenceFragment.java +++ b/mobile/android/base/background/preferences/PreferenceFragment.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.mozilla.gecko.background.preferences; +package org.mozilla.goanna.background.preferences; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Intent; import android.os.Bundle; diff --git a/mobile/android/base/background/preferences/PreferenceManagerCompat.java b/mobile/android/base/background/preferences/PreferenceManagerCompat.java index 22c62e4318..1effe47fb2 100644 --- a/mobile/android/base/background/preferences/PreferenceManagerCompat.java +++ b/mobile/android/base/background/preferences/PreferenceManagerCompat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mozilla.gecko.background.preferences; +package org.mozilla.goanna.background.preferences; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/mobile/android/base/browserid/ASNUtils.java b/mobile/android/base/browserid/ASNUtils.java index b032067c5e..9e4e624dcd 100644 --- a/mobile/android/base/browserid/ASNUtils.java +++ b/mobile/android/base/browserid/ASNUtils.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid; +package org.mozilla.goanna.browserid; /** diff --git a/mobile/android/base/browserid/BrowserIDKeyPair.java b/mobile/android/base/browserid/BrowserIDKeyPair.java index 7283a0299a..9c22b04854 100644 --- a/mobile/android/base/browserid/BrowserIDKeyPair.java +++ b/mobile/android/base/browserid/BrowserIDKeyPair.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid; +package org.mozilla.goanna.browserid; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.ExtendedJSONObject; public class BrowserIDKeyPair { public static final String JSON_KEY_PRIVATEKEY = "privateKey"; diff --git a/mobile/android/base/browserid/DSACryptoImplementation.java b/mobile/android/base/browserid/DSACryptoImplementation.java index 74ce82d57c..877ee447c1 100644 --- a/mobile/android/base/browserid/DSACryptoImplementation.java +++ b/mobile/android/base/browserid/DSACryptoImplementation.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid; +package org.mozilla.goanna.browserid; import java.math.BigInteger; import java.security.GeneralSecurityException; @@ -19,9 +19,9 @@ import java.security.spec.DSAPublicKeySpec; import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.Utils; public class DSACryptoImplementation { public static final String SIGNATURE_ALGORITHM = "SHA1withDSA"; diff --git a/mobile/android/base/browserid/JSONWebTokenUtils.java b/mobile/android/base/browserid/JSONWebTokenUtils.java index a236ecdf12..bfc9bda2ea 100644 --- a/mobile/android/base/browserid/JSONWebTokenUtils.java +++ b/mobile/android/base/browserid/JSONWebTokenUtils.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid; +package org.mozilla.goanna.browserid; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -15,9 +15,9 @@ import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; import org.mozilla.apache.commons.codec.binary.Base64; import org.mozilla.apache.commons.codec.binary.StringUtils; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.Utils; /** * Encode and decode JSON Web Tokens. diff --git a/mobile/android/base/browserid/MockMyIDTokenFactory.java b/mobile/android/base/browserid/MockMyIDTokenFactory.java index c807d4cbbd..70b93a3dbd 100644 --- a/mobile/android/base/browserid/MockMyIDTokenFactory.java +++ b/mobile/android/base/browserid/MockMyIDTokenFactory.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid; +package org.mozilla.goanna.browserid; import java.math.BigInteger; import java.security.NoSuchAlgorithmException; diff --git a/mobile/android/base/browserid/RSACryptoImplementation.java b/mobile/android/base/browserid/RSACryptoImplementation.java index 902f6fb4d6..4bf6f045ec 100644 --- a/mobile/android/base/browserid/RSACryptoImplementation.java +++ b/mobile/android/base/browserid/RSACryptoImplementation.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid; +package org.mozilla.goanna.browserid; import java.math.BigInteger; import java.security.GeneralSecurityException; @@ -18,8 +18,8 @@ import java.security.spec.KeySpec; import java.security.spec.RSAPrivateKeySpec; import java.security.spec.RSAPublicKeySpec; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; public class RSACryptoImplementation { public static final String SIGNATURE_ALGORITHM = "SHA256withRSA"; diff --git a/mobile/android/base/browserid/SigningPrivateKey.java b/mobile/android/base/browserid/SigningPrivateKey.java index 6c388d1673..d33ed9bd56 100644 --- a/mobile/android/base/browserid/SigningPrivateKey.java +++ b/mobile/android/base/browserid/SigningPrivateKey.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid; +package org.mozilla.goanna.browserid; import java.security.GeneralSecurityException; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.ExtendedJSONObject; public interface SigningPrivateKey { /** diff --git a/mobile/android/base/browserid/VerifyingPublicKey.java b/mobile/android/base/browserid/VerifyingPublicKey.java index 74b534b90c..14e6fbed2f 100644 --- a/mobile/android/base/browserid/VerifyingPublicKey.java +++ b/mobile/android/base/browserid/VerifyingPublicKey.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid; +package org.mozilla.goanna.browserid; import java.security.GeneralSecurityException; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.ExtendedJSONObject; public interface VerifyingPublicKey { diff --git a/mobile/android/base/browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java b/mobile/android/base/browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java index aa8db2d481..771abacf74 100644 --- a/mobile/android/base/browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java +++ b/mobile/android/base/browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid.verifier; +package org.mozilla.goanna.browserid.verifier; import java.io.IOException; import java.net.URI; import java.security.GeneralSecurityException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.browserid.verifier.BrowserIDVerifierException.BrowserIDVerifierErrorResponseException; -import org.mozilla.gecko.browserid.verifier.BrowserIDVerifierException.BrowserIDVerifierMalformedResponseException; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.net.Resource; -import org.mozilla.gecko.sync.net.SyncResponse; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.browserid.verifier.BrowserIDVerifierException.BrowserIDVerifierErrorResponseException; +import org.mozilla.goanna.browserid.verifier.BrowserIDVerifierException.BrowserIDVerifierMalformedResponseException; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.net.Resource; +import org.mozilla.goanna.sync.net.SyncResponse; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.client.ClientProtocolException; diff --git a/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient10.java b/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient10.java index f61a82323f..dc48c658eb 100644 --- a/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient10.java +++ b/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient10.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid.verifier; +package org.mozilla.goanna.browserid.verifier; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -10,7 +10,7 @@ import java.net.URISyntaxException; import java.util.Arrays; import java.util.List; -import org.mozilla.gecko.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResource; import ch.boye.httpclientandroidlib.NameValuePair; import ch.boye.httpclientandroidlib.client.entity.UrlEncodedFormEntity; diff --git a/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient20.java b/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient20.java index 013856576d..dc62f54af7 100644 --- a/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient20.java +++ b/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient20.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid.verifier; +package org.mozilla.goanna.browserid.verifier; import java.net.URI; import java.net.URISyntaxException; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.net.BaseResource; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.net.BaseResource; /** * The verifier protocol changed: version 1 posts form-encoded data; version 2 diff --git a/mobile/android/base/browserid/verifier/BrowserIDVerifierClient.java b/mobile/android/base/browserid/verifier/BrowserIDVerifierClient.java index 67a327f198..9777449a35 100644 --- a/mobile/android/base/browserid/verifier/BrowserIDVerifierClient.java +++ b/mobile/android/base/browserid/verifier/BrowserIDVerifierClient.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid.verifier; +package org.mozilla.goanna.browserid.verifier; public interface BrowserIDVerifierClient { public abstract void verify(String audience, String assertion, BrowserIDVerifierDelegate delegate); diff --git a/mobile/android/base/browserid/verifier/BrowserIDVerifierDelegate.java b/mobile/android/base/browserid/verifier/BrowserIDVerifierDelegate.java index b58d032817..57247fd75a 100644 --- a/mobile/android/base/browserid/verifier/BrowserIDVerifierDelegate.java +++ b/mobile/android/base/browserid/verifier/BrowserIDVerifierDelegate.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid.verifier; +package org.mozilla.goanna.browserid.verifier; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.ExtendedJSONObject; public interface BrowserIDVerifierDelegate { void handleSuccess(ExtendedJSONObject response); diff --git a/mobile/android/base/browserid/verifier/BrowserIDVerifierException.java b/mobile/android/base/browserid/verifier/BrowserIDVerifierException.java index dacaf61125..b7bbf1c073 100644 --- a/mobile/android/base/browserid/verifier/BrowserIDVerifierException.java +++ b/mobile/android/base/browserid/verifier/BrowserIDVerifierException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.browserid.verifier; +package org.mozilla.goanna.browserid.verifier; public class BrowserIDVerifierException extends Exception { private static final long serialVersionUID = 2228946910754889975L; diff --git a/mobile/android/base/crashreporter/res/layout/crash_reporter.xml b/mobile/android/base/crashreporter/res/layout/crash_reporter.xml index 558d522126..2d324cf7a4 100644 --- a/mobile/android/base/crashreporter/res/layout/crash_reporter.xml +++ b/mobile/android/base/crashreporter/res/layout/crash_reporter.xml @@ -71,7 +71,7 @@ android:layout_marginBottom="10dp" android:text="@string/crash_allow_contact2"/> - (); diff --git a/mobile/android/base/db/PerProfileDatabaseProvider.java b/mobile/android/base/db/PerProfileDatabaseProvider.java index 7075c6e8ac..ef59d579f8 100644 --- a/mobile/android/base/db/PerProfileDatabaseProvider.java +++ b/mobile/android/base/db/PerProfileDatabaseProvider.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.db.PerProfileDatabases.DatabaseHelperFactory; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.db.PerProfileDatabases.DatabaseHelperFactory; import android.content.Context; import android.database.sqlite.SQLiteOpenHelper; diff --git a/mobile/android/base/db/PerProfileDatabases.java b/mobile/android/base/db/PerProfileDatabases.java index 1e9baa35a5..1049b40e3b 100644 --- a/mobile/android/base/db/PerProfileDatabases.java +++ b/mobile/android/base/db/PerProfileDatabases.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import java.io.File; import java.util.HashMap; -import org.mozilla.gecko.GoannaProfile; +import org.mozilla.goanna.GoannaProfile; import android.content.Context; import android.database.sqlite.SQLiteOpenHelper; diff --git a/mobile/android/base/db/ReadingListAccessor.java b/mobile/android/base/db/ReadingListAccessor.java index b63687dd23..ad4dcd7ddb 100644 --- a/mobile/android/base/db/ReadingListAccessor.java +++ b/mobile/android/base/db/ReadingListAccessor.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; import android.database.ContentObserver; import android.database.Cursor; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; @RobocopTarget public interface ReadingListAccessor { diff --git a/mobile/android/base/db/ReadingListProvider.java b/mobile/android/base/db/ReadingListProvider.java index b6e52b9524..62445c1d5a 100644 --- a/mobile/android/base/db/ReadingListProvider.java +++ b/mobile/android/base/db/ReadingListProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import android.content.ContentUris; import android.content.ContentValues; @@ -14,9 +14,9 @@ import android.database.sqlite.SQLiteQueryBuilder; import android.net.Uri; import android.text.TextUtils; import android.util.Log; -import org.mozilla.gecko.db.DBUtils.UpdateOperation; +import org.mozilla.goanna.db.DBUtils.UpdateOperation; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.*; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.*; public class ReadingListProvider extends SharedBrowserDatabaseProvider { private static final String LOGTAG = "GoannaRLProvider"; diff --git a/mobile/android/base/db/RemoteClient.java b/mobile/android/base/db/RemoteClient.java index a02b64be07..9e5b25fbea 100644 --- a/mobile/android/base/db/RemoteClient.java +++ b/mobile/android/base/db/RemoteClient.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import java.util.ArrayList; diff --git a/mobile/android/base/db/RemoteTab.java b/mobile/android/base/db/RemoteTab.java index b5d74ff2dd..0e0eca272c 100644 --- a/mobile/android/base/db/RemoteTab.java +++ b/mobile/android/base/db/RemoteTab.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; -import org.mozilla.gecko.RemoteTabsExpandableListAdapter; +import org.mozilla.goanna.RemoteTabsExpandableListAdapter; import android.os.Parcel; import android.os.Parcelable; diff --git a/mobile/android/base/db/SQLiteBridgeContentProvider.java b/mobile/android/base/db/SQLiteBridgeContentProvider.java index b4e24e16a3..7891d43744 100644 --- a/mobile/android/base/db/SQLiteBridgeContentProvider.java +++ b/mobile/android/base/db/SQLiteBridgeContentProvider.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import java.io.File; import java.util.HashMap; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.GoannaThread; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.mozglue.GoannaLoader; -import org.mozilla.gecko.sqlite.SQLiteBridge; -import org.mozilla.gecko.sqlite.SQLiteBridgeException; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.GoannaThread; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.mozglue.GoannaLoader; +import org.mozilla.goanna.sqlite.SQLiteBridge; +import org.mozilla.goanna.sqlite.SQLiteBridgeException; import android.content.ContentProvider; import android.content.ContentUris; diff --git a/mobile/android/base/db/SearchHistoryProvider.java b/mobile/android/base/db/SearchHistoryProvider.java index b82be6e6d0..e6f4ad53c5 100644 --- a/mobile/android/base/db/SearchHistoryProvider.java +++ b/mobile/android/base/db/SearchHistoryProvider.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.SearchHistory; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.SearchHistory; import android.content.ContentUris; import android.content.ContentValues; diff --git a/mobile/android/base/db/Searches.java b/mobile/android/base/db/Searches.java index e050a4f932..41cec71a86 100644 --- a/mobile/android/base/db/Searches.java +++ b/mobile/android/base/db/Searches.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import android.content.ContentResolver; diff --git a/mobile/android/base/db/SharedBrowserDatabaseProvider.java b/mobile/android/base/db/SharedBrowserDatabaseProvider.java index fe5cbe08be..29cd6c8df1 100644 --- a/mobile/android/base/db/SharedBrowserDatabaseProvider.java +++ b/mobile/android/base/db/SharedBrowserDatabaseProvider.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.db.BrowserContract.CommonColumns; -import org.mozilla.gecko.db.BrowserContract.SyncColumns; -import org.mozilla.gecko.db.PerProfileDatabases.DatabaseHelperFactory; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.db.BrowserContract.CommonColumns; +import org.mozilla.goanna.db.BrowserContract.SyncColumns; +import org.mozilla.goanna.db.PerProfileDatabases.DatabaseHelperFactory; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/db/StubBrowserDB.java b/mobile/android/base/db/StubBrowserDB.java index 4e2fef20a2..c6c13cc6be 100644 --- a/mobile/android/base/db/StubBrowserDB.java +++ b/mobile/android/base/db/StubBrowserDB.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import java.io.File; import java.util.ArrayList; @@ -13,10 +13,10 @@ import java.util.List; import java.util.Map; import org.json.JSONObject; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.distribution.Distribution; -import org.mozilla.gecko.favicons.decoders.LoadFaviconResult; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.distribution.Distribution; +import org.mozilla.goanna.favicons.decoders.LoadFaviconResult; +import org.mozilla.goanna.mozglue.RobocopTarget; import android.content.ContentProviderOperation; import android.content.ContentResolver; diff --git a/mobile/android/base/db/SuggestedSites.java b/mobile/android/base/db/SuggestedSites.java index 766b2f8454..faef54db10 100644 --- a/mobile/android/base/db/SuggestedSites.java +++ b/mobile/android/base/db/SuggestedSites.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import android.content.Context; import android.content.ContentResolver; @@ -34,16 +34,16 @@ import java.util.Set; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.R; -import org.mozilla.gecko.distribution.Distribution; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.preferences.GoannaPreferences; -import org.mozilla.gecko.util.RawResource; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.R; +import org.mozilla.goanna.distribution.Distribution; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.preferences.GoannaPreferences; +import org.mozilla.goanna.util.RawResource; +import org.mozilla.goanna.util.ThreadUtils; /** * {@code SuggestedSites} provides API to get a list of locale-specific diff --git a/mobile/android/base/db/Table.java b/mobile/android/base/db/Table.java index 37a605ee1b..9ef36fdfe5 100644 --- a/mobile/android/base/db/Table.java +++ b/mobile/android/base/db/Table.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import android.content.ContentValues; import android.database.Cursor; diff --git a/mobile/android/base/db/TabsAccessor.java b/mobile/android/base/db/TabsAccessor.java index 985909efb8..c03ce7fb7c 100644 --- a/mobile/android/base/db/TabsAccessor.java +++ b/mobile/android/base/db/TabsAccessor.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import android.content.ContentResolver; import android.content.Context; import android.database.Cursor; -import org.mozilla.gecko.Tab; +import org.mozilla.goanna.Tab; import java.util.List; diff --git a/mobile/android/base/db/TabsProvider.java b/mobile/android/base/db/TabsProvider.java index ab89f21a6d..12e3a33fc2 100644 --- a/mobile/android/base/db/TabsProvider.java +++ b/mobile/android/base/db/TabsProvider.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.db.BrowserContract.Clients; -import org.mozilla.gecko.db.BrowserContract.Tabs; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.db.BrowserContract.Clients; +import org.mozilla.goanna.db.BrowserContract.Tabs; import android.content.ContentUris; import android.content.ContentValues; diff --git a/mobile/android/base/db/TopSitesCursorWrapper.java b/mobile/android/base/db/TopSitesCursorWrapper.java index d83dc12900..0eb8867201 100644 --- a/mobile/android/base/db/TopSitesCursorWrapper.java +++ b/mobile/android/base/db/TopSitesCursorWrapper.java @@ -1,13 +1,13 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import java.util.HashMap; import java.util.Map; -import org.mozilla.gecko.db.BrowserContract.Bookmarks; -import org.mozilla.gecko.db.BrowserContract.TopSites; +import org.mozilla.goanna.db.BrowserContract.Bookmarks; +import org.mozilla.goanna.db.BrowserContract.TopSites; import android.content.ContentResolver; import android.database.CharArrayBuffer; diff --git a/mobile/android/base/db/URLMetadata.java b/mobile/android/base/db/URLMetadata.java index f56b7abd1f..e931504ed0 100644 --- a/mobile/android/base/db/URLMetadata.java +++ b/mobile/android/base/db/URLMetadata.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; import java.util.List; import java.util.Map; diff --git a/mobile/android/base/db/URLMetadataTable.java b/mobile/android/base/db/URLMetadataTable.java index b42fc2b36b..8555b60245 100644 --- a/mobile/android/base/db/URLMetadataTable.java +++ b/mobile/android/base/db/URLMetadataTable.java @@ -4,10 +4,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.db; +package org.mozilla.goanna.db; -import org.mozilla.gecko.db.BrowserContract.Bookmarks; -import org.mozilla.gecko.db.BrowserContract.History; +import org.mozilla.goanna.db.BrowserContract.Bookmarks; +import org.mozilla.goanna.db.BrowserContract.History; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; diff --git a/mobile/android/base/distribution/Distribution.java b/mobile/android/base/distribution/Distribution.java index 62949bec64..48873a9a91 100644 --- a/mobile/android/base/distribution/Distribution.java +++ b/mobile/android/base/distribution/Distribution.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.distribution; +package org.mozilla.goanna.distribution; import java.io.BufferedInputStream; import java.io.File; @@ -36,15 +36,15 @@ import org.apache.http.protocol.HTTP; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.util.FileUtils; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.util.FileUtils; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.ThreadUtils; import android.app.Activity; import android.content.Context; @@ -121,7 +121,7 @@ public class Distribution { * a call to distributionArrivedLate. * * When distributionNotFound is called, - * {@link org.mozilla.gecko.distribution.Distribution#exists()} will return + * {@link org.mozilla.goanna.distribution.Distribution#exists()} will return * false. In the other two callbacks, it will return true. */ public interface ReadyCallback { @@ -471,14 +471,14 @@ public class Distribution { // If the Search Activity starts, and we handle the referrer intent, this'll return // null. Recover gracefully in this case. - final GoannaAppShell.GoannaInterface geckoInterface = GoannaAppShell.getGoannaInterface(); + final GoannaAppShell.GoannaInterface goannaInterface = GoannaAppShell.getGoannaInterface(); final String ua; - if (geckoInterface == null) { + if (goannaInterface == null) { // Fall back to GoannaApp's default implementation. ua = HardwareUtils.isTablet() ? AppConstants.USER_AGENT_FENNEC_TABLET : AppConstants.USER_AGENT_FENNEC_MOBILE; } else { - ua = geckoInterface.getDefaultUAString(); + ua = goannaInterface.getDefaultUAString(); } connection.setRequestProperty(HTTP.USER_AGENT, ua); diff --git a/mobile/android/base/distribution/ReferrerDescriptor.java b/mobile/android/base/distribution/ReferrerDescriptor.java index f422810ed1..5115ac4c8b 100644 --- a/mobile/android/base/distribution/ReferrerDescriptor.java +++ b/mobile/android/base/distribution/ReferrerDescriptor.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.distribution; +package org.mozilla.goanna.distribution; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; import android.net.Uri; diff --git a/mobile/android/base/distribution/ReferrerReceiver.java b/mobile/android/base/distribution/ReferrerReceiver.java index 337fd39d57..2f4cd3324b 100644 --- a/mobile/android/base/distribution/ReferrerReceiver.java +++ b/mobile/android/base/distribution/ReferrerReceiver.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.distribution; +package org.mozilla.goanna.distribution; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.mozglue.RobocopTarget; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/docs/gradle.rst b/mobile/android/base/docs/gradle.rst index ab24d8d872..d5846d4e4b 100644 --- a/mobile/android/base/docs/gradle.rst +++ b/mobile/android/base/docs/gradle.rst @@ -49,7 +49,7 @@ At the time of writing, there are three main sub-modules: *app*, *base*, and *thirdparty*, and several smaller sub-modules. *app* is the Fennec wrapper; it generates the **org.mozilla.fennec.R** resource -package. *base* is the Goanna code; it generates the **org.mozilla.gecko.R** +package. *base* is the Goanna code; it generates the **org.mozilla.goanna.R** resource package. Together, *app* and *base* address the "two package namespaces" that has plagued Fennec from day one. diff --git a/mobile/android/base/favicons/Favicons.java b/mobile/android/base/favicons/Favicons.java index 8b5aaa587d..0344d80ef0 100644 --- a/mobile/android/base/favicons/Favicons.java +++ b/mobile/android/base/favicons/Favicons.java @@ -3,19 +3,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons; +package org.mozilla.goanna.favicons; import android.graphics.drawable.Drawable; -import org.mozilla.gecko.AboutPages; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.favicons.cache.FaviconCache; -import org.mozilla.gecko.util.GoannaJarReader; -import org.mozilla.gecko.util.NonEvictingLruCache; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AboutPages; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.favicons.cache.FaviconCache; +import org.mozilla.goanna.util.GoannaJarReader; +import org.mozilla.goanna.util.NonEvictingLruCache; +import org.mozilla.goanna.util.ThreadUtils; import android.content.ContentResolver; import android.content.Context; diff --git a/mobile/android/base/favicons/LoadFaviconTask.java b/mobile/android/base/favicons/LoadFaviconTask.java index 75cf9f00c4..d1dce4e3f0 100644 --- a/mobile/android/base/favicons/LoadFaviconTask.java +++ b/mobile/android/base/favicons/LoadFaviconTask.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons; +package org.mozilla.goanna.favicons; import android.content.ContentResolver; @@ -15,14 +15,14 @@ import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.favicons.decoders.FaviconDecoder; -import org.mozilla.gecko.favicons.decoders.LoadFaviconResult; -import org.mozilla.gecko.util.GoannaJarReader; -import org.mozilla.gecko.util.IOUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.favicons.decoders.FaviconDecoder; +import org.mozilla.goanna.favicons.decoders.LoadFaviconResult; +import org.mozilla.goanna.util.GoannaJarReader; +import org.mozilla.goanna.util.IOUtils; +import org.mozilla.goanna.util.ThreadUtils; import java.io.IOException; import java.io.InputStream; @@ -34,7 +34,7 @@ import java.util.LinkedList; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicInteger; -import static org.mozilla.gecko.util.IOUtils.ConsumedInputStream; +import static org.mozilla.goanna.util.IOUtils.ConsumedInputStream; /** * Class representing the asynchronous task to load a Favicon which is not currently in the in-memory diff --git a/mobile/android/base/favicons/OnFaviconLoadedListener.java b/mobile/android/base/favicons/OnFaviconLoadedListener.java index 23772dea30..027e019187 100644 --- a/mobile/android/base/favicons/OnFaviconLoadedListener.java +++ b/mobile/android/base/favicons/OnFaviconLoadedListener.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons; +package org.mozilla.goanna.favicons; import android.graphics.Bitmap; diff --git a/mobile/android/base/favicons/RemoteFavicon.java b/mobile/android/base/favicons/RemoteFavicon.java index 978a2a5862..a7616ee17a 100644 --- a/mobile/android/base/favicons/RemoteFavicon.java +++ b/mobile/android/base/favicons/RemoteFavicon.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons; +package org.mozilla.goanna.favicons; /** * Class to represent a Favicon declared on a webpage which we may or may not have downloaded. diff --git a/mobile/android/base/favicons/cache/FaviconCache.java b/mobile/android/base/favicons/cache/FaviconCache.java index 0276b462be..a0b2691554 100644 --- a/mobile/android/base/favicons/cache/FaviconCache.java +++ b/mobile/android/base/favicons/cache/FaviconCache.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons.cache; +package org.mozilla.goanna.favicons.cache; import android.graphics.Bitmap; import android.util.Log; -import org.mozilla.gecko.favicons.Favicons; +import org.mozilla.goanna.favicons.Favicons; import java.util.HashMap; import java.util.Iterator; diff --git a/mobile/android/base/favicons/cache/FaviconCacheElement.java b/mobile/android/base/favicons/cache/FaviconCacheElement.java index a6aa3af029..c8c7711b8b 100644 --- a/mobile/android/base/favicons/cache/FaviconCacheElement.java +++ b/mobile/android/base/favicons/cache/FaviconCacheElement.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons.cache; +package org.mozilla.goanna.favicons.cache; import android.graphics.Bitmap; diff --git a/mobile/android/base/favicons/cache/FaviconsForURL.java b/mobile/android/base/favicons/cache/FaviconsForURL.java index 4351b44cfa..47e45b3fe9 100644 --- a/mobile/android/base/favicons/cache/FaviconsForURL.java +++ b/mobile/android/base/favicons/cache/FaviconsForURL.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons.cache; +package org.mozilla.goanna.favicons.cache; import android.graphics.Bitmap; import android.util.Log; -import org.mozilla.gecko.gfx.BitmapUtils; +import org.mozilla.goanna.gfx.BitmapUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/mobile/android/base/favicons/decoders/FaviconDecoder.java b/mobile/android/base/favicons/decoders/FaviconDecoder.java index c642945d09..8da806dc7e 100644 --- a/mobile/android/base/favicons/decoders/FaviconDecoder.java +++ b/mobile/android/base/favicons/decoders/FaviconDecoder.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons.decoders; +package org.mozilla.goanna.favicons.decoders; import android.graphics.Bitmap; import android.util.Base64; import android.util.Log; -import org.mozilla.gecko.gfx.BitmapUtils; +import org.mozilla.goanna.gfx.BitmapUtils; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/mobile/android/base/favicons/decoders/ICODecoder.java b/mobile/android/base/favicons/decoders/ICODecoder.java index 1c3f672069..f85a467e67 100644 --- a/mobile/android/base/favicons/decoders/ICODecoder.java +++ b/mobile/android/base/favicons/decoders/ICODecoder.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons.decoders; +package org.mozilla.goanna.favicons.decoders; import android.graphics.Bitmap; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.gfx.BitmapUtils; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.gfx.BitmapUtils; import android.util.SparseArray; diff --git a/mobile/android/base/favicons/decoders/IconDirectoryEntry.java b/mobile/android/base/favicons/decoders/IconDirectoryEntry.java index a322c7d60e..89a342de82 100644 --- a/mobile/android/base/favicons/decoders/IconDirectoryEntry.java +++ b/mobile/android/base/favicons/decoders/IconDirectoryEntry.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons.decoders; +package org.mozilla.goanna.favicons.decoders; /** * Representation of an ICO file ICONDIRENTRY structure. diff --git a/mobile/android/base/favicons/decoders/LoadFaviconResult.java b/mobile/android/base/favicons/decoders/LoadFaviconResult.java index fdda5593c7..8fcf9eb94b 100644 --- a/mobile/android/base/favicons/decoders/LoadFaviconResult.java +++ b/mobile/android/base/favicons/decoders/LoadFaviconResult.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.favicons.decoders; +package org.mozilla.goanna.favicons.decoders; import android.graphics.Bitmap; import android.util.Log; diff --git a/mobile/android/base/firstrun/FirstrunPager.java b/mobile/android/base/firstrun/FirstrunPager.java index cffaa862dc..544a21c6d0 100644 --- a/mobile/android/base/firstrun/FirstrunPager.java +++ b/mobile/android/base/firstrun/FirstrunPager.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.firstrun; +package org.mozilla.goanna.firstrun; import android.content.Context; import android.support.v4.app.Fragment; @@ -15,7 +15,7 @@ import com.nineoldandroids.animation.Animator; import com.nineoldandroids.animation.AnimatorSet; import com.nineoldandroids.animation.ObjectAnimator; import com.nineoldandroids.view.ViewHelper; -import org.mozilla.gecko.animation.TransitionsTracker; +import org.mozilla.goanna.animation.TransitionsTracker; import java.util.List; diff --git a/mobile/android/base/firstrun/FirstrunPagerConfig.java b/mobile/android/base/firstrun/FirstrunPagerConfig.java index 8fb4011f99..400b65c630 100644 --- a/mobile/android/base/firstrun/FirstrunPagerConfig.java +++ b/mobile/android/base/firstrun/FirstrunPagerConfig.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.firstrun; +package org.mozilla.goanna.firstrun; import java.util.LinkedList; import java.util.List; diff --git a/mobile/android/base/firstrun/FirstrunPane.java b/mobile/android/base/firstrun/FirstrunPane.java index 517320a3ed..f115647a12 100644 --- a/mobile/android/base/firstrun/FirstrunPane.java +++ b/mobile/android/base/firstrun/FirstrunPane.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.firstrun; +package org.mozilla.goanna.firstrun; import android.content.Context; import android.support.v4.app.FragmentManager; @@ -14,8 +14,8 @@ import android.widget.LinearLayout; import com.nineoldandroids.animation.Animator; import com.nineoldandroids.animation.AnimatorListenerAdapter; import com.nineoldandroids.animation.ObjectAnimator; -import org.mozilla.gecko.R; -import org.mozilla.gecko.animation.TransitionsTracker; +import org.mozilla.goanna.R; +import org.mozilla.goanna.animation.TransitionsTracker; public class FirstrunPane extends LinearLayout { public static final String PREF_FIRSTRUN_ENABLED = "startpane_enabled"; diff --git a/mobile/android/base/firstrun/FirstrunPanel.java b/mobile/android/base/firstrun/FirstrunPanel.java index d6d9203542..06f02e05ee 100644 --- a/mobile/android/base/firstrun/FirstrunPanel.java +++ b/mobile/android/base/firstrun/FirstrunPanel.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.firstrun; +package org.mozilla.goanna.firstrun; import android.support.v4.app.Fragment; diff --git a/mobile/android/base/firstrun/WelcomePanel.java b/mobile/android/base/firstrun/WelcomePanel.java index 7a0581e5b6..b7dc45ebdb 100644 --- a/mobile/android/base/firstrun/WelcomePanel.java +++ b/mobile/android/base/firstrun/WelcomePanel.java @@ -3,17 +3,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.firstrun; +package org.mozilla.goanna.firstrun; import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.fxa.activities.FxAccountGetStartedActivity; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.fxa.activities.FxAccountGetStartedActivity; public class WelcomePanel extends FirstrunPanel { public static final int TITLE_RES = R.string.firstrun_welcome_message; diff --git a/mobile/android/base/fxa/AccountLoader.java b/mobile/android/base/fxa/AccountLoader.java index 836a012456..c5471c13d9 100644 --- a/mobile/android/base/fxa/AccountLoader.java +++ b/mobile/android/base/fxa/AccountLoader.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa; +package org.mozilla.goanna.fxa; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.sync.setup.SyncAccounts; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.sync.setup.SyncAccounts; import android.accounts.Account; import android.accounts.AccountManager; @@ -25,7 +25,7 @@ import android.support.v4.content.AsyncTaskLoader; * * The loader listens for Accounts added and deleted, and also Accounts being * updated by Sync or another Activity, via the use of - * {@link AndroidFxAccount#setState(org.mozilla.gecko.fxa.login.State)}. + * {@link AndroidFxAccount#setState(org.mozilla.goanna.fxa.login.State)}. * Be careful of message loops if you update the account state from an activity * that uses this loader. * diff --git a/mobile/android/base/fxa/FirefoxAccounts.java b/mobile/android/base/fxa/FirefoxAccounts.java index 139775264c..10e370eed0 100644 --- a/mobile/android/base/fxa/FirefoxAccounts.java +++ b/mobile/android/base/fxa/FirefoxAccounts.java @@ -2,24 +2,24 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa; +package org.mozilla.goanna.fxa; import java.io.File; import java.util.EnumSet; import java.util.Locale; import java.util.concurrent.CountDownLatch; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.fxa.authenticator.AccountPickler; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.sync.FxAccountSyncAdapter; -import org.mozilla.gecko.fxa.sync.FxAccountSyncStatusHelper; -import org.mozilla.gecko.fxa.tasks.FxAccountCodeResender; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.fxa.authenticator.AccountPickler; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.sync.FxAccountSyncAdapter; +import org.mozilla.goanna.fxa.sync.FxAccountSyncStatusHelper; +import org.mozilla.goanna.fxa.tasks.FxAccountCodeResender; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.Utils; import android.accounts.Account; import android.accounts.AccountManager; @@ -316,7 +316,7 @@ public class FirefoxAccounts { * toast on both send success and failure. Note that because the underlying implementation * uses {@link AsyncTask}, the provided context must be UI-capable, and this * method called from the UI thread (see - * {@link org.mozilla.gecko.fxa.tasks.FxAccountCodeResender#resendCode(Context, AndroidFxAccount)} + * {@link org.mozilla.goanna.fxa.tasks.FxAccountCodeResender#resendCode(Context, AndroidFxAccount)} * for more). * * @param context a UI-capable Android context. diff --git a/mobile/android/base/fxa/FxAccountConstants.java b/mobile/android/base/fxa/FxAccountConstants.java index e181cf3de3..32fb2149b5 100644 --- a/mobile/android/base/fxa/FxAccountConstants.java +++ b/mobile/android/base/fxa/FxAccountConstants.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa; +package org.mozilla.goanna.fxa; -import org.mozilla.gecko.AppConstants; +import org.mozilla.goanna.AppConstants; public class FxAccountConstants { public static final String GLOBAL_LOG_TAG = "FxAccounts"; @@ -52,7 +52,7 @@ public class FxAccountConstants { * can be received only by Firefox channels sharing the same Android Firefox * Account type. *

- * See {@link org.mozilla.gecko.fxa.AndroidFxAccount#makeDeletedAccountIntent(android.content.Context, android.accounts.Account)} + * See {@link org.mozilla.goanna.fxa.AndroidFxAccount#makeDeletedAccountIntent(android.content.Context, android.accounts.Account)} * for contents of the intent. * * See bug 790931 for additional information in the context of Sync. diff --git a/mobile/android/base/fxa/activities/FxAccountAbstractActivity.java b/mobile/android/base/fxa/activities/FxAccountAbstractActivity.java index 86e0cf66d2..4033664c50 100644 --- a/mobile/android/base/fxa/activities/FxAccountAbstractActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountAbstractActivity.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; -import org.mozilla.gecko.Locales.LocaleAwareActivity; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountAgeLockoutHelper; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.sync.setup.activities.ActivityUtils; +import org.mozilla.goanna.Locales.LocaleAwareActivity; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountAgeLockoutHelper; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.sync.setup.activities.ActivityUtils; import android.accounts.Account; import android.app.Activity; diff --git a/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java b/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java index 18e3b7c3e6..589940f837 100644 --- a/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -12,26 +12,26 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient10.RequestDelegate; -import org.mozilla.gecko.background.fxa.FxAccountClient20.LoginResponse; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.background.fxa.PasswordStretcher; -import org.mozilla.gecko.background.fxa.QuickPasswordStretcher; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.Engaged; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.tasks.FxAccountSetupTask.ProgressDisplay; -import org.mozilla.gecko.fxa.tasks.FxAccountUnlockCodeResender; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.setup.Constants; -import org.mozilla.gecko.sync.setup.activities.ActivityUtils; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient10.RequestDelegate; +import org.mozilla.goanna.background.fxa.FxAccountClient20.LoginResponse; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientRemoteException; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.background.fxa.PasswordStretcher; +import org.mozilla.goanna.background.fxa.QuickPasswordStretcher; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.Engaged; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.tasks.FxAccountSetupTask.ProgressDisplay; +import org.mozilla.goanna.fxa.tasks.FxAccountUnlockCodeResender; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.setup.Constants; +import org.mozilla.goanna.sync.setup.activities.ActivityUtils; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/fxa/activities/FxAccountAbstractUpdateCredentialsActivity.java b/mobile/android/base/fxa/activities/FxAccountAbstractUpdateCredentialsActivity.java index d68eb36084..8919270704 100644 --- a/mobile/android/base/fxa/activities/FxAccountAbstractUpdateCredentialsActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountAbstractUpdateCredentialsActivity.java @@ -2,28 +2,28 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.common.telemetry.TelemetryWrapper; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.background.fxa.FxAccountClient10.RequestDelegate; -import org.mozilla.gecko.background.fxa.FxAccountClient20; -import org.mozilla.gecko.background.fxa.FxAccountClient20.LoginResponse; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.background.fxa.PasswordStretcher; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.Engaged; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.tasks.FxAccountSignInTask; -import org.mozilla.gecko.sync.setup.activities.ActivityUtils; -import org.mozilla.gecko.sync.telemetry.TelemetryContract; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.common.telemetry.TelemetryWrapper; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.background.fxa.FxAccountClient10.RequestDelegate; +import org.mozilla.goanna.background.fxa.FxAccountClient20; +import org.mozilla.goanna.background.fxa.FxAccountClient20.LoginResponse; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientRemoteException; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.background.fxa.PasswordStretcher; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.Engaged; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.tasks.FxAccountSignInTask; +import org.mozilla.goanna.sync.setup.activities.ActivityUtils; +import org.mozilla.goanna.sync.telemetry.TelemetryContract; import android.content.Intent; import android.os.Bundle; diff --git a/mobile/android/base/fxa/activities/FxAccountConfirmAccountActivity.java b/mobile/android/base/fxa/activities/FxAccountConfirmAccountActivity.java index 6dcbcf03f3..82d7ed5a55 100644 --- a/mobile/android/base/fxa/activities/FxAccountConfirmAccountActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountConfirmAccountActivity.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.Engaged; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.Action; -import org.mozilla.gecko.fxa.sync.FxAccountSyncStatusHelper; -import org.mozilla.gecko.fxa.tasks.FxAccountCodeResender; -import org.mozilla.gecko.sync.setup.activities.ActivityUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.Engaged; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.Action; +import org.mozilla.goanna.fxa.sync.FxAccountSyncStatusHelper; +import org.mozilla.goanna.fxa.tasks.FxAccountCodeResender; +import org.mozilla.goanna.sync.setup.activities.ActivityUtils; import android.accounts.Account; import android.app.Activity; diff --git a/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java b/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java index 1ba2be12b7..2dbec2de59 100644 --- a/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; import java.util.Calendar; import java.util.HashMap; @@ -12,21 +12,21 @@ import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountAgeLockoutHelper; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.background.fxa.FxAccountClient10.RequestDelegate; -import org.mozilla.gecko.background.fxa.FxAccountClient20; -import org.mozilla.gecko.background.fxa.FxAccountClient20.LoginResponse; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.background.fxa.PasswordStretcher; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.tasks.FxAccountCreateAccountTask; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountAgeLockoutHelper; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.background.fxa.FxAccountClient10.RequestDelegate; +import org.mozilla.goanna.background.fxa.FxAccountClient20; +import org.mozilla.goanna.background.fxa.FxAccountClient20.LoginResponse; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientRemoteException; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.background.fxa.PasswordStretcher; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.tasks.FxAccountCreateAccountTask; +import org.mozilla.goanna.sync.Utils; import android.app.AlertDialog; import android.app.Dialog; diff --git a/mobile/android/base/fxa/activities/FxAccountCreateAccountNotAllowedActivity.java b/mobile/android/base/fxa/activities/FxAccountCreateAccountNotAllowedActivity.java index 0cb55affaa..ae656e85f3 100644 --- a/mobile/android/base/fxa/activities/FxAccountCreateAccountNotAllowedActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountCreateAccountNotAllowedActivity.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.setup.activities.ActivityUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.setup.activities.ActivityUtils; import android.os.Bundle; import android.widget.TextView; diff --git a/mobile/android/base/fxa/activities/FxAccountFinishMigratingActivity.java b/mobile/android/base/fxa/activities/FxAccountFinishMigratingActivity.java index 4dd0f03370..d379af0113 100644 --- a/mobile/android/base/fxa/activities/FxAccountFinishMigratingActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountFinishMigratingActivity.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; import java.util.Map; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient20.LoginResponse; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.StateLabel; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient20.LoginResponse; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.StateLabel; import android.content.Intent; diff --git a/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java b/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java index e10bc3b9d5..5f069ee797 100644 --- a/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; import java.util.Locale; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountAgeLockoutHelper; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.sync.setup.activities.ActivityUtils; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountAgeLockoutHelper; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.sync.setup.activities.ActivityUtils; import android.accounts.AccountAuthenticatorActivity; import android.content.Intent; diff --git a/mobile/android/base/fxa/activities/FxAccountMigrationFinishedActivity.java b/mobile/android/base/fxa/activities/FxAccountMigrationFinishedActivity.java index 26bbcf7280..11e5683824 100644 --- a/mobile/android/base/fxa/activities/FxAccountMigrationFinishedActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountMigrationFinishedActivity.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.Action; -import org.mozilla.gecko.sync.setup.activities.ActivityUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.Action; +import org.mozilla.goanna.sync.setup.activities.ActivityUtils; import android.os.Bundle; import android.view.View; diff --git a/mobile/android/base/fxa/activities/FxAccountSignInActivity.java b/mobile/android/base/fxa/activities/FxAccountSignInActivity.java index eed7a1b567..33f63a2b6c 100644 --- a/mobile/android/base/fxa/activities/FxAccountSignInActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountSignInActivity.java @@ -2,21 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.background.fxa.FxAccountClient10.RequestDelegate; -import org.mozilla.gecko.background.fxa.FxAccountClient20; -import org.mozilla.gecko.background.fxa.FxAccountClient20.LoginResponse; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException; -import org.mozilla.gecko.background.fxa.PasswordStretcher; -import org.mozilla.gecko.fxa.tasks.FxAccountSignInTask; -import org.mozilla.gecko.sync.setup.activities.ActivityUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.background.fxa.FxAccountClient10.RequestDelegate; +import org.mozilla.goanna.background.fxa.FxAccountClient20; +import org.mozilla.goanna.background.fxa.FxAccountClient20.LoginResponse; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientRemoteException; +import org.mozilla.goanna.background.fxa.PasswordStretcher; +import org.mozilla.goanna.fxa.tasks.FxAccountSignInTask; +import org.mozilla.goanna.sync.setup.activities.ActivityUtils; import android.content.Intent; import android.os.Bundle; diff --git a/mobile/android/base/fxa/activities/FxAccountStatusActivity.java b/mobile/android/base/fxa/activities/FxAccountStatusActivity.java index 08a9adbf38..81ea9ada67 100644 --- a/mobile/android/base/fxa/activities/FxAccountStatusActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountStatusActivity.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.Locales.LocaleAwareFragmentActivity; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.Locales.LocaleAwareFragmentActivity; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.sync.Utils; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/fxa/activities/FxAccountStatusFragment.java b/mobile/android/base/fxa/activities/FxAccountStatusFragment.java index 3de2112bb4..1a0f47edd2 100644 --- a/mobile/android/base/fxa/activities/FxAccountStatusFragment.java +++ b/mobile/android/base/fxa/activities/FxAccountStatusFragment.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; import java.util.Calendar; import java.util.Date; @@ -11,22 +11,22 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.background.preferences.PreferenceFragment; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.Married; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.sync.FxAccountSyncStatusHelper; -import org.mozilla.gecko.fxa.tasks.FxAccountCodeResender; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.SharedPreferencesClientsDataDelegate; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.background.preferences.PreferenceFragment; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.Married; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.sync.FxAccountSyncStatusHelper; +import org.mozilla.goanna.fxa.tasks.FxAccountCodeResender; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.SharedPreferencesClientsDataDelegate; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.util.HardwareUtils; import android.accounts.Account; import android.content.ContentResolver; diff --git a/mobile/android/base/fxa/activities/FxAccountUpdateCredentialsActivity.java b/mobile/android/base/fxa/activities/FxAccountUpdateCredentialsActivity.java index 1a3ce4a065..0f1f05de3d 100644 --- a/mobile/android/base/fxa/activities/FxAccountUpdateCredentialsActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountUpdateCredentialsActivity.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient20.LoginResponse; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.StateLabel; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient20.LoginResponse; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.StateLabel; import android.content.Intent; diff --git a/mobile/android/base/fxa/activities/FxAccountVerifiedAccountActivity.java b/mobile/android/base/fxa/activities/FxAccountVerifiedAccountActivity.java index 8e23e9062c..6711b66df4 100644 --- a/mobile/android/base/fxa/activities/FxAccountVerifiedAccountActivity.java +++ b/mobile/android/base/fxa/activities/FxAccountVerifiedAccountActivity.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.activities; +package org.mozilla.goanna.fxa.activities; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.sync.setup.activities.ActivityUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.sync.setup.activities.ActivityUtils; import android.os.Bundle; import android.view.View; diff --git a/mobile/android/base/fxa/authenticator/AccountPickler.java b/mobile/android/base/fxa/authenticator/AccountPickler.java index b1a0021716..319bd18e5f 100644 --- a/mobile/android/base/fxa/authenticator/AccountPickler.java +++ b/mobile/android/base/fxa/authenticator/AccountPickler.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.authenticator; +package org.mozilla.goanna.fxa.authenticator; import java.io.FileOutputStream; import java.io.PrintStream; @@ -12,15 +12,15 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.StateLabel; -import org.mozilla.gecko.fxa.login.StateFactory; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.StateLabel; +import org.mozilla.goanna.fxa.login.StateFactory; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.Utils; import android.content.Context; diff --git a/mobile/android/base/fxa/authenticator/AndroidFxAccount.java b/mobile/android/base/fxa/authenticator/AndroidFxAccount.java index 6abb937ba1..40d0e43fb2 100644 --- a/mobile/android/base/fxa/authenticator/AndroidFxAccount.java +++ b/mobile/android/base/fxa/authenticator/AndroidFxAccount.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.authenticator; +package org.mozilla.goanna.fxa.authenticator; import java.io.UnsupportedEncodingException; import java.net.URISyntaxException; @@ -15,19 +15,19 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Semaphore; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.StateLabel; -import org.mozilla.gecko.fxa.login.StateFactory; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.StateLabel; +import org.mozilla.goanna.fxa.login.StateFactory; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.setup.Constants; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/fxa/authenticator/FxADefaultLoginStateMachineDelegate.java b/mobile/android/base/fxa/authenticator/FxADefaultLoginStateMachineDelegate.java index ff31223224..e5fd4ca66f 100644 --- a/mobile/android/base/fxa/authenticator/FxADefaultLoginStateMachineDelegate.java +++ b/mobile/android/base/fxa/authenticator/FxADefaultLoginStateMachineDelegate.java @@ -2,24 +2,24 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.authenticator; +package org.mozilla.goanna.fxa.authenticator; import java.security.NoSuchAlgorithmException; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.background.fxa.FxAccountClient20; -import org.mozilla.gecko.browserid.BrowserIDKeyPair; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.LoginStateMachineDelegate; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.Transition; -import org.mozilla.gecko.fxa.login.Married; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.StateLabel; -import org.mozilla.gecko.fxa.login.StateFactory; -import org.mozilla.gecko.fxa.sync.FxAccountNotificationManager; -import org.mozilla.gecko.fxa.sync.FxAccountSyncAdapter; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.background.fxa.FxAccountClient20; +import org.mozilla.goanna.browserid.BrowserIDKeyPair; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine.LoginStateMachineDelegate; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.Transition; +import org.mozilla.goanna.fxa.login.Married; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.StateLabel; +import org.mozilla.goanna.fxa.login.StateFactory; +import org.mozilla.goanna.fxa.sync.FxAccountNotificationManager; +import org.mozilla.goanna.fxa.sync.FxAccountSyncAdapter; import android.content.Context; diff --git a/mobile/android/base/fxa/authenticator/FxAccountAuthenticator.java b/mobile/android/base/fxa/authenticator/FxAccountAuthenticator.java index c043ed102e..4e48d23c71 100644 --- a/mobile/android/base/fxa/authenticator/FxAccountAuthenticator.java +++ b/mobile/android/base/fxa/authenticator/FxAccountAuthenticator.java @@ -2,33 +2,33 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.authenticator; +package org.mozilla.goanna.fxa.authenticator; import java.security.NoSuchAlgorithmException; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.background.fxa.FxAccountClient20; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.background.fxa.oauth.FxAccountAbstractClient.RequestDelegate; -import org.mozilla.gecko.background.fxa.oauth.FxAccountAbstractClientException.FxAccountAbstractClientRemoteException; -import org.mozilla.gecko.background.fxa.oauth.FxAccountOAuthClient10; -import org.mozilla.gecko.background.fxa.oauth.FxAccountOAuthClient10.AuthorizationResponse; -import org.mozilla.gecko.browserid.BrowserIDKeyPair; -import org.mozilla.gecko.browserid.JSONWebTokenUtils; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.activities.FxAccountGetStartedActivity; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.LoginStateMachineDelegate; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.Transition; -import org.mozilla.gecko.fxa.login.Married; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.StateLabel; -import org.mozilla.gecko.fxa.login.StateFactory; -import org.mozilla.gecko.fxa.sync.FxAccountNotificationManager; -import org.mozilla.gecko.fxa.sync.FxAccountSyncAdapter; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.background.fxa.FxAccountClient20; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.background.fxa.oauth.FxAccountAbstractClient.RequestDelegate; +import org.mozilla.goanna.background.fxa.oauth.FxAccountAbstractClientException.FxAccountAbstractClientRemoteException; +import org.mozilla.goanna.background.fxa.oauth.FxAccountOAuthClient10; +import org.mozilla.goanna.background.fxa.oauth.FxAccountOAuthClient10.AuthorizationResponse; +import org.mozilla.goanna.browserid.BrowserIDKeyPair; +import org.mozilla.goanna.browserid.JSONWebTokenUtils; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.activities.FxAccountGetStartedActivity; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine.LoginStateMachineDelegate; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.Transition; +import org.mozilla.goanna.fxa.login.Married; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.StateLabel; +import org.mozilla.goanna.fxa.login.StateFactory; +import org.mozilla.goanna.fxa.sync.FxAccountNotificationManager; +import org.mozilla.goanna.fxa.sync.FxAccountSyncAdapter; import android.accounts.AbstractAccountAuthenticator; import android.accounts.Account; diff --git a/mobile/android/base/fxa/authenticator/FxAccountAuthenticatorService.java b/mobile/android/base/fxa/authenticator/FxAccountAuthenticatorService.java index d138e6c45a..0cd59a0364 100644 --- a/mobile/android/base/fxa/authenticator/FxAccountAuthenticatorService.java +++ b/mobile/android/base/fxa/authenticator/FxAccountAuthenticatorService.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.authenticator; +package org.mozilla.goanna.fxa.authenticator; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; import android.app.Service; import android.content.Intent; diff --git a/mobile/android/base/fxa/authenticator/FxAccountLoginDelegate.java b/mobile/android/base/fxa/authenticator/FxAccountLoginDelegate.java index 71006e79d0..0e223e6cab 100644 --- a/mobile/android/base/fxa/authenticator/FxAccountLoginDelegate.java +++ b/mobile/android/base/fxa/authenticator/FxAccountLoginDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.authenticator; +package org.mozilla.goanna.fxa.authenticator; /** * Abstraction around things that might need to be signalled to the user via UI, diff --git a/mobile/android/base/fxa/authenticator/FxAccountLoginException.java b/mobile/android/base/fxa/authenticator/FxAccountLoginException.java index 56c0140b21..40bb89605c 100644 --- a/mobile/android/base/fxa/authenticator/FxAccountLoginException.java +++ b/mobile/android/base/fxa/authenticator/FxAccountLoginException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.authenticator; +package org.mozilla.goanna.fxa.authenticator; public class FxAccountLoginException extends Exception { public FxAccountLoginException(String string) { diff --git a/mobile/android/base/fxa/login/BaseRequestDelegate.java b/mobile/android/base/fxa/login/BaseRequestDelegate.java index a83b03aa31..48693980e0 100644 --- a/mobile/android/base/fxa/login/BaseRequestDelegate.java +++ b/mobile/android/base/fxa/login/BaseRequestDelegate.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; -import org.mozilla.gecko.background.fxa.FxAccountClient10; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.AccountNeedsVerification; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.LocalError; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.RemoteError; +import org.mozilla.goanna.background.fxa.FxAccountClient10; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientRemoteException; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.AccountNeedsVerification; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.LocalError; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.RemoteError; public abstract class BaseRequestDelegate implements FxAccountClient10.RequestDelegate { protected final ExecuteDelegate delegate; diff --git a/mobile/android/base/fxa/login/Cohabiting.java b/mobile/android/base/fxa/login/Cohabiting.java index dd3477a79e..d63ea0b51d 100644 --- a/mobile/android/base/fxa/login/Cohabiting.java +++ b/mobile/android/base/fxa/login/Cohabiting.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.browserid.BrowserIDKeyPair; -import org.mozilla.gecko.browserid.JSONWebTokenUtils; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.LogMessage; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.browserid.BrowserIDKeyPair; +import org.mozilla.goanna.browserid.JSONWebTokenUtils; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.LogMessage; +import org.mozilla.goanna.sync.ExtendedJSONObject; public class Cohabiting extends TokensAndKeysState { private static final String LOG_TAG = Cohabiting.class.getSimpleName(); diff --git a/mobile/android/base/fxa/login/Doghouse.java b/mobile/android/base/fxa/login/Doghouse.java index 57600577db..2dd93fa0d3 100644 --- a/mobile/android/base/fxa/login/Doghouse.java +++ b/mobile/android/base/fxa/login/Doghouse.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.LogMessage; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.LogMessage; public class Doghouse extends State { diff --git a/mobile/android/base/fxa/login/Engaged.java b/mobile/android/base/fxa/login/Engaged.java index 32e7906f86..8dd527ecca 100644 --- a/mobile/android/base/fxa/login/Engaged.java +++ b/mobile/android/base/fxa/login/Engaged.java @@ -2,21 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; import java.security.NoSuchAlgorithmException; -import org.mozilla.gecko.background.fxa.FxAccountClient10.TwoKeys; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.browserid.BrowserIDKeyPair; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.AccountVerified; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.LocalError; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.LogMessage; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.RemoteError; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.Transition; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.background.fxa.FxAccountClient10.TwoKeys; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.browserid.BrowserIDKeyPair; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.AccountVerified; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.LocalError; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.LogMessage; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.RemoteError; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.Transition; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; public class Engaged extends State { private static final String LOG_TAG = Engaged.class.getSimpleName(); diff --git a/mobile/android/base/fxa/login/FxAccountLoginStateMachine.java b/mobile/android/base/fxa/login/FxAccountLoginStateMachine.java index 34e5075419..cdfb7d1e4e 100644 --- a/mobile/android/base/fxa/login/FxAccountLoginStateMachine.java +++ b/mobile/android/base/fxa/login/FxAccountLoginStateMachine.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; import java.security.NoSuchAlgorithmException; import java.util.EnumSet; import java.util.Set; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.browserid.BrowserIDKeyPair; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.Transition; -import org.mozilla.gecko.fxa.login.State.StateLabel; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.browserid.BrowserIDKeyPair; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.Transition; +import org.mozilla.goanna.fxa.login.State.StateLabel; public class FxAccountLoginStateMachine { public static final String LOG_TAG = FxAccountLoginStateMachine.class.getSimpleName(); diff --git a/mobile/android/base/fxa/login/FxAccountLoginTransition.java b/mobile/android/base/fxa/login/FxAccountLoginTransition.java index 6832178533..8a645bd31e 100644 --- a/mobile/android/base/fxa/login/FxAccountLoginTransition.java +++ b/mobile/android/base/fxa/login/FxAccountLoginTransition.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; public class FxAccountLoginTransition { diff --git a/mobile/android/base/fxa/login/Married.java b/mobile/android/base/fxa/login/Married.java index 7d882b5a08..ee543667dc 100644 --- a/mobile/android/base/fxa/login/Married.java +++ b/mobile/android/base/fxa/login/Married.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -14,15 +14,15 @@ import java.util.Collections; import java.util.HashMap; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.browserid.BrowserIDKeyPair; -import org.mozilla.gecko.browserid.JSONWebTokenUtils; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.LogMessage; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.crypto.KeyBundle; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.browserid.BrowserIDKeyPair; +import org.mozilla.goanna.browserid.JSONWebTokenUtils; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.LogMessage; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.crypto.KeyBundle; public class Married extends TokensAndKeysState { private static final String LOG_TAG = Married.class.getSimpleName(); diff --git a/mobile/android/base/fxa/login/MigratedFromSync11.java b/mobile/android/base/fxa/login/MigratedFromSync11.java index c30ac2ff76..b73d3e8279 100644 --- a/mobile/android/base/fxa/login/MigratedFromSync11.java +++ b/mobile/android/base/fxa/login/MigratedFromSync11.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.PasswordRequired; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.PasswordRequired; public class MigratedFromSync11 extends State { public final String password; diff --git a/mobile/android/base/fxa/login/Separated.java b/mobile/android/base/fxa/login/Separated.java index bda620df99..887457dc8e 100644 --- a/mobile/android/base/fxa/login/Separated.java +++ b/mobile/android/base/fxa/login/Separated.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; -import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.PasswordRequired; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; +import org.mozilla.goanna.fxa.login.FxAccountLoginTransition.PasswordRequired; public class Separated extends State { diff --git a/mobile/android/base/fxa/login/State.java b/mobile/android/base/fxa/login/State.java index 797011ec23..6f23cfb563 100644 --- a/mobile/android/base/fxa/login/State.java +++ b/mobile/android/base/fxa/login/State.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; public abstract class State { public static final long CURRENT_VERSION = 3L; diff --git a/mobile/android/base/fxa/login/StateFactory.java b/mobile/android/base/fxa/login/StateFactory.java index a98f2fb276..14f21f4701 100644 --- a/mobile/android/base/fxa/login/StateFactory.java +++ b/mobile/android/base/fxa/login/StateFactory.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.browserid.BrowserIDKeyPair; -import org.mozilla.gecko.browserid.DSACryptoImplementation; -import org.mozilla.gecko.browserid.RSACryptoImplementation; -import org.mozilla.gecko.fxa.login.State.StateLabel; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.browserid.BrowserIDKeyPair; +import org.mozilla.goanna.browserid.DSACryptoImplementation; +import org.mozilla.goanna.browserid.RSACryptoImplementation; +import org.mozilla.goanna.fxa.login.State.StateLabel; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.Utils; /** * Create {@link State} instances from serialized representations. diff --git a/mobile/android/base/fxa/login/TokensAndKeysState.java b/mobile/android/base/fxa/login/TokensAndKeysState.java index 5454a63744..c1aae17f33 100644 --- a/mobile/android/base/fxa/login/TokensAndKeysState.java +++ b/mobile/android/base/fxa/login/TokensAndKeysState.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.login; +package org.mozilla.goanna.fxa.login; -import org.mozilla.gecko.browserid.BrowserIDKeyPair; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.browserid.BrowserIDKeyPair; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; public abstract class TokensAndKeysState extends State { protected final byte[] sessionToken; diff --git a/mobile/android/base/fxa/receivers/FxAccountDeletedReceiver.java b/mobile/android/base/fxa/receivers/FxAccountDeletedReceiver.java index 31665ca0cf..49d133a398 100644 --- a/mobile/android/base/fxa/receivers/FxAccountDeletedReceiver.java +++ b/mobile/android/base/fxa/receivers/FxAccountDeletedReceiver.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.receivers; +package org.mozilla.goanna.fxa.receivers; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/fxa/receivers/FxAccountDeletedService.java b/mobile/android/base/fxa/receivers/FxAccountDeletedService.java index 50094c0c70..598f202e97 100644 --- a/mobile/android/base/fxa/receivers/FxAccountDeletedService.java +++ b/mobile/android/base/fxa/receivers/FxAccountDeletedService.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.receivers; +package org.mozilla.goanna.fxa.receivers; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.sync.FxAccountNotificationManager; -import org.mozilla.gecko.fxa.sync.FxAccountSyncAdapter; -import org.mozilla.gecko.sync.config.AccountPickler; -import org.mozilla.gecko.sync.repositories.android.FennecTabsRepository; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.sync.FxAccountNotificationManager; +import org.mozilla.goanna.fxa.sync.FxAccountSyncAdapter; +import org.mozilla.goanna.sync.config.AccountPickler; +import org.mozilla.goanna.sync.repositories.android.FennecTabsRepository; import android.app.IntentService; import android.content.Context; diff --git a/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java b/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java index ad81e04886..df614be9b9 100644 --- a/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java +++ b/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java @@ -2,21 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.receivers; +package org.mozilla.goanna.fxa.receivers; import java.util.LinkedList; import java.util.List; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.StateLabel; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.StateLabel; +import org.mozilla.goanna.sync.Utils; import android.accounts.Account; import android.content.BroadcastReceiver; diff --git a/mobile/android/base/fxa/sync/FxAccountGlobalSession.java b/mobile/android/base/fxa/sync/FxAccountGlobalSession.java index 8fa3195937..1872e1a977 100644 --- a/mobile/android/base/fxa/sync/FxAccountGlobalSession.java +++ b/mobile/android/base/fxa/sync/FxAccountGlobalSession.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.sync; +package org.mozilla.goanna.fxa.sync; import java.io.IOException; import java.net.URISyntaxException; @@ -11,15 +11,15 @@ import java.util.EnumMap; import java.util.Map; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.sync.GlobalSession; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.SyncConfigurationException; -import org.mozilla.gecko.sync.delegates.BaseGlobalSessionCallback; -import org.mozilla.gecko.sync.delegates.ClientsDataDelegate; -import org.mozilla.gecko.sync.stage.CheckPreconditionsStage; -import org.mozilla.gecko.sync.stage.GlobalSyncStage; -import org.mozilla.gecko.sync.stage.GlobalSyncStage.Stage; +import org.mozilla.goanna.sync.GlobalSession; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.SyncConfigurationException; +import org.mozilla.goanna.sync.delegates.BaseGlobalSessionCallback; +import org.mozilla.goanna.sync.delegates.ClientsDataDelegate; +import org.mozilla.goanna.sync.stage.CheckPreconditionsStage; +import org.mozilla.goanna.sync.stage.GlobalSyncStage; +import org.mozilla.goanna.sync.stage.GlobalSyncStage.Stage; import android.content.Context; diff --git a/mobile/android/base/fxa/sync/FxAccountNotificationManager.java b/mobile/android/base/fxa/sync/FxAccountNotificationManager.java index b3230d8feb..09f8249244 100644 --- a/mobile/android/base/fxa/sync/FxAccountNotificationManager.java +++ b/mobile/android/base/fxa/sync/FxAccountNotificationManager.java @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.sync; +package org.mozilla.goanna.fxa.sync; -import org.mozilla.gecko.BrowserLocaleManager; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.common.telemetry.TelemetryWrapper; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.fxa.activities.FxAccountFinishMigratingActivity; -import org.mozilla.gecko.fxa.activities.FxAccountStatusActivity; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.Action; -import org.mozilla.gecko.sync.telemetry.TelemetryContract; +import org.mozilla.goanna.BrowserLocaleManager; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.common.telemetry.TelemetryWrapper; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.fxa.activities.FxAccountFinishMigratingActivity; +import org.mozilla.goanna.fxa.activities.FxAccountStatusActivity; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.Action; +import org.mozilla.goanna.sync.telemetry.TelemetryContract; import android.app.NotificationManager; import android.app.PendingIntent; diff --git a/mobile/android/base/fxa/sync/FxAccountSchedulePolicy.java b/mobile/android/base/fxa/sync/FxAccountSchedulePolicy.java index 708686e726..26cc817eb5 100644 --- a/mobile/android/base/fxa/sync/FxAccountSchedulePolicy.java +++ b/mobile/android/base/fxa/sync/FxAccountSchedulePolicy.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.sync; +package org.mozilla.goanna.fxa.sync; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.State.Action; -import org.mozilla.gecko.sync.BackoffHandler; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.State.Action; +import org.mozilla.goanna.sync.BackoffHandler; import android.accounts.Account; import android.content.ContentResolver; diff --git a/mobile/android/base/fxa/sync/FxAccountSyncAdapter.java b/mobile/android/base/fxa/sync/FxAccountSyncAdapter.java index fef11a114e..f4aca870f4 100644 --- a/mobile/android/base/fxa/sync/FxAccountSyncAdapter.java +++ b/mobile/android/base/fxa/sync/FxAccountSyncAdapter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.sync; +package org.mozilla.goanna.fxa.sync; import java.net.URI; import java.net.URISyntaxException; @@ -14,38 +14,38 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.background.fxa.SkewHandler; -import org.mozilla.gecko.browserid.JSONWebTokenUtils; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.authenticator.AccountPickler; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.authenticator.FxADefaultLoginStateMachineDelegate; -import org.mozilla.gecko.fxa.authenticator.FxAccountAuthenticator; -import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine; -import org.mozilla.gecko.fxa.login.Married; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.StateLabel; -import org.mozilla.gecko.fxa.sync.FxAccountSyncDelegate.Result; -import org.mozilla.gecko.sync.BackoffHandler; -import org.mozilla.gecko.sync.GlobalSession; -import org.mozilla.gecko.sync.PrefsBackoffHandler; -import org.mozilla.gecko.sync.SharedPreferencesClientsDataDelegate; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.delegates.BaseGlobalSessionCallback; -import org.mozilla.gecko.sync.delegates.ClientsDataDelegate; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.HawkAuthHeaderProvider; -import org.mozilla.gecko.sync.stage.GlobalSyncStage.Stage; -import org.mozilla.gecko.tokenserver.TokenServerClient; -import org.mozilla.gecko.tokenserver.TokenServerClientDelegate; -import org.mozilla.gecko.tokenserver.TokenServerException; -import org.mozilla.gecko.tokenserver.TokenServerToken; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.background.fxa.SkewHandler; +import org.mozilla.goanna.browserid.JSONWebTokenUtils; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.authenticator.AccountPickler; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.authenticator.FxADefaultLoginStateMachineDelegate; +import org.mozilla.goanna.fxa.authenticator.FxAccountAuthenticator; +import org.mozilla.goanna.fxa.login.FxAccountLoginStateMachine; +import org.mozilla.goanna.fxa.login.Married; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.StateLabel; +import org.mozilla.goanna.fxa.sync.FxAccountSyncDelegate.Result; +import org.mozilla.goanna.sync.BackoffHandler; +import org.mozilla.goanna.sync.GlobalSession; +import org.mozilla.goanna.sync.PrefsBackoffHandler; +import org.mozilla.goanna.sync.SharedPreferencesClientsDataDelegate; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.delegates.BaseGlobalSessionCallback; +import org.mozilla.goanna.sync.delegates.ClientsDataDelegate; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.HawkAuthHeaderProvider; +import org.mozilla.goanna.sync.stage.GlobalSyncStage.Stage; +import org.mozilla.goanna.tokenserver.TokenServerClient; +import org.mozilla.goanna.tokenserver.TokenServerClientDelegate; +import org.mozilla.goanna.tokenserver.TokenServerException; +import org.mozilla.goanna.tokenserver.TokenServerToken; import android.accounts.Account; import android.content.AbstractThreadedSyncAdapter; diff --git a/mobile/android/base/fxa/sync/FxAccountSyncDelegate.java b/mobile/android/base/fxa/sync/FxAccountSyncDelegate.java index 71148f66cf..8454e016f8 100644 --- a/mobile/android/base/fxa/sync/FxAccountSyncDelegate.java +++ b/mobile/android/base/fxa/sync/FxAccountSyncDelegate.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.sync; +package org.mozilla.goanna.fxa.sync; import java.util.concurrent.BlockingQueue; -import org.mozilla.gecko.fxa.login.State; +import org.mozilla.goanna.fxa.login.State; import android.content.SyncResult; diff --git a/mobile/android/base/fxa/sync/FxAccountSyncService.java b/mobile/android/base/fxa/sync/FxAccountSyncService.java index 59c06ca976..8887f9ca51 100644 --- a/mobile/android/base/fxa/sync/FxAccountSyncService.java +++ b/mobile/android/base/fxa/sync/FxAccountSyncService.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.sync; +package org.mozilla.goanna.fxa.sync; import android.app.Service; import android.content.Intent; diff --git a/mobile/android/base/fxa/sync/FxAccountSyncStatusHelper.java b/mobile/android/base/fxa/sync/FxAccountSyncStatusHelper.java index fc4b33f866..c73dfc373e 100644 --- a/mobile/android/base/fxa/sync/FxAccountSyncStatusHelper.java +++ b/mobile/android/base/fxa/sync/FxAccountSyncStatusHelper.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.sync; +package org.mozilla.goanna.fxa.sync; import java.util.Map; import java.util.Map.Entry; import java.util.WeakHashMap; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; import android.content.ContentResolver; import android.content.SyncStatusObserver; diff --git a/mobile/android/base/fxa/sync/SchedulePolicy.java b/mobile/android/base/fxa/sync/SchedulePolicy.java index 809191f5e2..7acfbcd16c 100644 --- a/mobile/android/base/fxa/sync/SchedulePolicy.java +++ b/mobile/android/base/fxa/sync/SchedulePolicy.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.sync; +package org.mozilla.goanna.fxa.sync; -import org.mozilla.gecko.fxa.login.State.Action; -import org.mozilla.gecko.sync.BackoffHandler; +import org.mozilla.goanna.fxa.login.State.Action; +import org.mozilla.goanna.sync.BackoffHandler; public interface SchedulePolicy { /** diff --git a/mobile/android/base/fxa/tasks/FxAccountCodeResender.java b/mobile/android/base/fxa/tasks/FxAccountCodeResender.java index d98e97f080..2230c59e5b 100644 --- a/mobile/android/base/fxa/tasks/FxAccountCodeResender.java +++ b/mobile/android/base/fxa/tasks/FxAccountCodeResender.java @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.tasks; +package org.mozilla.goanna.fxa.tasks; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.background.fxa.FxAccountClient10.RequestDelegate; -import org.mozilla.gecko.background.fxa.FxAccountClient20; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.Engaged; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.background.fxa.FxAccountClient10.RequestDelegate; +import org.mozilla.goanna.background.fxa.FxAccountClient20; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientRemoteException; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.Engaged; import android.content.Context; import android.os.AsyncTask; diff --git a/mobile/android/base/fxa/tasks/FxAccountCreateAccountTask.java b/mobile/android/base/fxa/tasks/FxAccountCreateAccountTask.java index cf1c74e949..a28566879e 100644 --- a/mobile/android/base/fxa/tasks/FxAccountCreateAccountTask.java +++ b/mobile/android/base/fxa/tasks/FxAccountCreateAccountTask.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.tasks; +package org.mozilla.goanna.fxa.tasks; import java.io.UnsupportedEncodingException; import java.util.Map; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.background.fxa.FxAccountClient10.RequestDelegate; -import org.mozilla.gecko.background.fxa.FxAccountClient20.LoginResponse; -import org.mozilla.gecko.background.fxa.PasswordStretcher; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.background.fxa.FxAccountClient10.RequestDelegate; +import org.mozilla.goanna.background.fxa.FxAccountClient20.LoginResponse; +import org.mozilla.goanna.background.fxa.PasswordStretcher; import android.content.Context; diff --git a/mobile/android/base/fxa/tasks/FxAccountSetupTask.java b/mobile/android/base/fxa/tasks/FxAccountSetupTask.java index c5c9c429c2..9676a18f7e 100644 --- a/mobile/android/base/fxa/tasks/FxAccountSetupTask.java +++ b/mobile/android/base/fxa/tasks/FxAccountSetupTask.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.tasks; +package org.mozilla.goanna.fxa.tasks; import java.util.Map; import java.util.concurrent.CountDownLatch; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.background.fxa.FxAccountClient10.RequestDelegate; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException; -import org.mozilla.gecko.fxa.tasks.FxAccountSetupTask.InnerRequestDelegate; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.background.fxa.FxAccountClient10.RequestDelegate; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientRemoteException; +import org.mozilla.goanna.fxa.tasks.FxAccountSetupTask.InnerRequestDelegate; import android.content.Context; import android.os.AsyncTask; diff --git a/mobile/android/base/fxa/tasks/FxAccountSignInTask.java b/mobile/android/base/fxa/tasks/FxAccountSignInTask.java index dd5ae0d5e9..47c2106287 100644 --- a/mobile/android/base/fxa/tasks/FxAccountSignInTask.java +++ b/mobile/android/base/fxa/tasks/FxAccountSignInTask.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.tasks; +package org.mozilla.goanna.fxa.tasks; import java.io.UnsupportedEncodingException; import java.util.Map; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.background.fxa.FxAccountClient10.RequestDelegate; -import org.mozilla.gecko.background.fxa.FxAccountClient20.LoginResponse; -import org.mozilla.gecko.background.fxa.PasswordStretcher; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.background.fxa.FxAccountClient10.RequestDelegate; +import org.mozilla.goanna.background.fxa.FxAccountClient20.LoginResponse; +import org.mozilla.goanna.background.fxa.PasswordStretcher; import android.content.Context; diff --git a/mobile/android/base/fxa/tasks/FxAccountUnlockCodeResender.java b/mobile/android/base/fxa/tasks/FxAccountUnlockCodeResender.java index 0f32f3e222..2a5e6f8782 100644 --- a/mobile/android/base/fxa/tasks/FxAccountUnlockCodeResender.java +++ b/mobile/android/base/fxa/tasks/FxAccountUnlockCodeResender.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.fxa.tasks; +package org.mozilla.goanna.fxa.tasks; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountClient; -import org.mozilla.gecko.background.fxa.FxAccountClient10.RequestDelegate; -import org.mozilla.gecko.background.fxa.FxAccountClient20; -import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountClient; +import org.mozilla.goanna.background.fxa.FxAccountClient10.RequestDelegate; +import org.mozilla.goanna.background.fxa.FxAccountClient20; +import org.mozilla.goanna.background.fxa.FxAccountClientException.FxAccountClientRemoteException; import android.content.Context; import android.os.AsyncTask; diff --git a/mobile/android/base/geckoview.ddf b/mobile/android/base/geckoview.ddf index 344478e445..cae9d21329 100644 --- a/mobile/android/base/geckoview.ddf +++ b/mobile/android/base/geckoview.ddf @@ -7,64 +7,64 @@ show allResults [lib] = \ - org.mozilla.gecko.gfx.* \ - org.mozilla.gecko.mozglue.* \ - org.mozilla.gecko.sqlite.* \ - org.mozilla.gecko.util.* \ - org.mozilla.gecko.AndroidGamepadManager \ - org.mozilla.gecko.AppConstants \ - org.mozilla.gecko.BaseGoannaInterface \ - org.mozilla.gecko.ContextGetter \ - org.mozilla.gecko.CrashHandler \ - org.mozilla.gecko.EventDispatcher \ - org.mozilla.gecko.GoannaAccessibility \ - org.mozilla.gecko.GoannaAppShell \ - org.mozilla.gecko.GoannaBatteryManager \ - org.mozilla.gecko.GoannaEditable \ - org.mozilla.gecko.GoannaEditableClient \ - org.mozilla.gecko.GoannaEditableListener \ - org.mozilla.gecko.GoannaEvent \ - org.mozilla.gecko.GoannaInputConnection \ - org.mozilla.gecko.GoannaJavaSampler \ - org.mozilla.gecko.GoannaNetworkManager \ - org.mozilla.gecko.GoannaProfile \ - org.mozilla.gecko.GoannaScreenOrientation \ - org.mozilla.gecko.GoannaSharedPrefs \ - org.mozilla.gecko.GoannaThread \ - org.mozilla.gecko.GoannaView \ - org.mozilla.gecko.GlobalHistory \ - org.mozilla.gecko.InputMethods \ - org.mozilla.gecko.NSSBridge \ - org.mozilla.gecko.NotificationClient \ - org.mozilla.gecko.NotificationHandler \ - org.mozilla.gecko.PrefsHelper \ - org.mozilla.gecko.SmsManager \ - org.mozilla.gecko.SurfaceBits \ - org.mozilla.gecko.SysInfo \ - org.mozilla.gecko.TouchEventInterceptor \ - org.mozilla.gecko.ZoomConstraints + org.mozilla.goanna.gfx.* \ + org.mozilla.goanna.mozglue.* \ + org.mozilla.goanna.sqlite.* \ + org.mozilla.goanna.util.* \ + org.mozilla.goanna.AndroidGamepadManager \ + org.mozilla.goanna.AppConstants \ + org.mozilla.goanna.BaseGoannaInterface \ + org.mozilla.goanna.ContextGetter \ + org.mozilla.goanna.CrashHandler \ + org.mozilla.goanna.EventDispatcher \ + org.mozilla.goanna.GoannaAccessibility \ + org.mozilla.goanna.GoannaAppShell \ + org.mozilla.goanna.GoannaBatteryManager \ + org.mozilla.goanna.GoannaEditable \ + org.mozilla.goanna.GoannaEditableClient \ + org.mozilla.goanna.GoannaEditableListener \ + org.mozilla.goanna.GoannaEvent \ + org.mozilla.goanna.GoannaInputConnection \ + org.mozilla.goanna.GoannaJavaSampler \ + org.mozilla.goanna.GoannaNetworkManager \ + org.mozilla.goanna.GoannaProfile \ + org.mozilla.goanna.GoannaScreenOrientation \ + org.mozilla.goanna.GoannaSharedPrefs \ + org.mozilla.goanna.GoannaThread \ + org.mozilla.goanna.GoannaView \ + org.mozilla.goanna.GlobalHistory \ + org.mozilla.goanna.InputMethods \ + org.mozilla.goanna.NSSBridge \ + org.mozilla.goanna.NotificationClient \ + org.mozilla.goanna.NotificationHandler \ + org.mozilla.goanna.PrefsHelper \ + org.mozilla.goanna.SmsManager \ + org.mozilla.goanna.SurfaceBits \ + org.mozilla.goanna.SysInfo \ + org.mozilla.goanna.TouchEventInterceptor \ + org.mozilla.goanna.ZoomConstraints [middle] = \ - org.mozilla.gecko.prompts.* \ - org.mozilla.gecko.AlertNotification \ - org.mozilla.gecko.FormAssistPopup \ - org.mozilla.gecko.GoannaActivity \ - org.mozilla.gecko.GoannaApp \ - org.mozilla.gecko.GoannaProfileDirectories \ - org.mozilla.gecko.GuestSession \ - org.mozilla.gecko.R \ - org.mozilla.gecko.Tab \ - org.mozilla.gecko.Tabs \ - org.mozilla.gecko.Telemetry \ - org.mozilla.gecko.TelemetryContract \ - org.mozilla.gecko.ThumbnailHelper \ - org.mozilla.gecko.db.BrowserDB \ - org.mozilla.gecko.db.LocalBrowserDB \ - org.mozilla.gecko.distribution.Distribution \ - org.mozilla.gecko.favicons.Favicons \ - org.mozilla.gecko.favicons.OnFaviconLoadedListener + org.mozilla.goanna.prompts.* \ + org.mozilla.goanna.AlertNotification \ + org.mozilla.goanna.FormAssistPopup \ + org.mozilla.goanna.GoannaActivity \ + org.mozilla.goanna.GoannaApp \ + org.mozilla.goanna.GoannaProfileDirectories \ + org.mozilla.goanna.GuestSession \ + org.mozilla.goanna.R \ + org.mozilla.goanna.Tab \ + org.mozilla.goanna.Tabs \ + org.mozilla.goanna.Telemetry \ + org.mozilla.goanna.TelemetryContract \ + org.mozilla.goanna.ThumbnailHelper \ + org.mozilla.goanna.db.BrowserDB \ + org.mozilla.goanna.db.LocalBrowserDB \ + org.mozilla.goanna.distribution.Distribution \ + org.mozilla.goanna.favicons.Favicons \ + org.mozilla.goanna.favicons.OnFaviconLoadedListener -[main] = org.mozilla.gecko.* excluding [lib] [middle] +[main] = org.mozilla.goanna.* excluding [lib] [middle] check sets [lib] [middle] [main] diff --git a/mobile/android/base/gfx/Axis.java b/mobile/android/base/gfx/Axis.java index 6d762346bf..e3f7ddb9da 100644 --- a/mobile/android/base/gfx/Axis.java +++ b/mobile/android/base/gfx/Axis.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import java.util.HashMap; import java.util.Map; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.util.FloatUtils; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.util.FloatUtils; import android.os.SystemClock; import android.util.Log; diff --git a/mobile/android/base/gfx/BitmapUtils.java b/mobile/android/base/gfx/BitmapUtils.java index aeb117552d..7bc13cc1ec 100644 --- a/mobile/android/base/gfx/BitmapUtils.java +++ b/mobile/android/base/gfx/BitmapUtils.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import java.io.IOException; import java.io.InputStream; @@ -11,14 +11,14 @@ import java.lang.reflect.Field; import java.net.MalformedURLException; import java.net.URL; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.R; -import org.mozilla.gecko.util.GoannaJarReader; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.UIAsyncTask; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.ThumbnailHelper; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.R; +import org.mozilla.goanna.util.GoannaJarReader; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.UIAsyncTask; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.ThumbnailHelper; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/gfx/BufferedImage.java b/mobile/android/base/gfx/BufferedImage.java index 238aa5c7f0..763c6ffb76 100644 --- a/mobile/android/base/gfx/BufferedImage.java +++ b/mobile/android/base/gfx/BufferedImage.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.mozglue.DirectBufferAllocator; +import org.mozilla.goanna.mozglue.DirectBufferAllocator; import android.graphics.Bitmap; import android.util.Log; diff --git a/mobile/android/base/gfx/BufferedImageGLInfo.java b/mobile/android/base/gfx/BufferedImageGLInfo.java index 41f38e1ba0..eda6416239 100644 --- a/mobile/android/base/gfx/BufferedImageGLInfo.java +++ b/mobile/android/base/gfx/BufferedImageGLInfo.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import javax.microedition.khronos.opengles.GL10; diff --git a/mobile/android/base/gfx/DisplayPortCalculator.java b/mobile/android/base/gfx/DisplayPortCalculator.java index 98c60e6b59..36e38fd726 100644 --- a/mobile/android/base/gfx/DisplayPortCalculator.java +++ b/mobile/android/base/gfx/DisplayPortCalculator.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.util.FloatUtils; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.util.FloatUtils; import org.json.JSONArray; diff --git a/mobile/android/base/gfx/DisplayPortMetrics.java b/mobile/android/base/gfx/DisplayPortMetrics.java index 386d96fb15..bf438d81b0 100644 --- a/mobile/android/base/gfx/DisplayPortMetrics.java +++ b/mobile/android/base/gfx/DisplayPortMetrics.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; -import org.mozilla.gecko.util.FloatUtils; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.util.FloatUtils; import android.graphics.RectF; diff --git a/mobile/android/base/gfx/DrawTimingQueue.java b/mobile/android/base/gfx/DrawTimingQueue.java index cb0b07ab36..6205c12124 100644 --- a/mobile/android/base/gfx/DrawTimingQueue.java +++ b/mobile/android/base/gfx/DrawTimingQueue.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import android.os.SystemClock; diff --git a/mobile/android/base/gfx/FloatSize.java b/mobile/android/base/gfx/FloatSize.java index 4b495ab77e..ee16c34db0 100644 --- a/mobile/android/base/gfx/FloatSize.java +++ b/mobile/android/base/gfx/FloatSize.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.util.FloatUtils; +import org.mozilla.goanna.util.FloatUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/gfx/FullScreenState.java b/mobile/android/base/gfx/FullScreenState.java index 9574bbe0e5..1415d2aa94 100644 --- a/mobile/android/base/gfx/FullScreenState.java +++ b/mobile/android/base/gfx/FullScreenState.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; public enum FullScreenState { NONE, diff --git a/mobile/android/base/gfx/GLController.java b/mobile/android/base/gfx/GLController.java index 4068543431..85cc545007 100644 --- a/mobile/android/base/gfx/GLController.java +++ b/mobile/android/base/gfx/GLController.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaThread; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaThread; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.util.ThreadUtils; import android.util.Log; @@ -187,7 +187,7 @@ public class GLController { return; } - // Only try to create the compositor if we have a valid surface and gecko is up. When these + // Only try to create the compositor if we have a valid surface and goanna is up. When these // two conditions are satisfied, we can be relatively sure that the compositor creation will // happen without needing to block anywhere. Do it with a synchronous Goanna event so that the // Android doesn't have a chance to destroy our surface in between. @@ -198,7 +198,7 @@ public class GLController { void compositorCreated() { // This is invoked on the compositor thread, while the java UI thread - // is blocked on the gecko sync event in updateCompositor() above + // is blocked on the goanna sync event in updateCompositor() above mCompositorCreated = true; } diff --git a/mobile/android/base/gfx/GeckoLayerClient.java b/mobile/android/base/gfx/GeckoLayerClient.java index 9163a4344a..af09d71a36 100644 --- a/mobile/android/base/gfx/GeckoLayerClient.java +++ b/mobile/android/base/gfx/GeckoLayerClient.java @@ -3,18 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.gfx.LayerView.DrawListener; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.ZoomConstraints; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.util.FloatUtils; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.gfx.LayerView.DrawListener; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.ZoomConstraints; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.util.FloatUtils; import android.content.Context; import android.graphics.PointF; @@ -158,7 +158,7 @@ class GoannaLayerClient implements LayerView.Listener, PanZoomTarget DisplayPortCalculator.initPrefs(); // Goanna being ready is one of the two conditions (along with having an available - // surface) that cause us to create the compositor. So here, now that we know gecko + // surface) that cause us to create the compositor. So here, now that we know goanna // is ready, call updateCompositor() to see if we can actually do the creation. // This needs to run on the UI thread so that the surface validity can't change on // us while we're in the middle of creating the compositor. @@ -218,11 +218,11 @@ class GoannaLayerClient implements LayerView.Listener, PanZoomTarget mViewportMetrics = mViewportMetrics.setViewportSize(width, height); if (mGoannaIsReady) { - // here we send gecko a resize message. The code in browser.js is responsible for + // here we send goanna a resize message. The code in browser.js is responsible for // picking up on that resize event, modifying the viewport as necessary, and informing // us of the new viewport. sendResizeEventIfNecessary(true); - // the following call also sends gecko a message, which will be processed after the resize + // the following call also sends goanna a message, which will be processed after the resize // message above has updated the viewport. this message ensures that if we have just put // focus in a text field, we scroll the content so that the text field is in view. GoannaAppShell.viewSizeChanged(); @@ -416,11 +416,11 @@ class GoannaLayerClient implements LayerView.Listener, PanZoomTarget // Update the Goanna-side viewport metrics. Make sure to do this // before modifying the metrics below. - final ImmutableViewportMetrics geckoMetrics = newMetrics.clamp(); + final ImmutableViewportMetrics goannaMetrics = newMetrics.clamp(); post(new Runnable() { @Override public void run() { - mGoannaViewport = geckoMetrics; + mGoannaViewport = goannaMetrics; } }); @@ -612,7 +612,7 @@ class GoannaLayerClient implements LayerView.Listener, PanZoomTarget // we previously displaying. This means we need to abort any panning/zooming animations // that are in progress and send an updated display port request to browser.js as soon // as possible. The call to PanZoomController.abortAnimation accomplishes this by calling the - // forceRedraw function, which sends the viewport to gecko. The display port request is + // forceRedraw function, which sends the viewport to goanna. The display port request is // actually a full viewport update, which is fine because if browser.js has somehow moved to // be out of sync with this first-paint viewport, then we force them back in sync. abortPanZoomAnimation(); @@ -978,18 +978,18 @@ class GoannaLayerClient implements LayerView.Listener, PanZoomTarget PointF offset = viewportMetrics.getMarginOffset(); origin.offset(-offset.x, -offset.y); float zoom = viewportMetrics.zoomFactor; - ImmutableViewportMetrics geckoViewport = mGoannaViewport; - PointF geckoOrigin = geckoViewport.getOrigin(); - float geckoZoom = geckoViewport.zoomFactor; + ImmutableViewportMetrics goannaViewport = mGoannaViewport; + PointF goannaOrigin = goannaViewport.getOrigin(); + float goannaZoom = goannaViewport.zoomFactor; // viewPoint + origin - offset gives the coordinate in device pixels from the top-left corner of the page. // Divided by zoom, this gives us the coordinate in CSS pixels from the top-left corner of the page. - // geckoOrigin / geckoZoom is where Goanna thinks it is (scrollTo position) in CSS pixels from + // goannaOrigin / goannaZoom is where Goanna thinks it is (scrollTo position) in CSS pixels from // the top-left corner of the page. Subtracting the two gives us the offset of the viewPoint from // the current Goanna coordinate in CSS pixels. PointF layerPoint = new PointF( - ((viewPoint.x + origin.x) / zoom) - (geckoOrigin.x / geckoZoom), - ((viewPoint.y + origin.y) / zoom) - (geckoOrigin.y / geckoZoom)); + ((viewPoint.x + origin.x) / zoom) - (goannaOrigin.x / goannaZoom), + ((viewPoint.y + origin.y) / zoom) - (goannaOrigin.y / goannaZoom)); return layerPoint; } diff --git a/mobile/android/base/gfx/ImmutableViewportMetrics.java b/mobile/android/base/gfx/ImmutableViewportMetrics.java index 817190c6c4..913ff73450 100644 --- a/mobile/android/base/gfx/ImmutableViewportMetrics.java +++ b/mobile/android/base/gfx/ImmutableViewportMetrics.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; -import org.mozilla.gecko.util.FloatUtils; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.util.FloatUtils; import android.graphics.PointF; import android.graphics.RectF; diff --git a/mobile/android/base/gfx/InputConnectionHandler.java b/mobile/android/base/gfx/InputConnectionHandler.java index 9b3ca381b5..066240dea2 100644 --- a/mobile/android/base/gfx/InputConnectionHandler.java +++ b/mobile/android/base/gfx/InputConnectionHandler.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import android.os.Handler; import android.view.KeyEvent; diff --git a/mobile/android/base/gfx/IntSize.java b/mobile/android/base/gfx/IntSize.java index b758d732c2..c3dabe85d8 100644 --- a/mobile/android/base/gfx/IntSize.java +++ b/mobile/android/base/gfx/IntSize.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/gfx/JavaPanZoomController.java b/mobile/android/base/gfx/JavaPanZoomController.java index e3d35cea33..b1cb4eb805 100644 --- a/mobile/android/base/gfx/JavaPanZoomController.java +++ b/mobile/android/base/gfx/JavaPanZoomController.java @@ -3,21 +3,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.ZoomConstraints; -import org.mozilla.gecko.util.FloatUtils; -import org.mozilla.gecko.util.GamepadUtils; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.ZoomConstraints; +import org.mozilla.goanna.util.FloatUtils; +import org.mozilla.goanna.util.GamepadUtils; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; import android.graphics.PointF; import android.graphics.RectF; @@ -363,7 +363,7 @@ class JavaPanZoomController @Override public void abortAnimation() { checkMainThread(); - // this happens when gecko changes the viewport on us or if the device is rotated. + // this happens when goanna changes the viewport on us or if the device is rotated. // if that's the case, abort any animation in progress and re-zoom so that the page // snaps to edges. for other cases (where the user's finger(s) are down) don't do // anything special. @@ -1304,7 +1304,7 @@ class JavaPanZoomController case ANIMATED_ZOOM: case BOUNCE: // don't redraw during these because the zoom is (or might be, in the case - // of BOUNCE) be changing rapidly and gecko will have to redraw the entire + // of BOUNCE) be changing rapidly and goanna will have to redraw the entire // display port area. we trigger a force-redraw upon exiting these states. return false; default: diff --git a/mobile/android/base/gfx/Layer.java b/mobile/android/base/gfx/Layer.java index 20bfce76d0..c4609ad324 100644 --- a/mobile/android/base/gfx/Layer.java +++ b/mobile/android/base/gfx/Layer.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.util.FloatUtils; +import org.mozilla.goanna.util.FloatUtils; import android.graphics.PointF; import android.graphics.Rect; diff --git a/mobile/android/base/gfx/LayerMarginsAnimator.java b/mobile/android/base/gfx/LayerMarginsAnimator.java index 479b28137a..d6daa24a9b 100644 --- a/mobile/android/base/gfx/LayerMarginsAnimator.java +++ b/mobile/android/base/gfx/LayerMarginsAnimator.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.util.FloatUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.util.FloatUtils; +import org.mozilla.goanna.util.ThreadUtils; import android.graphics.PointF; import android.graphics.RectF; diff --git a/mobile/android/base/gfx/LayerRenderer.java b/mobile/android/base/gfx/LayerRenderer.java index f778744333..ebbb2b93d8 100644 --- a/mobile/android/base/gfx/LayerRenderer.java +++ b/mobile/android/base/gfx/LayerRenderer.java @@ -3,15 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.gfx.Layer.RenderContext; -import org.mozilla.gecko.gfx.RenderTask; -import org.mozilla.gecko.mozglue.DirectBufferAllocator; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.gfx.Layer.RenderContext; +import org.mozilla.goanna.gfx.RenderTask; +import org.mozilla.goanna.mozglue.DirectBufferAllocator; import android.content.Context; import android.content.SharedPreferences; @@ -27,8 +27,8 @@ import android.opengl.GLES20; import android.os.SystemClock; import android.util.Log; -import org.mozilla.gecko.mozglue.JNITarget; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.mozglue.JNITarget; +import org.mozilla.goanna.util.ThreadUtils; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/mobile/android/base/gfx/LayerView.java b/mobile/android/base/gfx/LayerView.java index 80a3de14e9..bf823e5bbe 100644 --- a/mobile/android/base/gfx/LayerView.java +++ b/mobile/android/base/gfx/LayerView.java @@ -3,24 +3,24 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import java.nio.ByteBuffer; import java.nio.IntBuffer; import java.util.ArrayList; -import org.mozilla.gecko.AndroidGamepadManager; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAccessibility; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.ZoomConstraints; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.AndroidGamepadManager; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAccessibility; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.ZoomConstraints; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; import android.content.Context; import android.graphics.Bitmap; @@ -153,7 +153,7 @@ public class LayerView extends FrameLayout implements Tabs.OnTabsChangedListener (int)event.getToolMinor() / 2); } - public void geckoConnected() { + public void goannaConnected() { // See if we want to force 16-bit colour before doing anything PrefsHelper.getPref("gfx.android.rgb16.force", new PrefsHelper.PrefHandlerBase() { @Override public void prefValue(String pref, boolean force16bit) { diff --git a/mobile/android/base/gfx/NativePanZoomController.java b/mobile/android/base/gfx/NativePanZoomController.java index 487589f942..a4c6914ae7 100644 --- a/mobile/android/base/gfx/NativePanZoomController.java +++ b/mobile/android/base/gfx/NativePanZoomController.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaThread; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaThread; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.util.GoannaEventListener; import org.json.JSONObject; diff --git a/mobile/android/base/gfx/Overscroll.java b/mobile/android/base/gfx/Overscroll.java index e442444d5a..a11dcf4d54 100644 --- a/mobile/android/base/gfx/Overscroll.java +++ b/mobile/android/base/gfx/Overscroll.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import android.graphics.Canvas; diff --git a/mobile/android/base/gfx/OverscrollEdgeEffect.java b/mobile/android/base/gfx/OverscrollEdgeEffect.java index f2a73e07fc..622e17a7cc 100644 --- a/mobile/android/base/gfx/OverscrollEdgeEffect.java +++ b/mobile/android/base/gfx/OverscrollEdgeEffect.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.AppConstants.Versions; import android.content.Context; import android.graphics.Canvas; diff --git a/mobile/android/base/gfx/PanZoomController.java b/mobile/android/base/gfx/PanZoomController.java index 2b0cbc4db5..acfe5e1ab9 100644 --- a/mobile/android/base/gfx/PanZoomController.java +++ b/mobile/android/base/gfx/PanZoomController.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.EventDispatcher; import android.graphics.PointF; import android.view.KeyEvent; @@ -23,7 +23,7 @@ public interface PanZoomController { static class Factory { static PanZoomController create(PanZoomTarget target, View view, EventDispatcher dispatcher) { - if (org.mozilla.gecko.AppConstants.MOZ_ANDROID_APZ) { + if (org.mozilla.goanna.AppConstants.MOZ_ANDROID_APZ) { return new NativePanZoomController(target, view, dispatcher); } else { return new JavaPanZoomController(target, view, dispatcher); diff --git a/mobile/android/base/gfx/PanZoomTarget.java b/mobile/android/base/gfx/PanZoomTarget.java index 7f47865ba8..2adb2b4169 100644 --- a/mobile/android/base/gfx/PanZoomTarget.java +++ b/mobile/android/base/gfx/PanZoomTarget.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.ZoomConstraints; +import org.mozilla.goanna.ZoomConstraints; import android.graphics.PointF; import android.graphics.RectF; diff --git a/mobile/android/base/gfx/PanningPerfAPI.java b/mobile/android/base/gfx/PanningPerfAPI.java index 4477b20964..b4cd9ad8ad 100644 --- a/mobile/android/base/gfx/PanningPerfAPI.java +++ b/mobile/android/base/gfx/PanningPerfAPI.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; import android.os.SystemClock; import android.util.Log; diff --git a/mobile/android/base/gfx/PluginLayer.java b/mobile/android/base/gfx/PluginLayer.java index 3af96ce1f6..1329b30c5c 100644 --- a/mobile/android/base/gfx/PluginLayer.java +++ b/mobile/android/base/gfx/PluginLayer.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.util.FloatUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.util.FloatUtils; +import org.mozilla.goanna.util.ThreadUtils; import android.graphics.PointF; import android.graphics.Rect; diff --git a/mobile/android/base/gfx/PointUtils.java b/mobile/android/base/gfx/PointUtils.java index 2663a42515..e6bb3f60ed 100644 --- a/mobile/android/base/gfx/PointUtils.java +++ b/mobile/android/base/gfx/PointUtils.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/gfx/ProgressiveUpdateData.java b/mobile/android/base/gfx/ProgressiveUpdateData.java index 07c4a2860f..2f62bb7bf5 100644 --- a/mobile/android/base/gfx/ProgressiveUpdateData.java +++ b/mobile/android/base/gfx/ProgressiveUpdateData.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.mozglue.generatorannotations.WrapEntireClassForJNI; +import org.mozilla.goanna.mozglue.generatorannotations.WrapEntireClassForJNI; /** * This is the data structure that's returned by the progressive tile update diff --git a/mobile/android/base/gfx/RectUtils.java b/mobile/android/base/gfx/RectUtils.java index 22151db769..a81b006e6b 100644 --- a/mobile/android/base/gfx/RectUtils.java +++ b/mobile/android/base/gfx/RectUtils.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.util.FloatUtils; +import org.mozilla.goanna.util.FloatUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/gfx/RenderTask.java b/mobile/android/base/gfx/RenderTask.java index 80cbf77f0a..696b50d790 100644 --- a/mobile/android/base/gfx/RenderTask.java +++ b/mobile/android/base/gfx/RenderTask.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; /** * A class used to schedule a callback to occur when the next frame is drawn. diff --git a/mobile/android/base/gfx/ScrollbarLayer.java b/mobile/android/base/gfx/ScrollbarLayer.java index f1593aea9b..116d44ee12 100644 --- a/mobile/android/base/gfx/ScrollbarLayer.java +++ b/mobile/android/base/gfx/ScrollbarLayer.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.util.FloatUtils; +import org.mozilla.goanna.util.FloatUtils; import android.graphics.Bitmap; import android.graphics.Rect; diff --git a/mobile/android/base/gfx/SimpleScaleGestureDetector.java b/mobile/android/base/gfx/SimpleScaleGestureDetector.java index beae3b91b9..6c81380f1d 100644 --- a/mobile/android/base/gfx/SimpleScaleGestureDetector.java +++ b/mobile/android/base/gfx/SimpleScaleGestureDetector.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import org.json.JSONException; diff --git a/mobile/android/base/gfx/SubdocumentScrollHelper.java b/mobile/android/base/gfx/SubdocumentScrollHelper.java index 92213b385b..9ce8e9a86c 100644 --- a/mobile/android/base/gfx/SubdocumentScrollHelper.java +++ b/mobile/android/base/gfx/SubdocumentScrollHelper.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.util.GoannaEventListener; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/gfx/TextureGenerator.java b/mobile/android/base/gfx/TextureGenerator.java index 97446d28b9..9b5a92acdf 100644 --- a/mobile/android/base/gfx/TextureGenerator.java +++ b/mobile/android/base/gfx/TextureGenerator.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import android.opengl.GLES20; import android.util.Log; diff --git a/mobile/android/base/gfx/TextureReaper.java b/mobile/android/base/gfx/TextureReaper.java index 2b132cb88c..f874208624 100644 --- a/mobile/android/base/gfx/TextureReaper.java +++ b/mobile/android/base/gfx/TextureReaper.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import android.opengl.GLES20; diff --git a/mobile/android/base/gfx/TileLayer.java b/mobile/android/base/gfx/TileLayer.java index a7bc032dae..9d5ae609fe 100644 --- a/mobile/android/base/gfx/TileLayer.java +++ b/mobile/android/base/gfx/TileLayer.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; import android.graphics.Rect; import android.opengl.GLES20; diff --git a/mobile/android/base/gfx/TouchEventHandler.java b/mobile/android/base/gfx/TouchEventHandler.java index 3b1584d387..84819e4128 100644 --- a/mobile/android/base/gfx/TouchEventHandler.java +++ b/mobile/android/base/gfx/TouchEventHandler.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; import android.content.Context; import android.os.SystemClock; @@ -38,7 +38,7 @@ import java.util.Queue; * the block, or the first MOVE event following that, were prevent-defaulted. * * A "default-prevented notification" is when we here in Java-land receive a notification - * from gecko as to whether or not a block of events was default-prevented. This happens + * from goanna as to whether or not a block of events was default-prevented. This happens * at some point after the first or second event in the block is processed in Goanna. * This code assumes we get EXACTLY ONE default-prevented notification for each block * of events. @@ -82,7 +82,7 @@ final class TouchEventHandler implements Tabs.OnTabsChangedListener { // this next variable requires some explanation. strap yourself in. // - // for each block of events, we do two things: (1) send the events to gecko and expect + // for each block of events, we do two things: (1) send the events to goanna and expect // exactly one default-prevented notification in return, and (2) kick off a delayed // ListenerTimeoutProcessor that triggers in case we don't hear from the listener in // a timely fashion. @@ -91,7 +91,7 @@ final class TouchEventHandler implements Tabs.OnTabsChangedListener { // // this means that there are ordering restrictions on these that we can take advantage of, // and need to abide by. blocks of events in the queue will always be in the order that - // the user generated them. default-prevented notifications we get from gecko will be in + // the user generated them. default-prevented notifications we get from goanna will be in // the same order as the blocks of events in the queue. the ListenerTimeoutProcessors that // have been posted will also fire in the same order as the blocks of events in the queue. // HOWEVER, we may get multiple default-prevented notifications interleaved with multiple @@ -182,8 +182,8 @@ final class TouchEventHandler implements Tabs.OnTabsChangedListener { } /** - * This function is how gecko sends us a default-prevented notification. It is called - * once gecko knows definitively whether the block of events has had preventDefault + * This function is how goanna sends us a default-prevented notification. It is called + * once goanna knows definitively whether the block of events has had preventDefault * called on it (either on the initial down event that starts the block, or on * the first event following that down event). * @@ -287,7 +287,7 @@ final class TouchEventHandler implements Tabs.OnTabsChangedListener { @Override public void run() { if (mProcessingBalance < 0) { - // gecko already responded with default-prevented notification, and so + // goanna already responded with default-prevented notification, and so // the block of events this ListenerTimeoutProcessor corresponds to have // already been removed from the queue. } else { diff --git a/mobile/android/base/gfx/ViewTransform.java b/mobile/android/base/gfx/ViewTransform.java index a9eec57180..fc36e588fd 100644 --- a/mobile/android/base/gfx/ViewTransform.java +++ b/mobile/android/base/gfx/ViewTransform.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; -import org.mozilla.gecko.mozglue.generatorannotations.WrapEntireClassForJNI; +import org.mozilla.goanna.mozglue.generatorannotations.WrapEntireClassForJNI; @WrapEntireClassForJNI public class ViewTransform { diff --git a/mobile/android/base/gfx/VirtualLayer.java b/mobile/android/base/gfx/VirtualLayer.java index 83d0128761..9ed025c94a 100644 --- a/mobile/android/base/gfx/VirtualLayer.java +++ b/mobile/android/base/gfx/VirtualLayer.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.gfx; +package org.mozilla.goanna.gfx; public class VirtualLayer extends Layer { public VirtualLayer(IntSize size) { @@ -27,7 +27,7 @@ public class VirtualLayer extends Layer { // } // it is safe to drop the transaction lock in this instance (i.e. for the - // VirtualLayer that is just a shadow of what gecko is painting) because + // VirtualLayer that is just a shadow of what goanna is painting) because // the position and resolution of this layer are always touched on the compositor // thread, and therefore do not require synchronization. mPosition.set(left, top, right, bottom); diff --git a/mobile/android/base/health/BrowserHealthRecorder.java b/mobile/android/base/health/BrowserHealthRecorder.java index 4e8c576761..4644abeedb 100644 --- a/mobile/android/base/health/BrowserHealthRecorder.java +++ b/mobile/android/base/health/BrowserHealthRecorder.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.health; +package org.mozilla.goanna.health; import java.io.File; import java.io.FileOutputStream; @@ -22,21 +22,21 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.background.healthreport.AndroidConfigurationProvider; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder.ConfigurationProvider; -import org.mozilla.gecko.background.healthreport.HealthReportDatabaseStorage; -import org.mozilla.gecko.background.healthreport.HealthReportStorage.Field; -import org.mozilla.gecko.background.healthreport.HealthReportStorage.MeasurementFields; -import org.mozilla.gecko.background.healthreport.ProfileInformationCache; -import org.mozilla.gecko.distribution.Distribution; -import org.mozilla.gecko.distribution.Distribution.DistributionDescriptor; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.background.healthreport.AndroidConfigurationProvider; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder.ConfigurationProvider; +import org.mozilla.goanna.background.healthreport.HealthReportDatabaseStorage; +import org.mozilla.goanna.background.healthreport.HealthReportStorage.Field; +import org.mozilla.goanna.background.healthreport.HealthReportStorage.MeasurementFields; +import org.mozilla.goanna.background.healthreport.ProfileInformationCache; +import org.mozilla.goanna.distribution.Distribution; +import org.mozilla.goanna.distribution.Distribution.DistributionDescriptor; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; import android.content.ContentProviderClient; import android.content.Context; diff --git a/mobile/android/base/health/BrowserHealthReporter.java b/mobile/android/base/health/BrowserHealthReporter.java index 716b33b81f..f8049435ab 100644 --- a/mobile/android/base/health/BrowserHealthReporter.java +++ b/mobile/android/base/health/BrowserHealthReporter.java @@ -3,23 +3,23 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.health; +package org.mozilla.goanna.health; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.healthreport.AndroidConfigurationProvider; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder; -import org.mozilla.gecko.background.healthreport.EnvironmentBuilder.ConfigurationProvider; -import org.mozilla.gecko.background.healthreport.HealthReportConstants; -import org.mozilla.gecko.background.healthreport.HealthReportDatabaseStorage; -import org.mozilla.gecko.background.healthreport.HealthReportGenerator; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.healthreport.AndroidConfigurationProvider; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder; +import org.mozilla.goanna.background.healthreport.EnvironmentBuilder.ConfigurationProvider; +import org.mozilla.goanna.background.healthreport.HealthReportConstants; +import org.mozilla.goanna.background.healthreport.HealthReportDatabaseStorage; +import org.mozilla.goanna.background.healthreport.HealthReportGenerator; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; import android.content.ContentProviderClient; import android.content.Context; diff --git a/mobile/android/base/health/HealthRecorder.java b/mobile/android/base/health/HealthRecorder.java index 02a3bcf910..c7069ccb7d 100644 --- a/mobile/android/base/health/HealthRecorder.java +++ b/mobile/android/base/health/HealthRecorder.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.health; +package org.mozilla.goanna.health; import android.content.SharedPreferences; diff --git a/mobile/android/base/health/SessionInformation.java b/mobile/android/base/health/SessionInformation.java index 8f1f8ecf66..0484dbdd1c 100644 --- a/mobile/android/base/health/SessionInformation.java +++ b/mobile/android/base/health/SessionInformation.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.health; +package org.mozilla.goanna.health; import android.content.SharedPreferences; import android.util.Log; -import org.mozilla.gecko.GoannaApp; +import org.mozilla.goanna.GoannaApp; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/health/StubbedHealthRecorder.java b/mobile/android/base/health/StubbedHealthRecorder.java index b3f4f56f84..a5dd901f54 100644 --- a/mobile/android/base/health/StubbedHealthRecorder.java +++ b/mobile/android/base/health/StubbedHealthRecorder.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.health; +package org.mozilla.goanna.health; import android.content.SharedPreferences; diff --git a/mobile/android/base/home/BookmarkFolderView.java b/mobile/android/base/home/BookmarkFolderView.java index a024b4601b..e8ba56c04e 100644 --- a/mobile/android/base/home/BookmarkFolderView.java +++ b/mobile/android/base/home/BookmarkFolderView.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/home/BookmarksListAdapter.java b/mobile/android/base/home/BookmarksListAdapter.java index 799d3120b9..531febef4d 100644 --- a/mobile/android/base/home/BookmarksListAdapter.java +++ b/mobile/android/base/home/BookmarksListAdapter.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.mozilla.gecko.R; -import org.mozilla.gecko.db.BrowserContract.Bookmarks; +import org.mozilla.goanna.R; +import org.mozilla.goanna.db.BrowserContract.Bookmarks; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/home/BookmarksListView.java b/mobile/android/base/home/BookmarksListView.java index f12ff386d6..b2c97afbb4 100644 --- a/mobile/android/base/home/BookmarksListView.java +++ b/mobile/android/base/home/BookmarksListView.java @@ -3,15 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.EnumSet; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.BrowserContract.Bookmarks; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.BrowserContract.Bookmarks; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/BookmarksPanel.java b/mobile/android/base/home/BookmarksPanel.java index c389fd038b..ca066572fe 100644 --- a/mobile/android/base/home/BookmarksPanel.java +++ b/mobile/android/base/home/BookmarksPanel.java @@ -3,19 +3,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.List; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.R; -import org.mozilla.gecko.db.BrowserContract.Bookmarks; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.home.BookmarksListAdapter.FolderInfo; -import org.mozilla.gecko.home.BookmarksListAdapter.OnRefreshFolderListener; -import org.mozilla.gecko.home.BookmarksListAdapter.RefreshType; -import org.mozilla.gecko.home.HomeContextMenuInfo.RemoveItemType; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.R; +import org.mozilla.goanna.db.BrowserContract.Bookmarks; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.home.BookmarksListAdapter.FolderInfo; +import org.mozilla.goanna.home.BookmarksListAdapter.OnRefreshFolderListener; +import org.mozilla.goanna.home.BookmarksListAdapter.RefreshType; +import org.mozilla.goanna.home.HomeContextMenuInfo.RemoveItemType; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; import android.app.Activity; import android.content.Context; diff --git a/mobile/android/base/home/BrowserSearch.java b/mobile/android/base/home/BrowserSearch.java index df05f36934..81801b40ed 100644 --- a/mobile/android/base/home/BrowserSearch.java +++ b/mobile/android/base/home/BrowserSearch.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.ArrayList; import java.util.Collections; @@ -14,25 +14,25 @@ import java.util.Locale; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.R; -import org.mozilla.gecko.SuggestClient; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.BrowserContract.History; -import org.mozilla.gecko.db.BrowserContract.URLColumns; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.home.SearchLoader.SearchCursorLoader; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.toolbar.AutocompleteHandler; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.StringUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.R; +import org.mozilla.goanna.SuggestClient; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.BrowserContract.History; +import org.mozilla.goanna.db.BrowserContract.URLColumns; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.home.SearchLoader.SearchCursorLoader; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.toolbar.AutocompleteHandler; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.StringUtils; +import org.mozilla.goanna.util.ThreadUtils; import android.app.Activity; import android.content.Context; @@ -669,7 +669,7 @@ public class BrowserSearch extends HomeFragment } }); - // Pref observer in gecko will also set prompted = true + // Pref observer in goanna will also set prompted = true PrefsHelper.setPref("browser.search.suggest.enabled", enabled); TranslateAnimation slideAnimation = new TranslateAnimation(0, mSuggestionsOptInPrompt.getWidth(), 0, 0); diff --git a/mobile/android/base/home/DynamicPanel.java b/mobile/android/base/home/DynamicPanel.java index 5b99db4a6b..19ddba390a 100644 --- a/mobile/android/base/home/DynamicPanel.java +++ b/mobile/android/base/home/DynamicPanel.java @@ -3,16 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.HomeItems; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; -import org.mozilla.gecko.home.PanelLayout.ContextMenuRegistry; -import org.mozilla.gecko.home.PanelLayout.DatasetHandler; -import org.mozilla.gecko.home.PanelLayout.DatasetRequest; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.UIAsyncTask; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.HomeItems; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.home.PanelLayout.ContextMenuRegistry; +import org.mozilla.goanna.home.PanelLayout.DatasetHandler; +import org.mozilla.goanna.home.PanelLayout.DatasetRequest; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.UIAsyncTask; import android.content.ContentResolver; import android.content.Context; diff --git a/mobile/android/base/home/FramePanelLayout.java b/mobile/android/base/home/FramePanelLayout.java index d07f7dcbfc..5516e08af6 100644 --- a/mobile/android/base/home/FramePanelLayout.java +++ b/mobile/android/base/home/FramePanelLayout.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; -import org.mozilla.gecko.home.HomeConfig.ViewConfig; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.home.HomeConfig.ViewConfig; import android.content.Context; import android.util.Log; diff --git a/mobile/android/base/home/HistoryPanel.java b/mobile/android/base/home/HistoryPanel.java index a0a76c51ef..e6d4d93be3 100644 --- a/mobile/android/base/home/HistoryPanel.java +++ b/mobile/android/base/home/HistoryPanel.java @@ -3,25 +3,25 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.Date; import java.util.EnumSet; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.BrowserContract.Combined; -import org.mozilla.gecko.db.BrowserContract.History; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.home.HomeContextMenuInfo.RemoveItemType; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.BrowserContract.Combined; +import org.mozilla.goanna.db.BrowserContract.History; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.home.HomeContextMenuInfo.RemoveItemType; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; import android.app.AlertDialog; import android.content.ContentResolver; diff --git a/mobile/android/base/home/HomeAdapter.java b/mobile/android/base/home/HomeAdapter.java index 2e7cbd5e2a..35f5ecc566 100644 --- a/mobile/android/base/home/HomeAdapter.java +++ b/mobile/android/base/home/HomeAdapter.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; -import org.mozilla.gecko.home.HomeConfig.PanelType; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.home.HomeConfig.PanelType; import android.content.Context; import android.os.Bundle; diff --git a/mobile/android/base/home/HomeBanner.java b/mobile/android/base/home/HomeBanner.java index 752af4dc3b..6f519f948a 100644 --- a/mobile/android/base/home/HomeBanner.java +++ b/mobile/android/base/home/HomeBanner.java @@ -3,21 +3,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.R; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.PropertyAnimator.Property; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.widget.EllipsisTextView; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.R; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.PropertyAnimator.Property; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.widget.EllipsisTextView; import android.content.Context; import android.graphics.drawable.Drawable; @@ -157,7 +157,7 @@ public class HomeBanner extends LinearLayout } /** - * Sends a message to gecko to request a new banner message. UI is updated in handleMessage. + * Sends a message to goanna to request a new banner message. UI is updated in handleMessage. */ public void update() { GoannaAppShell.sendEventToGoanna(GoannaEvent.createBroadcastEvent("HomeBanner:Get", null)); diff --git a/mobile/android/base/home/HomeConfig.java b/mobile/android/base/home/HomeConfig.java index da4d5ac82e..f0789a7b43 100644 --- a/mobile/android/base/home/HomeConfig.java +++ b/mobile/android/base/home/HomeConfig.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.ArrayList; import java.util.Collections; @@ -17,11 +17,11 @@ import java.util.Map; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.R; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.R; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.util.ThreadUtils; import android.content.Context; import android.os.Parcel; diff --git a/mobile/android/base/home/HomeConfigLoader.java b/mobile/android/base/home/HomeConfigLoader.java index 0f9f3e4b40..44346f7eb5 100644 --- a/mobile/android/base/home/HomeConfigLoader.java +++ b/mobile/android/base/home/HomeConfigLoader.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; -import org.mozilla.gecko.home.HomeConfig.OnReloadListener; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.home.HomeConfig.OnReloadListener; import android.content.Context; import android.support.v4.content.AsyncTaskLoader; diff --git a/mobile/android/base/home/HomeConfigPrefsBackend.java b/mobile/android/base/home/HomeConfigPrefsBackend.java index 1cb3742703..842bad6cd4 100644 --- a/mobile/android/base/home/HomeConfigPrefsBackend.java +++ b/mobile/android/base/home/HomeConfigPrefsBackend.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import static org.mozilla.gecko.home.HomeConfig.createBuiltinPanelConfig; +import static org.mozilla.goanna.home.HomeConfig.createBuiltinPanelConfig; import java.util.ArrayList; import java.util.EnumSet; @@ -14,14 +14,14 @@ import java.util.Locale; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.RestrictedProfiles; -import org.mozilla.gecko.home.HomeConfig.HomeConfigBackend; -import org.mozilla.gecko.home.HomeConfig.OnReloadListener; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; -import org.mozilla.gecko.home.HomeConfig.PanelType; -import org.mozilla.gecko.home.HomeConfig.State; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.RestrictedProfiles; +import org.mozilla.goanna.home.HomeConfig.HomeConfigBackend; +import org.mozilla.goanna.home.HomeConfig.OnReloadListener; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.home.HomeConfig.PanelType; +import org.mozilla.goanna.home.HomeConfig.State; +import org.mozilla.goanna.util.HardwareUtils; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/home/HomeContextMenuInfo.java b/mobile/android/base/home/HomeContextMenuInfo.java index cfdce3ee4e..0226987299 100644 --- a/mobile/android/base/home/HomeContextMenuInfo.java +++ b/mobile/android/base/home/HomeContextMenuInfo.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.util.StringUtils; +import org.mozilla.goanna.util.StringUtils; import android.database.Cursor; import android.text.TextUtils; diff --git a/mobile/android/base/home/HomeExpandableListView.java b/mobile/android/base/home/HomeExpandableListView.java index 7badd69290..a234db4426 100644 --- a/mobile/android/base/home/HomeExpandableListView.java +++ b/mobile/android/base/home/HomeExpandableListView.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/home/HomeFragment.java b/mobile/android/base/home/HomeFragment.java index d3491e3ed3..8cb4cb37c8 100644 --- a/mobile/android/base/home/HomeFragment.java +++ b/mobile/android/base/home/HomeFragment.java @@ -3,31 +3,31 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.EnumSet; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.EditBookmarkDialog; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.R; -import org.mozilla.gecko.ReaderModeUtils; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.BrowserContract.SuggestedSites; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.home.HomeContextMenuInfo.RemoveItemType; -import org.mozilla.gecko.home.HomePager.OnUrlOpenInBackgroundListener; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.home.TopSitesGridView.TopSitesGridContextMenuInfo; -import org.mozilla.gecko.util.Clipboard; -import org.mozilla.gecko.util.StringUtils; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.UIAsyncTask; +import org.mozilla.goanna.EditBookmarkDialog; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.R; +import org.mozilla.goanna.ReaderModeUtils; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.BrowserContract.SuggestedSites; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.home.HomeContextMenuInfo.RemoveItemType; +import org.mozilla.goanna.home.HomePager.OnUrlOpenInBackgroundListener; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.home.TopSitesGridView.TopSitesGridContextMenuInfo; +import org.mozilla.goanna.util.Clipboard; +import org.mozilla.goanna.util.StringUtils; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.UIAsyncTask; import android.app.Activity; import android.content.ContentResolver; diff --git a/mobile/android/base/home/HomeListView.java b/mobile/android/base/home/HomeListView.java index d179a27ce0..bcb4765e69 100644 --- a/mobile/android/base/home/HomeListView.java +++ b/mobile/android/base/home/HomeListView.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.R; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/home/HomePager.java b/mobile/android/base/home/HomePager.java index f826a7d4d1..b01033f797 100644 --- a/mobile/android/base/home/HomePager.java +++ b/mobile/android/base/home/HomePager.java @@ -3,21 +3,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.home.HomeAdapter.OnAddPanelListener; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.home.HomeAdapter.OnAddPanelListener; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.util.ThreadUtils; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/mobile/android/base/home/HomePagerTabStrip.java b/mobile/android/base/home/HomePagerTabStrip.java index 8b885f93c5..86a2d84fd9 100644 --- a/mobile/android/base/home/HomePagerTabStrip.java +++ b/mobile/android/base/home/HomePagerTabStrip.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; -import org.mozilla.gecko.animation.BounceAnimator; -import org.mozilla.gecko.animation.BounceAnimator.Attributes; -import org.mozilla.gecko.animation.TransitionsTracker; +import org.mozilla.goanna.R; +import org.mozilla.goanna.animation.BounceAnimator; +import org.mozilla.goanna.animation.BounceAnimator.Attributes; +import org.mozilla.goanna.animation.TransitionsTracker; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/home/HomePanelsManager.java b/mobile/android/base/home/HomePanelsManager.java index ba7b64661d..ef615de835 100644 --- a/mobile/android/base/home/HomePanelsManager.java +++ b/mobile/android/base/home/HomePanelsManager.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import static org.mozilla.gecko.home.HomeConfig.createBuiltinPanelConfig; +import static org.mozilla.goanna.home.HomeConfig.createBuiltinPanelConfig; import java.util.ArrayList; import java.util.HashSet; @@ -16,13 +16,13 @@ import java.util.concurrent.ConcurrentLinkedQueue; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.db.HomeProvider; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; -import org.mozilla.gecko.home.PanelInfoManager.PanelInfo; -import org.mozilla.gecko.home.PanelInfoManager.RequestCallback; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.db.HomeProvider; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.home.PanelInfoManager.PanelInfo; +import org.mozilla.goanna.home.PanelInfoManager.RequestCallback; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; import android.content.ContentResolver; import android.content.Context; @@ -144,7 +144,7 @@ public class HomePanelsManager implements GoannaEventListener { } /** - * Runs in the gecko thread. + * Runs in the goanna thread. */ private void handlePanelInstall(PanelConfig panelConfig, InvalidationMode mode) { mPendingChanges.offer(new ConfigChange(ChangeType.INSTALL, panelConfig)); @@ -154,7 +154,7 @@ public class HomePanelsManager implements GoannaEventListener { } /** - * Runs in the gecko thread. + * Runs in the goanna thread. */ private void handlePanelUninstall(String panelId) { mPendingChanges.offer(new ConfigChange(ChangeType.UNINSTALL, panelId)); @@ -164,7 +164,7 @@ public class HomePanelsManager implements GoannaEventListener { } /** - * Runs in the gecko thread. + * Runs in the goanna thread. */ private void handlePanelUpdate(PanelConfig panelConfig) { mPendingChanges.offer(new ConfigChange(ChangeType.UPDATE, panelConfig)); @@ -188,7 +188,7 @@ public class HomePanelsManager implements GoannaEventListener { * Handles a dataset refresh request from Goanna. This is usually * triggered by a HomeStorage.save() call in an add-on. * - * Runs in the gecko thread. + * Runs in the goanna thread. */ private void handleDatasetRefresh(JSONObject message) { final String datasetId; @@ -206,7 +206,7 @@ public class HomePanelsManager implements GoannaEventListener { } /** - * Runs in the gecko or main thread. + * Runs in the goanna or main thread. */ private void scheduleInvalidation(InvalidationMode mode) { final Handler handler = ThreadUtils.getBackgroundHandler(); @@ -343,7 +343,7 @@ public class HomePanelsManager implements GoannaEventListener { refreshFromPanelInfos(editor, latestPanelInfos); } } catch (InterruptedException e) { - Log.e(LOGTAG, "Failed to fetch panels from gecko", e); + Log.e(LOGTAG, "Failed to fetch panels from goanna", e); } } diff --git a/mobile/android/base/home/ImageLoader.java b/mobile/android/base/home/ImageLoader.java index f0cef1ef37..35c1de325e 100644 --- a/mobile/android/base/home/ImageLoader.java +++ b/mobile/android/base/home/ImageLoader.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import android.content.Context; import android.net.Uri; @@ -20,12 +20,12 @@ import java.io.IOException; import java.util.EnumSet; import java.util.Set; -import org.mozilla.gecko.distribution.Distribution; +import org.mozilla.goanna.distribution.Distribution; public class ImageLoader { private static final String LOGTAG = "GoannaImageLoader"; - private static final String DISTRIBUTION_SCHEME = "gecko.distribution"; + private static final String DISTRIBUTION_SCHEME = "goanna.distribution"; private static final String SUGGESTED_SITES_AUTHORITY = "suggestedsites"; // The order of density factors to try when looking for an image resource @@ -109,7 +109,7 @@ public class ImageLoader { /** * Handle distribution URIs in Picasso. The expected format is: * - * gecko.distribution:/// + * goanna.distribution:/// * * Which will look for the following file in the distribution: * diff --git a/mobile/android/base/home/MultiTypeCursorAdapter.java b/mobile/android/base/home/MultiTypeCursorAdapter.java index 69784c4f9e..3a765f9b41 100644 --- a/mobile/android/base/home/MultiTypeCursorAdapter.java +++ b/mobile/android/base/home/MultiTypeCursorAdapter.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/PanelAuthCache.java b/mobile/android/base/home/PanelAuthCache.java index 164b968c16..499cbfc859 100644 --- a/mobile/android/base/home/PanelAuthCache.java +++ b/mobile/android/base/home/PanelAuthCache.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import android.content.Context; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.util.Log; -import org.mozilla.gecko.GoannaSharedPrefs; +import org.mozilla.goanna.GoannaSharedPrefs; /** * Cache used to store authentication state of dynamic panels. The values diff --git a/mobile/android/base/home/PanelAuthLayout.java b/mobile/android/base/home/PanelAuthLayout.java index 95b07dae18..f249c6419e 100644 --- a/mobile/android/base/home/PanelAuthLayout.java +++ b/mobile/android/base/home/PanelAuthLayout.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.R; -import org.mozilla.gecko.home.HomeConfig.AuthConfig; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.R; +import org.mozilla.goanna.home.HomeConfig.AuthConfig; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; import android.content.Context; import android.text.TextUtils; diff --git a/mobile/android/base/home/PanelBackItemView.java b/mobile/android/base/home/PanelBackItemView.java index e82b3fcd84..49c35b54dc 100644 --- a/mobile/android/base/home/PanelBackItemView.java +++ b/mobile/android/base/home/PanelBackItemView.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; -import org.mozilla.gecko.home.PanelLayout.FilterDetail; +import org.mozilla.goanna.R; +import org.mozilla.goanna.home.PanelLayout.FilterDetail; import android.content.Context; import android.text.TextUtils; diff --git a/mobile/android/base/home/PanelGridView.java b/mobile/android/base/home/PanelGridView.java index b75d121d10..2772a89d01 100644 --- a/mobile/android/base/home/PanelGridView.java +++ b/mobile/android/base/home/PanelGridView.java @@ -3,19 +3,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.EnumSet; -import org.mozilla.gecko.R; -import org.mozilla.gecko.db.BrowserContract.HomeItems; -import org.mozilla.gecko.home.HomeConfig.ItemHandler; -import org.mozilla.gecko.home.HomeConfig.ViewConfig; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.home.PanelLayout.DatasetBacked; -import org.mozilla.gecko.home.PanelLayout.FilterManager; -import org.mozilla.gecko.home.PanelLayout.OnItemOpenListener; -import org.mozilla.gecko.home.PanelLayout.PanelView; +import org.mozilla.goanna.R; +import org.mozilla.goanna.db.BrowserContract.HomeItems; +import org.mozilla.goanna.home.HomeConfig.ItemHandler; +import org.mozilla.goanna.home.HomeConfig.ViewConfig; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.home.PanelLayout.DatasetBacked; +import org.mozilla.goanna.home.PanelLayout.FilterManager; +import org.mozilla.goanna.home.PanelLayout.OnItemOpenListener; +import org.mozilla.goanna.home.PanelLayout.PanelView; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/PanelInfoManager.java b/mobile/android/base/home/PanelInfoManager.java index 90acb3b76f..75b58c2b75 100644 --- a/mobile/android/base/home/PanelInfoManager.java +++ b/mobile/android/base/home/PanelInfoManager.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.ArrayList; import java.util.List; @@ -13,12 +13,12 @@ import java.util.concurrent.atomic.AtomicInteger; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; import android.util.Log; import android.util.SparseArray; diff --git a/mobile/android/base/home/PanelItemView.java b/mobile/android/base/home/PanelItemView.java index 6dc39645d4..f81caafa9f 100644 --- a/mobile/android/base/home/PanelItemView.java +++ b/mobile/android/base/home/PanelItemView.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; -import org.mozilla.gecko.db.BrowserContract.HomeItems; -import org.mozilla.gecko.home.HomeConfig.ItemType; +import org.mozilla.goanna.R; +import org.mozilla.goanna.db.BrowserContract.HomeItems; +import org.mozilla.goanna.home.HomeConfig.ItemType; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/PanelLayout.java b/mobile/android/base/home/PanelLayout.java index 4db0651ed4..ffcd6d6e79 100644 --- a/mobile/android/base/home/PanelLayout.java +++ b/mobile/android/base/home/PanelLayout.java @@ -3,16 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; -import org.mozilla.gecko.db.BrowserContract.HomeItems; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.home.HomeConfig.EmptyViewConfig; -import org.mozilla.gecko.home.HomeConfig.ItemHandler; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; -import org.mozilla.gecko.home.HomeConfig.ViewConfig; -import org.mozilla.gecko.util.StringUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.db.BrowserContract.HomeItems; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.home.HomeConfig.EmptyViewConfig; +import org.mozilla.goanna.home.HomeConfig.ItemHandler; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.home.HomeConfig.ViewConfig; +import org.mozilla.goanna.util.StringUtils; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/PanelListView.java b/mobile/android/base/home/PanelListView.java index f51ded693a..cd239f9992 100644 --- a/mobile/android/base/home/PanelListView.java +++ b/mobile/android/base/home/PanelListView.java @@ -3,18 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.EnumSet; -import org.mozilla.gecko.db.BrowserContract.HomeItems; -import org.mozilla.gecko.home.HomeConfig.ItemHandler; -import org.mozilla.gecko.home.HomeConfig.ViewConfig; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.home.PanelLayout.DatasetBacked; -import org.mozilla.gecko.home.PanelLayout.FilterManager; -import org.mozilla.gecko.home.PanelLayout.OnItemOpenListener; -import org.mozilla.gecko.home.PanelLayout.PanelView; +import org.mozilla.goanna.db.BrowserContract.HomeItems; +import org.mozilla.goanna.home.HomeConfig.ItemHandler; +import org.mozilla.goanna.home.HomeConfig.ViewConfig; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.home.PanelLayout.DatasetBacked; +import org.mozilla.goanna.home.PanelLayout.FilterManager; +import org.mozilla.goanna.home.PanelLayout.OnItemOpenListener; +import org.mozilla.goanna.home.PanelLayout.PanelView; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/PanelRefreshLayout.java b/mobile/android/base/home/PanelRefreshLayout.java index dcb05ce836..e4314f2ac1 100644 --- a/mobile/android/base/home/PanelRefreshLayout.java +++ b/mobile/android/base/home/PanelRefreshLayout.java @@ -3,16 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.home.PanelLayout.DatasetBacked; -import org.mozilla.gecko.home.PanelLayout.FilterManager; -import org.mozilla.gecko.widget.GoannaSwipeRefreshLayout; -import org.mozilla.gecko.widget.GoannaSwipeRefreshLayout.OnRefreshListener; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.home.PanelLayout.DatasetBacked; +import org.mozilla.goanna.home.PanelLayout.FilterManager; +import org.mozilla.goanna.widget.GoannaSwipeRefreshLayout; +import org.mozilla.goanna.widget.GoannaSwipeRefreshLayout.OnRefreshListener; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/home/PanelViewAdapter.java b/mobile/android/base/home/PanelViewAdapter.java index cf03c50c0b..db1387225e 100644 --- a/mobile/android/base/home/PanelViewAdapter.java +++ b/mobile/android/base/home/PanelViewAdapter.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.home.HomeConfig.ItemType; -import org.mozilla.gecko.home.HomeConfig.ViewConfig; -import org.mozilla.gecko.home.PanelLayout.FilterManager; +import org.mozilla.goanna.home.HomeConfig.ItemType; +import org.mozilla.goanna.home.HomeConfig.ViewConfig; +import org.mozilla.goanna.home.PanelLayout.FilterManager; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/PanelViewItemHandler.java b/mobile/android/base/home/PanelViewItemHandler.java index 1285a187ae..9dc7972274 100644 --- a/mobile/android/base/home/PanelViewItemHandler.java +++ b/mobile/android/base/home/PanelViewItemHandler.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.db.BrowserContract.HomeItems; -import org.mozilla.gecko.home.HomeConfig.ViewConfig; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.home.PanelLayout.FilterManager; -import org.mozilla.gecko.home.PanelLayout.OnItemOpenListener; +import org.mozilla.goanna.db.BrowserContract.HomeItems; +import org.mozilla.goanna.home.HomeConfig.ViewConfig; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.home.PanelLayout.FilterManager; +import org.mozilla.goanna.home.PanelLayout.OnItemOpenListener; import android.database.Cursor; diff --git a/mobile/android/base/home/PinSiteDialog.java b/mobile/android/base/home/PinSiteDialog.java index b4cebdd9f3..520c3f1b29 100644 --- a/mobile/android/base/home/PinSiteDialog.java +++ b/mobile/android/base/home/PinSiteDialog.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.EnumSet; -import org.mozilla.gecko.R; -import org.mozilla.gecko.db.BrowserContract.URLColumns; -import org.mozilla.gecko.db.BrowserDB.FilterFlags; -import org.mozilla.gecko.util.StringUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.db.BrowserContract.URLColumns; +import org.mozilla.goanna.db.BrowserDB.FilterFlags; +import org.mozilla.goanna.util.StringUtils; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/ReadingListPanel.java b/mobile/android/base/home/ReadingListPanel.java index 5d7f93cef9..2dc6d067a4 100644 --- a/mobile/android/base/home/ReadingListPanel.java +++ b/mobile/android/base/home/ReadingListPanel.java @@ -3,22 +3,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.EnumSet; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.R; -import org.mozilla.gecko.ReaderModeUtils; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.db.BrowserContract.URLColumns; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.ReadingListAccessor; -import org.mozilla.gecko.home.HomeContextMenuInfo.RemoveItemType; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.R; +import org.mozilla.goanna.ReaderModeUtils; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.BrowserContract.ReadingListItems; +import org.mozilla.goanna.db.BrowserContract.URLColumns; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.ReadingListAccessor; +import org.mozilla.goanna.home.HomeContextMenuInfo.RemoveItemType; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.util.HardwareUtils; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/ReadingListRow.java b/mobile/android/base/home/ReadingListRow.java index 03659fe806..6c972eb16f 100644 --- a/mobile/android/base/home/ReadingListRow.java +++ b/mobile/android/base/home/ReadingListRow.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.home.TwoLinePageRow; -import org.mozilla.gecko.util.StringUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.db.BrowserContract.ReadingListItems; +import org.mozilla.goanna.home.TwoLinePageRow; +import org.mozilla.goanna.util.StringUtils; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/home/RecentTabsPanel.java b/mobile/android/base/home/RecentTabsPanel.java index 17afdd2ad3..595e289e5e 100644 --- a/mobile/android/base/home/RecentTabsPanel.java +++ b/mobile/android/base/home/RecentTabsPanel.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.ArrayList; import java.util.List; @@ -11,21 +11,21 @@ import java.util.List; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AboutPages; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.R; -import org.mozilla.gecko.SessionParser; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.BrowserContract.CommonColumns; -import org.mozilla.gecko.db.BrowserContract.URLColumns; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AboutPages; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.R; +import org.mozilla.goanna.SessionParser; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.BrowserContract.CommonColumns; +import org.mozilla.goanna.db.BrowserContract.URLColumns; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.ThreadUtils; import android.content.Context; import android.database.Cursor; @@ -66,7 +66,7 @@ public class RecentTabsPanel extends HomeFragment // Callbacks used for the search and favicon cursor loaders private CursorLoaderCallbacks mCursorLoaderCallbacks; - // Recently closed tabs from gecko + // Recently closed tabs from goanna private ClosedTab[] mClosedTabs; private void restoreSessionWithHistory(List dataList) { diff --git a/mobile/android/base/home/RemoteTabsBaseFragment.java b/mobile/android/base/home/RemoteTabsBaseFragment.java index a010ec89bd..07ffefa20d 100644 --- a/mobile/android/base/home/RemoteTabsBaseFragment.java +++ b/mobile/android/base/home/RemoteTabsBaseFragment.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import android.accounts.Account; import android.content.Context; @@ -16,15 +16,15 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.R; -import org.mozilla.gecko.RemoteClientsDialogFragment.RemoteClientsListener; -import org.mozilla.gecko.RemoteTabsExpandableListAdapter; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.RemoteClient; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.widget.GoannaSwipeRefreshLayout; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.R; +import org.mozilla.goanna.RemoteClientsDialogFragment.RemoteClientsListener; +import org.mozilla.goanna.RemoteTabsExpandableListAdapter; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.RemoteClient; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.widget.GoannaSwipeRefreshLayout; import java.util.ArrayList; import java.util.Iterator; diff --git a/mobile/android/base/home/RemoteTabsExpandableListFragment.java b/mobile/android/base/home/RemoteTabsExpandableListFragment.java index ccb41ffaef..5c8c0b13cc 100644 --- a/mobile/android/base/home/RemoteTabsExpandableListFragment.java +++ b/mobile/android/base/home/RemoteTabsExpandableListFragment.java @@ -3,20 +3,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import org.mozilla.gecko.R; -import org.mozilla.gecko.RemoteClientsDialogFragment; -import org.mozilla.gecko.RemoteTabsExpandableListAdapter; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.RemoteClient; -import org.mozilla.gecko.db.RemoteTab; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.R; +import org.mozilla.goanna.RemoteClientsDialogFragment; +import org.mozilla.goanna.RemoteTabsExpandableListAdapter; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.RemoteClient; +import org.mozilla.goanna.db.RemoteTab; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/mobile/android/base/home/RemoteTabsExpandableListState.java b/mobile/android/base/home/RemoteTabsExpandableListState.java index 862d453867..47705d9174 100644 --- a/mobile/android/base/home/RemoteTabsExpandableListState.java +++ b/mobile/android/base/home/RemoteTabsExpandableListState.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.HashSet; import java.util.Set; -import org.mozilla.gecko.util.PrefUtils; +import org.mozilla.goanna.util.PrefUtils; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; diff --git a/mobile/android/base/home/RemoteTabsPanel.java b/mobile/android/base/home/RemoteTabsPanel.java index 6c1e585912..98eb638d66 100644 --- a/mobile/android/base/home/RemoteTabsPanel.java +++ b/mobile/android/base/home/RemoteTabsPanel.java @@ -3,17 +3,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.GoannaScreenOrientation; -import org.mozilla.gecko.R; -import org.mozilla.gecko.fxa.AccountLoader; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.fxa.login.State.Action; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.GoannaScreenOrientation; +import org.mozilla.goanna.R; +import org.mozilla.goanna.fxa.AccountLoader; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.fxa.login.State.Action; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.util.HardwareUtils; import android.accounts.Account; import android.content.res.Configuration; diff --git a/mobile/android/base/home/RemoteTabsSplitPlaneFragment.java b/mobile/android/base/home/RemoteTabsSplitPlaneFragment.java index 3c14c81bd5..71e93ac5f0 100644 --- a/mobile/android/base/home/RemoteTabsSplitPlaneFragment.java +++ b/mobile/android/base/home/RemoteTabsSplitPlaneFragment.java @@ -1,4 +1,4 @@ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import android.content.Context; import android.database.Cursor; @@ -14,14 +14,14 @@ import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.TextView; -import org.mozilla.gecko.R; -import org.mozilla.gecko.RemoteClientsDialogFragment; -import org.mozilla.gecko.RemoteTabsExpandableListAdapter; -import org.mozilla.gecko.RemoteTabsExpandableListAdapter.GroupViewHolder; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.RemoteClient; -import org.mozilla.gecko.db.RemoteTab; +import org.mozilla.goanna.R; +import org.mozilla.goanna.RemoteClientsDialogFragment; +import org.mozilla.goanna.RemoteTabsExpandableListAdapter; +import org.mozilla.goanna.RemoteTabsExpandableListAdapter.GroupViewHolder; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.RemoteClient; +import org.mozilla.goanna.db.RemoteTab; import java.util.ArrayList; import java.util.EnumSet; diff --git a/mobile/android/base/home/RemoteTabsStaticFragment.java b/mobile/android/base/home/RemoteTabsStaticFragment.java index e38a7e172b..e0078a28ac 100644 --- a/mobile/android/base/home/RemoteTabsStaticFragment.java +++ b/mobile/android/base/home/RemoteTabsStaticFragment.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.EnumSet; import java.util.Locale; -import org.mozilla.gecko.R; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.activities.FxAccountCreateAccountActivity; -import org.mozilla.gecko.fxa.activities.FxAccountFinishMigratingActivity; -import org.mozilla.gecko.fxa.activities.FxAccountUpdateCredentialsActivity; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.R; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.activities.FxAccountCreateAccountActivity; +import org.mozilla.goanna.fxa.activities.FxAccountFinishMigratingActivity; +import org.mozilla.goanna.fxa.activities.FxAccountUpdateCredentialsActivity; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; import android.content.Intent; import android.os.Bundle; diff --git a/mobile/android/base/home/SearchEngine.java b/mobile/android/base/home/SearchEngine.java index 4fc18c42be..ddeab0d9f8 100644 --- a/mobile/android/base/home/SearchEngine.java +++ b/mobile/android/base/home/SearchEngine.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.gfx.BitmapUtils; +import org.mozilla.goanna.gfx.BitmapUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/home/SearchEngineRow.java b/mobile/android/base/home/SearchEngineRow.java index 667ab7902b..6f9d6dec82 100644 --- a/mobile/android/base/home/SearchEngineRow.java +++ b/mobile/android/base/home/SearchEngineRow.java @@ -3,18 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.home.BrowserSearch.OnEditSuggestionListener; -import org.mozilla.gecko.home.BrowserSearch.OnSearchListener; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.util.StringUtils; -import org.mozilla.gecko.widget.AnimatedHeightLayout; -import org.mozilla.gecko.widget.FaviconView; -import org.mozilla.gecko.widget.FlowLayout; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.home.BrowserSearch.OnEditSuggestionListener; +import org.mozilla.goanna.home.BrowserSearch.OnSearchListener; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.util.StringUtils; +import org.mozilla.goanna.widget.AnimatedHeightLayout; +import org.mozilla.goanna.widget.FaviconView; +import org.mozilla.goanna.widget.FlowLayout; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/home/SearchLoader.java b/mobile/android/base/home/SearchLoader.java index 508115aaba..32c6b4ef45 100644 --- a/mobile/android/base/home/SearchLoader.java +++ b/mobile/android/base/home/SearchLoader.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.util.EnumSet; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.db.BrowserDB.FilterFlags; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.db.BrowserDB.FilterFlags; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/SimpleCursorLoader.java b/mobile/android/base/home/SimpleCursorLoader.java index 46b63b9984..10af6c5d3b 100644 --- a/mobile/android/base/home/SimpleCursorLoader.java +++ b/mobile/android/base/home/SimpleCursorLoader.java @@ -17,7 +17,7 @@ * limitations under the License. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/home/TabMenuStrip.java b/mobile/android/base/home/TabMenuStrip.java index e82a910d7e..31b88892e8 100644 --- a/mobile/android/base/home/TabMenuStrip.java +++ b/mobile/android/base/home/TabMenuStrip.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/home/TabMenuStripLayout.java b/mobile/android/base/home/TabMenuStripLayout.java index db8139e478..b7ad363fc8 100644 --- a/mobile/android/base/home/TabMenuStripLayout.java +++ b/mobile/android/base/home/TabMenuStripLayout.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/home/TopSitesGridItemView.java b/mobile/android/base/home/TopSitesGridItemView.java index f95de94e48..09a59eeecc 100644 --- a/mobile/android/base/home/TopSitesGridItemView.java +++ b/mobile/android/base/home/TopSitesGridItemView.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.db.BrowserContract.TopSites; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.R; +import org.mozilla.goanna.db.BrowserContract.TopSites; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.R; import android.content.Context; import android.graphics.Bitmap; diff --git a/mobile/android/base/home/TopSitesGridView.java b/mobile/android/base/home/TopSitesGridView.java index 9ea2cd8e11..d8a9b25602 100644 --- a/mobile/android/base/home/TopSitesGridView.java +++ b/mobile/android/base/home/TopSitesGridView.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; -import org.mozilla.gecko.ThumbnailHelper; +import org.mozilla.goanna.R; +import org.mozilla.goanna.ThumbnailHelper; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Rect; diff --git a/mobile/android/base/home/TopSitesPanel.java b/mobile/android/base/home/TopSitesPanel.java index b630784255..c3c0f94db0 100644 --- a/mobile/android/base/home/TopSitesPanel.java +++ b/mobile/android/base/home/TopSitesPanel.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import static org.mozilla.gecko.db.URLMetadataTable.TILE_COLOR_COLUMN; -import static org.mozilla.gecko.db.URLMetadataTable.TILE_IMAGE_URL_COLUMN; +import static org.mozilla.goanna.db.URLMetadataTable.TILE_COLOR_COLUMN; +import static org.mozilla.goanna.db.URLMetadataTable.TILE_IMAGE_URL_COLUMN; import java.util.ArrayList; import java.util.EnumSet; @@ -15,28 +15,28 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.BrowserContract.Thumbnails; -import org.mozilla.gecko.db.BrowserContract.TopSites; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.favicons.OnFaviconLoadedListener; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.home.HomeContextMenuInfo.RemoveItemType; -import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; -import org.mozilla.gecko.home.PinSiteDialog.OnSiteSelectedListener; -import org.mozilla.gecko.home.TopSitesGridView.OnEditPinnedSiteListener; -import org.mozilla.gecko.home.TopSitesGridView.TopSitesGridContextMenuInfo; -import org.mozilla.gecko.tiles.TilesRecorder; -import org.mozilla.gecko.tiles.Tile; -import org.mozilla.gecko.util.StringUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.BrowserContract.Thumbnails; +import org.mozilla.goanna.db.BrowserContract.TopSites; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.favicons.OnFaviconLoadedListener; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.home.HomeContextMenuInfo.RemoveItemType; +import org.mozilla.goanna.home.HomePager.OnUrlOpenListener; +import org.mozilla.goanna.home.PinSiteDialog.OnSiteSelectedListener; +import org.mozilla.goanna.home.TopSitesGridView.OnEditPinnedSiteListener; +import org.mozilla.goanna.home.TopSitesGridView.TopSitesGridContextMenuInfo; +import org.mozilla.goanna.tiles.TilesRecorder; +import org.mozilla.goanna.tiles.Tile; +import org.mozilla.goanna.util.StringUtils; +import org.mozilla.goanna.util.ThreadUtils; import android.app.Activity; import android.content.ContentResolver; diff --git a/mobile/android/base/home/TopSitesThumbnailView.java b/mobile/android/base/home/TopSitesThumbnailView.java index 7d65fb1e11..046b4f179d 100644 --- a/mobile/android/base/home/TopSitesThumbnailView.java +++ b/mobile/android/base/home/TopSitesThumbnailView.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; -import org.mozilla.gecko.R; -import org.mozilla.gecko.ThumbnailHelper; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.ThumbnailHelper; +import org.mozilla.goanna.util.HardwareUtils; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/home/TransitionAwareCursorLoaderCallbacks.java b/mobile/android/base/home/TransitionAwareCursorLoaderCallbacks.java index acf514cc69..30827b3438 100644 --- a/mobile/android/base/home/TransitionAwareCursorLoaderCallbacks.java +++ b/mobile/android/base/home/TransitionAwareCursorLoaderCallbacks.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import android.database.Cursor; import android.support.v4.app.LoaderManager.LoaderCallbacks; import android.support.v4.content.Loader; -import org.mozilla.gecko.animation.TransitionsTracker; +import org.mozilla.goanna.animation.TransitionsTracker; /** * A {@link LoaderCallbacks} implementation that avoids running its diff --git a/mobile/android/base/home/TwoLinePageRow.java b/mobile/android/base/home/TwoLinePageRow.java index 2dd10f669a..f24490db6f 100644 --- a/mobile/android/base/home/TwoLinePageRow.java +++ b/mobile/android/base/home/TwoLinePageRow.java @@ -3,20 +3,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.home; +package org.mozilla.goanna.home; import java.lang.ref.WeakReference; -import org.mozilla.gecko.AboutPages; -import org.mozilla.gecko.R; -import org.mozilla.gecko.ReaderModeUtils; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.db.BrowserContract.Combined; -import org.mozilla.gecko.db.BrowserContract.URLColumns; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.favicons.OnFaviconLoadedListener; -import org.mozilla.gecko.widget.FaviconView; +import org.mozilla.goanna.AboutPages; +import org.mozilla.goanna.R; +import org.mozilla.goanna.ReaderModeUtils; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.db.BrowserContract.Combined; +import org.mozilla.goanna.db.BrowserContract.URLColumns; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.favicons.OnFaviconLoadedListener; +import org.mozilla.goanna.widget.FaviconView; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/jni-generator.py b/mobile/android/base/jni-generator.py index aa83ea7289..eee88c3676 100644 --- a/mobile/android/base/jni-generator.py +++ b/mobile/android/base/jni-generator.py @@ -40,7 +40,7 @@ class Generator: + 'Do not edit manually! */\n') # this matches lines such as: - # JNIEXPORT void JNICALL Java_org_mozilla_gecko_GoannaAppShell_onResume + # JNIEXPORT void JNICALL Java_org_mozilla_goanna_GoannaAppShell_onResume # and extracts the return type and the function name nameRegex = re.compile('''JNIEXPORT \s+ (?P\S+) \s+ diff --git a/mobile/android/base/lwt/LightweightTheme.java b/mobile/android/base/lwt/LightweightTheme.java index caac7f6679..710074da48 100644 --- a/mobile/android/base/lwt/LightweightTheme.java +++ b/mobile/android/base/lwt/LightweightTheme.java @@ -3,20 +3,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.lwt; +package org.mozilla.goanna.lwt; import java.util.ArrayList; import java.util.List; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.WindowUtils; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.ThreadUtils.AssertBehavior; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.WindowUtils; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.ThreadUtils.AssertBehavior; import android.app.Application; import android.content.SharedPreferences; diff --git a/mobile/android/base/lwt/LightweightThemeDrawable.java b/mobile/android/base/lwt/LightweightThemeDrawable.java index c0ae6eaedf..ea0aadc105 100644 --- a/mobile/android/base/lwt/LightweightThemeDrawable.java +++ b/mobile/android/base/lwt/LightweightThemeDrawable.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.lwt; +package org.mozilla.goanna.lwt; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/mobile/android/base/menu/GeckoMenu.java b/mobile/android/base/menu/GeckoMenu.java index 60613753ef..f84d7a6deb 100644 --- a/mobile/android/base/menu/GeckoMenu.java +++ b/mobile/android/base/menu/GeckoMenu.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.menu; +package org.mozilla.goanna.menu; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.R; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.ThreadUtils.AssertBehavior; -import org.mozilla.gecko.widget.GoannaActionProvider; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.R; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.ThreadUtils.AssertBehavior; +import org.mozilla.goanna.widget.GoannaActionProvider; import android.content.ComponentName; import android.content.Context; @@ -129,7 +129,7 @@ public class GoannaMenu extends ListView } public GoannaMenu(Context context, AttributeSet attrs) { - this(context, attrs, R.attr.geckoMenuListViewStyle); + this(context, attrs, R.attr.goannaMenuListViewStyle); } public GoannaMenu(Context context, AttributeSet attrs, int defStyle) { diff --git a/mobile/android/base/menu/GeckoMenuInflater.java b/mobile/android/base/menu/GeckoMenuInflater.java index c3d770654f..e2d746d14b 100644 --- a/mobile/android/base/menu/GeckoMenuInflater.java +++ b/mobile/android/base/menu/GeckoMenuInflater.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.menu; +package org.mozilla.goanna.menu; import java.io.IOException; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.NewTabletUI; -import org.mozilla.gecko.R; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.NewTabletUI; +import org.mozilla.goanna.R; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -142,13 +142,13 @@ public class GoannaMenuInflater extends MenuInflater { public void setValues(ParsedItem item, MenuItem menuItem) { // We are blocking any presenter updates during inflation. - GoannaMenuItem geckoItem = null; + GoannaMenuItem goannaItem = null; if (menuItem instanceof GoannaMenuItem) { - geckoItem = (GoannaMenuItem) menuItem; + goannaItem = (GoannaMenuItem) menuItem; } - if (geckoItem != null) { - geckoItem.stopDispatchingChanges(); + if (goannaItem != null) { + goannaItem.stopDispatchingChanges(); } menuItem.setChecked(item.checked) @@ -161,10 +161,10 @@ public class GoannaMenuInflater extends MenuInflater { menuItem.setShowAsAction(item.showAsAction); } - if (geckoItem != null) { + if (goannaItem != null) { // We don't need to allow presenter updates during inflation, // so we use the weak form of re-enabling changes. - geckoItem.resumeDispatchingChanges(); + goannaItem.resumeDispatchingChanges(); } } } diff --git a/mobile/android/base/menu/GeckoMenuItem.java b/mobile/android/base/menu/GeckoMenuItem.java index 536c903dda..80049df260 100644 --- a/mobile/android/base/menu/GeckoMenuItem.java +++ b/mobile/android/base/menu/GeckoMenuItem.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.menu; +package org.mozilla.goanna.menu; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.R; -import org.mozilla.gecko.widget.GoannaActionProvider; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.R; +import org.mozilla.goanna.widget.GoannaActionProvider; import android.content.Intent; import android.graphics.drawable.Drawable; diff --git a/mobile/android/base/menu/GeckoSubMenu.java b/mobile/android/base/menu/GeckoSubMenu.java index 3e7c5848b7..d7a9425554 100644 --- a/mobile/android/base/menu/GeckoSubMenu.java +++ b/mobile/android/base/menu/GeckoSubMenu.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.menu; +package org.mozilla.goanna.menu; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/mobile/android/base/menu/MenuItemActionBar.java b/mobile/android/base/menu/MenuItemActionBar.java index 67d575aff7..7c4f7271e6 100644 --- a/mobile/android/base/menu/MenuItemActionBar.java +++ b/mobile/android/base/menu/MenuItemActionBar.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.menu; +package org.mozilla.goanna.menu; -import org.mozilla.gecko.NewTabletUI; -import org.mozilla.gecko.R; -import org.mozilla.gecko.widget.ThemedImageButton; +import org.mozilla.goanna.NewTabletUI; +import org.mozilla.goanna.R; +import org.mozilla.goanna.widget.ThemedImageButton; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/mobile/android/base/menu/MenuItemActionView.java b/mobile/android/base/menu/MenuItemActionView.java index 0ae3d6125e..fcb16cf349 100644 --- a/mobile/android/base/menu/MenuItemActionView.java +++ b/mobile/android/base/menu/MenuItemActionView.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.menu; +package org.mozilla.goanna.menu; import java.util.ArrayList; import java.util.List; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.R; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.R; import android.annotation.TargetApi; import android.content.Context; diff --git a/mobile/android/base/menu/MenuItemDefault.java b/mobile/android/base/menu/MenuItemDefault.java index 85dc683f31..2e8325a459 100644 --- a/mobile/android/base/menu/MenuItemDefault.java +++ b/mobile/android/base/menu/MenuItemDefault.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.menu; +package org.mozilla.goanna.menu; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/menu/MenuPanel.java b/mobile/android/base/menu/MenuPanel.java index 1839a23708..9659417d78 100644 --- a/mobile/android/base/menu/MenuPanel.java +++ b/mobile/android/base/menu/MenuPanel.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.menu; +package org.mozilla.goanna.menu; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.R; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.R; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/menu/MenuPopup.java b/mobile/android/base/menu/MenuPopup.java index 1cbc02b1d6..d7a17b13fe 100644 --- a/mobile/android/base/menu/MenuPopup.java +++ b/mobile/android/base/menu/MenuPopup.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.menu; +package org.mozilla.goanna.menu; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.graphics.Color; diff --git a/mobile/android/base/menu/QuickShareBarActionView.java b/mobile/android/base/menu/QuickShareBarActionView.java index 934dd1e39a..10b2030e45 100644 --- a/mobile/android/base/menu/QuickShareBarActionView.java +++ b/mobile/android/base/menu/QuickShareBarActionView.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.menu; +package org.mozilla.goanna.menu; import android.annotation.TargetApi; import android.content.Context; import android.util.AttributeSet; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; /** * A MenuItemActionView without the default child views. diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index ed17be9b7f..ff2b719cd1 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -16,13 +16,13 @@ constants_jar.sources = [ 'SysInfo.java', ] constants_jar.generated_sources = [ - 'preprocessed/org/mozilla/gecko/AppConstants.java', + 'preprocessed/org/mozilla/goanna/AppConstants.java', ] -resjar = add_java_jar('gecko-R') +resjar = add_java_jar('goanna-R') resjar.sources = [] resjar.generated_sources += [ - 'org/mozilla/gecko/R.java', + 'org/mozilla/goanna/R.java', ] if CONFIG['MOZ_NATIVE_DEVICES']: @@ -32,7 +32,7 @@ if CONFIG['MOZ_NATIVE_DEVICES']: resjar.javac_flags += ['-Xlint:all'] -mgjar = add_java_jar('gecko-mozglue') +mgjar = add_java_jar('goanna-mozglue') mgjar.sources += [ 'mozglue/ByteBufferInputStream.java', 'mozglue/ContextUtils.java', @@ -53,7 +53,7 @@ mgjar.extra_jars += [ ] mgjar.javac_flags += ['-Xlint:all'] -gujar = add_java_jar('gecko-util') +gujar = add_java_jar('goanna-util') gujar.sources += [ 'util/ActivityResultHandler.java', 'util/ActivityResultHandlerMap.java', @@ -88,7 +88,7 @@ gujar.sources += [ ] gujar.extra_jars = [ 'constants.jar', - 'gecko-mozglue.jar', + 'goanna-mozglue.jar', ] gujar.javac_flags += ['-Xlint:all,-deprecation'] @@ -114,14 +114,14 @@ if CONFIG['MOZ_WEBRTC']: audio_root + 'WebRtcAudioTrack.java', ] wrjar.extra_jars = [ - 'gecko-R.jar', - 'gecko-browser.jar', - 'gecko-util.jar', - 'gecko-mozglue.jar', + 'goanna-R.jar', + 'goanna-browser.jar', + 'goanna-util.jar', + 'goanna-mozglue.jar', ] wrjar.javac_flags += ['-Xlint:all,-deprecation,-cast'] -gbjar = add_java_jar('gecko-browser') +gbjar = add_java_jar('goanna-browser') gbjar.sources += [ 'AboutPages.java', 'ActionModeCompat.java', @@ -575,10 +575,10 @@ if CONFIG['MOZ_ANDROID_READING_LIST_SERVICE']: gbjar.sources += sync_java_files gbjar.extra_jars += [ - 'gecko-R.jar', - 'gecko-mozglue.jar', - 'gecko-thirdparty.jar', - 'gecko-util.jar', + 'goanna-R.jar', + 'goanna-mozglue.jar', + 'goanna-thirdparty.jar', + 'goanna-util.jar', 'sync-thirdparty.jar', ] @@ -598,8 +598,8 @@ if CONFIG['MOZ_NATIVE_DEVICES']: gbjar.javac_flags += ['-Xlint:all,-deprecation,-fallthrough', '-J-Xmx512m', '-J-Xms128m'] -# gecko-thirdparty is a good place to put small independent libraries -gtjar = add_java_jar('gecko-thirdparty') +# goanna-thirdparty is a good place to put small independent libraries +gtjar = add_java_jar('goanna-thirdparty') gtjar.sources += [ thirdparty_source_dir + f for f in [ 'com/nineoldandroids/animation/Animator.java', 'com/nineoldandroids/animation/AnimatorInflater.java', @@ -721,42 +721,42 @@ if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']: search_activity.javac_flags += ['-Xlint:all'] search_activity.extra_jars = [ 'constants.jar', - 'gecko-R.jar', - 'gecko-browser.jar', - 'gecko-mozglue.jar', - 'gecko-thirdparty.jar', - 'gecko-util.jar' + 'goanna-R.jar', + 'goanna-browser.jar', + 'goanna-mozglue.jar', + 'goanna-thirdparty.jar', + 'goanna-util.jar' ] generated_recursive_make_targets = ['.aapt.deps', '.locales.deps'] # Captures dependencies on Android manifest and all resources. generated = add_android_eclipse_library_project('FennecResourcesGenerated') -generated.package_name = 'org.mozilla.gecko.generated' +generated.package_name = 'org.mozilla.goanna.generated' generated.res = OBJDIR + '/res' generated.recursive_make_targets += generated_recursive_make_targets branding = add_android_eclipse_library_project('FennecResourcesBranding') -branding.package_name = 'org.mozilla.gecko.branding' +branding.package_name = 'org.mozilla.goanna.branding' branding.res = TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res' branding.recursive_make_targets += generated_recursive_make_targets static = add_android_eclipse_library_project('FennecResourcesStatic') -# 'org.mozilla.gecko.static' is not a valid Java package name, so we use a different one. -static.package_name = 'org.mozilla.gecko.resources' +# 'org.mozilla.goanna.static' is not a valid Java package name, so we use a different one. +static.package_name = 'org.mozilla.goanna.resources' static.res = SRCDIR + '/resources' static.recursive_make_targets += generated_recursive_make_targets static.included_projects += ['../' + generated.name, '../' + branding.name] static.referenced_projects += ['../' + generated.name, '../' + branding.name] main = add_android_eclipse_project('Fennec', OBJDIR + '/AndroidManifest.xml') -main.package_name = 'org.mozilla.gecko' +main.package_name = 'org.mozilla.goanna' # These values were extracted from an existing Eclipse project. Use # Project > Resource > Resource Filters and inspect the resulting # .project file to modify this list. main.filtered_resources += [ - '1.0-projectRelativePath-matches-false-false-*org/mozilla/gecko/resources/**', - '1.0-projectRelativePath-matches-false-false-*org/mozilla/gecko/tests/**', + '1.0-projectRelativePath-matches-false-false-*org/mozilla/goanna/resources/**', + '1.0-projectRelativePath-matches-false-false-*org/mozilla/goanna/tests/**', ] main.recursive_make_targets += generated_recursive_make_targets @@ -774,13 +774,13 @@ main.libs = [ main.res = None cpe = main.add_classpathentry('src', SRCDIR, - dstdir='src/org/mozilla/gecko', + dstdir='src/org/mozilla/goanna', exclude_patterns=[ - 'org/mozilla/gecko/tests/**', - 'org/mozilla/gecko/resources/**']) + 'org/mozilla/goanna/tests/**', + 'org/mozilla/goanna/resources/**']) if not CONFIG['MOZ_CRASHREPORTER']: - cpe.exclude_patterns += ['org/mozilla/gecko/CrashReporter.java'] + cpe.exclude_patterns += ['org/mozilla/goanna/CrashReporter.java'] if CONFIG['MOZ_NATIVE_DEVICES']: # This is rather hacky, but: we define three Eclipse projects for appcompat, @@ -824,23 +824,23 @@ main.add_classpathentry('thirdparty', TOPSRCDIR + '/mobile/android/thirdparty', dstdir='thirdparty', ignore_warnings=True) -# Eclipse generates org.mozilla.gecko.R for this project, which is referenced by +# Eclipse generates org.mozilla.goanna.R for this project, which is referenced by # all the Java code. The reason that this is not generated in the main Fennec # project is that you cannot specify a custom package to the Eclipse Android # builder; that is, the Eclipse Android builder always builds the # org.mozilla.fennec_*.R class. This approach works because Eclipse shares # resources and some code across projects implicitly, which lets us provide -# org.mozilla.gecko.R to the main Fennec project from the FennecResources +# org.mozilla.goanna.R to the main Fennec project from the FennecResources # project. # # Previously, the static resources were in the FennecResources project. To let -# the FennecResources Eclipse project produce org.mozilla.gecko.R, however, the +# the FennecResources Eclipse project produce org.mozilla.goanna.R, however, the # project must depend on all the resource projects. But the crash reporter # resources depend on some of the static resources, and that causes a cycle. # This layer of indirection lets us break the cycle. resources = add_android_eclipse_library_project('FennecResources') -resources.package_name = 'org.mozilla.gecko' +resources.package_name = 'org.mozilla.goanna' resources.res = None resources.included_projects += ['../' + static.name, '../' + generated.name, '../' + branding.name] resources.recursive_make_targets += generated_recursive_make_targets @@ -849,7 +849,7 @@ resources.recursive_make_targets += generated_recursive_make_targets main.included_projects += ['../' + resources.name] omnijar = add_android_eclipse_library_project('FennecOmnijar') -omnijar.package_name = 'org.mozilla.gecko.omnijar' +omnijar.package_name = 'org.mozilla.goanna.omnijar' # This is delicate. We write into OBJDIR, and write triggers a new build of the # Fennec project, because the omni.ja timestamp is always updated. (The target # is FORCE and the installer does not track dependencies.) However, Eclipse only @@ -865,7 +865,7 @@ main.included_projects += ['../' + omnijar.name] if CONFIG['MOZ_CRASHREPORTER']: crashreporter = add_android_eclipse_library_project('FennecResourcesCrashReporter') - crashreporter.package_name = 'org.mozilla.gecko.crashreporter' + crashreporter.package_name = 'org.mozilla.goanna.crashreporter' crashreporter.res = SRCDIR + '/crashreporter/res' crashreporter.recursive_make_targets += generated_recursive_make_targets diff --git a/mobile/android/base/mozglue/ByteBufferInputStream.java b/mobile/android/base/mozglue/ByteBufferInputStream.java index ddc2546479..6ca1cb91fe 100644 --- a/mobile/android/base/mozglue/ByteBufferInputStream.java +++ b/mobile/android/base/mozglue/ByteBufferInputStream.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.goanna.mozglue; import java.io.InputStream; import java.nio.ByteBuffer; diff --git a/mobile/android/base/mozglue/ContextUtils.java b/mobile/android/base/mozglue/ContextUtils.java index 7bdfe89c37..dfa33cfae8 100644 --- a/mobile/android/base/mozglue/ContextUtils.java +++ b/mobile/android/base/mozglue/ContextUtils.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.goanna.mozglue; import android.content.Intent; import android.net.Uri; diff --git a/mobile/android/base/mozglue/DirectBufferAllocator.java b/mobile/android/base/mozglue/DirectBufferAllocator.java index a234fd0f43..9a045679bc 100644 --- a/mobile/android/base/mozglue/DirectBufferAllocator.java +++ b/mobile/android/base/mozglue/DirectBufferAllocator.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.goanna.mozglue; import java.nio.ByteBuffer; diff --git a/mobile/android/base/mozglue/GeckoLoader.java b/mobile/android/base/mozglue/GeckoLoader.java index f03147c085..b871d1af80 100644 --- a/mobile/android/base/mozglue/GeckoLoader.java +++ b/mobile/android/base/mozglue/GeckoLoader.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.goanna.mozglue; import java.io.File; import java.io.FileOutputStream; @@ -21,8 +21,8 @@ import android.os.Build; import android.os.Environment; import android.util.Log; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.mozglue.ContextUtils.SafeIntent; public final class GoannaLoader { private static final String LOGTAG = "GoannaLoader"; diff --git a/mobile/android/base/mozglue/JNITarget.java b/mobile/android/base/mozglue/JNITarget.java index 2cfd849690..c9714fcd29 100644 --- a/mobile/android/base/mozglue/JNITarget.java +++ b/mobile/android/base/mozglue/JNITarget.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.goanna.mozglue; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mobile/android/base/mozglue/NativeReference.java b/mobile/android/base/mozglue/NativeReference.java index 9d897d3842..1e80eaec98 100644 --- a/mobile/android/base/mozglue/NativeReference.java +++ b/mobile/android/base/mozglue/NativeReference.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.goanna.mozglue; public interface NativeReference { diff --git a/mobile/android/base/mozglue/NativeZip.java b/mobile/android/base/mozglue/NativeZip.java index 84e8ac6437..510620797a 100644 --- a/mobile/android/base/mozglue/NativeZip.java +++ b/mobile/android/base/mozglue/NativeZip.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.goanna.mozglue; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; import java.io.InputStream; import java.nio.ByteBuffer; diff --git a/mobile/android/base/mozglue/RobocopTarget.java b/mobile/android/base/mozglue/RobocopTarget.java index 94fa1b85fb..10da0bc6e9 100644 --- a/mobile/android/base/mozglue/RobocopTarget.java +++ b/mobile/android/base/mozglue/RobocopTarget.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.goanna.mozglue; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mobile/android/base/mozglue/WebRTCJNITarget.java b/mobile/android/base/mozglue/WebRTCJNITarget.java index aad1cbfda2..d235dec036 100644 --- a/mobile/android/base/mozglue/WebRTCJNITarget.java +++ b/mobile/android/base/mozglue/WebRTCJNITarget.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.goanna.mozglue; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java b/mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java index 1aab897307..f55838e9d3 100644 --- a/mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java +++ b/mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue.generatorannotations; +package org.mozilla.goanna.mozglue.generatorannotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java b/mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java index a73d2d91b3..b8a0a1d8b1 100644 --- a/mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java +++ b/mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue.generatorannotations; +package org.mozilla.goanna.mozglue.generatorannotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mobile/android/base/mozglue/generatorannotations/WrapEntireClassForJNI.java b/mobile/android/base/mozglue/generatorannotations/WrapEntireClassForJNI.java index 71e375a33f..742cdea319 100644 --- a/mobile/android/base/mozglue/generatorannotations/WrapEntireClassForJNI.java +++ b/mobile/android/base/mozglue/generatorannotations/WrapEntireClassForJNI.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.mozglue.generatorannotations; +package org.mozilla.goanna.mozglue.generatorannotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mobile/android/base/overlays/OverlayConstants.java b/mobile/android/base/overlays/OverlayConstants.java index 16f5560d3d..3705f462cf 100644 --- a/mobile/android/base/overlays/OverlayConstants.java +++ b/mobile/android/base/overlays/OverlayConstants.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays; +package org.mozilla.goanna.overlays; /** * Constants used by the share handler service (and clients). @@ -22,7 +22,7 @@ public class OverlayConstants { * * None. */ - public static final String ACTION_PREPARE_SHARE = "org.mozilla.gecko.overlays.ACTION_PREPARE_SHARE"; + public static final String ACTION_PREPARE_SHARE = "org.mozilla.goanna.overlays.ACTION_PREPARE_SHARE"; /* * Action for sharing a page. @@ -35,7 +35,7 @@ public class OverlayConstants { * $EXTRA_TITLE: Title of page to share (optional) * $EXTRA_PARAMETERS: Parcelable of extra data to pass to the ShareMethod (optional) */ - public static final String ACTION_SHARE = "org.mozilla.gecko.overlays.ACTION_SHARE"; + public static final String ACTION_SHARE = "org.mozilla.goanna.overlays.ACTION_SHARE"; /* * OverlayIntentHandler service intent extra field keys. @@ -64,5 +64,5 @@ public class OverlayConstants { * $EXTRA_SHARE_METHOD: The ShareType to which this event relates. * ... ShareType-specific parameters as desired... (optional) */ - public static final String SHARE_METHOD_UI_EVENT = "org.mozilla.gecko.overlays.ACTION_SHARE_METHOD_UI_EVENT"; + public static final String SHARE_METHOD_UI_EVENT = "org.mozilla.goanna.overlays.ACTION_SHARE_METHOD_UI_EVENT"; } diff --git a/mobile/android/base/overlays/service/OverlayActionService.java b/mobile/android/base/overlays/service/OverlayActionService.java index 3f4bcc1491..db218cfa15 100644 --- a/mobile/android/base/overlays/service/OverlayActionService.java +++ b/mobile/android/base/overlays/service/OverlayActionService.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.service; +package org.mozilla.goanna.overlays.service; import android.app.Service; import android.content.Context; @@ -11,19 +11,19 @@ import android.content.Intent; import android.os.IBinder; import android.util.Log; import android.view.View; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.overlays.service.sharemethods.AddBookmark; -import org.mozilla.gecko.overlays.service.sharemethods.AddToReadingList; -import org.mozilla.gecko.overlays.service.sharemethods.SendTab; -import org.mozilla.gecko.overlays.service.sharemethods.ShareMethod; -import org.mozilla.gecko.overlays.ui.OverlayToastHelper; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.overlays.service.sharemethods.AddBookmark; +import org.mozilla.goanna.overlays.service.sharemethods.AddToReadingList; +import org.mozilla.goanna.overlays.service.sharemethods.SendTab; +import org.mozilla.goanna.overlays.service.sharemethods.ShareMethod; +import org.mozilla.goanna.overlays.ui.OverlayToastHelper; +import org.mozilla.goanna.util.ThreadUtils; import java.util.EnumMap; import java.util.Map; -import static org.mozilla.gecko.overlays.OverlayConstants.ACTION_PREPARE_SHARE; -import static org.mozilla.gecko.overlays.OverlayConstants.ACTION_SHARE; +import static org.mozilla.goanna.overlays.OverlayConstants.ACTION_PREPARE_SHARE; +import static org.mozilla.goanna.overlays.OverlayConstants.ACTION_SHARE; /** * A service to receive requests from overlays to perform actions. diff --git a/mobile/android/base/overlays/service/ShareData.java b/mobile/android/base/overlays/service/ShareData.java index f586f1a769..ad089ceb2b 100644 --- a/mobile/android/base/overlays/service/ShareData.java +++ b/mobile/android/base/overlays/service/ShareData.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.service; +package org.mozilla.goanna.overlays.service; import android.content.Intent; import android.os.Bundle; import android.os.Parcelable; -import org.mozilla.gecko.overlays.OverlayConstants; -import org.mozilla.gecko.overlays.service.sharemethods.ShareMethod; +import org.mozilla.goanna.overlays.OverlayConstants; +import org.mozilla.goanna.overlays.service.sharemethods.ShareMethod; -import static org.mozilla.gecko.overlays.OverlayConstants.EXTRA_SHARE_METHOD; +import static org.mozilla.goanna.overlays.OverlayConstants.EXTRA_SHARE_METHOD; /** * Class to hold information related to a particular request to perform a share. diff --git a/mobile/android/base/overlays/service/sharemethods/AddBookmark.java b/mobile/android/base/overlays/service/sharemethods/AddBookmark.java index 30756a8aa2..75a075cfe1 100644 --- a/mobile/android/base/overlays/service/sharemethods/AddBookmark.java +++ b/mobile/android/base/overlays/service/sharemethods/AddBookmark.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.service.sharemethods; +package org.mozilla.goanna.overlays.service.sharemethods; import android.content.ContentResolver; import android.content.Context; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.R; -import org.mozilla.gecko.db.LocalBrowserDB; -import org.mozilla.gecko.overlays.service.ShareData; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.R; +import org.mozilla.goanna.db.LocalBrowserDB; +import org.mozilla.goanna.overlays.service.ShareData; public class AddBookmark extends ShareMethod { private static final String LOGTAG = "GoannaAddBookmark"; diff --git a/mobile/android/base/overlays/service/sharemethods/AddToReadingList.java b/mobile/android/base/overlays/service/sharemethods/AddToReadingList.java index 5ae2ba01a9..ae1e0d3666 100644 --- a/mobile/android/base/overlays/service/sharemethods/AddToReadingList.java +++ b/mobile/android/base/overlays/service/sharemethods/AddToReadingList.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.service.sharemethods; +package org.mozilla.goanna.overlays.service.sharemethods; import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.R; -import org.mozilla.gecko.db.LocalBrowserDB; -import org.mozilla.gecko.db.ReadingListProvider; -import org.mozilla.gecko.overlays.service.ShareData; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.R; +import org.mozilla.goanna.db.LocalBrowserDB; +import org.mozilla.goanna.db.ReadingListProvider; +import org.mozilla.goanna.overlays.service.ShareData; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems; /** * ShareMethod to add a page to the reading list. diff --git a/mobile/android/base/overlays/service/sharemethods/ParcelableClientRecord.java b/mobile/android/base/overlays/service/sharemethods/ParcelableClientRecord.java index 37167fffac..19875a49a8 100644 --- a/mobile/android/base/overlays/service/sharemethods/ParcelableClientRecord.java +++ b/mobile/android/base/overlays/service/sharemethods/ParcelableClientRecord.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.service.sharemethods; +package org.mozilla.goanna.overlays.service.sharemethods; import android.os.Parcel; import android.os.Parcelable; -import org.mozilla.gecko.sync.repositories.domain.ClientRecord; +import org.mozilla.goanna.sync.repositories.domain.ClientRecord; /** * An immutable representation of a Sync ClientRecord for Parceling, storing only name, guid, type. diff --git a/mobile/android/base/overlays/service/sharemethods/SendTab.java b/mobile/android/base/overlays/service/sharemethods/SendTab.java index 506c543f8d..af05d5dbaa 100644 --- a/mobile/android/base/overlays/service/sharemethods/SendTab.java +++ b/mobile/android/base/overlays/service/sharemethods/SendTab.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.service.sharemethods; +package org.mozilla.goanna.overlays.service.sharemethods; import android.accounts.Account; import android.accounts.AccountManager; @@ -14,25 +14,25 @@ import android.os.Bundle; import android.os.Parcelable; import android.support.v4.content.LocalBroadcastManager; import android.util.Log; -import org.mozilla.gecko.R; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.activities.FxAccountGetStartedActivity; -import org.mozilla.gecko.fxa.activities.FxAccountStatusActivity; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.overlays.OverlayConstants; -import org.mozilla.gecko.overlays.service.ShareData; -import org.mozilla.gecko.sync.CommandProcessor; -import org.mozilla.gecko.sync.CommandRunner; -import org.mozilla.gecko.sync.GlobalSession; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.android.ClientsDatabaseAccessor; -import org.mozilla.gecko.sync.repositories.domain.ClientRecord; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.sync.syncadapter.SyncAdapter; +import org.mozilla.goanna.R; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.activities.FxAccountGetStartedActivity; +import org.mozilla.goanna.fxa.activities.FxAccountStatusActivity; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.overlays.OverlayConstants; +import org.mozilla.goanna.overlays.service.ShareData; +import org.mozilla.goanna.sync.CommandProcessor; +import org.mozilla.goanna.sync.CommandRunner; +import org.mozilla.goanna.sync.GlobalSession; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.android.ClientsDatabaseAccessor; +import org.mozilla.goanna.sync.repositories.domain.ClientRecord; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.sync.syncadapter.SyncAdapter; import java.util.ArrayList; import java.util.Arrays; diff --git a/mobile/android/base/overlays/service/sharemethods/ShareMethod.java b/mobile/android/base/overlays/service/sharemethods/ShareMethod.java index a15e15c7eb..8a61b887f4 100644 --- a/mobile/android/base/overlays/service/sharemethods/ShareMethod.java +++ b/mobile/android/base/overlays/service/sharemethods/ShareMethod.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.service.sharemethods; +package org.mozilla.goanna.overlays.service.sharemethods; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import org.mozilla.gecko.overlays.service.ShareData; +import org.mozilla.goanna.overlays.service.ShareData; /** * Represents a method of sharing a URL/title. Add a bookmark? Send to a device? Add to reading list? diff --git a/mobile/android/base/overlays/ui/OverlayDialogButton.java b/mobile/android/base/overlays/ui/OverlayDialogButton.java index bb4287a71c..12b62a3ff3 100644 --- a/mobile/android/base/overlays/ui/OverlayDialogButton.java +++ b/mobile/android/base/overlays/ui/OverlayDialogButton.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.ui; +package org.mozilla.goanna.overlays.ui; import android.util.AttributeSet; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/mobile/android/base/overlays/ui/OverlayToastHelper.java b/mobile/android/base/overlays/ui/OverlayToastHelper.java index 24b99f0d3c..cf91235444 100644 --- a/mobile/android/base/overlays/ui/OverlayToastHelper.java +++ b/mobile/android/base/overlays/ui/OverlayToastHelper.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.ui; +package org.mozilla.goanna.overlays.ui; import android.content.Context; import android.view.LayoutInflater; @@ -10,7 +10,7 @@ import android.view.View; import android.widget.TextView; import android.widget.Toast; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; /** * Static helper class for generating toasts for share events. diff --git a/mobile/android/base/overlays/ui/SendTabDeviceListArrayAdapter.java b/mobile/android/base/overlays/ui/SendTabDeviceListArrayAdapter.java index ab7441996e..ffda0a7d52 100644 --- a/mobile/android/base/overlays/ui/SendTabDeviceListArrayAdapter.java +++ b/mobile/android/base/overlays/ui/SendTabDeviceListArrayAdapter.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.ui; +package org.mozilla.goanna.overlays.ui; import java.util.Collection; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.R; -import org.mozilla.gecko.overlays.service.sharemethods.ParcelableClientRecord; -import org.mozilla.gecko.overlays.ui.SendTabList.State; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.R; +import org.mozilla.goanna.overlays.service.sharemethods.ParcelableClientRecord; +import org.mozilla.goanna.overlays.ui.SendTabList.State; import android.app.AlertDialog; import android.content.Context; diff --git a/mobile/android/base/overlays/ui/SendTabList.java b/mobile/android/base/overlays/ui/SendTabList.java index 85b8490ca8..8a12475ddd 100644 --- a/mobile/android/base/overlays/ui/SendTabList.java +++ b/mobile/android/base/overlays/ui/SendTabList.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.ui; +package org.mozilla.goanna.overlays.ui; -import static org.mozilla.gecko.overlays.ui.SendTabList.State.LIST; -import static org.mozilla.gecko.overlays.ui.SendTabList.State.LOADING; -import static org.mozilla.gecko.overlays.ui.SendTabList.State.SHOW_DEVICES; +import static org.mozilla.goanna.overlays.ui.SendTabList.State.LIST; +import static org.mozilla.goanna.overlays.ui.SendTabList.State.LOADING; +import static org.mozilla.goanna.overlays.ui.SendTabList.State.SHOW_DEVICES; import java.util.Arrays; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.overlays.service.sharemethods.ParcelableClientRecord; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.overlays.service.sharemethods.ParcelableClientRecord; import android.app.AlertDialog; import android.content.Context; diff --git a/mobile/android/base/overlays/ui/SendTabTargetSelectedListener.java b/mobile/android/base/overlays/ui/SendTabTargetSelectedListener.java index 79da526da5..c53b4149a2 100644 --- a/mobile/android/base/overlays/ui/SendTabTargetSelectedListener.java +++ b/mobile/android/base/overlays/ui/SendTabTargetSelectedListener.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.ui; +package org.mozilla.goanna.overlays.ui; /** * Interface for classes that wish to listen for the selection of an element from a SendTabList. diff --git a/mobile/android/base/overlays/ui/ShareDialog.java b/mobile/android/base/overlays/ui/ShareDialog.java index 9ad7d854a3..9c6c81e12f 100644 --- a/mobile/android/base/overlays/ui/ShareDialog.java +++ b/mobile/android/base/overlays/ui/ShareDialog.java @@ -3,27 +3,27 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.overlays.ui; +package org.mozilla.goanna.overlays.ui; import java.net.URISyntaxException; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.LocalBrowserDB; -import org.mozilla.gecko.overlays.OverlayConstants; -import org.mozilla.gecko.overlays.service.OverlayActionService; -import org.mozilla.gecko.overlays.service.sharemethods.ParcelableClientRecord; -import org.mozilla.gecko.overlays.service.sharemethods.SendTab; -import org.mozilla.gecko.overlays.service.sharemethods.ShareMethod; -import org.mozilla.gecko.sync.setup.activities.WebURLFinder; -import org.mozilla.gecko.mozglue.ContextUtils; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.UIAsyncTask; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.LocalBrowserDB; +import org.mozilla.goanna.overlays.OverlayConstants; +import org.mozilla.goanna.overlays.service.OverlayActionService; +import org.mozilla.goanna.overlays.service.sharemethods.ParcelableClientRecord; +import org.mozilla.goanna.overlays.service.sharemethods.SendTab; +import org.mozilla.goanna.overlays.service.sharemethods.ShareMethod; +import org.mozilla.goanna.sync.setup.activities.WebURLFinder; +import org.mozilla.goanna.mozglue.ContextUtils; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.UIAsyncTask; import android.content.BroadcastReceiver; import android.content.ContentResolver; diff --git a/mobile/android/base/preferences/AlignRightLinkPreference.java b/mobile/android/base/preferences/AlignRightLinkPreference.java index b68a018f2d..e5c46074ac 100644 --- a/mobile/android/base/preferences/AlignRightLinkPreference.java +++ b/mobile/android/base/preferences/AlignRightLinkPreference.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/preferences/AndroidImport.java b/mobile/android/base/preferences/AndroidImport.java index 9fc33a443f..02aa5a8002 100644 --- a/mobile/android/base/preferences/AndroidImport.java +++ b/mobile/android/base/preferences/AndroidImport.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.Bookmarks; -import org.mozilla.gecko.db.LocalBrowserDB; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.Bookmarks; +import org.mozilla.goanna.db.LocalBrowserDB; import android.content.ContentProviderOperation; import android.content.ContentResolver; diff --git a/mobile/android/base/preferences/AndroidImportPreference.java b/mobile/android/base/preferences/AndroidImportPreference.java index 0d8de1931c..1f04d3370d 100644 --- a/mobile/android/base/preferences/AndroidImportPreference.java +++ b/mobile/android/base/preferences/AndroidImportPreference.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.R; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.RestrictedProfiles; -import org.mozilla.gecko.RestrictedProfiles.Restriction; +import org.mozilla.goanna.R; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.RestrictedProfiles; +import org.mozilla.goanna.RestrictedProfiles.Restriction; import java.util.Set; diff --git a/mobile/android/base/preferences/ClearOnShutdownPref.java b/mobile/android/base/preferences/ClearOnShutdownPref.java index d7f77b5d7a..32fe88888c 100644 --- a/mobile/android/base/preferences/ClearOnShutdownPref.java +++ b/mobile/android/base/preferences/ClearOnShutdownPref.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; import java.util.HashSet; import java.util.Set; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.util.PrefUtils; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.util.PrefUtils; import android.content.Context; import android.content.SharedPreferences; diff --git a/mobile/android/base/preferences/CustomCheckBoxPreference.java b/mobile/android/base/preferences/CustomCheckBoxPreference.java index 2934ca88e4..3558a60b22 100644 --- a/mobile/android/base/preferences/CustomCheckBoxPreference.java +++ b/mobile/android/base/preferences/CustomCheckBoxPreference.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; import android.content.Context; import android.preference.CheckBoxPreference; diff --git a/mobile/android/base/preferences/CustomListCategory.java b/mobile/android/base/preferences/CustomListCategory.java index ee5a46bef2..1f8dd0d401 100644 --- a/mobile/android/base/preferences/CustomListCategory.java +++ b/mobile/android/base/preferences/CustomListCategory.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; import android.content.Context; import android.preference.PreferenceCategory; diff --git a/mobile/android/base/preferences/CustomListPreference.java b/mobile/android/base/preferences/CustomListPreference.java index 8b7e0e7b39..8f92810119 100644 --- a/mobile/android/base/preferences/CustomListPreference.java +++ b/mobile/android/base/preferences/CustomListPreference.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.app.AlertDialog; import android.content.Context; diff --git a/mobile/android/base/preferences/FontSizePreference.java b/mobile/android/base/preferences/FontSizePreference.java index a87a9e6a33..0d46abf649 100644 --- a/mobile/android/base/preferences/FontSizePreference.java +++ b/mobile/android/base/preferences/FontSizePreference.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.app.AlertDialog; import android.content.Context; diff --git a/mobile/android/base/preferences/GeckoPreferenceFragment.java b/mobile/android/base/preferences/GeckoPreferenceFragment.java index bbe0fdbaaf..017ddc69b5 100644 --- a/mobile/android/base/preferences/GeckoPreferenceFragment.java +++ b/mobile/android/base/preferences/GeckoPreferenceFragment.java @@ -3,19 +3,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; import java.util.Locale; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.BrowserLocaleManager; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.LocaleManager; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.TelemetryContract.Method; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.BrowserLocaleManager; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.LocaleManager; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.TelemetryContract.Method; import android.app.ActionBar; import android.app.Activity; diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java index e53cb0742e..bb5a9af995 100644 --- a/mobile/android/base/preferences/GeckoPreferences.java +++ b/mobile/android/base/preferences/GeckoPreferences.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; import java.util.ArrayList; import java.util.HashMap; @@ -14,36 +14,36 @@ import java.util.Map; import android.os.Build; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.BrowserApp; -import org.mozilla.gecko.BrowserLocaleManager; -import org.mozilla.gecko.DataReportingNotification; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaActivityStatus; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.GuestSession; -import org.mozilla.gecko.LocaleManager; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.R; -import org.mozilla.gecko.RestrictedProfiles; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.TelemetryContract.Method; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.healthreport.HealthReportConstants; -import org.mozilla.gecko.db.BrowserContract.SuggestedSites; -import org.mozilla.gecko.updater.UpdateService; -import org.mozilla.gecko.updater.UpdateServiceHelper; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.widget.FloatingHintEditText; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.BrowserApp; +import org.mozilla.goanna.BrowserLocaleManager; +import org.mozilla.goanna.DataReportingNotification; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaActivityStatus; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.GuestSession; +import org.mozilla.goanna.LocaleManager; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.R; +import org.mozilla.goanna.RestrictedProfiles; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.TelemetryContract.Method; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.healthreport.HealthReportConstants; +import org.mozilla.goanna.db.BrowserContract.SuggestedSites; +import org.mozilla.goanna.updater.UpdateService; +import org.mozilla.goanna.updater.UpdateServiceHelper; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.widget.FloatingHintEditText; import android.app.ActionBar; import android.app.Activity; @@ -1359,7 +1359,7 @@ OnSharedPreferenceChangeListener @Override public void finish() { - // enable all preferences once we have them from gecko + // enable all preferences once we have them from goanna ThreadUtils.postToUiThread(new Runnable() { @Override public void run() { diff --git a/mobile/android/base/preferences/LinkPreference.java b/mobile/android/base/preferences/LinkPreference.java index 4ccf2527d1..03c1369f8a 100644 --- a/mobile/android/base/preferences/LinkPreference.java +++ b/mobile/android/base/preferences/LinkPreference.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.Tabs; +import org.mozilla.goanna.Tabs; import android.content.Context; import android.preference.Preference; diff --git a/mobile/android/base/preferences/ListCheckboxPreference.java b/mobile/android/base/preferences/ListCheckboxPreference.java index e06e20d509..dc7ee81577 100644 --- a/mobile/android/base/preferences/ListCheckboxPreference.java +++ b/mobile/android/base/preferences/ListCheckboxPreference.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.Checkable; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; /** * This preference shows a checkbox on its left hand side, but will show a menu when clicked. diff --git a/mobile/android/base/preferences/LocaleListPreference.java b/mobile/android/base/preferences/LocaleListPreference.java index db5fdb134a..65e2900148 100644 --- a/mobile/android/base/preferences/LocaleListPreference.java +++ b/mobile/android/base/preferences/LocaleListPreference.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; import java.nio.ByteBuffer; import java.text.Collator; @@ -12,10 +12,10 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.BrowserLocaleManager; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.R; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.BrowserLocaleManager; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.R; import android.content.Context; import android.graphics.Bitmap; diff --git a/mobile/android/base/preferences/ModifiableHintPreference.java b/mobile/android/base/preferences/ModifiableHintPreference.java index c545472e24..af2c3ee5ac 100644 --- a/mobile/android/base/preferences/ModifiableHintPreference.java +++ b/mobile/android/base/preferences/ModifiableHintPreference.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/mobile/android/base/preferences/MultiChoicePreference.java b/mobile/android/base/preferences/MultiChoicePreference.java index 10b7f3f1b6..cba0edf7e7 100644 --- a/mobile/android/base/preferences/MultiChoicePreference.java +++ b/mobile/android/base/preferences/MultiChoicePreference.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.R; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.util.PrefUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.util.PrefUtils; +import org.mozilla.goanna.util.ThreadUtils; import android.app.AlertDialog.Builder; import android.content.Context; diff --git a/mobile/android/base/preferences/MultiPrefMultiChoicePreference.java b/mobile/android/base/preferences/MultiPrefMultiChoicePreference.java index f2403b1b2f..164c5b7c79 100644 --- a/mobile/android/base/preferences/MultiPrefMultiChoicePreference.java +++ b/mobile/android/base/preferences/MultiPrefMultiChoicePreference.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.R; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.util.ThreadUtils; import android.app.AlertDialog; import android.content.Context; diff --git a/mobile/android/base/preferences/PanelsPreference.java b/mobile/android/base/preferences/PanelsPreference.java index 96aec53ac5..f2c76345fe 100644 --- a/mobile/android/base/preferences/PanelsPreference.java +++ b/mobile/android/base/preferences/PanelsPreference.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.PropertyAnimator.Property; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.R; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.PropertyAnimator.Property; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.R; import android.app.AlertDialog; import android.app.Dialog; diff --git a/mobile/android/base/preferences/PanelsPreferenceCategory.java b/mobile/android/base/preferences/PanelsPreferenceCategory.java index 59206cf057..bfe904523e 100644 --- a/mobile/android/base/preferences/PanelsPreferenceCategory.java +++ b/mobile/android/base/preferences/PanelsPreferenceCategory.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.TelemetryContract.Method; -import org.mozilla.gecko.home.HomeConfig; -import org.mozilla.gecko.home.HomeConfig.PanelConfig; -import org.mozilla.gecko.home.HomeConfig.State; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.util.UIAsyncTask; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.TelemetryContract.Method; +import org.mozilla.goanna.home.HomeConfig; +import org.mozilla.goanna.home.HomeConfig.PanelConfig; +import org.mozilla.goanna.home.HomeConfig.State; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.util.UIAsyncTask; import android.content.Context; import android.text.TextUtils; diff --git a/mobile/android/base/preferences/PrivateDataPreference.java b/mobile/android/base/preferences/PrivateDataPreference.java index d4ece07830..37ca5df919 100644 --- a/mobile/android/base/preferences/PrivateDataPreference.java +++ b/mobile/android/base/preferences/PrivateDataPreference.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; import org.json.JSONException; import org.json.JSONObject; @@ -54,7 +54,7 @@ class PrivateDataPreference extends MultiPrefMultiChoicePreference { } } - // clear private data in gecko + // clear private data in goanna GoannaAppShell.sendEventToGoanna(GoannaEvent.createBroadcastEvent("Sanitize:ClearData", json.toString())); } } diff --git a/mobile/android/base/preferences/SearchEnginePreference.java b/mobile/android/base/preferences/SearchEnginePreference.java index 70a3edbad9..0be9e71fd7 100644 --- a/mobile/android/base/preferences/SearchEnginePreference.java +++ b/mobile/android/base/preferences/SearchEnginePreference.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.R; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.favicons.OnFaviconLoadedListener; -import org.mozilla.gecko.favicons.decoders.FaviconDecoder; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.widget.FaviconView; +import org.mozilla.goanna.R; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.favicons.OnFaviconLoadedListener; +import org.mozilla.goanna.favicons.decoders.FaviconDecoder; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.widget.FaviconView; import android.app.AlertDialog; import android.content.Context; @@ -39,7 +39,7 @@ public class SearchEnginePreference extends CustomListPreference { private FaviconView mFaviconView; - // Search engine identifier specified by the gecko search service. This will be "other" + // Search engine identifier specified by the goanna search service. This will be "other" // for engines that are not shipped with the app. private String mIdentifier; @@ -137,23 +137,23 @@ public class SearchEnginePreference extends CustomListPreference { /** * Configure this Preference object from the Goanna search engine JSON object. - * @param geckoEngineJSON The Goanna-formatted JSON object representing the search engine. + * @param goannaEngineJSON The Goanna-formatted JSON object representing the search engine. * @throws JSONException If the JSONObject is invalid. */ - public void setSearchEngineFromJSON(JSONObject geckoEngineJSON) throws JSONException { - mIdentifier = geckoEngineJSON.getString("identifier"); + public void setSearchEngineFromJSON(JSONObject goannaEngineJSON) throws JSONException { + mIdentifier = goannaEngineJSON.getString("identifier"); // A null JS value gets converted into a string. if (mIdentifier.equals("null")) { mIdentifier = "other"; } - final String engineName = geckoEngineJSON.getString("name"); + final String engineName = goannaEngineJSON.getString("name"); final SpannableString titleSpannable = new SpannableString(engineName); setTitle(titleSpannable); - final String iconURI = geckoEngineJSON.getString("iconURI"); + final String iconURI = goannaEngineJSON.getString("iconURI"); // Keep a reference to the bitmap - we'll need it later in onBindView. try { final int desiredWidth; diff --git a/mobile/android/base/preferences/SearchPreferenceCategory.java b/mobile/android/base/preferences/SearchPreferenceCategory.java index 476dbe15de..6f4b50f10b 100644 --- a/mobile/android/base/preferences/SearchPreferenceCategory.java +++ b/mobile/android/base/preferences/SearchPreferenceCategory.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; import android.content.Context; import android.preference.Preference; @@ -13,14 +13,14 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.TelemetryContract.Method; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.TelemetryContract.Method; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; public class SearchPreferenceCategory extends CustomListCategory implements GoannaEventListener { public static final String LOGTAG = "SearchPrefCategory"; diff --git a/mobile/android/base/preferences/SyncPreference.java b/mobile/android/base/preferences/SyncPreference.java index 21d9ea96e4..e5eade0123 100644 --- a/mobile/android/base/preferences/SyncPreference.java +++ b/mobile/android/base/preferences/SyncPreference.java @@ -3,15 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.preferences; +package org.mozilla.goanna.preferences; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.TelemetryContract.Method; -import org.mozilla.gecko.fxa.activities.FxAccountGetStartedActivity; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.sync.setup.activities.SetupSyncActivity; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.TelemetryContract.Method; +import org.mozilla.goanna.fxa.activities.FxAccountGetStartedActivity; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.sync.setup.activities.SetupSyncActivity; +import org.mozilla.goanna.util.HardwareUtils; import android.content.Context; import android.content.Intent; diff --git a/mobile/android/base/prompts/ColorPickerInput.java b/mobile/android/base/prompts/ColorPickerInput.java index 5f9363aa9c..edf70e5c29 100644 --- a/mobile/android/base/prompts/ColorPickerInput.java +++ b/mobile/android/base/prompts/ColorPickerInput.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.prompts; +package org.mozilla.goanna.prompts; import org.json.JSONObject; -import org.mozilla.gecko.R; -import org.mozilla.gecko.widget.BasicColorPicker; +import org.mozilla.goanna.R; +import org.mozilla.goanna.widget.BasicColorPicker; import android.content.Context; import android.graphics.Color; diff --git a/mobile/android/base/prompts/IconGridInput.java b/mobile/android/base/prompts/IconGridInput.java index 03c5336a91..63a3383496 100644 --- a/mobile/android/base/prompts/IconGridInput.java +++ b/mobile/android/base/prompts/IconGridInput.java @@ -3,17 +3,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.prompts; +package org.mozilla.goanna.prompts; import java.util.ArrayList; import java.util.List; import org.json.JSONArray; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.R; -import org.mozilla.gecko.gfx.BitmapUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.R; +import org.mozilla.goanna.gfx.BitmapUtils; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/mobile/android/base/prompts/IntentChooserPrompt.java b/mobile/android/base/prompts/IntentChooserPrompt.java index a6bb670da7..f2ba86a8b2 100644 --- a/mobile/android/base/prompts/IntentChooserPrompt.java +++ b/mobile/android/base/prompts/IntentChooserPrompt.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.prompts; +package org.mozilla.goanna.prompts; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.widget.GoannaActionProvider; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.widget.GoannaActionProvider; import android.content.ComponentName; import android.content.Context; diff --git a/mobile/android/base/prompts/IntentHandler.java b/mobile/android/base/prompts/IntentHandler.java index 1509ab6264..74cae5760f 100644 --- a/mobile/android/base/prompts/IntentHandler.java +++ b/mobile/android/base/prompts/IntentHandler.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.prompts; +package org.mozilla.goanna.prompts; import android.content.Intent; diff --git a/mobile/android/base/prompts/Prompt.java b/mobile/android/base/prompts/Prompt.java index 56583a3e8b..ed2e2a1a52 100644 --- a/mobile/android/base/prompts/Prompt.java +++ b/mobile/android/base/prompts/Prompt.java @@ -3,18 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.prompts; +package org.mozilla.goanna.prompts; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.R; -import org.mozilla.gecko.gfx.LayerView; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.R; +import org.mozilla.goanna.gfx.LayerView; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; import android.app.AlertDialog; import android.content.Context; diff --git a/mobile/android/base/prompts/PromptInput.java b/mobile/android/base/prompts/PromptInput.java index 33caeabed2..bfaf36843e 100644 --- a/mobile/android/base/prompts/PromptInput.java +++ b/mobile/android/base/prompts/PromptInput.java @@ -3,17 +3,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.prompts; +package org.mozilla.goanna.prompts; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.GregorianCalendar; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.widget.AllCapsTextView; -import org.mozilla.gecko.widget.DateTimePicker; -import org.mozilla.gecko.widget.FloatingHintEditText; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.widget.AllCapsTextView; +import org.mozilla.goanna.widget.DateTimePicker; +import org.mozilla.goanna.widget.FloatingHintEditText; import android.content.Context; import android.content.res.Configuration; diff --git a/mobile/android/base/prompts/PromptListAdapter.java b/mobile/android/base/prompts/PromptListAdapter.java index 4b93f9af6f..4228ec3160 100644 --- a/mobile/android/base/prompts/PromptListAdapter.java +++ b/mobile/android/base/prompts/PromptListAdapter.java @@ -1,12 +1,12 @@ -package org.mozilla.gecko.prompts; +package org.mozilla.goanna.prompts; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.menu.MenuItemActionView; -import org.mozilla.gecko.widget.GoannaActionProvider; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.menu.MenuItemActionView; +import org.mozilla.goanna.widget.GoannaActionProvider; import org.json.JSONArray; import org.json.JSONObject; diff --git a/mobile/android/base/prompts/PromptListItem.java b/mobile/android/base/prompts/PromptListItem.java index 8d1f5ae606..d1b8fff534 100644 --- a/mobile/android/base/prompts/PromptListItem.java +++ b/mobile/android/base/prompts/PromptListItem.java @@ -1,8 +1,8 @@ -package org.mozilla.gecko.prompts; +package org.mozilla.goanna.prompts; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.widget.GoannaActionProvider; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.widget.GoannaActionProvider; import org.json.JSONArray; import org.json.JSONObject; diff --git a/mobile/android/base/prompts/PromptService.java b/mobile/android/base/prompts/PromptService.java index 3c54dff818..1480dca04f 100644 --- a/mobile/android/base/prompts/PromptService.java +++ b/mobile/android/base/prompts/PromptService.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.prompts; +package org.mozilla.goanna.prompts; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.ThreadUtils; import android.content.Context; import android.util.Log; diff --git a/mobile/android/base/prompts/TabInput.java b/mobile/android/base/prompts/TabInput.java index 6061c481a5..d8cf73a5f5 100644 --- a/mobile/android/base/prompts/TabInput.java +++ b/mobile/android/base/prompts/TabInput.java @@ -3,16 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.prompts; +package org.mozilla.goanna.prompts; import java.util.LinkedHashMap; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.R; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.R; +import org.mozilla.goanna.util.ThreadUtils; import android.content.Context; import android.util.Log; diff --git a/mobile/android/base/reading/ClientMetadata.java b/mobile/android/base/reading/ClientMetadata.java index 90bca5eaf8..ea1368bf94 100644 --- a/mobile/android/base/reading/ClientMetadata.java +++ b/mobile/android/base/reading/ClientMetadata.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; public class ClientMetadata { public final long id; // A client numeric ID. We don't always have a GUID. diff --git a/mobile/android/base/reading/ClientReadingListRecord.java b/mobile/android/base/reading/ClientReadingListRecord.java index 05fd68dd95..124acda858 100644 --- a/mobile/android/base/reading/ClientReadingListRecord.java +++ b/mobile/android/base/reading/ClientReadingListRecord.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.ExtendedJSONObject; public class ClientReadingListRecord extends ReadingListRecord { final ExtendedJSONObject fields; diff --git a/mobile/android/base/reading/FetchSpec.java b/mobile/android/base/reading/FetchSpec.java index 3989752928..d74bf65c61 100644 --- a/mobile/android/base/reading/FetchSpec.java +++ b/mobile/android/base/reading/FetchSpec.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import java.net.URI; import java.net.URISyntaxException; diff --git a/mobile/android/base/reading/LocalReadingListStorage.java b/mobile/android/base/reading/LocalReadingListStorage.java index 399aaf8366..e9a57c22a8 100644 --- a/mobile/android/base/reading/LocalReadingListStorage.java +++ b/mobile/android/base/reading/LocalReadingListStorage.java @@ -2,23 +2,23 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_FAVORITE_CHANGED; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_FLAGS; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_UNREAD_CHANGED; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS_MODIFIED; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS_NEW; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_CHANGE_FAVORITE_CHANGED; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_CHANGE_FLAGS; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_CHANGE_UNREAD_CHANGED; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_STATUS; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_STATUS_MODIFIED; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_STATUS_NEW; import java.util.ArrayList; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.sync.repositories.android.RepoUtils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.ReadingListItems; +import org.mozilla.goanna.sync.repositories.android.RepoUtils; import android.content.ContentProviderClient; import android.content.ContentProviderOperation; diff --git a/mobile/android/base/reading/ReadingListBackoffObserver.java b/mobile/android/base/reading/ReadingListBackoffObserver.java index c843fc1634..e4f82aba4e 100644 --- a/mobile/android/base/reading/ReadingListBackoffObserver.java +++ b/mobile/android/base/reading/ReadingListBackoffObserver.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import java.util.concurrent.atomic.AtomicLong; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.net.HttpResponseObserver; -import org.mozilla.gecko.sync.net.MozResponse; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.net.HttpResponseObserver; +import org.mozilla.goanna.sync.net.MozResponse; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.client.methods.HttpUriRequest; diff --git a/mobile/android/base/reading/ReadingListChangeAccumulator.java b/mobile/android/base/reading/ReadingListChangeAccumulator.java index 375f125283..53174ed81c 100644 --- a/mobile/android/base/reading/ReadingListChangeAccumulator.java +++ b/mobile/android/base/reading/ReadingListChangeAccumulator.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; /** diff --git a/mobile/android/base/reading/ReadingListClient.java b/mobile/android/base/reading/ReadingListClient.java index f43974bb7a..f8223f06df 100644 --- a/mobile/android/base/reading/ReadingListClient.java +++ b/mobile/android/base/reading/ReadingListClient.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import java.io.IOException; import java.net.URI; @@ -11,16 +11,16 @@ import java.security.GeneralSecurityException; import java.util.Queue; import java.util.concurrent.Executor; -import org.mozilla.gecko.background.ReadingListConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.reading.ReadingListResponse.ResponseFactory; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.net.BasicAuthHeaderProvider; -import org.mozilla.gecko.sync.net.MozResponse; -import org.mozilla.gecko.sync.net.Resource; +import org.mozilla.goanna.background.ReadingListConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.reading.ReadingListResponse.ResponseFactory; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.net.BasicAuthHeaderProvider; +import org.mozilla.goanna.sync.net.MozResponse; +import org.mozilla.goanna.sync.net.Resource; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.client.ClientProtocolException; diff --git a/mobile/android/base/reading/ReadingListClientContentValuesFactory.java b/mobile/android/base/reading/ReadingListClientContentValuesFactory.java index 5b88e1d4e8..02558f574a 100644 --- a/mobile/android/base/reading/ReadingListClientContentValuesFactory.java +++ b/mobile/android/base/reading/ReadingListClientContentValuesFactory.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import java.util.Map.Entry; import java.util.Set; -import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.reading.ReadingListRecord.ServerMetadata; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.db.BrowserContract.ReadingListItems; +import org.mozilla.goanna.reading.ReadingListRecord.ServerMetadata; +import org.mozilla.goanna.sync.ExtendedJSONObject; import android.content.ContentValues; diff --git a/mobile/android/base/reading/ReadingListClientRecordFactory.java b/mobile/android/base/reading/ReadingListClientRecordFactory.java index b41ca4ea34..105ce9ccfc 100644 --- a/mobile/android/base/reading/ReadingListClientRecordFactory.java +++ b/mobile/android/base/reading/ReadingListClientRecordFactory.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.reading.ReadingListRecord.ServerMetadata; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.db.BrowserContract.ReadingListItems; +import org.mozilla.goanna.reading.ReadingListRecord.ServerMetadata; +import org.mozilla.goanna.sync.ExtendedJSONObject; import android.annotation.TargetApi; import android.database.AbstractWindowedCursor; diff --git a/mobile/android/base/reading/ReadingListDeleteDelegate.java b/mobile/android/base/reading/ReadingListDeleteDelegate.java index b22cba9e71..f5ea21aba0 100644 --- a/mobile/android/base/reading/ReadingListDeleteDelegate.java +++ b/mobile/android/base/reading/ReadingListDeleteDelegate.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import org.mozilla.gecko.sync.net.MozResponse; +import org.mozilla.goanna.sync.net.MozResponse; /** * Response delegate for a server DELETE. diff --git a/mobile/android/base/reading/ReadingListInvalidAuthenticationException.java b/mobile/android/base/reading/ReadingListInvalidAuthenticationException.java index 57189e903d..b7961b4b76 100644 --- a/mobile/android/base/reading/ReadingListInvalidAuthenticationException.java +++ b/mobile/android/base/reading/ReadingListInvalidAuthenticationException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import org.mozilla.gecko.sync.net.MozResponse; +import org.mozilla.goanna.sync.net.MozResponse; public class ReadingListInvalidAuthenticationException extends Exception { private static final long serialVersionUID = 7112459541558266597L; diff --git a/mobile/android/base/reading/ReadingListRecord.java b/mobile/android/base/reading/ReadingListRecord.java index 2f5beb12ea..182c603c10 100644 --- a/mobile/android/base/reading/ReadingListRecord.java +++ b/mobile/android/base/reading/ReadingListRecord.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.ExtendedJSONObject; /** * This models the wire protocol format, not database contents. diff --git a/mobile/android/base/reading/ReadingListRecordDelegate.java b/mobile/android/base/reading/ReadingListRecordDelegate.java index 41bd86c5f3..37e26de29f 100644 --- a/mobile/android/base/reading/ReadingListRecordDelegate.java +++ b/mobile/android/base/reading/ReadingListRecordDelegate.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import org.mozilla.gecko.sync.net.MozResponse; +import org.mozilla.goanna.sync.net.MozResponse; /** * Delegate for downloading records. diff --git a/mobile/android/base/reading/ReadingListRecordResponse.java b/mobile/android/base/reading/ReadingListRecordResponse.java index 154a5f2ea8..2870ea78e6 100644 --- a/mobile/android/base/reading/ReadingListRecordResponse.java +++ b/mobile/android/base/reading/ReadingListRecordResponse.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import java.io.IOException; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.NonObjectJSONException; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/reading/ReadingListRecordUploadDelegate.java b/mobile/android/base/reading/ReadingListRecordUploadDelegate.java index 8915a5526a..a1e9c71813 100644 --- a/mobile/android/base/reading/ReadingListRecordUploadDelegate.java +++ b/mobile/android/base/reading/ReadingListRecordUploadDelegate.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import org.mozilla.gecko.sync.net.MozResponse; +import org.mozilla.goanna.sync.net.MozResponse; public interface ReadingListRecordUploadDelegate { // Called once per batch. diff --git a/mobile/android/base/reading/ReadingListResponse.java b/mobile/android/base/reading/ReadingListResponse.java index b163f8491b..c9c2d3d55f 100644 --- a/mobile/android/base/reading/ReadingListResponse.java +++ b/mobile/android/base/reading/ReadingListResponse.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import org.mozilla.gecko.sync.net.MozResponse; +import org.mozilla.goanna.sync.net.MozResponse; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/reading/ReadingListStorage.java b/mobile/android/base/reading/ReadingListStorage.java index 5a96d548b6..961f6ef881 100644 --- a/mobile/android/base/reading/ReadingListStorage.java +++ b/mobile/android/base/reading/ReadingListStorage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import android.database.Cursor; diff --git a/mobile/android/base/reading/ReadingListStorageResponse.java b/mobile/android/base/reading/ReadingListStorageResponse.java index b5e2ce3e32..fc2134d5f1 100644 --- a/mobile/android/base/reading/ReadingListStorageResponse.java +++ b/mobile/android/base/reading/ReadingListStorageResponse.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import java.io.IOException; import java.util.Iterator; @@ -10,9 +10,9 @@ import java.util.Iterator; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.UnexpectedJSONException; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.UnexpectedJSONException; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/reading/ReadingListSyncAdapter.java b/mobile/android/base/reading/ReadingListSyncAdapter.java index d29b36efbe..6cd8978ddd 100644 --- a/mobile/android/base/reading/ReadingListSyncAdapter.java +++ b/mobile/android/base/reading/ReadingListSyncAdapter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import java.net.URI; import java.net.URISyntaxException; @@ -14,23 +14,23 @@ import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.mozilla.gecko.background.ReadingListConstants; -import org.mozilla.gecko.background.common.PrefsBranch; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.FirefoxAccounts.SyncHint; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.sync.FxAccountSyncDelegate; -import org.mozilla.gecko.fxa.sync.FxAccountSyncDelegate.Result; -import org.mozilla.gecko.sync.BackoffHandler; -import org.mozilla.gecko.sync.PrefsBackoffHandler; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BearerAuthHeaderProvider; +import org.mozilla.goanna.background.ReadingListConstants; +import org.mozilla.goanna.background.common.PrefsBranch; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.ReadingListItems; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.FirefoxAccounts.SyncHint; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.sync.FxAccountSyncDelegate; +import org.mozilla.goanna.fxa.sync.FxAccountSyncDelegate.Result; +import org.mozilla.goanna.sync.BackoffHandler; +import org.mozilla.goanna.sync.PrefsBackoffHandler; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BearerAuthHeaderProvider; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/reading/ReadingListSyncService.java b/mobile/android/base/reading/ReadingListSyncService.java index 033752aeb5..8d6aeca1b9 100644 --- a/mobile/android/base/reading/ReadingListSyncService.java +++ b/mobile/android/base/reading/ReadingListSyncService.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import android.app.Service; import android.content.Intent; diff --git a/mobile/android/base/reading/ReadingListSynchronizer.java b/mobile/android/base/reading/ReadingListSynchronizer.java index e1e5032b05..557bdf629d 100644 --- a/mobile/android/base/reading/ReadingListSynchronizer.java +++ b/mobile/android/base/reading/ReadingListSynchronizer.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import java.io.IOException; import java.net.URISyntaxException; @@ -12,13 +12,13 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.common.PrefsBranch; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.reading.ReadingListRecord.ServerMetadata; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.net.MozResponse; +import org.mozilla.goanna.background.common.PrefsBranch; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract.ReadingListItems; +import org.mozilla.goanna.reading.ReadingListRecord.ServerMetadata; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.net.MozResponse; import android.database.Cursor; import android.text.TextUtils; diff --git a/mobile/android/base/reading/ReadingListSynchronizerDelegate.java b/mobile/android/base/reading/ReadingListSynchronizerDelegate.java index 6ebb3f9ab3..7991abb664 100644 --- a/mobile/android/base/reading/ReadingListSynchronizerDelegate.java +++ b/mobile/android/base/reading/ReadingListSynchronizerDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; import java.util.Collection; diff --git a/mobile/android/base/reading/ReadingListWipeDelegate.java b/mobile/android/base/reading/ReadingListWipeDelegate.java index 3120eb0eb3..56afc97f92 100644 --- a/mobile/android/base/reading/ReadingListWipeDelegate.java +++ b/mobile/android/base/reading/ReadingListWipeDelegate.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import org.mozilla.gecko.sync.net.MozResponse; +import org.mozilla.goanna.sync.net.MozResponse; public interface ReadingListWipeDelegate { void onSuccess(ReadingListStorageResponse response); diff --git a/mobile/android/base/reading/ServerReadingListRecord.java b/mobile/android/base/reading/ServerReadingListRecord.java index 8cb76603d0..7375f252c0 100644 --- a/mobile/android/base/reading/ServerReadingListRecord.java +++ b/mobile/android/base/reading/ServerReadingListRecord.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.reading; +package org.mozilla.goanna.reading; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.ExtendedJSONObject; public class ServerReadingListRecord extends ReadingListRecord { final ExtendedJSONObject fields; diff --git a/mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_bg.xml b/mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_bg.xml index dde6c99506..37b89d5823 100644 --- a/mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_bg.xml +++ b/mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_bg.xml @@ -4,19 +4,19 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> diff --git a/mobile/android/base/resources/color/toolbar_display_layout_bg.xml b/mobile/android/base/resources/color/toolbar_display_layout_bg.xml index ddb4cc9298..eb68bef0f2 100644 --- a/mobile/android/base/resources/color/toolbar_display_layout_bg.xml +++ b/mobile/android/base/resources/color/toolbar_display_layout_bg.xml @@ -2,9 +2,9 @@ + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - + diff --git a/mobile/android/base/resources/color/url_bar_title.xml b/mobile/android/base/resources/color/url_bar_title.xml index 789328c6ac..80a0cb5171 100644 --- a/mobile/android/base/resources/color/url_bar_title.xml +++ b/mobile/android/base/resources/color/url_bar_title.xml @@ -4,16 +4,16 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - + - + - + diff --git a/mobile/android/base/resources/color/url_bar_title_hint.xml b/mobile/android/base/resources/color/url_bar_title_hint.xml index 0c748ac0bf..b510d6dc31 100644 --- a/mobile/android/base/resources/color/url_bar_title_hint.xml +++ b/mobile/android/base/resources/color/url_bar_title_hint.xml @@ -4,10 +4,10 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - + diff --git a/mobile/android/base/resources/drawable-large-v11/new_tablet_action_bar_button.xml b/mobile/android/base/resources/drawable-large-v11/new_tablet_action_bar_button.xml index 979645e9ef..641b7d997a 100644 --- a/mobile/android/base/resources/drawable-large-v11/new_tablet_action_bar_button.xml +++ b/mobile/android/base/resources/drawable-large-v11/new_tablet_action_bar_button.xml @@ -4,9 +4,9 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - @@ -22,7 +22,7 @@ - diff --git a/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_add_tab.xml b/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_add_tab.xml index ab50df40bc..ee8e2080d7 100644 --- a/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_add_tab.xml +++ b/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_add_tab.xml @@ -4,12 +4,12 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - - diff --git a/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_button.xml b/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_button.xml index e2cc5f8d42..0a2083d044 100644 --- a/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_button.xml +++ b/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_button.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> diff --git a/mobile/android/base/resources/drawable-large-v11/new_tablet_url_bar_nav_button.xml b/mobile/android/base/resources/drawable-large-v11/new_tablet_url_bar_nav_button.xml index 2ae5b652a2..ec12be8b2c 100644 --- a/mobile/android/base/resources/drawable-large-v11/new_tablet_url_bar_nav_button.xml +++ b/mobile/android/base/resources/drawable-large-v11/new_tablet_url_bar_nav_button.xml @@ -4,15 +4,15 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - - @@ -27,7 +27,7 @@ android:drawable="@color/new_tablet_highlight_focused"/> - diff --git a/mobile/android/base/resources/drawable/bookmark_folder.xml b/mobile/android/base/resources/drawable/bookmark_folder.xml index f905a78bc0..3f49020d77 100644 --- a/mobile/android/base/resources/drawable/bookmark_folder.xml +++ b/mobile/android/base/resources/drawable/bookmark_folder.xml @@ -4,10 +4,10 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - diff --git a/mobile/android/base/resources/drawable/close_edit_mode_selector.xml b/mobile/android/base/resources/drawable/close_edit_mode_selector.xml index aab2a469c1..cbd2557621 100644 --- a/mobile/android/base/resources/drawable/close_edit_mode_selector.xml +++ b/mobile/android/base/resources/drawable/close_edit_mode_selector.xml @@ -4,12 +4,12 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - - diff --git a/mobile/android/base/resources/drawable/home_pager_empty_state.xml b/mobile/android/base/resources/drawable/home_pager_empty_state.xml index 71389ebc63..91453428fd 100644 --- a/mobile/android/base/resources/drawable/home_pager_empty_state.xml +++ b/mobile/android/base/resources/drawable/home_pager_empty_state.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> diff --git a/mobile/android/base/resources/drawable/menu_item_state.xml b/mobile/android/base/resources/drawable/menu_item_state.xml index c7063f4e3c..cf38a1ee91 100644 --- a/mobile/android/base/resources/drawable/menu_item_state.xml +++ b/mobile/android/base/resources/drawable/menu_item_state.xml @@ -4,17 +4,17 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - - - diff --git a/mobile/android/base/resources/drawable/menu_level.xml b/mobile/android/base/resources/drawable/menu_level.xml index 88617f4b76..122000e932 100644 --- a/mobile/android/base/resources/drawable/menu_level.xml +++ b/mobile/android/base/resources/drawable/menu_level.xml @@ -4,13 +4,13 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - + diff --git a/mobile/android/base/resources/drawable/tab_thumbnail.xml b/mobile/android/base/resources/drawable/tab_thumbnail.xml index d886dc0612..2dd94d8eae 100644 --- a/mobile/android/base/resources/drawable/tab_thumbnail.xml +++ b/mobile/android/base/resources/drawable/tab_thumbnail.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> @@ -24,7 +24,7 @@ - + @@ -36,7 +36,7 @@ + goanna:state_recording="false"> diff --git a/mobile/android/base/resources/drawable/url_bar_bg.xml b/mobile/android/base/resources/drawable/url_bar_bg.xml index 05e49f1394..fa1d75fe2e 100644 --- a/mobile/android/base/resources/drawable/url_bar_bg.xml +++ b/mobile/android/base/resources/drawable/url_bar_bg.xml @@ -4,10 +4,10 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - + diff --git a/mobile/android/base/resources/drawable/url_bar_entry.xml b/mobile/android/base/resources/drawable/url_bar_entry.xml index 4090ceb8e7..57329dbe50 100644 --- a/mobile/android/base/resources/drawable/url_bar_entry.xml +++ b/mobile/android/base/resources/drawable/url_bar_entry.xml @@ -4,22 +4,22 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - - - - diff --git a/mobile/android/base/resources/layout-large-land-v11/home_list.xml b/mobile/android/base/resources/layout-large-land-v11/home_list.xml index 7dfc075c22..12704e17ca 100644 --- a/mobile/android/base/resources/layout-large-land-v11/home_list.xml +++ b/mobile/android/base/resources/layout-large-land-v11/home_list.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - - - - + goanna:tabs="tabs_normal"/> - - diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml index 98412e6037..7a2eb05f63 100644 --- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml +++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - - - - - - - - - - - - + goanna:strip="@drawable/home_tab_menu_strip"/> - + diff --git a/mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml b/mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml index a0278b4b34..4796293f98 100644 --- a/mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml +++ b/mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - + goanna:dividerVerticalPadding="@dimen/new_tablet_tab_panel_divider_vertical_padding" + goanna:rightDivider="@drawable/tab_indicator_divider"/> diff --git a/mobile/android/base/resources/layout-large-v11/tab_strip.xml b/mobile/android/base/resources/layout-large-v11/tab_strip.xml index d37a76b64c..6710fa4fb2 100644 --- a/mobile/android/base/resources/layout-large-v11/tab_strip.xml +++ b/mobile/android/base/resources/layout-large-v11/tab_strip.xml @@ -5,7 +5,7 @@ - - - + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - - - - @@ -55,11 +55,11 @@ android:background="@drawable/tab_thumbnail" android:duplicateParentState="true"> - - + diff --git a/mobile/android/base/resources/layout-xlarge-v11/home_list.xml b/mobile/android/base/resources/layout-xlarge-v11/home_list.xml index 7dfc075c22..12704e17ca 100644 --- a/mobile/android/base/resources/layout-xlarge-v11/home_list.xml +++ b/mobile/android/base/resources/layout-xlarge-v11/home_list.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - - diff --git a/mobile/android/base/resources/layout/basic_color_picker_dialog.xml b/mobile/android/base/resources/layout/basic_color_picker_dialog.xml index 4efb341d52..ed44e22e2c 100644 --- a/mobile/android/base/resources/layout/basic_color_picker_dialog.xml +++ b/mobile/android/base/resources/layout/basic_color_picker_dialog.xml @@ -8,7 +8,7 @@ android:layout_width="match_parent" android:orientation="vertical"> - - - - - - - - - - - - - - - - - - - - + + diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml index 94f79246d6..ba606b994a 100644 --- a/mobile/android/base/resources/layout/gecko_app.xml +++ b/mobile/android/base/resources/layout/gecko_app.xml @@ -3,8 +3,8 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - @@ -14,13 +14,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - - - - - - - - + - - + diff --git a/mobile/android/base/resources/layout/home_banner.xml b/mobile/android/base/resources/layout/home_banner.xml index 46152c7116..849add76d0 100644 --- a/mobile/android/base/resources/layout/home_banner.xml +++ b/mobile/android/base/resources/layout/home_banner.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - + goanna:ellipsizeAtLine="3"/> - diff --git a/mobile/android/base/resources/layout/home_item_row.xml b/mobile/android/base/resources/layout/home_item_row.xml index 19e24db0fa..24098cf5b8 100644 --- a/mobile/android/base/resources/layout/home_item_row.xml +++ b/mobile/android/base/resources/layout/home_item_row.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - diff --git a/mobile/android/base/resources/layout/home_list.xml b/mobile/android/base/resources/layout/home_list.xml index 7dfc075c22..12704e17ca 100644 --- a/mobile/android/base/resources/layout/home_list.xml +++ b/mobile/android/base/resources/layout/home_list.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - - - - - + diff --git a/mobile/android/base/resources/layout/home_reading_list_panel.xml b/mobile/android/base/resources/layout/home_reading_list_panel.xml index 90ecf3c6d8..064c1e1741 100644 --- a/mobile/android/base/resources/layout/home_reading_list_panel.xml +++ b/mobile/android/base/resources/layout/home_reading_list_panel.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - diff --git a/mobile/android/base/resources/layout/home_remote_tabs_child.xml b/mobile/android/base/resources/layout/home_remote_tabs_child.xml index 74fef7a1be..d4e6d7ab36 100644 --- a/mobile/android/base/resources/layout/home_remote_tabs_child.xml +++ b/mobile/android/base/resources/layout/home_remote_tabs_child.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - - - + diff --git a/mobile/android/base/resources/layout/home_remote_tabs_split_plane_panel.xml b/mobile/android/base/resources/layout/home_remote_tabs_split_plane_panel.xml index 0cea1a1b79..5dfc6c4680 100644 --- a/mobile/android/base/resources/layout/home_remote_tabs_split_plane_panel.xml +++ b/mobile/android/base/resources/layout/home_remote_tabs_split_plane_panel.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - - - - + diff --git a/mobile/android/base/resources/layout/home_search_item_row.xml b/mobile/android/base/resources/layout/home_search_item_row.xml index c475e78864..b7f96786ef 100644 --- a/mobile/android/base/resources/layout/home_search_item_row.xml +++ b/mobile/android/base/resources/layout/home_search_item_row.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - - diff --git a/mobile/android/base/resources/layout/overlay_share_dialog.xml b/mobile/android/base/resources/layout/overlay_share_dialog.xml index 4d6cdd36a5..29d788e1d1 100644 --- a/mobile/android/base/resources/layout/overlay_share_dialog.xml +++ b/mobile/android/base/resources/layout/overlay_share_dialog.xml @@ -47,7 +47,7 @@ - - - - - - diff --git a/mobile/android/base/resources/layout/preference_search_engine.xml b/mobile/android/base/resources/layout/preference_search_engine.xml index f1c3a01a6a..70581c6ed7 100644 --- a/mobile/android/base/resources/layout/preference_search_engine.xml +++ b/mobile/android/base/resources/layout/preference_search_engine.xml @@ -11,7 +11,7 @@ android:paddingLeft="15dp" android:paddingRight="?android:attr/scrollbarSize"> - + xmlns:goanna="http://schemas.android.com/apk/res-auto"> @@ -48,12 +48,12 @@ - + goanna:tabs="tabs_private"/> diff --git a/mobile/android/base/resources/layout/reading_list_item_row.xml b/mobile/android/base/resources/layout/reading_list_item_row.xml index d8793ada5b..205022ee7b 100644 --- a/mobile/android/base/resources/layout/reading_list_item_row.xml +++ b/mobile/android/base/resources/layout/reading_list_item_row.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - diff --git a/mobile/android/base/resources/layout/search_engine_row.xml b/mobile/android/base/resources/layout/search_engine_row.xml index 103103813c..3fbe3b12ad 100644 --- a/mobile/android/base/resources/layout/search_engine_row.xml +++ b/mobile/android/base/resources/layout/search_engine_row.xml @@ -5,7 +5,7 @@ - - - + diff --git a/mobile/android/base/resources/layout/shared_ui_components.xml b/mobile/android/base/resources/layout/shared_ui_components.xml index 890b25d9a8..bd339a8a56 100644 --- a/mobile/android/base/resources/layout/shared_ui_components.xml +++ b/mobile/android/base/resources/layout/shared_ui_components.xml @@ -3,14 +3,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - diff --git a/mobile/android/base/resources/layout/site_setting_item.xml b/mobile/android/base/resources/layout/site_setting_item.xml index a2f822f70f..55d981ceeb 100644 --- a/mobile/android/base/resources/layout/site_setting_item.xml +++ b/mobile/android/base/resources/layout/site_setting_item.xml @@ -1,6 +1,6 @@ - - + diff --git a/mobile/android/base/resources/layout/tab_history_item_row.xml b/mobile/android/base/resources/layout/tab_history_item_row.xml index 49f13522d1..3569bf02d0 100644 --- a/mobile/android/base/resources/layout/tab_history_item_row.xml +++ b/mobile/android/base/resources/layout/tab_history_item_row.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + goanna:overrideScaleType="false" + goanna:dominantBorderEnabled="false" /> - + goanna:fadeWidth="@dimen/tab_history_title_fading_width"/> diff --git a/mobile/android/base/resources/layout/tabs_counter.xml b/mobile/android/base/resources/layout/tabs_counter.xml index 01acbff80f..b4db8bba5b 100644 --- a/mobile/android/base/resources/layout/tabs_counter.xml +++ b/mobile/android/base/resources/layout/tabs_counter.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - @@ -57,4 +57,4 @@ - + diff --git a/mobile/android/base/resources/layout/tabs_item_row.xml b/mobile/android/base/resources/layout/tabs_item_row.xml index 2ededa31d7..2a9c58e111 100644 --- a/mobile/android/base/resources/layout/tabs_item_row.xml +++ b/mobile/android/base/resources/layout/tabs_item_row.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - - + - + diff --git a/mobile/android/base/resources/layout/tabs_panel_default.xml b/mobile/android/base/resources/layout/tabs_panel_default.xml index e3f2212f3e..f029f09fb8 100644 --- a/mobile/android/base/resources/layout/tabs_panel_default.xml +++ b/mobile/android/base/resources/layout/tabs_panel_default.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - + goanna:handleType="start"/> - + goanna:handleType="middle"/> - + goanna:handleType="end"/> diff --git a/mobile/android/base/resources/layout/toolbar_display_layout.xml b/mobile/android/base/resources/layout/toolbar_display_layout.xml index 5a098b7029..c1b86cda96 100644 --- a/mobile/android/base/resources/layout/toolbar_display_layout.xml +++ b/mobile/android/base/resources/layout/toolbar_display_layout.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - + goanna:fadeWidth="40dip" + goanna:fadeBackgroundColor="@color/toolbar_display_layout_bg" + goanna:autoUpdateTheme="false"/> - + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - + goanna:autoUpdateTheme="false"/> diff --git a/mobile/android/base/resources/layout/top_sites_grid_item_view.xml b/mobile/android/base/resources/layout/top_sites_grid_item_view.xml index 6a76514a33..afc445df87 100644 --- a/mobile/android/base/resources/layout/top_sites_grid_item_view.xml +++ b/mobile/android/base/resources/layout/top_sites_grid_item_view.xml @@ -4,15 +4,15 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:goanna="http://schemas.android.com/apk/res-auto"> - - + goanna:fadeWidth="20dip"/> diff --git a/mobile/android/base/resources/layout/two_line_page_row.xml b/mobile/android/base/resources/layout/two_line_page_row.xml index a36472ed67..6ff3fea152 100644 --- a/mobile/android/base/resources/layout/two_line_page_row.xml +++ b/mobile/android/base/resources/layout/two_line_page_row.xml @@ -5,10 +5,10 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/mobile/android/base/resources/values/attrs.xml b/mobile/android/base/resources/values/attrs.xml index bef8bd822f..31db01f087 100644 --- a/mobile/android/base/resources/values/attrs.xml +++ b/mobile/android/base/resources/values/attrs.xml @@ -8,7 +8,7 @@ - + diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml index 3f6485cc4f..7d4303849f 100644 --- a/mobile/android/base/resources/values/themes.xml +++ b/mobile/android/base/resources/values/themes.xml @@ -89,7 +89,7 @@ @style/Widget.BookmarksListView @style/FloatingHintEditText @style/Widget.TabsGridLayout - @style/Widget.GoannaMenuListView + @style/Widget.GoannaMenuListView @style/Widget.HomeListView @style/Widget.MenuItemActionBar @style/GoannaActionBar.Button diff --git a/mobile/android/base/resources/xml-v11/preference_headers.xml b/mobile/android/base/resources/xml-v11/preference_headers.xml index b6c436c9a9..307abed353 100644 --- a/mobile/android/base/resources/xml-v11/preference_headers.xml +++ b/mobile/android/base/resources/xml-v11/preference_headers.xml @@ -9,38 +9,38 @@ -

-
-
-
-
-
diff --git a/mobile/android/base/resources/xml-v11/preferences.xml b/mobile/android/base/resources/xml-v11/preferences.xml index 848828a8bc..3f924297ff 100644 --- a/mobile/android/base/resources/xml-v11/preferences.xml +++ b/mobile/android/base/resources/xml-v11/preferences.xml @@ -8,24 +8,24 @@ Preference changes here should be mirrored to xml/preferences.xml.in. --> - + android:fragment="org.mozilla.goanna.preferences.GoannaPreferenceFragment" > + android:fragment="org.mozilla.goanna.preferences.GoannaPreferenceFragment" > @@ -33,28 +33,28 @@ + android:fragment="org.mozilla.goanna.preferences.GoannaPreferenceFragment" > + android:fragment="org.mozilla.goanna.preferences.GoannaPreferenceFragment" > + android:fragment="org.mozilla.goanna.preferences.GoannaPreferenceFragment" > + android:fragment="org.mozilla.goanna.preferences.GoannaPreferenceFragment" > diff --git a/mobile/android/base/resources/xml-v11/preferences_customize.xml b/mobile/android/base/resources/xml-v11/preferences_customize.xml index bfcb61e507..429486311c 100644 --- a/mobile/android/base/resources/xml-v11/preferences_customize.xml +++ b/mobile/android/base/resources/xml-v11/preferences_customize.xml @@ -6,19 +6,19 @@ + android:fragment="org.mozilla.goanna.preferences.GoannaPreferenceFragment" > + android:fragment="org.mozilla.goanna.preferences.GoannaPreferenceFragment" > @@ -30,12 +30,12 @@ android:entryValues="@array/pref_restore_values" android:persistent="true" /> - - + android:fragment="org.mozilla.goanna.preferences.GoannaPreferenceFragment" > + android:fragment="org.mozilla.goanna.preferences.GoannaPreferenceFragment" > @@ -37,11 +37,11 @@ android:entryValues="@array/pref_restore_values" android:persistent="true" /> - @@ -13,12 +13,12 @@ android:defaultValue="false" android:persistent="false" /> - - diff --git a/mobile/android/base/resources/xml/fxaccount_options.xml b/mobile/android/base/resources/xml/fxaccount_options.xml index 449fc05455..221df7f1e7 100644 --- a/mobile/android/base/resources/xml/fxaccount_options.xml +++ b/mobile/android/base/resources/xml/fxaccount_options.xml @@ -12,7 +12,7 @@ + android:targetClass="org.mozilla.goanna.fxa.activities.FxAccountStatusActivity"> diff --git a/mobile/android/base/resources/xml/preference_headers.xml b/mobile/android/base/resources/xml/preference_headers.xml index 8a8c38b2c6..f7ca1d2b53 100644 --- a/mobile/android/base/resources/xml/preference_headers.xml +++ b/mobile/android/base/resources/xml/preference_headers.xml @@ -7,7 +7,7 @@ even for a version-limited build. --> -
diff --git a/mobile/android/base/resources/xml/preferences.xml b/mobile/android/base/resources/xml/preferences.xml index 33fff4e679..c1fc522337 100644 --- a/mobile/android/base/resources/xml/preferences.xml +++ b/mobile/android/base/resources/xml/preferences.xml @@ -8,10 +8,10 @@ to xml-v11/preferences.xml. --> - @@ -20,7 +20,7 @@ android:summary="@string/pref_category_customize_summary" > + android:targetClass="org.mozilla.goanna.preferences.GoannaPreferences" > @@ -31,7 +31,7 @@ android:summary="@string/pref_category_display_summary" > + android:targetClass="org.mozilla.goanna.preferences.GoannaPreferences" > @@ -42,7 +42,7 @@ android:summary="@string/pref_category_privacy_summary" > + android:targetClass="org.mozilla.goanna.preferences.GoannaPreferences" > @@ -53,7 +53,7 @@ android:summary="@string/pref_category_language_summary" > + android:targetClass="org.mozilla.goanna.preferences.GoannaPreferences" > @@ -64,7 +64,7 @@ android:summary="@string/pref_category_vendor_summary" > + android:targetClass="org.mozilla.goanna.preferences.GoannaPreferences" > @@ -74,7 +74,7 @@ android:summary="@string/pref_category_devtools_summary" > + android:targetClass="org.mozilla.goanna.preferences.GoannaPreferences" > diff --git a/mobile/android/base/resources/xml/preferences_customize.xml b/mobile/android/base/resources/xml/preferences_customize.xml index 168cc6f230..3e8d1bfe4a 100644 --- a/mobile/android/base/resources/xml/preferences_customize.xml +++ b/mobile/android/base/resources/xml/preferences_customize.xml @@ -4,14 +4,14 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + android:targetClass="org.mozilla.goanna.preferences.GoannaPreferences" > @@ -23,7 +23,7 @@ + android:targetClass="org.mozilla.goanna.preferences.GoannaPreferences" > @@ -38,12 +38,12 @@ android:persistent="true" /> - - - diff --git a/mobile/android/base/resources/xml/preferences_display.xml b/mobile/android/base/resources/xml/preferences_display.xml index 475b012a3a..db072416fa 100644 --- a/mobile/android/base/resources/xml/preferences_display.xml +++ b/mobile/android/base/resources/xml/preferences_display.xml @@ -4,11 +4,11 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - diff --git a/mobile/android/base/resources/xml/preferences_locale.xml b/mobile/android/base/resources/xml/preferences_locale.xml index 3c12d526ae..e163765914 100644 --- a/mobile/android/base/resources/xml/preferences_locale.xml +++ b/mobile/android/base/resources/xml/preferences_locale.xml @@ -4,13 +4,13 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - @@ -13,7 +13,7 @@ android:summary="@string/pref_tracking_protection_summary" android:persistent="false" /> - - - + goanna:entries="@array/pref_private_data_entries" + goanna:entryValues="@array/pref_private_data_values" + goanna:entryKeys="@array/pref_private_data_keys" + goanna:initialValues="@array/pref_private_data_defaults" /> - @@ -13,7 +13,7 @@ android:defaultValue="false" android:persistent="false" /> - @@ -25,7 +25,7 @@ - diff --git a/mobile/android/base/resources/xml/preferences_vendor.xml b/mobile/android/base/resources/xml/preferences_vendor.xml index 55294ef0a9..2e76896c2d 100644 --- a/mobile/android/base/resources/xml/preferences_vendor.xml +++ b/mobile/android/base/resources/xml/preferences_vendor.xml @@ -4,21 +4,21 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - @@ -39,7 +39,7 @@ android:title="@string/datareporting_wifi_title" android:summary="@string/datareporting_wifi_geolocation_summary" /> - @@ -49,7 +49,7 @@ android:summary="@string/datareporting_fhr_summary2" android:defaultValue="true" /> - diff --git a/mobile/android/base/resources/xml/sync_options.xml b/mobile/android/base/resources/xml/sync_options.xml index d0c85ca1d7..ac9e61b3bd 100644 --- a/mobile/android/base/resources/xml/sync_options.xml +++ b/mobile/android/base/resources/xml/sync_options.xml @@ -13,7 +13,7 @@ + android:targetClass="org.mozilla.goanna.sync.setup.activities.SetupSyncActivity"> @@ -25,7 +25,7 @@ + android:targetClass="org.mozilla.goanna.sync.config.activities.SelectEnginesActivity"> diff --git a/mobile/android/base/sqlite/ByteBufferInputStream.java b/mobile/android/base/sqlite/ByteBufferInputStream.java index f6b16619f5..d768e27e09 100644 --- a/mobile/android/base/sqlite/ByteBufferInputStream.java +++ b/mobile/android/base/sqlite/ByteBufferInputStream.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sqlite; +package org.mozilla.goanna.sqlite; import java.io.IOException; import java.io.InputStream; diff --git a/mobile/android/base/sqlite/MatrixBlobCursor.java b/mobile/android/base/sqlite/MatrixBlobCursor.java index 6bc34eda2b..252f4191b8 100644 --- a/mobile/android/base/sqlite/MatrixBlobCursor.java +++ b/mobile/android/base/sqlite/MatrixBlobCursor.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.mozilla.gecko.sqlite; +package org.mozilla.goanna.sqlite; import java.nio.ByteBuffer; import java.util.ArrayList; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; import android.database.AbstractCursor; import android.database.CursorIndexOutOfBoundsException; diff --git a/mobile/android/base/sqlite/SQLiteBridge.java b/mobile/android/base/sqlite/SQLiteBridge.java index 072e63bf81..9a76d9bd78 100644 --- a/mobile/android/base/sqlite/SQLiteBridge.java +++ b/mobile/android/base/sqlite/SQLiteBridge.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sqlite; +package org.mozilla.goanna.sqlite; import android.content.ContentValues; import android.database.Cursor; @@ -11,7 +11,7 @@ import android.database.sqlite.SQLiteException; import android.text.TextUtils; import android.util.Log; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; import java.util.ArrayList; import java.util.Arrays; diff --git a/mobile/android/base/sqlite/SQLiteBridgeException.java b/mobile/android/base/sqlite/SQLiteBridgeException.java index e7deca1da5..6e29bb8a56 100644 --- a/mobile/android/base/sqlite/SQLiteBridgeException.java +++ b/mobile/android/base/sqlite/SQLiteBridgeException.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sqlite; +package org.mozilla.goanna.sqlite; -import org.mozilla.gecko.mozglue.generatorannotations.WrapEntireClassForJNI; +import org.mozilla.goanna.mozglue.generatorannotations.WrapEntireClassForJNI; @WrapEntireClassForJNI public class SQLiteBridgeException extends RuntimeException { diff --git a/mobile/android/base/sync/AlreadySyncingException.java b/mobile/android/base/sync/AlreadySyncingException.java index 75eb5ad370..c5125d8914 100644 --- a/mobile/android/base/sync/AlreadySyncingException.java +++ b/mobile/android/base/sync/AlreadySyncingException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; -import org.mozilla.gecko.sync.stage.GlobalSyncStage.Stage; +import org.mozilla.goanna.sync.stage.GlobalSyncStage.Stage; import android.content.SyncResult; diff --git a/mobile/android/base/sync/BackoffHandler.java b/mobile/android/base/sync/BackoffHandler.java index abb880621c..0f36da1a12 100644 --- a/mobile/android/base/sync/BackoffHandler.java +++ b/mobile/android/base/sync/BackoffHandler.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; public interface BackoffHandler { diff --git a/mobile/android/base/sync/BadRequiredFieldJSONException.java b/mobile/android/base/sync/BadRequiredFieldJSONException.java index 3db93652d7..2ab9f38474 100644 --- a/mobile/android/base/sync/BadRequiredFieldJSONException.java +++ b/mobile/android/base/sync/BadRequiredFieldJSONException.java @@ -2,4 +2,4 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; diff --git a/mobile/android/base/sync/CollectionKeys.java b/mobile/android/base/sync/CollectionKeys.java index 896649306b..25463a541c 100644 --- a/mobile/android/base/sync/CollectionKeys.java +++ b/mobile/android/base/sync/CollectionKeys.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -14,8 +14,8 @@ import java.util.Set; import org.json.simple.JSONArray; import org.json.simple.parser.ParseException; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.sync.crypto.CryptoException; -import org.mozilla.gecko.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.crypto.CryptoException; +import org.mozilla.goanna.sync.crypto.KeyBundle; public class CollectionKeys { private KeyBundle defaultKeyBundle = null; diff --git a/mobile/android/base/sync/CommandProcessor.java b/mobile/android/base/sync/CommandProcessor.java index 442ccc3041..3b06418e9c 100644 --- a/mobile/android/base/sync/CommandProcessor.java +++ b/mobile/android/base/sync/CommandProcessor.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.util.ArrayList; import java.util.List; @@ -12,12 +12,12 @@ import java.util.concurrent.atomic.AtomicInteger; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.mozilla.gecko.BrowserLocaleManager; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.android.ClientsDatabaseAccessor; -import org.mozilla.gecko.sync.repositories.domain.ClientRecord; +import org.mozilla.goanna.BrowserLocaleManager; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.android.ClientsDatabaseAccessor; +import org.mozilla.goanna.sync.repositories.domain.ClientRecord; import android.app.Notification; import android.app.NotificationManager; diff --git a/mobile/android/base/sync/CommandRunner.java b/mobile/android/base/sync/CommandRunner.java index c7a0f17623..bb2e5fd30d 100644 --- a/mobile/android/base/sync/CommandRunner.java +++ b/mobile/android/base/sync/CommandRunner.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.util.List; diff --git a/mobile/android/base/sync/CredentialException.java b/mobile/android/base/sync/CredentialException.java index f9004e14ca..b8fca82942 100644 --- a/mobile/android/base/sync/CredentialException.java +++ b/mobile/android/base/sync/CredentialException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import android.content.SyncResult; diff --git a/mobile/android/base/sync/CryptoRecord.java b/mobile/android/base/sync/CryptoRecord.java index 3adeabd5ec..2bd26075c8 100644 --- a/mobile/android/base/sync/CryptoRecord.java +++ b/mobile/android/base/sync/CryptoRecord.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -10,13 +10,13 @@ import java.io.UnsupportedEncodingException; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.sync.crypto.CryptoException; -import org.mozilla.gecko.sync.crypto.CryptoInfo; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.crypto.MissingCryptoInputException; -import org.mozilla.gecko.sync.crypto.NoKeyBundleException; -import org.mozilla.gecko.sync.repositories.domain.Record; -import org.mozilla.gecko.sync.repositories.domain.RecordParseException; +import org.mozilla.goanna.sync.crypto.CryptoException; +import org.mozilla.goanna.sync.crypto.CryptoInfo; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.crypto.MissingCryptoInputException; +import org.mozilla.goanna.sync.crypto.NoKeyBundleException; +import org.mozilla.goanna.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.repositories.domain.RecordParseException; /** * A Sync crypto record has: diff --git a/mobile/android/base/sync/DelayedWorkTracker.java b/mobile/android/base/sync/DelayedWorkTracker.java index ddcb5411c0..702ba16776 100644 --- a/mobile/android/base/sync/DelayedWorkTracker.java +++ b/mobile/android/base/sync/DelayedWorkTracker.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; /** * A little class to allow us to maintain a count of extant diff --git a/mobile/android/base/sync/EngineSettings.java b/mobile/android/base/sync/EngineSettings.java index 0358160886..5eaaecc6c6 100644 --- a/mobile/android/base/sync/EngineSettings.java +++ b/mobile/android/base/sync/EngineSettings.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; public class EngineSettings { public final String syncID; diff --git a/mobile/android/base/sync/ExtendedJSONObject.java b/mobile/android/base/sync/ExtendedJSONObject.java index 560ad8bccb..f3b056c15a 100644 --- a/mobile/android/base/sync/ExtendedJSONObject.java +++ b/mobile/android/base/sync/ExtendedJSONObject.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.io.IOException; import java.io.Reader; @@ -16,7 +16,7 @@ import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.sync.UnexpectedJSONException.BadRequiredFieldJSONException; +import org.mozilla.goanna.sync.UnexpectedJSONException.BadRequiredFieldJSONException; /** * Extend JSONObject to do little things, like, y'know, accessing members. diff --git a/mobile/android/base/sync/GlobalSession.java b/mobile/android/base/sync/GlobalSession.java index bb7c65738c..4426b27369 100644 --- a/mobile/android/base/sync/GlobalSession.java +++ b/mobile/android/base/sync/GlobalSession.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.io.IOException; import java.net.URI; @@ -21,41 +21,41 @@ import java.util.concurrent.atomic.AtomicLong; import org.json.simple.JSONArray; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.crypto.CryptoException; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.delegates.BaseGlobalSessionCallback; -import org.mozilla.gecko.sync.delegates.ClientsDataDelegate; -import org.mozilla.gecko.sync.delegates.FreshStartDelegate; -import org.mozilla.gecko.sync.delegates.JSONRecordFetchDelegate; -import org.mozilla.gecko.sync.delegates.KeyUploadDelegate; -import org.mozilla.gecko.sync.delegates.MetaGlobalDelegate; -import org.mozilla.gecko.sync.delegates.NodeAssignmentCallback; -import org.mozilla.gecko.sync.delegates.WipeServerDelegate; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.HttpResponseObserver; -import org.mozilla.gecko.sync.net.SyncResponse; -import org.mozilla.gecko.sync.net.SyncStorageRecordRequest; -import org.mozilla.gecko.sync.net.SyncStorageRequest; -import org.mozilla.gecko.sync.net.SyncStorageRequestDelegate; -import org.mozilla.gecko.sync.net.SyncStorageResponse; -import org.mozilla.gecko.sync.stage.AndroidBrowserBookmarksServerSyncStage; -import org.mozilla.gecko.sync.stage.AndroidBrowserHistoryServerSyncStage; -import org.mozilla.gecko.sync.stage.CheckPreconditionsStage; -import org.mozilla.gecko.sync.stage.CompletedStage; -import org.mozilla.gecko.sync.stage.EnsureClusterURLStage; -import org.mozilla.gecko.sync.stage.EnsureCrypto5KeysStage; -import org.mozilla.gecko.sync.stage.FennecTabsServerSyncStage; -import org.mozilla.gecko.sync.stage.FetchInfoCollectionsStage; -import org.mozilla.gecko.sync.stage.FetchMetaGlobalStage; -import org.mozilla.gecko.sync.stage.FormHistoryServerSyncStage; -import org.mozilla.gecko.sync.stage.GlobalSyncStage; -import org.mozilla.gecko.sync.stage.GlobalSyncStage.Stage; -import org.mozilla.gecko.sync.stage.NoSuchStageException; -import org.mozilla.gecko.sync.stage.PasswordsServerSyncStage; -import org.mozilla.gecko.sync.stage.SyncClientsEngineStage; -import org.mozilla.gecko.sync.stage.UploadMetaGlobalStage; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.crypto.CryptoException; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.delegates.BaseGlobalSessionCallback; +import org.mozilla.goanna.sync.delegates.ClientsDataDelegate; +import org.mozilla.goanna.sync.delegates.FreshStartDelegate; +import org.mozilla.goanna.sync.delegates.JSONRecordFetchDelegate; +import org.mozilla.goanna.sync.delegates.KeyUploadDelegate; +import org.mozilla.goanna.sync.delegates.MetaGlobalDelegate; +import org.mozilla.goanna.sync.delegates.NodeAssignmentCallback; +import org.mozilla.goanna.sync.delegates.WipeServerDelegate; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.HttpResponseObserver; +import org.mozilla.goanna.sync.net.SyncResponse; +import org.mozilla.goanna.sync.net.SyncStorageRecordRequest; +import org.mozilla.goanna.sync.net.SyncStorageRequest; +import org.mozilla.goanna.sync.net.SyncStorageRequestDelegate; +import org.mozilla.goanna.sync.net.SyncStorageResponse; +import org.mozilla.goanna.sync.stage.AndroidBrowserBookmarksServerSyncStage; +import org.mozilla.goanna.sync.stage.AndroidBrowserHistoryServerSyncStage; +import org.mozilla.goanna.sync.stage.CheckPreconditionsStage; +import org.mozilla.goanna.sync.stage.CompletedStage; +import org.mozilla.goanna.sync.stage.EnsureClusterURLStage; +import org.mozilla.goanna.sync.stage.EnsureCrypto5KeysStage; +import org.mozilla.goanna.sync.stage.FennecTabsServerSyncStage; +import org.mozilla.goanna.sync.stage.FetchInfoCollectionsStage; +import org.mozilla.goanna.sync.stage.FetchMetaGlobalStage; +import org.mozilla.goanna.sync.stage.FormHistoryServerSyncStage; +import org.mozilla.goanna.sync.stage.GlobalSyncStage; +import org.mozilla.goanna.sync.stage.GlobalSyncStage.Stage; +import org.mozilla.goanna.sync.stage.NoSuchStageException; +import org.mozilla.goanna.sync.stage.PasswordsServerSyncStage; +import org.mozilla.goanna.sync.stage.SyncClientsEngineStage; +import org.mozilla.goanna.sync.stage.UploadMetaGlobalStage; import android.content.Context; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/sync/HTTPFailureException.java b/mobile/android/base/sync/HTTPFailureException.java index 69bba88419..cc91e3a9a3 100644 --- a/mobile/android/base/sync/HTTPFailureException.java +++ b/mobile/android/base/sync/HTTPFailureException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.sync.net.SyncStorageResponse; import android.content.SyncResult; diff --git a/mobile/android/base/sync/InfoCollections.java b/mobile/android/base/sync/InfoCollections.java index 374fa5cf5d..37bbe275e5 100644 --- a/mobile/android/base/sync/InfoCollections.java +++ b/mobile/android/base/sync/InfoCollections.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; /** * Fetches the timestamp information in info/collections on the diff --git a/mobile/android/base/sync/InfoCounts.java b/mobile/android/base/sync/InfoCounts.java index 832e97d102..2a695bec5f 100644 --- a/mobile/android/base/sync/InfoCounts.java +++ b/mobile/android/base/sync/InfoCounts.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.util.Collections; import java.util.HashMap; @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; public class InfoCounts { static final String LOG_TAG = "InfoCounts"; diff --git a/mobile/android/base/sync/JSONRecordFetcher.java b/mobile/android/base/sync/JSONRecordFetcher.java index 982b5b0266..0590a79856 100644 --- a/mobile/android/base/sync/JSONRecordFetcher.java +++ b/mobile/android/base/sync/JSONRecordFetcher.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.delegates.JSONRecordFetchDelegate; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.SyncStorageRecordRequest; -import org.mozilla.gecko.sync.net.SyncStorageRequestDelegate; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.delegates.JSONRecordFetchDelegate; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.SyncStorageRecordRequest; +import org.mozilla.goanna.sync.net.SyncStorageRequestDelegate; +import org.mozilla.goanna.sync.net.SyncStorageResponse; /** * An object which fetches a chunk of JSON from a URI, using certain credentials, diff --git a/mobile/android/base/sync/KeyBundleProvider.java b/mobile/android/base/sync/KeyBundleProvider.java index 4a2be2a9b1..736085d238 100644 --- a/mobile/android/base/sync/KeyBundleProvider.java +++ b/mobile/android/base/sync/KeyBundleProvider.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; -import org.mozilla.gecko.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.crypto.KeyBundle; public interface KeyBundleProvider { public abstract KeyBundle keyBundle(); diff --git a/mobile/android/base/sync/MetaGlobal.java b/mobile/android/base/sync/MetaGlobal.java index 62361831a4..bab44d72b9 100644 --- a/mobile/android/base/sync/MetaGlobal.java +++ b/mobile/android/base/sync/MetaGlobal.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.io.IOException; import java.net.URISyntaxException; @@ -14,14 +14,14 @@ import java.util.Set; import org.json.simple.JSONArray; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.MetaGlobalException.MetaGlobalMalformedSyncIDException; -import org.mozilla.gecko.sync.MetaGlobalException.MetaGlobalMalformedVersionException; -import org.mozilla.gecko.sync.delegates.MetaGlobalDelegate; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.SyncStorageRecordRequest; -import org.mozilla.gecko.sync.net.SyncStorageRequestDelegate; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.MetaGlobalException.MetaGlobalMalformedSyncIDException; +import org.mozilla.goanna.sync.MetaGlobalException.MetaGlobalMalformedVersionException; +import org.mozilla.goanna.sync.delegates.MetaGlobalDelegate; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.SyncStorageRecordRequest; +import org.mozilla.goanna.sync.net.SyncStorageRequestDelegate; +import org.mozilla.goanna.sync.net.SyncStorageResponse; public class MetaGlobal implements SyncStorageRequestDelegate { private static final String LOG_TAG = "MetaGlobal"; diff --git a/mobile/android/base/sync/MetaGlobalException.java b/mobile/android/base/sync/MetaGlobalException.java index bec531d11f..5dc68e34fa 100644 --- a/mobile/android/base/sync/MetaGlobalException.java +++ b/mobile/android/base/sync/MetaGlobalException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; public class MetaGlobalException extends SyncException { private static final long serialVersionUID = -6182315615113508925L; diff --git a/mobile/android/base/sync/MetaGlobalMissingEnginesException.java b/mobile/android/base/sync/MetaGlobalMissingEnginesException.java index 91bfd2f76f..325bb09336 100644 --- a/mobile/android/base/sync/MetaGlobalMissingEnginesException.java +++ b/mobile/android/base/sync/MetaGlobalMissingEnginesException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; public class MetaGlobalMissingEnginesException extends MetaGlobalException { private static final long serialVersionUID = -2662107402622277865L; diff --git a/mobile/android/base/sync/MetaGlobalNotSetException.java b/mobile/android/base/sync/MetaGlobalNotSetException.java index ef059c71d4..ca8426966d 100644 --- a/mobile/android/base/sync/MetaGlobalNotSetException.java +++ b/mobile/android/base/sync/MetaGlobalNotSetException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; public class MetaGlobalNotSetException extends MetaGlobalException { private static final long serialVersionUID = 2959032409571832970L; diff --git a/mobile/android/base/sync/MigrationSentinelSyncStage.java b/mobile/android/base/sync/MigrationSentinelSyncStage.java index 6a50beb813..a31ee92a8b 100644 --- a/mobile/android/base/sync/MigrationSentinelSyncStage.java +++ b/mobile/android/base/sync/MigrationSentinelSyncStage.java @@ -2,24 +2,24 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.net.URISyntaxException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.common.telemetry.TelemetryWrapper; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.MigratedFromSync11; -import org.mozilla.gecko.fxa.login.State; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.SyncStorageRecordRequest; -import org.mozilla.gecko.sync.net.SyncStorageRequestDelegate; -import org.mozilla.gecko.sync.net.SyncStorageResponse; -import org.mozilla.gecko.sync.stage.AbstractNonRepositorySyncStage; -import org.mozilla.gecko.sync.stage.NoSuchStageException; -import org.mozilla.gecko.sync.telemetry.TelemetryContract; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.common.telemetry.TelemetryWrapper; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.MigratedFromSync11; +import org.mozilla.goanna.fxa.login.State; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.SyncStorageRecordRequest; +import org.mozilla.goanna.sync.net.SyncStorageRequestDelegate; +import org.mozilla.goanna.sync.net.SyncStorageResponse; +import org.mozilla.goanna.sync.stage.AbstractNonRepositorySyncStage; +import org.mozilla.goanna.sync.stage.NoSuchStageException; +import org.mozilla.goanna.sync.telemetry.TelemetryContract; /** * The purpose of this class is to talk to a Sync 1.1 server and check diff --git a/mobile/android/base/sync/NoCollectionKeysSetException.java b/mobile/android/base/sync/NoCollectionKeysSetException.java index 323e355b4e..4eb749b638 100644 --- a/mobile/android/base/sync/NoCollectionKeysSetException.java +++ b/mobile/android/base/sync/NoCollectionKeysSetException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import android.content.SyncResult; diff --git a/mobile/android/base/sync/NodeAuthenticationException.java b/mobile/android/base/sync/NodeAuthenticationException.java index a5cd5f0eb4..a66c84a4f3 100644 --- a/mobile/android/base/sync/NodeAuthenticationException.java +++ b/mobile/android/base/sync/NodeAuthenticationException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import android.content.SyncResult; diff --git a/mobile/android/base/sync/NonArrayJSONException.java b/mobile/android/base/sync/NonArrayJSONException.java index 4b4147ffff..842d004edb 100644 --- a/mobile/android/base/sync/NonArrayJSONException.java +++ b/mobile/android/base/sync/NonArrayJSONException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; public class NonArrayJSONException extends UnexpectedJSONException { private static final long serialVersionUID = 5582918057432365749L; diff --git a/mobile/android/base/sync/NonObjectJSONException.java b/mobile/android/base/sync/NonObjectJSONException.java index cb3bf7ac0f..476d5ad15e 100644 --- a/mobile/android/base/sync/NonObjectJSONException.java +++ b/mobile/android/base/sync/NonObjectJSONException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; public class NonObjectJSONException extends UnexpectedJSONException { private static final long serialVersionUID = 2214238763035650087L; diff --git a/mobile/android/base/sync/NullClusterURLException.java b/mobile/android/base/sync/NullClusterURLException.java index c1d8833b62..249aad00f5 100644 --- a/mobile/android/base/sync/NullClusterURLException.java +++ b/mobile/android/base/sync/NullClusterURLException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import android.content.SyncResult; diff --git a/mobile/android/base/sync/PersistedMetaGlobal.java b/mobile/android/base/sync/PersistedMetaGlobal.java index d3467545c2..ccca97f001 100644 --- a/mobile/android/base/sync/PersistedMetaGlobal.java +++ b/mobile/android/base/sync/PersistedMetaGlobal.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; import android.content.SharedPreferences; diff --git a/mobile/android/base/sync/PrefsBackoffHandler.java b/mobile/android/base/sync/PrefsBackoffHandler.java index 63f6446da1..360a22f2d0 100644 --- a/mobile/android/base/sync/PrefsBackoffHandler.java +++ b/mobile/android/base/sync/PrefsBackoffHandler.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; diff --git a/mobile/android/base/sync/Server11PreviousPostFailedException.java b/mobile/android/base/sync/Server11PreviousPostFailedException.java index 4ea77f37c8..5d2fe2dfea 100644 --- a/mobile/android/base/sync/Server11PreviousPostFailedException.java +++ b/mobile/android/base/sync/Server11PreviousPostFailedException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; /** * A previous POST failed, so we won't send any more records this session. diff --git a/mobile/android/base/sync/Server11RecordPostFailedException.java b/mobile/android/base/sync/Server11RecordPostFailedException.java index d654d3116a..f912660cb7 100644 --- a/mobile/android/base/sync/Server11RecordPostFailedException.java +++ b/mobile/android/base/sync/Server11RecordPostFailedException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; /** * The server rejected a record in its "failure" array. diff --git a/mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java b/mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java index 9c9279dd70..d1f0f9a109 100644 --- a/mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java +++ b/mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; -import org.mozilla.gecko.background.fxa.FxAccountUtils; -import org.mozilla.gecko.sync.delegates.ClientsDataDelegate; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.background.fxa.FxAccountUtils; +import org.mozilla.goanna.sync.delegates.ClientsDataDelegate; +import org.mozilla.goanna.util.HardwareUtils; import android.content.Context; import android.content.SharedPreferences; diff --git a/mobile/android/base/sync/SharedPreferencesNodeAssignmentCallback.java b/mobile/android/base/sync/SharedPreferencesNodeAssignmentCallback.java index 5408a167bc..a306910592 100644 --- a/mobile/android/base/sync/SharedPreferencesNodeAssignmentCallback.java +++ b/mobile/android/base/sync/SharedPreferencesNodeAssignmentCallback.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.net.URI; import java.net.URISyntaxException; -import org.mozilla.gecko.sync.delegates.NodeAssignmentCallback; +import org.mozilla.goanna.sync.delegates.NodeAssignmentCallback; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; diff --git a/mobile/android/base/sync/Sync11Configuration.java b/mobile/android/base/sync/Sync11Configuration.java index 4b22808955..3b419100ac 100644 --- a/mobile/android/base/sync/Sync11Configuration.java +++ b/mobile/android/base/sync/Sync11Configuration.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.net.URI; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; diff --git a/mobile/android/base/sync/SyncConfiguration.java b/mobile/android/base/sync/SyncConfiguration.java index e1e6ad76af..608901a885 100644 --- a/mobile/android/base/sync/SyncConfiguration.java +++ b/mobile/android/base/sync/SyncConfiguration.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.net.URI; import java.net.URISyntaxException; @@ -13,12 +13,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.mozilla.gecko.background.common.PrefsBranch; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.crypto.PersistedCrypto5Keys; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.stage.GlobalSyncStage.Stage; +import org.mozilla.goanna.background.common.PrefsBranch; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.crypto.PersistedCrypto5Keys; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.stage.GlobalSyncStage.Stage; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; diff --git a/mobile/android/base/sync/SyncConfigurationException.java b/mobile/android/base/sync/SyncConfigurationException.java index 02ba118c56..84e912c7fe 100644 --- a/mobile/android/base/sync/SyncConfigurationException.java +++ b/mobile/android/base/sync/SyncConfigurationException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import android.content.SyncResult; diff --git a/mobile/android/base/sync/SyncConstants.java b/mobile/android/base/sync/SyncConstants.java index 4d3527cf3c..9101b21405 100644 --- a/mobile/android/base/sync/SyncConstants.java +++ b/mobile/android/base/sync/SyncConstants.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; -import org.mozilla.gecko.AppConstants; +import org.mozilla.goanna.AppConstants; /** * Preprocessed class for storing preprocessed values specific to Android Sync. @@ -32,7 +32,7 @@ public class SyncConstants { * can be received only by Firefox versions sharing the same Android Sync * Account type. *

- * See {@link org.mozilla.gecko.sync.setup.SyncAccounts#makeSyncAccountDeletedIntent(android.content.Context, android.accounts.AccountManager, android.accounts.Account)} + * See {@link org.mozilla.goanna.sync.setup.SyncAccounts#makeSyncAccountDeletedIntent(android.content.Context, android.accounts.AccountManager, android.accounts.Account)} * for contents of the intent. */ public static final String SYNC_ACCOUNT_DELETED_ACTION = AppConstants.MOZ_ANDROID_SHARED_ACCOUNT_TYPE + ".accounts.SYNC_ACCOUNT_DELETED_ACTION"; @@ -41,7 +41,7 @@ public class SyncConstants { * Bug 790931: version number of contents of SYNC_ACCOUNT_DELETED_ACTION * intent. *

- * See {@link org.mozilla.gecko.sync.setup.SyncAccounts#makeSyncAccountDeletedIntent(android.content.Context, android.accounts.AccountManager, android.accounts.Account)} + * See {@link org.mozilla.goanna.sync.setup.SyncAccounts#makeSyncAccountDeletedIntent(android.content.Context, android.accounts.AccountManager, android.accounts.Account)} * for contents of the intent. */ public static final long SYNC_ACCOUNT_DELETED_INTENT_VERSION = 1; diff --git a/mobile/android/base/sync/SyncException.java b/mobile/android/base/sync/SyncException.java index ee09025681..a576ed8a82 100644 --- a/mobile/android/base/sync/SyncException.java +++ b/mobile/android/base/sync/SyncException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import android.content.SyncResult; diff --git a/mobile/android/base/sync/SynchronizerConfiguration.java b/mobile/android/base/sync/SynchronizerConfiguration.java index ed46eaa0f5..cb62a8eeb7 100644 --- a/mobile/android/base/sync/SynchronizerConfiguration.java +++ b/mobile/android/base/sync/SynchronizerConfiguration.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.io.IOException; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.common.PrefsBranch; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.RepositorySessionBundle; +import org.mozilla.goanna.background.common.PrefsBranch; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.RepositorySessionBundle; import android.content.SharedPreferences.Editor; diff --git a/mobile/android/base/sync/ThreadPool.java b/mobile/android/base/sync/ThreadPool.java index 7f2029566d..344b42d390 100644 --- a/mobile/android/base/sync/ThreadPool.java +++ b/mobile/android/base/sync/ThreadPool.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/mobile/android/base/sync/UnexpectedJSONException.java b/mobile/android/base/sync/UnexpectedJSONException.java index 8c8523eb8c..77e39553a2 100644 --- a/mobile/android/base/sync/UnexpectedJSONException.java +++ b/mobile/android/base/sync/UnexpectedJSONException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; public class UnexpectedJSONException extends Exception { private static final long serialVersionUID = 4797570033096443169L; diff --git a/mobile/android/base/sync/UnknownSynchronizerConfigurationVersionException.java b/mobile/android/base/sync/UnknownSynchronizerConfigurationVersionException.java index e2350095eb..5c012e7edc 100644 --- a/mobile/android/base/sync/UnknownSynchronizerConfigurationVersionException.java +++ b/mobile/android/base/sync/UnknownSynchronizerConfigurationVersionException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; public class UnknownSynchronizerConfigurationVersionException extends SyncConfigurationException { diff --git a/mobile/android/base/sync/Utils.java b/mobile/android/base/sync/Utils.java index 389b99c74a..9a61492c0c 100644 --- a/mobile/android/base/sync/Utils.java +++ b/mobile/android/base/sync/Utils.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync; +package org.mozilla.goanna.sync; import java.io.BufferedReader; import java.io.FileInputStream; @@ -27,9 +27,9 @@ import java.util.TreeMap; import org.json.simple.JSONArray; import org.mozilla.apache.commons.codec.binary.Base32; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.nativecode.NativeCrypto; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.nativecode.NativeCrypto; +import org.mozilla.goanna.sync.setup.Constants; import android.annotation.SuppressLint; import android.content.Context; diff --git a/mobile/android/base/sync/config/AccountPickler.java b/mobile/android/base/sync/config/AccountPickler.java index 85f247a1f5..902b775463 100644 --- a/mobile/android/base/sync/config/AccountPickler.java +++ b/mobile/android/base/sync/config/AccountPickler.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.config; +package org.mozilla.goanna.sync.config; import java.io.FileOutputStream; import java.io.PrintStream; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.setup.Constants; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.sync.setup.SyncAccounts.SyncAccountParameters; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.setup.Constants; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.sync.setup.SyncAccounts.SyncAccountParameters; import android.accounts.Account; import android.content.Context; diff --git a/mobile/android/base/sync/config/ClientRecordTerminator.java b/mobile/android/base/sync/config/ClientRecordTerminator.java index 0ec1d3955d..6244f17824 100644 --- a/mobile/android/base/sync/config/ClientRecordTerminator.java +++ b/mobile/android/base/sync/config/ClientRecordTerminator.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.config; +package org.mozilla.goanna.sync.config; import java.net.URI; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.SyncStorageRecordRequest; -import org.mozilla.gecko.sync.net.SyncStorageRequestDelegate; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.SyncStorageRecordRequest; +import org.mozilla.goanna.sync.net.SyncStorageRequestDelegate; +import org.mozilla.goanna.sync.net.SyncStorageResponse; /** * Bug 770785: when an Android Account is deleted, we need to (try to) delete diff --git a/mobile/android/base/sync/config/ConfigurationMigrator.java b/mobile/android/base/sync/config/ConfigurationMigrator.java index d4b073a876..550d475568 100644 --- a/mobile/android/base/sync/config/ConfigurationMigrator.java +++ b/mobile/android/base/sync/config/ConfigurationMigrator.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.config; +package org.mozilla.goanna.sync.config; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.Utils; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/sync/config/activities/SelectEnginesActivity.java b/mobile/android/base/sync/config/activities/SelectEnginesActivity.java index 95f975d517..39daacc9b5 100644 --- a/mobile/android/base/sync/config/activities/SelectEnginesActivity.java +++ b/mobile/android/base/sync/config/activities/SelectEnginesActivity.java @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.config.activities; +package org.mozilla.goanna.sync.config.activities; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.sync.syncadapter.SyncAdapter; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.sync.syncadapter.SyncAdapter; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/sync/crypto/CryptoException.java b/mobile/android/base/sync/crypto/CryptoException.java index a8d0483c9b..e32e822c9e 100644 --- a/mobile/android/base/sync/crypto/CryptoException.java +++ b/mobile/android/base/sync/crypto/CryptoException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.crypto; +package org.mozilla.goanna.sync.crypto; import java.security.GeneralSecurityException; diff --git a/mobile/android/base/sync/crypto/CryptoInfo.java b/mobile/android/base/sync/crypto/CryptoInfo.java index 355571c6a1..de03eefee1 100644 --- a/mobile/android/base/sync/crypto/CryptoInfo.java +++ b/mobile/android/base/sync/crypto/CryptoInfo.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.crypto; +package org.mozilla.goanna.sync.crypto; import java.security.GeneralSecurityException; import java.security.InvalidKeyException; diff --git a/mobile/android/base/sync/crypto/HKDF.java b/mobile/android/base/sync/crypto/HKDF.java index 16c0d8147d..7644286036 100644 --- a/mobile/android/base/sync/crypto/HKDF.java +++ b/mobile/android/base/sync/crypto/HKDF.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.crypto; +package org.mozilla.goanna.sync.crypto; import java.security.InvalidKeyException; import java.security.Key; @@ -11,7 +11,7 @@ import java.security.NoSuchAlgorithmException; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.sync.Utils; /* * A standards-compliant implementation of RFC 5869 diff --git a/mobile/android/base/sync/crypto/HMACVerificationException.java b/mobile/android/base/sync/crypto/HMACVerificationException.java index f33babd52e..1f12c4414c 100644 --- a/mobile/android/base/sync/crypto/HMACVerificationException.java +++ b/mobile/android/base/sync/crypto/HMACVerificationException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.crypto; +package org.mozilla.goanna.sync.crypto; public class HMACVerificationException extends CryptoException { private static final long serialVersionUID = 1235311303567074897L; diff --git a/mobile/android/base/sync/crypto/KeyBundle.java b/mobile/android/base/sync/crypto/KeyBundle.java index 2063b1e32a..7a9944da28 100644 --- a/mobile/android/base/sync/crypto/KeyBundle.java +++ b/mobile/android/base/sync/crypto/KeyBundle.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.crypto; +package org.mozilla.goanna.sync.crypto; import java.io.UnsupportedEncodingException; import java.security.InvalidKeyException; @@ -13,7 +13,7 @@ import javax.crypto.KeyGenerator; import javax.crypto.Mac; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.sync.Utils; public class KeyBundle { private static final String KEY_ALGORITHM_SPEC = "AES"; diff --git a/mobile/android/base/sync/crypto/MissingCryptoInputException.java b/mobile/android/base/sync/crypto/MissingCryptoInputException.java index 8add1cf11a..ee6be8ef87 100644 --- a/mobile/android/base/sync/crypto/MissingCryptoInputException.java +++ b/mobile/android/base/sync/crypto/MissingCryptoInputException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.crypto; +package org.mozilla.goanna.sync.crypto; public class MissingCryptoInputException extends CryptoException { private static final long serialVersionUID = 5334412407012972445L; diff --git a/mobile/android/base/sync/crypto/NoKeyBundleException.java b/mobile/android/base/sync/crypto/NoKeyBundleException.java index 00e0f8b185..c5dc1f639b 100644 --- a/mobile/android/base/sync/crypto/NoKeyBundleException.java +++ b/mobile/android/base/sync/crypto/NoKeyBundleException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.crypto; +package org.mozilla.goanna.sync.crypto; public class NoKeyBundleException extends CryptoException { private static final long serialVersionUID = -6627154503154040915L; diff --git a/mobile/android/base/sync/crypto/PBKDF2.java b/mobile/android/base/sync/crypto/PBKDF2.java index 636b2105c3..b8677f0fba 100644 --- a/mobile/android/base/sync/crypto/PBKDF2.java +++ b/mobile/android/base/sync/crypto/PBKDF2.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.crypto; +package org.mozilla.goanna.sync.crypto; import java.security.GeneralSecurityException; import java.util.Arrays; diff --git a/mobile/android/base/sync/crypto/PersistedCrypto5Keys.java b/mobile/android/base/sync/crypto/PersistedCrypto5Keys.java index 4dba4f258c..56b28e4309 100644 --- a/mobile/android/base/sync/crypto/PersistedCrypto5Keys.java +++ b/mobile/android/base/sync/crypto/PersistedCrypto5Keys.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.crypto; +package org.mozilla.goanna.sync.crypto; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.CollectionKeys; -import org.mozilla.gecko.sync.CryptoRecord; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.CollectionKeys; +import org.mozilla.goanna.sync.CryptoRecord; import android.content.SharedPreferences; diff --git a/mobile/android/base/sync/delegates/BaseGlobalSessionCallback.java b/mobile/android/base/sync/delegates/BaseGlobalSessionCallback.java index 0ba049772a..ccd6c8d567 100644 --- a/mobile/android/base/sync/delegates/BaseGlobalSessionCallback.java +++ b/mobile/android/base/sync/delegates/BaseGlobalSessionCallback.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.delegates; +package org.mozilla.goanna.sync.delegates; import java.net.URI; -import org.mozilla.gecko.sync.GlobalSession; -import org.mozilla.gecko.sync.stage.GlobalSyncStage.Stage; +import org.mozilla.goanna.sync.GlobalSession; +import org.mozilla.goanna.sync.stage.GlobalSyncStage.Stage; public interface BaseGlobalSessionCallback { /** diff --git a/mobile/android/base/sync/delegates/ClientsDataDelegate.java b/mobile/android/base/sync/delegates/ClientsDataDelegate.java index 07e9179f0f..b09711e1f3 100644 --- a/mobile/android/base/sync/delegates/ClientsDataDelegate.java +++ b/mobile/android/base/sync/delegates/ClientsDataDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.delegates; +package org.mozilla.goanna.sync.delegates; public interface ClientsDataDelegate { public String getAccountGUID(); diff --git a/mobile/android/base/sync/delegates/FreshStartDelegate.java b/mobile/android/base/sync/delegates/FreshStartDelegate.java index 2e53470611..6c456e40bf 100644 --- a/mobile/android/base/sync/delegates/FreshStartDelegate.java +++ b/mobile/android/base/sync/delegates/FreshStartDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.delegates; +package org.mozilla.goanna.sync.delegates; public interface FreshStartDelegate { void onFreshStart(); diff --git a/mobile/android/base/sync/delegates/GlobalSessionCallback.java b/mobile/android/base/sync/delegates/GlobalSessionCallback.java index ffa4aa59d9..4e5bbd1115 100644 --- a/mobile/android/base/sync/delegates/GlobalSessionCallback.java +++ b/mobile/android/base/sync/delegates/GlobalSessionCallback.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.delegates; +package org.mozilla.goanna.sync.delegates; public interface GlobalSessionCallback extends BaseGlobalSessionCallback, NodeAssignmentCallback { } diff --git a/mobile/android/base/sync/delegates/JSONRecordFetchDelegate.java b/mobile/android/base/sync/delegates/JSONRecordFetchDelegate.java index eacf3c1577..b64b654324 100644 --- a/mobile/android/base/sync/delegates/JSONRecordFetchDelegate.java +++ b/mobile/android/base/sync/delegates/JSONRecordFetchDelegate.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.delegates; +package org.mozilla.goanna.sync.delegates; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.net.SyncStorageResponse; /** * A fairly generic delegate to handle fetches of single JSON object blobs, as diff --git a/mobile/android/base/sync/delegates/KeyUploadDelegate.java b/mobile/android/base/sync/delegates/KeyUploadDelegate.java index 0cd5ec732c..e5b006d743 100644 --- a/mobile/android/base/sync/delegates/KeyUploadDelegate.java +++ b/mobile/android/base/sync/delegates/KeyUploadDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.delegates; +package org.mozilla.goanna.sync.delegates; public interface KeyUploadDelegate { /** diff --git a/mobile/android/base/sync/delegates/MetaGlobalDelegate.java b/mobile/android/base/sync/delegates/MetaGlobalDelegate.java index 13854cb5a3..b7f3d3ed86 100644 --- a/mobile/android/base/sync/delegates/MetaGlobalDelegate.java +++ b/mobile/android/base/sync/delegates/MetaGlobalDelegate.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.delegates; +package org.mozilla.goanna.sync.delegates; -import org.mozilla.gecko.sync.MetaGlobal; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.sync.MetaGlobal; +import org.mozilla.goanna.sync.net.SyncStorageResponse; public interface MetaGlobalDelegate { public void handleSuccess(MetaGlobal global, SyncStorageResponse response); diff --git a/mobile/android/base/sync/delegates/NodeAssignmentCallback.java b/mobile/android/base/sync/delegates/NodeAssignmentCallback.java index 55cae37288..75768158f2 100644 --- a/mobile/android/base/sync/delegates/NodeAssignmentCallback.java +++ b/mobile/android/base/sync/delegates/NodeAssignmentCallback.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.delegates; +package org.mozilla.goanna.sync.delegates; import java.net.URI; -import org.mozilla.gecko.sync.GlobalSession; +import org.mozilla.goanna.sync.GlobalSession; public interface NodeAssignmentCallback { /** diff --git a/mobile/android/base/sync/delegates/WipeServerDelegate.java b/mobile/android/base/sync/delegates/WipeServerDelegate.java index ef35658127..30d14a2e6f 100644 --- a/mobile/android/base/sync/delegates/WipeServerDelegate.java +++ b/mobile/android/base/sync/delegates/WipeServerDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.delegates; +package org.mozilla.goanna.sync.delegates; public interface WipeServerDelegate { public void onWiped(long timestamp); diff --git a/mobile/android/base/sync/jpake/BigIntegerHelper.java b/mobile/android/base/sync/jpake/BigIntegerHelper.java index f19cc1232d..0536a1d851 100644 --- a/mobile/android/base/sync/jpake/BigIntegerHelper.java +++ b/mobile/android/base/sync/jpake/BigIntegerHelper.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; import java.math.BigInteger; diff --git a/mobile/android/base/sync/jpake/Gx3OrGx4IsZeroOrOneException.java b/mobile/android/base/sync/jpake/Gx3OrGx4IsZeroOrOneException.java index a88dda6332..df0b809dab 100644 --- a/mobile/android/base/sync/jpake/Gx3OrGx4IsZeroOrOneException.java +++ b/mobile/android/base/sync/jpake/Gx3OrGx4IsZeroOrOneException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; public class Gx3OrGx4IsZeroOrOneException extends Exception { private static final long serialVersionUID = 7347530447460039679L; diff --git a/mobile/android/base/sync/jpake/IncorrectZkpException.java b/mobile/android/base/sync/jpake/IncorrectZkpException.java index fdd269a85d..250b013fc8 100644 --- a/mobile/android/base/sync/jpake/IncorrectZkpException.java +++ b/mobile/android/base/sync/jpake/IncorrectZkpException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; public class IncorrectZkpException extends Exception { diff --git a/mobile/android/base/sync/jpake/JPakeClient.java b/mobile/android/base/sync/jpake/JPakeClient.java index dab820ba71..0da8407e04 100644 --- a/mobile/android/base/sync/jpake/JPakeClient.java +++ b/mobile/android/base/sync/jpake/JPakeClient.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; import java.io.UnsupportedEncodingException; import java.math.BigInteger; @@ -11,28 +11,28 @@ import java.util.Queue; import org.json.simple.JSONObject; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.crypto.CryptoException; -import org.mozilla.gecko.sync.crypto.CryptoInfo; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.crypto.NoKeyBundleException; -import org.mozilla.gecko.sync.jpake.stage.CompleteStage; -import org.mozilla.gecko.sync.jpake.stage.ComputeFinalStage; -import org.mozilla.gecko.sync.jpake.stage.ComputeKeyVerificationStage; -import org.mozilla.gecko.sync.jpake.stage.ComputeStepOneStage; -import org.mozilla.gecko.sync.jpake.stage.ComputeStepTwoStage; -import org.mozilla.gecko.sync.jpake.stage.DecryptDataStage; -import org.mozilla.gecko.sync.jpake.stage.DeleteChannel; -import org.mozilla.gecko.sync.jpake.stage.GetChannelStage; -import org.mozilla.gecko.sync.jpake.stage.GetRequestStage; -import org.mozilla.gecko.sync.jpake.stage.JPakeStage; -import org.mozilla.gecko.sync.jpake.stage.PutRequestStage; -import org.mozilla.gecko.sync.jpake.stage.VerifyPairingStage; -import org.mozilla.gecko.sync.setup.Constants; -import org.mozilla.gecko.sync.setup.activities.SetupSyncActivity; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.crypto.CryptoException; +import org.mozilla.goanna.sync.crypto.CryptoInfo; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.crypto.NoKeyBundleException; +import org.mozilla.goanna.sync.jpake.stage.CompleteStage; +import org.mozilla.goanna.sync.jpake.stage.ComputeFinalStage; +import org.mozilla.goanna.sync.jpake.stage.ComputeKeyVerificationStage; +import org.mozilla.goanna.sync.jpake.stage.ComputeStepOneStage; +import org.mozilla.goanna.sync.jpake.stage.ComputeStepTwoStage; +import org.mozilla.goanna.sync.jpake.stage.DecryptDataStage; +import org.mozilla.goanna.sync.jpake.stage.DeleteChannel; +import org.mozilla.goanna.sync.jpake.stage.GetChannelStage; +import org.mozilla.goanna.sync.jpake.stage.GetRequestStage; +import org.mozilla.goanna.sync.jpake.stage.JPakeStage; +import org.mozilla.goanna.sync.jpake.stage.PutRequestStage; +import org.mozilla.goanna.sync.jpake.stage.VerifyPairingStage; +import org.mozilla.goanna.sync.setup.Constants; +import org.mozilla.goanna.sync.setup.activities.SetupSyncActivity; import ch.boye.httpclientandroidlib.entity.StringEntity; diff --git a/mobile/android/base/sync/jpake/JPakeCrypto.java b/mobile/android/base/sync/jpake/JPakeCrypto.java index 9800565c8c..ec45010f4b 100644 --- a/mobile/android/base/sync/jpake/JPakeCrypto.java +++ b/mobile/android/base/sync/jpake/JPakeCrypto.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; import java.io.UnsupportedEncodingException; import java.math.BigInteger; @@ -14,9 +14,9 @@ import java.security.NoSuchAlgorithmException; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.crypto.HKDF; -import org.mozilla.gecko.sync.crypto.KeyBundle; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.crypto.HKDF; +import org.mozilla.goanna.sync.crypto.KeyBundle; public class JPakeCrypto { private static final String LOG_TAG = "JPakeCrypto"; diff --git a/mobile/android/base/sync/jpake/JPakeJson.java b/mobile/android/base/sync/jpake/JPakeJson.java index 79f96d19de..13f4e75c85 100644 --- a/mobile/android/base/sync/jpake/JPakeJson.java +++ b/mobile/android/base/sync/jpake/JPakeJson.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; import java.math.BigInteger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.setup.Constants; public class JPakeJson { /* diff --git a/mobile/android/base/sync/jpake/JPakeNoActivePairingException.java b/mobile/android/base/sync/jpake/JPakeNoActivePairingException.java index b2b123816c..1a7828db4f 100644 --- a/mobile/android/base/sync/jpake/JPakeNoActivePairingException.java +++ b/mobile/android/base/sync/jpake/JPakeNoActivePairingException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class JPakeNoActivePairingException extends SyncException { private static final long serialVersionUID = 715366241252256473L; diff --git a/mobile/android/base/sync/jpake/JPakeNumGenerator.java b/mobile/android/base/sync/jpake/JPakeNumGenerator.java index f23c07d7f9..613a3f76e2 100644 --- a/mobile/android/base/sync/jpake/JPakeNumGenerator.java +++ b/mobile/android/base/sync/jpake/JPakeNumGenerator.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; import java.math.BigInteger; diff --git a/mobile/android/base/sync/jpake/JPakeNumGeneratorRandom.java b/mobile/android/base/sync/jpake/JPakeNumGeneratorRandom.java index 3b3c0df826..322ef825f8 100644 --- a/mobile/android/base/sync/jpake/JPakeNumGeneratorRandom.java +++ b/mobile/android/base/sync/jpake/JPakeNumGeneratorRandom.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; import java.math.BigInteger; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.sync.Utils; /** * Helper Function to generate a uniformly random value in [0, r). diff --git a/mobile/android/base/sync/jpake/JPakeParty.java b/mobile/android/base/sync/jpake/JPakeParty.java index 9b0e5ffca6..92fb0796da 100644 --- a/mobile/android/base/sync/jpake/JPakeParty.java +++ b/mobile/android/base/sync/jpake/JPakeParty.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; import java.math.BigInteger; diff --git a/mobile/android/base/sync/jpake/Zkp.java b/mobile/android/base/sync/jpake/Zkp.java index 0f2da507ed..630ed780d7 100644 --- a/mobile/android/base/sync/jpake/Zkp.java +++ b/mobile/android/base/sync/jpake/Zkp.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake; +package org.mozilla.goanna.sync.jpake; import java.math.BigInteger; diff --git a/mobile/android/base/sync/jpake/stage/CompleteStage.java b/mobile/android/base/sync/jpake/stage/CompleteStage.java index 0af14f2f46..1ac773ff16 100644 --- a/mobile/android/base/sync/jpake/stage/CompleteStage.java +++ b/mobile/android/base/sync/jpake/stage/CompleteStage.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.jpake.JPakeClient; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.jpake.JPakeClient; public class CompleteStage extends JPakeStage { diff --git a/mobile/android/base/sync/jpake/stage/ComputeFinalStage.java b/mobile/android/base/sync/jpake/stage/ComputeFinalStage.java index 24e0a77f3d..6baccd502c 100644 --- a/mobile/android/base/sync/jpake/stage/ComputeFinalStage.java +++ b/mobile/android/base/sync/jpake/stage/ComputeFinalStage.java @@ -2,21 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.jpake.IncorrectZkpException; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.jpake.JPakeCrypto; -import org.mozilla.gecko.sync.jpake.Zkp; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.jpake.IncorrectZkpException; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.jpake.JPakeCrypto; +import org.mozilla.goanna.sync.jpake.Zkp; +import org.mozilla.goanna.sync.setup.Constants; public class ComputeFinalStage extends JPakeStage { diff --git a/mobile/android/base/sync/jpake/stage/ComputeKeyVerificationStage.java b/mobile/android/base/sync/jpake/stage/ComputeKeyVerificationStage.java index f20cfc7e5c..7a45e08b3b 100644 --- a/mobile/android/base/sync/jpake/stage/ComputeKeyVerificationStage.java +++ b/mobile/android/base/sync/jpake/stage/ComputeKeyVerificationStage.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; import java.io.UnsupportedEncodingException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.crypto.CryptoException; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.crypto.CryptoException; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.setup.Constants; public class ComputeKeyVerificationStage extends JPakeStage { diff --git a/mobile/android/base/sync/jpake/stage/ComputeStepOneStage.java b/mobile/android/base/sync/jpake/stage/ComputeStepOneStage.java index dc0a011b2c..fde3be12fb 100644 --- a/mobile/android/base/sync/jpake/stage/ComputeStepOneStage.java +++ b/mobile/android/base/sync/jpake/stage/ComputeStepOneStage.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; import java.io.UnsupportedEncodingException; import java.security.NoSuchAlgorithmException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.jpake.BigIntegerHelper; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.jpake.JPakeCrypto; -import org.mozilla.gecko.sync.jpake.JPakeJson; -import org.mozilla.gecko.sync.jpake.JPakeParty; -import org.mozilla.gecko.sync.jpake.Zkp; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.jpake.BigIntegerHelper; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.jpake.JPakeCrypto; +import org.mozilla.goanna.sync.jpake.JPakeJson; +import org.mozilla.goanna.sync.jpake.JPakeParty; +import org.mozilla.goanna.sync.jpake.Zkp; +import org.mozilla.goanna.sync.setup.Constants; public class ComputeStepOneStage extends JPakeStage { diff --git a/mobile/android/base/sync/jpake/stage/ComputeStepTwoStage.java b/mobile/android/base/sync/jpake/stage/ComputeStepTwoStage.java index 28a3291752..f5b85cb71a 100644 --- a/mobile/android/base/sync/jpake/stage/ComputeStepTwoStage.java +++ b/mobile/android/base/sync/jpake/stage/ComputeStepTwoStage.java @@ -2,23 +2,23 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.security.NoSuchAlgorithmException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.jpake.BigIntegerHelper; -import org.mozilla.gecko.sync.jpake.Gx3OrGx4IsZeroOrOneException; -import org.mozilla.gecko.sync.jpake.IncorrectZkpException; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.jpake.JPakeCrypto; -import org.mozilla.gecko.sync.jpake.JPakeJson; -import org.mozilla.gecko.sync.jpake.Zkp; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.jpake.BigIntegerHelper; +import org.mozilla.goanna.sync.jpake.Gx3OrGx4IsZeroOrOneException; +import org.mozilla.goanna.sync.jpake.IncorrectZkpException; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.jpake.JPakeCrypto; +import org.mozilla.goanna.sync.jpake.JPakeJson; +import org.mozilla.goanna.sync.jpake.Zkp; +import org.mozilla.goanna.sync.setup.Constants; public class ComputeStepTwoStage extends JPakeStage { diff --git a/mobile/android/base/sync/jpake/stage/DecryptDataStage.java b/mobile/android/base/sync/jpake/stage/DecryptDataStage.java index 6fbc23dfb2..5f59ca028c 100644 --- a/mobile/android/base/sync/jpake/stage/DecryptDataStage.java +++ b/mobile/android/base/sync/jpake/stage/DecryptDataStage.java @@ -2,22 +2,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; import java.io.IOException; import java.io.UnsupportedEncodingException; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.crypto.CryptoException; -import org.mozilla.gecko.sync.crypto.CryptoInfo; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.crypto.CryptoException; +import org.mozilla.goanna.sync.crypto.CryptoInfo; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.setup.Constants; public class DecryptDataStage extends JPakeStage { diff --git a/mobile/android/base/sync/jpake/stage/DeleteChannel.java b/mobile/android/base/sync/jpake/stage/DeleteChannel.java index 280a587674..f172ce181b 100644 --- a/mobile/android/base/sync/jpake/stage/DeleteChannel.java +++ b/mobile/android/base/sync/jpake/stage/DeleteChannel.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; import java.io.IOException; import java.net.URISyntaxException; import java.security.GeneralSecurityException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.setup.auth.AccountAuthenticator; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.setup.auth.AccountAuthenticator; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.client.ClientProtocolException; diff --git a/mobile/android/base/sync/jpake/stage/GetChannelStage.java b/mobile/android/base/sync/jpake/stage/GetChannelStage.java index 1a30c7240a..c16ecb9034 100644 --- a/mobile/android/base/sync/jpake/stage/GetChannelStage.java +++ b/mobile/android/base/sync/jpake/stage/GetChannelStage.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; import java.io.IOException; import java.net.URISyntaxException; import java.security.GeneralSecurityException; import org.json.simple.parser.JSONParser; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.net.SyncResponse; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.net.SyncResponse; +import org.mozilla.goanna.sync.setup.Constants; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.client.ClientProtocolException; diff --git a/mobile/android/base/sync/jpake/stage/GetRequestStage.java b/mobile/android/base/sync/jpake/stage/GetRequestStage.java index 7d00b06b77..0537355899 100644 --- a/mobile/android/base/sync/jpake/stage/GetRequestStage.java +++ b/mobile/android/base/sync/jpake/stage/GetRequestStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; import java.io.IOException; import java.net.URISyntaxException; @@ -10,14 +10,14 @@ import java.security.GeneralSecurityException; import java.util.Timer; import java.util.TimerTask; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.net.Resource; -import org.mozilla.gecko.sync.net.SyncResponse; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.net.Resource; +import org.mozilla.goanna.sync.net.SyncResponse; +import org.mozilla.goanna.sync.setup.Constants; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/sync/jpake/stage/JPakeStage.java b/mobile/android/base/sync/jpake/stage/JPakeStage.java index a35f050786..a4ed8f7645 100644 --- a/mobile/android/base/sync/jpake/stage/JPakeStage.java +++ b/mobile/android/base/sync/jpake/stage/JPakeStage.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; -import org.mozilla.gecko.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.jpake.JPakeClient; public abstract class JPakeStage { protected final String LOG_TAG = "SyncJPakeStage"; diff --git a/mobile/android/base/sync/jpake/stage/PutRequestStage.java b/mobile/android/base/sync/jpake/stage/PutRequestStage.java index d87318f10d..5f62f6a357 100644 --- a/mobile/android/base/sync/jpake/stage/PutRequestStage.java +++ b/mobile/android/base/sync/jpake/stage/PutRequestStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -11,13 +11,13 @@ import java.security.GeneralSecurityException; import java.util.Timer; import java.util.TimerTask; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.net.Resource; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.net.Resource; +import org.mozilla.goanna.sync.setup.Constants; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/sync/jpake/stage/VerifyPairingStage.java b/mobile/android/base/sync/jpake/stage/VerifyPairingStage.java index 9b5aa73583..5c46369e60 100644 --- a/mobile/android/base/sync/jpake/stage/VerifyPairingStage.java +++ b/mobile/android/base/sync/jpake/stage/VerifyPairingStage.java @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.jpake.stage; +package org.mozilla.goanna.sync.jpake.stage; import java.io.UnsupportedEncodingException; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.crypto.CryptoException; -import org.mozilla.gecko.sync.crypto.CryptoInfo; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.crypto.CryptoException; +import org.mozilla.goanna.sync.crypto.CryptoInfo; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.setup.Constants; public class VerifyPairingStage extends JPakeStage { diff --git a/mobile/android/base/sync/middleware/Crypto5MiddlewareRepository.java b/mobile/android/base/sync/middleware/Crypto5MiddlewareRepository.java index 79319aff50..3080874647 100644 --- a/mobile/android/base/sync/middleware/Crypto5MiddlewareRepository.java +++ b/mobile/android/base/sync/middleware/Crypto5MiddlewareRepository.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.middleware; +package org.mozilla.goanna.sync.middleware; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.repositories.IdentityRecordFactory; -import org.mozilla.gecko.sync.repositories.RecordFactory; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.RepositorySession; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCleanDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.repositories.IdentityRecordFactory; +import org.mozilla.goanna.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCleanDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; import android.content.Context; diff --git a/mobile/android/base/sync/middleware/Crypto5MiddlewareRepositorySession.java b/mobile/android/base/sync/middleware/Crypto5MiddlewareRepositorySession.java index 46de7a2367..376ce3847e 100644 --- a/mobile/android/base/sync/middleware/Crypto5MiddlewareRepositorySession.java +++ b/mobile/android/base/sync/middleware/Crypto5MiddlewareRepositorySession.java @@ -2,21 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.middleware; +package org.mozilla.goanna.sync.middleware; import java.io.UnsupportedEncodingException; import java.util.concurrent.ExecutorService; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.crypto.CryptoException; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.repositories.InactiveSessionException; -import org.mozilla.gecko.sync.repositories.NoStoreDelegateException; -import org.mozilla.gecko.sync.repositories.RecordFactory; -import org.mozilla.gecko.sync.repositories.RepositorySession; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionStoreDelegate; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.crypto.CryptoException; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.repositories.InactiveSessionException; +import org.mozilla.goanna.sync.repositories.NoStoreDelegateException; +import org.mozilla.goanna.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionStoreDelegate; +import org.mozilla.goanna.sync.repositories.domain.Record; /** * It's a RepositorySession that accepts Records as input, producing CryptoRecords diff --git a/mobile/android/base/sync/middleware/MiddlewareRepository.java b/mobile/android/base/sync/middleware/MiddlewareRepository.java index d807aa5c09..88a84abb61 100644 --- a/mobile/android/base/sync/middleware/MiddlewareRepository.java +++ b/mobile/android/base/sync/middleware/MiddlewareRepository.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.middleware; +package org.mozilla.goanna.sync.middleware; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; public abstract class MiddlewareRepository extends Repository { diff --git a/mobile/android/base/sync/middleware/MiddlewareRepositorySession.java b/mobile/android/base/sync/middleware/MiddlewareRepositorySession.java index e14ef52265..73361f61bd 100644 --- a/mobile/android/base/sync/middleware/MiddlewareRepositorySession.java +++ b/mobile/android/base/sync/middleware/MiddlewareRepositorySession.java @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.middleware; +package org.mozilla.goanna.sync.middleware; import java.util.concurrent.ExecutorService; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.InactiveSessionException; -import org.mozilla.gecko.sync.repositories.InvalidSessionTransitionException; -import org.mozilla.gecko.sync.repositories.RepositorySession; -import org.mozilla.gecko.sync.repositories.RepositorySessionBundle; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.InactiveSessionException; +import org.mozilla.goanna.sync.repositories.InvalidSessionTransitionException; +import org.mozilla.goanna.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.RepositorySessionBundle; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionBeginDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionWipeDelegate; public abstract class MiddlewareRepositorySession extends RepositorySession { private static final String LOG_TAG = "MiddlewareSession"; diff --git a/mobile/android/base/sync/net/AbstractBearerTokenAuthHeaderProvider.java b/mobile/android/base/sync/net/AbstractBearerTokenAuthHeaderProvider.java index e3b4f25b1e..5065931f3d 100644 --- a/mobile/android/base/sync/net/AbstractBearerTokenAuthHeaderProvider.java +++ b/mobile/android/base/sync/net/AbstractBearerTokenAuthHeaderProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.client.methods.HttpRequestBase; diff --git a/mobile/android/base/sync/net/AuthHeaderProvider.java b/mobile/android/base/sync/net/AuthHeaderProvider.java index 7be6fef3d2..db6084cf48 100644 --- a/mobile/android/base/sync/net/AuthHeaderProvider.java +++ b/mobile/android/base/sync/net/AuthHeaderProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.security.GeneralSecurityException; diff --git a/mobile/android/base/sync/net/BaseResource.java b/mobile/android/base/sync/net/BaseResource.java index f0784bb3dd..8e362e4143 100644 --- a/mobile/android/base/sync/net/BaseResource.java +++ b/mobile/android/base/sync/net/BaseResource.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.io.BufferedReader; import java.io.IOException; @@ -20,8 +20,8 @@ import javax.net.ssl.SSLContext; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.HttpEntity; diff --git a/mobile/android/base/sync/net/BaseResourceDelegate.java b/mobile/android/base/sync/net/BaseResourceDelegate.java index 84ae7a3d5c..b76d184f8a 100644 --- a/mobile/android/base/sync/net/BaseResourceDelegate.java +++ b/mobile/android/base/sync/net/BaseResourceDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import ch.boye.httpclientandroidlib.client.methods.HttpRequestBase; import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient; diff --git a/mobile/android/base/sync/net/BasicAuthHeaderProvider.java b/mobile/android/base/sync/net/BasicAuthHeaderProvider.java index d8a371ddca..a09fe685f2 100644 --- a/mobile/android/base/sync/net/BasicAuthHeaderProvider.java +++ b/mobile/android/base/sync/net/BasicAuthHeaderProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.auth.Credentials; diff --git a/mobile/android/base/sync/net/BearerAuthHeaderProvider.java b/mobile/android/base/sync/net/BearerAuthHeaderProvider.java index d142d50d95..baae9d70c6 100644 --- a/mobile/android/base/sync/net/BearerAuthHeaderProvider.java +++ b/mobile/android/base/sync/net/BearerAuthHeaderProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; /** * An AuthHeaderProvider that returns an Authorization header for diff --git a/mobile/android/base/sync/net/BrowserIDAuthHeaderProvider.java b/mobile/android/base/sync/net/BrowserIDAuthHeaderProvider.java index 5004673b35..b3a6d043db 100644 --- a/mobile/android/base/sync/net/BrowserIDAuthHeaderProvider.java +++ b/mobile/android/base/sync/net/BrowserIDAuthHeaderProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; /** * An AuthHeaderProvider that returns an Authorization header for diff --git a/mobile/android/base/sync/net/ConnectionMonitorThread.java b/mobile/android/base/sync/net/ConnectionMonitorThread.java index 1a20117718..f1c5186b9a 100644 --- a/mobile/android/base/sync/net/ConnectionMonitorThread.java +++ b/mobile/android/base/sync/net/ConnectionMonitorThread.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; /** * Every REAP_INTERVAL milliseconds, wake up diff --git a/mobile/android/base/sync/net/HMACAuthHeaderProvider.java b/mobile/android/base/sync/net/HMACAuthHeaderProvider.java index 5314d345b6..46c3df50fd 100644 --- a/mobile/android/base/sync/net/HMACAuthHeaderProvider.java +++ b/mobile/android/base/sync/net/HMACAuthHeaderProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -14,8 +14,8 @@ import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.Utils; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.client.methods.HttpRequestBase; diff --git a/mobile/android/base/sync/net/HandleProgressException.java b/mobile/android/base/sync/net/HandleProgressException.java index 27ec74b66c..51c1ffb6de 100644 --- a/mobile/android/base/sync/net/HandleProgressException.java +++ b/mobile/android/base/sync/net/HandleProgressException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class HandleProgressException extends SyncException { private static final long serialVersionUID = -4444933937013161059L; diff --git a/mobile/android/base/sync/net/HawkAuthHeaderProvider.java b/mobile/android/base/sync/net/HawkAuthHeaderProvider.java index 2bdd5604a8..0621646c6f 100644 --- a/mobile/android/base/sync/net/HawkAuthHeaderProvider.java +++ b/mobile/android/base/sync/net/HawkAuthHeaderProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.io.IOException; import java.io.InputStream; @@ -18,8 +18,8 @@ import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.Utils; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.HttpEntity; diff --git a/mobile/android/base/sync/net/HttpResponseObserver.java b/mobile/android/base/sync/net/HttpResponseObserver.java index 24b37a0e61..6fb2181a89 100644 --- a/mobile/android/base/sync/net/HttpResponseObserver.java +++ b/mobile/android/base/sync/net/HttpResponseObserver.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.client.methods.HttpUriRequest; diff --git a/mobile/android/base/sync/net/MozResponse.java b/mobile/android/base/sync/net/MozResponse.java index 5932fde84d..4a0666ea75 100644 --- a/mobile/android/base/sync/net/MozResponse.java +++ b/mobile/android/base/sync/net/MozResponse.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.io.BufferedReader; import java.io.IOException; @@ -12,9 +12,9 @@ import java.io.Reader; import java.util.Scanner; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.HttpEntity; diff --git a/mobile/android/base/sync/net/Resource.java b/mobile/android/base/sync/net/Resource.java index ab7b98aff8..9f2faab4fe 100644 --- a/mobile/android/base/sync/net/Resource.java +++ b/mobile/android/base/sync/net/Resource.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.net.URI; diff --git a/mobile/android/base/sync/net/ResourceDelegate.java b/mobile/android/base/sync/net/ResourceDelegate.java index 0dea9432b3..67c64434d0 100644 --- a/mobile/android/base/sync/net/ResourceDelegate.java +++ b/mobile/android/base/sync/net/ResourceDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/mobile/android/base/sync/net/SRPConstants.java b/mobile/android/base/sync/net/SRPConstants.java index 5dfe660eff..51ab51d45b 100644 --- a/mobile/android/base/sync/net/SRPConstants.java +++ b/mobile/android/base/sync/net/SRPConstants.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.math.BigInteger; diff --git a/mobile/android/base/sync/net/SyncResponse.java b/mobile/android/base/sync/net/SyncResponse.java index ce2eb2cc0b..6c1f93096e 100644 --- a/mobile/android/base/sync/net/SyncResponse.java +++ b/mobile/android/base/sync/net/SyncResponse.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.sync.Utils; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/sync/net/SyncStorageCollectionRequest.java b/mobile/android/base/sync/net/SyncStorageCollectionRequest.java index 3ae672f21e..3985df2947 100644 --- a/mobile/android/base/sync/net/SyncStorageCollectionRequest.java +++ b/mobile/android/base/sync/net/SyncStorageCollectionRequest.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.io.BufferedReader; import java.io.IOException; @@ -10,7 +10,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.URI; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.HttpEntity; diff --git a/mobile/android/base/sync/net/SyncStorageCollectionRequestDelegate.java b/mobile/android/base/sync/net/SyncStorageCollectionRequestDelegate.java index ddf52007be..0f27758071 100644 --- a/mobile/android/base/sync/net/SyncStorageCollectionRequestDelegate.java +++ b/mobile/android/base/sync/net/SyncStorageCollectionRequestDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; public abstract class SyncStorageCollectionRequestDelegate implements SyncStorageRequestIncrementalDelegate, SyncStorageRequestDelegate { diff --git a/mobile/android/base/sync/net/SyncStorageRecordRequest.java b/mobile/android/base/sync/net/SyncStorageRecordRequest.java index 5e87ce8c8e..a38f0e3398 100644 --- a/mobile/android/base/sync/net/SyncStorageRecordRequest.java +++ b/mobile/android/base/sync/net/SyncStorageRecordRequest.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -10,8 +10,8 @@ import java.net.URISyntaxException; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.ThreadPool; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.ThreadPool; /** * Resource class that implements expected headers and processing for Sync. diff --git a/mobile/android/base/sync/net/SyncStorageRequest.java b/mobile/android/base/sync/net/SyncStorageRequest.java index 18f0ab9e35..038b0b22bb 100644 --- a/mobile/android/base/sync/net/SyncStorageRequest.java +++ b/mobile/android/base/sync/net/SyncStorageRequest.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.io.IOException; import java.net.URI; @@ -10,8 +10,8 @@ import java.net.URISyntaxException; import java.security.GeneralSecurityException; import java.util.HashMap; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; import ch.boye.httpclientandroidlib.HttpEntity; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/sync/net/SyncStorageRequestDelegate.java b/mobile/android/base/sync/net/SyncStorageRequestDelegate.java index 29f42cc289..a84a746fa9 100644 --- a/mobile/android/base/sync/net/SyncStorageRequestDelegate.java +++ b/mobile/android/base/sync/net/SyncStorageRequestDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; public interface SyncStorageRequestDelegate { public AuthHeaderProvider getAuthHeaderProvider(); diff --git a/mobile/android/base/sync/net/SyncStorageRequestIncrementalDelegate.java b/mobile/android/base/sync/net/SyncStorageRequestIncrementalDelegate.java index aa5d735bf2..f1c5c0bedd 100644 --- a/mobile/android/base/sync/net/SyncStorageRequestIncrementalDelegate.java +++ b/mobile/android/base/sync/net/SyncStorageRequestIncrementalDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; public interface SyncStorageRequestIncrementalDelegate { void handleRequestProgress(String progress); // For line-by-line. diff --git a/mobile/android/base/sync/net/SyncStorageResponse.java b/mobile/android/base/sync/net/SyncStorageResponse.java index 51f4fc65bb..de58628b78 100644 --- a/mobile/android/base/sync/net/SyncStorageResponse.java +++ b/mobile/android/base/sync/net/SyncStorageResponse.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.io.IOException; import java.util.HashMap; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/sync/net/TLSSocketFactory.java b/mobile/android/base/sync/net/TLSSocketFactory.java index 29b8602480..49354d43ee 100644 --- a/mobile/android/base/sync/net/TLSSocketFactory.java +++ b/mobile/android/base/sync/net/TLSSocketFactory.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; import java.io.IOException; import java.net.Socket; @@ -10,7 +10,7 @@ import java.net.Socket; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; import ch.boye.httpclientandroidlib.conn.ssl.SSLSocketFactory; import ch.boye.httpclientandroidlib.params.HttpParams; diff --git a/mobile/android/base/sync/net/WBOCollectionRequestDelegate.java b/mobile/android/base/sync/net/WBOCollectionRequestDelegate.java index 2e26f041b1..44d9cf8a8f 100644 --- a/mobile/android/base/sync/net/WBOCollectionRequestDelegate.java +++ b/mobile/android/base/sync/net/WBOCollectionRequestDelegate.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.KeyBundleProvider; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.KeyBundleProvider; /** * Subclass this to handle collection fetches. diff --git a/mobile/android/base/sync/net/WBORequestDelegate.java b/mobile/android/base/sync/net/WBORequestDelegate.java index 8a09e0c7f0..fea0f4bc1f 100644 --- a/mobile/android/base/sync/net/WBORequestDelegate.java +++ b/mobile/android/base/sync/net/WBORequestDelegate.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.net; +package org.mozilla.goanna.sync.net; -import org.mozilla.gecko.sync.KeyBundleProvider; -import org.mozilla.gecko.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.KeyBundleProvider; +import org.mozilla.goanna.sync.crypto.KeyBundle; public abstract class WBORequestDelegate implements SyncStorageRequestDelegate, KeyBundleProvider { diff --git a/mobile/android/base/sync/receivers/SyncAccountDeletedReceiver.java b/mobile/android/base/sync/receivers/SyncAccountDeletedReceiver.java index 66fb68841c..e34d3349b2 100644 --- a/mobile/android/base/sync/receivers/SyncAccountDeletedReceiver.java +++ b/mobile/android/base/sync/receivers/SyncAccountDeletedReceiver.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.receivers; +package org.mozilla.goanna.sync.receivers; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.background.common.log.Logger; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/sync/receivers/SyncAccountDeletedService.java b/mobile/android/base/sync/receivers/SyncAccountDeletedService.java index ac5db93731..ded17cab62 100644 --- a/mobile/android/base/sync/receivers/SyncAccountDeletedService.java +++ b/mobile/android/base/sync/receivers/SyncAccountDeletedService.java @@ -2,21 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.receivers; +package org.mozilla.goanna.sync.receivers; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.Sync11Configuration; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.config.AccountPickler; -import org.mozilla.gecko.sync.config.ClientRecordTerminator; -import org.mozilla.gecko.sync.net.BasicAuthHeaderProvider; -import org.mozilla.gecko.sync.repositories.android.FennecTabsRepository; -import org.mozilla.gecko.sync.setup.Constants; -import org.mozilla.gecko.sync.setup.SyncAccounts.SyncAccountParameters; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.Sync11Configuration; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.config.AccountPickler; +import org.mozilla.goanna.sync.config.ClientRecordTerminator; +import org.mozilla.goanna.sync.net.BasicAuthHeaderProvider; +import org.mozilla.goanna.sync.repositories.android.FennecTabsRepository; +import org.mozilla.goanna.sync.setup.Constants; +import org.mozilla.goanna.sync.setup.SyncAccounts.SyncAccountParameters; import android.accounts.AccountManager; import android.app.IntentService; diff --git a/mobile/android/base/sync/receivers/UpgradeReceiver.java b/mobile/android/base/sync/receivers/UpgradeReceiver.java index 22c1bafade..e26f633894 100644 --- a/mobile/android/base/sync/receivers/UpgradeReceiver.java +++ b/mobile/android/base/sync/receivers/UpgradeReceiver.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.receivers; +package org.mozilla.goanna.sync.receivers; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.CredentialException; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.config.ConfigurationMigrator; -import org.mozilla.gecko.sync.setup.Constants; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.sync.setup.SyncAccounts.SyncAccountParameters; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.CredentialException; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.config.ConfigurationMigrator; +import org.mozilla.goanna.sync.setup.Constants; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.sync.setup.SyncAccounts.SyncAccountParameters; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/sync/repositories/BookmarkNeedsReparentingException.java b/mobile/android/base/sync/repositories/BookmarkNeedsReparentingException.java index 5fe3dc9fae..1cc21ca48e 100644 --- a/mobile/android/base/sync/repositories/BookmarkNeedsReparentingException.java +++ b/mobile/android/base/sync/repositories/BookmarkNeedsReparentingException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class BookmarkNeedsReparentingException extends SyncException { diff --git a/mobile/android/base/sync/repositories/BookmarksRepository.java b/mobile/android/base/sync/repositories/BookmarksRepository.java index 289fc48ecf..c96b2994a4 100644 --- a/mobile/android/base/sync/repositories/BookmarksRepository.java +++ b/mobile/android/base/sync/repositories/BookmarksRepository.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; /** * Shared interface for repositories that consume and produce diff --git a/mobile/android/base/sync/repositories/ConstrainedServer11Repository.java b/mobile/android/base/sync/repositories/ConstrainedServer11Repository.java index 3997b14718..b8d8776964 100644 --- a/mobile/android/base/sync/repositories/ConstrainedServer11Repository.java +++ b/mobile/android/base/sync/repositories/ConstrainedServer11Repository.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; import java.net.URISyntaxException; -import org.mozilla.gecko.sync.InfoCollections; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.InfoCollections; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; /** * A kind of Server11Repository that supports explicit setting of limit and sort on operations. diff --git a/mobile/android/base/sync/repositories/FetchFailedException.java b/mobile/android/base/sync/repositories/FetchFailedException.java index 8b29a37bae..6d3328292e 100644 --- a/mobile/android/base/sync/repositories/FetchFailedException.java +++ b/mobile/android/base/sync/repositories/FetchFailedException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class FetchFailedException extends SyncException { private static final long serialVersionUID = -7533105300182522946L; diff --git a/mobile/android/base/sync/repositories/HashSetStoreTracker.java b/mobile/android/base/sync/repositories/HashSetStoreTracker.java index 3b6facc316..33adda10e6 100644 --- a/mobile/android/base/sync/repositories/HashSetStoreTracker.java +++ b/mobile/android/base/sync/repositories/HashSetStoreTracker.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; import java.util.HashSet; import java.util.Iterator; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.repositories.domain.Record; public class HashSetStoreTracker implements StoreTracker { diff --git a/mobile/android/base/sync/repositories/HistoryRepository.java b/mobile/android/base/sync/repositories/HistoryRepository.java index eddc321029..0581bceb97 100644 --- a/mobile/android/base/sync/repositories/HistoryRepository.java +++ b/mobile/android/base/sync/repositories/HistoryRepository.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; /** * Shared interface for repositories that consume and produce diff --git a/mobile/android/base/sync/repositories/IdentityRecordFactory.java b/mobile/android/base/sync/repositories/IdentityRecordFactory.java index acedc66e2c..eaf6f96df4 100644 --- a/mobile/android/base/sync/repositories/IdentityRecordFactory.java +++ b/mobile/android/base/sync/repositories/IdentityRecordFactory.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.repositories.domain.Record; public class IdentityRecordFactory extends RecordFactory { diff --git a/mobile/android/base/sync/repositories/InactiveSessionException.java b/mobile/android/base/sync/repositories/InactiveSessionException.java index 185f0d724f..b85f8e9703 100644 --- a/mobile/android/base/sync/repositories/InactiveSessionException.java +++ b/mobile/android/base/sync/repositories/InactiveSessionException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class InactiveSessionException extends SyncException { diff --git a/mobile/android/base/sync/repositories/InvalidBookmarkTypeException.java b/mobile/android/base/sync/repositories/InvalidBookmarkTypeException.java index 3597276a45..2bcdb03c40 100644 --- a/mobile/android/base/sync/repositories/InvalidBookmarkTypeException.java +++ b/mobile/android/base/sync/repositories/InvalidBookmarkTypeException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class InvalidBookmarkTypeException extends SyncException { diff --git a/mobile/android/base/sync/repositories/InvalidRequestException.java b/mobile/android/base/sync/repositories/InvalidRequestException.java index 3f761e5408..5b12bf4986 100644 --- a/mobile/android/base/sync/repositories/InvalidRequestException.java +++ b/mobile/android/base/sync/repositories/InvalidRequestException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class InvalidRequestException extends SyncException { diff --git a/mobile/android/base/sync/repositories/InvalidSessionTransitionException.java b/mobile/android/base/sync/repositories/InvalidSessionTransitionException.java index 0963892c93..68ebae3612 100644 --- a/mobile/android/base/sync/repositories/InvalidSessionTransitionException.java +++ b/mobile/android/base/sync/repositories/InvalidSessionTransitionException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class InvalidSessionTransitionException extends SyncException { diff --git a/mobile/android/base/sync/repositories/MultipleRecordsForGuidException.java b/mobile/android/base/sync/repositories/MultipleRecordsForGuidException.java index 58cca4a49c..7f85c97430 100644 --- a/mobile/android/base/sync/repositories/MultipleRecordsForGuidException.java +++ b/mobile/android/base/sync/repositories/MultipleRecordsForGuidException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class MultipleRecordsForGuidException extends SyncException { diff --git a/mobile/android/base/sync/repositories/NoContentProviderException.java b/mobile/android/base/sync/repositories/NoContentProviderException.java index 85d119a5d3..03b52c2a68 100644 --- a/mobile/android/base/sync/repositories/NoContentProviderException.java +++ b/mobile/android/base/sync/repositories/NoContentProviderException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; import android.net.Uri; diff --git a/mobile/android/base/sync/repositories/NoGuidForIdException.java b/mobile/android/base/sync/repositories/NoGuidForIdException.java index 3681deffd6..7b95c538d2 100644 --- a/mobile/android/base/sync/repositories/NoGuidForIdException.java +++ b/mobile/android/base/sync/repositories/NoGuidForIdException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class NoGuidForIdException extends SyncException { diff --git a/mobile/android/base/sync/repositories/NoStoreDelegateException.java b/mobile/android/base/sync/repositories/NoStoreDelegateException.java index 5747039aaa..0459c6b01f 100644 --- a/mobile/android/base/sync/repositories/NoStoreDelegateException.java +++ b/mobile/android/base/sync/repositories/NoStoreDelegateException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class NoStoreDelegateException extends SyncException { private static final long serialVersionUID = 6631689468978422074L; diff --git a/mobile/android/base/sync/repositories/NullCursorException.java b/mobile/android/base/sync/repositories/NullCursorException.java index 4d90579928..1be7f92124 100644 --- a/mobile/android/base/sync/repositories/NullCursorException.java +++ b/mobile/android/base/sync/repositories/NullCursorException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class NullCursorException extends SyncException { diff --git a/mobile/android/base/sync/repositories/ParentNotFoundException.java b/mobile/android/base/sync/repositories/ParentNotFoundException.java index 991fd74268..96c2cb7870 100644 --- a/mobile/android/base/sync/repositories/ParentNotFoundException.java +++ b/mobile/android/base/sync/repositories/ParentNotFoundException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class ParentNotFoundException extends SyncException { diff --git a/mobile/android/base/sync/repositories/ProfileDatabaseException.java b/mobile/android/base/sync/repositories/ProfileDatabaseException.java index 0f8075133f..211e53dca6 100644 --- a/mobile/android/base/sync/repositories/ProfileDatabaseException.java +++ b/mobile/android/base/sync/repositories/ProfileDatabaseException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class ProfileDatabaseException extends SyncException { diff --git a/mobile/android/base/sync/repositories/RecordFactory.java b/mobile/android/base/sync/repositories/RecordFactory.java index 6a8d81a77f..6c2dd5b84c 100644 --- a/mobile/android/base/sync/repositories/RecordFactory.java +++ b/mobile/android/base/sync/repositories/RecordFactory.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.repositories.domain.Record; // Take a record retrieved from some middleware, producing // some concrete record type for application to some local repository. diff --git a/mobile/android/base/sync/repositories/RecordFilter.java b/mobile/android/base/sync/repositories/RecordFilter.java index 733448ded7..33577b8740 100644 --- a/mobile/android/base/sync/repositories/RecordFilter.java +++ b/mobile/android/base/sync/repositories/RecordFilter.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.repositories.domain.Record; public interface RecordFilter { public boolean excludeRecord(Record r); diff --git a/mobile/android/base/sync/repositories/Repository.java b/mobile/android/base/sync/repositories/Repository.java index 3dd3fd2c40..21c48d6d6d 100644 --- a/mobile/android/base/sync/repositories/Repository.java +++ b/mobile/android/base/sync/repositories/Repository.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCleanDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCleanDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/RepositorySession.java b/mobile/android/base/sync/repositories/RepositorySession.java index 84fca13799..450009ec0f 100644 --- a/mobile/android/base/sync/repositories/RepositorySession.java +++ b/mobile/android/base/sync/repositories/RepositorySession.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; import java.util.ArrayList; import java.util.Collection; @@ -10,14 +10,14 @@ import java.util.Iterator; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionStoreDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionBeginDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionStoreDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionWipeDelegate; +import org.mozilla.goanna.sync.repositories.domain.Record; /** * A RepositorySession is created and used thusly: diff --git a/mobile/android/base/sync/repositories/RepositorySessionBundle.java b/mobile/android/base/sync/repositories/RepositorySessionBundle.java index 03b63185f4..5cfeb9732c 100644 --- a/mobile/android/base/sync/repositories/RepositorySessionBundle.java +++ b/mobile/android/base/sync/repositories/RepositorySessionBundle.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; import java.io.IOException; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonObjectJSONException; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonObjectJSONException; public class RepositorySessionBundle { public static final String LOG_TAG = RepositorySessionBundle.class.getSimpleName(); diff --git a/mobile/android/base/sync/repositories/Server11Repository.java b/mobile/android/base/sync/repositories/Server11Repository.java index db6d1c72a9..3a2e0fa4db 100644 --- a/mobile/android/base/sync/repositories/Server11Repository.java +++ b/mobile/android/base/sync/repositories/Server11Repository.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import org.mozilla.gecko.sync.InfoCollections; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.InfoCollections; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/Server11RepositorySession.java b/mobile/android/base/sync/repositories/Server11RepositorySession.java index 512337c4d4..dc0d597e81 100644 --- a/mobile/android/base/sync/repositories/Server11RepositorySession.java +++ b/mobile/android/base/sync/repositories/Server11RepositorySession.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; import java.io.IOException; import java.io.OutputStream; @@ -16,27 +16,27 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicLong; import org.json.simple.JSONArray; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.DelayedWorkTracker; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.HTTPFailureException; -import org.mozilla.gecko.sync.Server11PreviousPostFailedException; -import org.mozilla.gecko.sync.Server11RecordPostFailedException; -import org.mozilla.gecko.sync.UnexpectedJSONException; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.SyncStorageCollectionRequest; -import org.mozilla.gecko.sync.net.SyncStorageRequest; -import org.mozilla.gecko.sync.net.SyncStorageRequestDelegate; -import org.mozilla.gecko.sync.net.SyncStorageResponse; -import org.mozilla.gecko.sync.net.WBOCollectionRequestDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionStoreDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.DelayedWorkTracker; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.HTTPFailureException; +import org.mozilla.goanna.sync.Server11PreviousPostFailedException; +import org.mozilla.goanna.sync.Server11RecordPostFailedException; +import org.mozilla.goanna.sync.UnexpectedJSONException; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.SyncStorageCollectionRequest; +import org.mozilla.goanna.sync.net.SyncStorageRequest; +import org.mozilla.goanna.sync.net.SyncStorageRequestDelegate; +import org.mozilla.goanna.sync.net.SyncStorageResponse; +import org.mozilla.goanna.sync.net.WBOCollectionRequestDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionBeginDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionStoreDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionWipeDelegate; +import org.mozilla.goanna.sync.repositories.domain.Record; import ch.boye.httpclientandroidlib.entity.ContentProducer; import ch.boye.httpclientandroidlib.entity.EntityTemplate; diff --git a/mobile/android/base/sync/repositories/StoreFailedException.java b/mobile/android/base/sync/repositories/StoreFailedException.java index fcb09e32e1..af5ec7eedc 100644 --- a/mobile/android/base/sync/repositories/StoreFailedException.java +++ b/mobile/android/base/sync/repositories/StoreFailedException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class StoreFailedException extends SyncException { private static final long serialVersionUID = 6080340122855859752L; diff --git a/mobile/android/base/sync/repositories/StoreTracker.java b/mobile/android/base/sync/repositories/StoreTracker.java index b6a3071a9d..9efda8aa90 100644 --- a/mobile/android/base/sync/repositories/StoreTracker.java +++ b/mobile/android/base/sync/repositories/StoreTracker.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; import java.util.Iterator; diff --git a/mobile/android/base/sync/repositories/StoreTrackingRepositorySession.java b/mobile/android/base/sync/repositories/StoreTrackingRepositorySession.java index 1a5c1e96a6..72758e0bd0 100644 --- a/mobile/android/base/sync/repositories/StoreTrackingRepositorySession.java +++ b/mobile/android/base/sync/repositories/StoreTrackingRepositorySession.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories; +package org.mozilla.goanna.sync.repositories; import java.util.Collection; import java.util.Iterator; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionBeginDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.domain.Record; public abstract class StoreTrackingRepositorySession extends RepositorySession { private static final String LOG_TAG = "StoreTrackSession"; diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java index fd3c35da01..b95ea19dc6 100644 --- a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java +++ b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; import java.util.Collection; @@ -10,11 +10,11 @@ import java.util.HashMap; import java.util.Map; import org.json.simple.JSONArray; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.domain.BookmarkRecord; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.domain.BookmarkRecord; +import org.mozilla.goanna.sync.repositories.domain.Record; import android.content.ContentUris; import android.content.ContentValues; diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepository.java b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepository.java index 38520fd7aa..0aaf99dd40 100644 --- a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepository.java +++ b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepository.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; -import org.mozilla.gecko.sync.repositories.BookmarksRepository; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.repositories.BookmarksRepository; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java index fb79901a14..f6041020c7 100644 --- a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java +++ b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; import java.util.Collection; @@ -13,22 +13,22 @@ import java.util.Map.Entry; import java.util.TreeMap; import org.json.simple.JSONArray; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.repositories.InactiveSessionException; -import org.mozilla.gecko.sync.repositories.InvalidSessionTransitionException; -import org.mozilla.gecko.sync.repositories.NoGuidForIdException; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.ParentNotFoundException; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionStoreDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate; -import org.mozilla.gecko.sync.repositories.domain.BookmarkRecord; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.repositories.InactiveSessionException; +import org.mozilla.goanna.sync.repositories.InvalidSessionTransitionException; +import org.mozilla.goanna.sync.repositories.NoGuidForIdException; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.ParentNotFoundException; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionBeginDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionStoreDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionWipeDelegate; +import org.mozilla.goanna.sync.repositories.domain.BookmarkRecord; +import org.mozilla.goanna.sync.repositories.domain.Record; import android.content.ContentUris; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataAccessor.java b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataAccessor.java index 10fce26b20..09ebcd24b1 100644 --- a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataAccessor.java +++ b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataAccessor.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; import java.util.HashMap; @@ -10,11 +10,11 @@ import java.util.Map; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.domain.HistoryRecord; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.domain.HistoryRecord; +import org.mozilla.goanna.sync.repositories.domain.Record; import android.content.ContentValues; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataExtender.java b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataExtender.java index 868bc4495d..0c3c369ada 100644 --- a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataExtender.java +++ b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataExtender.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; import org.json.simple.JSONArray; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.domain.HistoryRecord; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.domain.HistoryRecord; import android.content.ContentValues; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepository.java b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepository.java index bd2b5d31fa..7d9e1fcdfa 100644 --- a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepository.java +++ b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepository.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; -import org.mozilla.gecko.sync.repositories.HistoryRepository; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.repositories.HistoryRepository; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java index 3037c335c1..d3959f53a4 100644 --- a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java +++ b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java @@ -2,24 +2,24 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.sync.repositories.InactiveSessionException; -import org.mozilla.gecko.sync.repositories.InvalidSessionTransitionException; -import org.mozilla.gecko.sync.repositories.NoGuidForIdException; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.ParentNotFoundException; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.domain.HistoryRecord; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.sync.repositories.InactiveSessionException; +import org.mozilla.goanna.sync.repositories.InvalidSessionTransitionException; +import org.mozilla.goanna.sync.repositories.NoGuidForIdException; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.ParentNotFoundException; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionBeginDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.domain.HistoryRecord; +import org.mozilla.goanna.sync.repositories.domain.Record; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserRepository.java b/mobile/android/base/sync/repositories/android/AndroidBrowserRepository.java index 6c5c661eea..b6566f61b0 100644 --- a/mobile/android/base/sync/repositories/android/AndroidBrowserRepository.java +++ b/mobile/android/base/sync/repositories/android/AndroidBrowserRepository.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCleanDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCleanDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java index 138d63d4cc..9662431f8f 100644 --- a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java +++ b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.List; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.db.CursorDumper; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.db.CursorDumper; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.domain.Record; import android.content.ContentValues; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java index f5e6f40d0c..f45b8b8926 100644 --- a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java +++ b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java @@ -2,29 +2,29 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.InactiveSessionException; -import org.mozilla.gecko.sync.repositories.InvalidRequestException; -import org.mozilla.gecko.sync.repositories.InvalidSessionTransitionException; -import org.mozilla.gecko.sync.repositories.MultipleRecordsForGuidException; -import org.mozilla.gecko.sync.repositories.NoGuidForIdException; -import org.mozilla.gecko.sync.repositories.NoStoreDelegateException; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.ParentNotFoundException; -import org.mozilla.gecko.sync.repositories.ProfileDatabaseException; -import org.mozilla.gecko.sync.repositories.RecordFilter; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.StoreTrackingRepositorySession; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.InactiveSessionException; +import org.mozilla.goanna.sync.repositories.InvalidRequestException; +import org.mozilla.goanna.sync.repositories.InvalidSessionTransitionException; +import org.mozilla.goanna.sync.repositories.MultipleRecordsForGuidException; +import org.mozilla.goanna.sync.repositories.NoGuidForIdException; +import org.mozilla.goanna.sync.repositories.NoStoreDelegateException; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.ParentNotFoundException; +import org.mozilla.goanna.sync.repositories.ProfileDatabaseException; +import org.mozilla.goanna.sync.repositories.RecordFilter; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.StoreTrackingRepositorySession; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionBeginDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionWipeDelegate; +import org.mozilla.goanna.sync.repositories.domain.Record; import android.content.ContentUris; import android.database.Cursor; diff --git a/mobile/android/base/sync/repositories/android/BookmarksDeletionManager.java b/mobile/android/base/sync/repositories/android/BookmarksDeletionManager.java index d8d8756f77..c273abc65e 100644 --- a/mobile/android/base/sync/repositories/android/BookmarksDeletionManager.java +++ b/mobile/android/base/sync/repositories/android/BookmarksDeletionManager.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionStoreDelegate; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionStoreDelegate; /** * Queue up deletions. Process them at the end. diff --git a/mobile/android/base/sync/repositories/android/BookmarksInsertionManager.java b/mobile/android/base/sync/repositories/android/BookmarksInsertionManager.java index 98670d39be..e8528363c8 100644 --- a/mobile/android/base/sync/repositories/android/BookmarksInsertionManager.java +++ b/mobile/android/base/sync/repositories/android/BookmarksInsertionManager.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; import java.util.Collection; @@ -12,9 +12,9 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.repositories.domain.BookmarkRecord; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.repositories.domain.BookmarkRecord; /** * Queue up insertions: diff --git a/mobile/android/base/sync/repositories/android/BrowserContractHelpers.java b/mobile/android/base/sync/repositories/android/BrowserContractHelpers.java index eaeedf3b27..b66ec94e93 100644 --- a/mobile/android/base/sync/repositories/android/BrowserContractHelpers.java +++ b/mobile/android/base/sync/repositories/android/BrowserContractHelpers.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.sync.setup.Constants; import android.net.Uri; diff --git a/mobile/android/base/sync/repositories/android/CachedSQLiteOpenHelper.java b/mobile/android/base/sync/repositories/android/CachedSQLiteOpenHelper.java index 5c17f9b85d..6cac13f5da 100644 --- a/mobile/android/base/sync/repositories/android/CachedSQLiteOpenHelper.java +++ b/mobile/android/base/sync/repositories/android/CachedSQLiteOpenHelper.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/mobile/android/base/sync/repositories/android/ClientsDatabase.java b/mobile/android/base/sync/repositories/android/ClientsDatabase.java index 4962a20c68..c5cac1521e 100644 --- a/mobile/android/base/sync/repositories/android/ClientsDatabase.java +++ b/mobile/android/base/sync/repositories/android/ClientsDatabase.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.domain.ClientRecord; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.domain.ClientRecord; import android.content.ContentValues; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/android/ClientsDatabaseAccessor.java b/mobile/android/base/sync/repositories/android/ClientsDatabaseAccessor.java index 4af84ceaf0..21555328f9 100644 --- a/mobile/android/base/sync/repositories/android/ClientsDatabaseAccessor.java +++ b/mobile/android/base/sync/repositories/android/ClientsDatabaseAccessor.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; import java.util.Collection; @@ -13,10 +13,10 @@ import java.util.Map; import org.json.simple.JSONArray; -import org.mozilla.gecko.sync.CommandProcessor.Command; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.domain.ClientRecord; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.sync.CommandProcessor.Command; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.domain.ClientRecord; +import org.mozilla.goanna.sync.setup.Constants; import android.content.Context; import android.database.Cursor; diff --git a/mobile/android/base/sync/repositories/android/FennecTabsRepository.java b/mobile/android/base/sync/repositories/android/FennecTabsRepository.java index c71e92fffe..8e4540a336 100644 --- a/mobile/android/base/sync/repositories/android/FennecTabsRepository.java +++ b/mobile/android/base/sync/repositories/android/FennecTabsRepository.java @@ -2,28 +2,28 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.db.Tab; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.Clients; -import org.mozilla.gecko.sync.delegates.ClientsDataDelegate; -import org.mozilla.gecko.sync.repositories.InactiveSessionException; -import org.mozilla.gecko.sync.repositories.NoContentProviderException; -import org.mozilla.gecko.sync.repositories.NoStoreDelegateException; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.RepositorySession; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate; -import org.mozilla.gecko.sync.repositories.domain.ClientRecord; -import org.mozilla.gecko.sync.repositories.domain.Record; -import org.mozilla.gecko.sync.repositories.domain.TabsRecord; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.db.Tab; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.Clients; +import org.mozilla.goanna.sync.delegates.ClientsDataDelegate; +import org.mozilla.goanna.sync.repositories.InactiveSessionException; +import org.mozilla.goanna.sync.repositories.NoContentProviderException; +import org.mozilla.goanna.sync.repositories.NoStoreDelegateException; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionWipeDelegate; +import org.mozilla.goanna.sync.repositories.domain.ClientRecord; +import org.mozilla.goanna.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.repositories.domain.TabsRecord; import android.content.ContentProviderClient; import android.content.ContentValues; diff --git a/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java b/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java index 9beafa712e..116a52d337 100644 --- a/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java +++ b/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java @@ -2,31 +2,31 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.concurrent.Callable; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.DeletedFormHistory; -import org.mozilla.gecko.db.BrowserContract.FormHistory; -import org.mozilla.gecko.sync.repositories.InactiveSessionException; -import org.mozilla.gecko.sync.repositories.NoContentProviderException; -import org.mozilla.gecko.sync.repositories.NoStoreDelegateException; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.RecordFilter; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.StoreTrackingRepositorySession; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate; -import org.mozilla.gecko.sync.repositories.domain.FormHistoryRecord; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.DeletedFormHistory; +import org.mozilla.goanna.db.BrowserContract.FormHistory; +import org.mozilla.goanna.sync.repositories.InactiveSessionException; +import org.mozilla.goanna.sync.repositories.NoContentProviderException; +import org.mozilla.goanna.sync.repositories.NoStoreDelegateException; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.RecordFilter; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.StoreTrackingRepositorySession; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionWipeDelegate; +import org.mozilla.goanna.sync.repositories.domain.FormHistoryRecord; +import org.mozilla.goanna.sync.repositories.domain.Record; import android.content.ContentProviderClient; import android.content.ContentValues; diff --git a/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java b/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java index 5a2fe56c27..a640f587f4 100644 --- a/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java +++ b/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java @@ -2,30 +2,30 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.util.ArrayList; import java.util.List; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.DeletedColumns; -import org.mozilla.gecko.db.BrowserContract.DeletedPasswords; -import org.mozilla.gecko.db.BrowserContract.Passwords; -import org.mozilla.gecko.sync.repositories.InactiveSessionException; -import org.mozilla.gecko.sync.repositories.NoStoreDelegateException; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.RecordFilter; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.StoreTrackingRepositorySession; -import org.mozilla.gecko.sync.repositories.android.RepoUtils.QueryHelper; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate; -import org.mozilla.gecko.sync.repositories.domain.PasswordRecord; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.DeletedColumns; +import org.mozilla.goanna.db.BrowserContract.DeletedPasswords; +import org.mozilla.goanna.db.BrowserContract.Passwords; +import org.mozilla.goanna.sync.repositories.InactiveSessionException; +import org.mozilla.goanna.sync.repositories.NoStoreDelegateException; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.RecordFilter; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.StoreTrackingRepositorySession; +import org.mozilla.goanna.sync.repositories.android.RepoUtils.QueryHelper; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionWipeDelegate; +import org.mozilla.goanna.sync.repositories.domain.PasswordRecord; +import org.mozilla.goanna.sync.repositories.domain.Record; import android.content.ContentProviderClient; import android.content.ContentUris; diff --git a/mobile/android/base/sync/repositories/android/RepoUtils.java b/mobile/android/base/sync/repositories/android/RepoUtils.java index b08a581ad5..69e0ec2908 100644 --- a/mobile/android/base/sync/repositories/android/RepoUtils.java +++ b/mobile/android/base/sync/repositories/android/RepoUtils.java @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.android; +package org.mozilla.goanna.sync.repositories.android; import java.io.IOException; import org.json.simple.JSONArray; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonArrayJSONException; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.domain.ClientRecord; -import org.mozilla.gecko.sync.repositories.domain.HistoryRecord; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonArrayJSONException; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.domain.ClientRecord; +import org.mozilla.goanna.sync.repositories.domain.HistoryRecord; import android.content.ContentProviderClient; import android.content.Context; diff --git a/mobile/android/base/sync/repositories/delegates/DeferrableRepositorySessionCreationDelegate.java b/mobile/android/base/sync/repositories/delegates/DeferrableRepositorySessionCreationDelegate.java index f292600e47..6690fb6f80 100644 --- a/mobile/android/base/sync/repositories/delegates/DeferrableRepositorySessionCreationDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/DeferrableRepositorySessionCreationDelegate.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.repositories.RepositorySession; public abstract class DeferrableRepositorySessionCreationDelegate implements RepositorySessionCreationDelegate { @Override diff --git a/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionBeginDelegate.java b/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionBeginDelegate.java index 1ccdcce19a..86466da07a 100644 --- a/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionBeginDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionBeginDelegate.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; import java.util.concurrent.ExecutorService; -import org.mozilla.gecko.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.RepositorySession; public class DeferredRepositorySessionBeginDelegate implements RepositorySessionBeginDelegate { private final RepositorySessionBeginDelegate inner; diff --git a/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionFetchRecordsDelegate.java b/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionFetchRecordsDelegate.java index 1178d9b5bf..3184829f81 100644 --- a/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionFetchRecordsDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionFetchRecordsDelegate.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; import java.util.concurrent.ExecutorService; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.repositories.domain.Record; public class DeferredRepositorySessionFetchRecordsDelegate implements RepositorySessionFetchRecordsDelegate { private final RepositorySessionFetchRecordsDelegate inner; diff --git a/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionFinishDelegate.java b/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionFinishDelegate.java index dbe7e43275..a241f6c0e2 100644 --- a/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionFinishDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionFinishDelegate.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; import java.util.concurrent.ExecutorService; -import org.mozilla.gecko.sync.repositories.RepositorySession; -import org.mozilla.gecko.sync.repositories.RepositorySessionBundle; +import org.mozilla.goanna.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.RepositorySessionBundle; public class DeferredRepositorySessionFinishDelegate implements RepositorySessionFinishDelegate { diff --git a/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java b/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java index 2f659c733f..a4481a2fad 100644 --- a/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; import java.util.concurrent.ExecutorService; diff --git a/mobile/android/base/sync/repositories/delegates/RepositorySessionBeginDelegate.java b/mobile/android/base/sync/repositories/delegates/RepositorySessionBeginDelegate.java index f5853647f7..4ffe389e51 100644 --- a/mobile/android/base/sync/repositories/delegates/RepositorySessionBeginDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/RepositorySessionBeginDelegate.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; import java.util.concurrent.ExecutorService; -import org.mozilla.gecko.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.RepositorySession; /** * One of these two methods is guaranteed to be called after session.begin() is diff --git a/mobile/android/base/sync/repositories/delegates/RepositorySessionCleanDelegate.java b/mobile/android/base/sync/repositories/delegates/RepositorySessionCleanDelegate.java index 139c561a0b..0c61037629 100644 --- a/mobile/android/base/sync/repositories/delegates/RepositorySessionCleanDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/RepositorySessionCleanDelegate.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; -import org.mozilla.gecko.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.Repository; public interface RepositorySessionCleanDelegate { public void onCleaned(Repository repo); diff --git a/mobile/android/base/sync/repositories/delegates/RepositorySessionCreationDelegate.java b/mobile/android/base/sync/repositories/delegates/RepositorySessionCreationDelegate.java index 6ad4991c3b..aa7f9c1471 100644 --- a/mobile/android/base/sync/repositories/delegates/RepositorySessionCreationDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/RepositorySessionCreationDelegate.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; -import org.mozilla.gecko.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.RepositorySession; // Used to provide the sessionCallback and storeCallback // mechanism to repository instances. diff --git a/mobile/android/base/sync/repositories/delegates/RepositorySessionFetchRecordsDelegate.java b/mobile/android/base/sync/repositories/delegates/RepositorySessionFetchRecordsDelegate.java index 589a093dc2..ee7913fe7d 100644 --- a/mobile/android/base/sync/repositories/delegates/RepositorySessionFetchRecordsDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/RepositorySessionFetchRecordsDelegate.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; import java.util.concurrent.ExecutorService; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.repositories.domain.Record; public interface RepositorySessionFetchRecordsDelegate { public void onFetchFailed(Exception ex, Record record); diff --git a/mobile/android/base/sync/repositories/delegates/RepositorySessionFinishDelegate.java b/mobile/android/base/sync/repositories/delegates/RepositorySessionFinishDelegate.java index 40296dd4fe..f51759750f 100644 --- a/mobile/android/base/sync/repositories/delegates/RepositorySessionFinishDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/RepositorySessionFinishDelegate.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; import java.util.concurrent.ExecutorService; -import org.mozilla.gecko.sync.repositories.RepositorySession; -import org.mozilla.gecko.sync.repositories.RepositorySessionBundle; +import org.mozilla.goanna.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.RepositorySessionBundle; public interface RepositorySessionFinishDelegate { public void onFinishFailed(Exception ex); diff --git a/mobile/android/base/sync/repositories/delegates/RepositorySessionGuidsSinceDelegate.java b/mobile/android/base/sync/repositories/delegates/RepositorySessionGuidsSinceDelegate.java index 4f82768f11..864a5ec6b8 100644 --- a/mobile/android/base/sync/repositories/delegates/RepositorySessionGuidsSinceDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/RepositorySessionGuidsSinceDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; public interface RepositorySessionGuidsSinceDelegate { public void onGuidsSinceFailed(Exception ex); diff --git a/mobile/android/base/sync/repositories/delegates/RepositorySessionStoreDelegate.java b/mobile/android/base/sync/repositories/delegates/RepositorySessionStoreDelegate.java index 01e44c3aea..d000f192e8 100644 --- a/mobile/android/base/sync/repositories/delegates/RepositorySessionStoreDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/RepositorySessionStoreDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; import java.util.concurrent.ExecutorService; diff --git a/mobile/android/base/sync/repositories/delegates/RepositorySessionWipeDelegate.java b/mobile/android/base/sync/repositories/delegates/RepositorySessionWipeDelegate.java index cc88307298..630a91d3ab 100644 --- a/mobile/android/base/sync/repositories/delegates/RepositorySessionWipeDelegate.java +++ b/mobile/android/base/sync/repositories/delegates/RepositorySessionWipeDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.delegates; +package org.mozilla.goanna.sync.repositories.delegates; import java.util.concurrent.ExecutorService; diff --git a/mobile/android/base/sync/repositories/domain/BookmarkRecord.java b/mobile/android/base/sync/repositories/domain/BookmarkRecord.java index 27b8e7151a..e894d8b81a 100644 --- a/mobile/android/base/sync/repositories/domain/BookmarkRecord.java +++ b/mobile/android/base/sync/repositories/domain/BookmarkRecord.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Map; import org.json.simple.JSONArray; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonArrayJSONException; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.repositories.android.RepoUtils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonArrayJSONException; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.repositories.android.RepoUtils; /** * Covers the fields used by all bookmark objects. diff --git a/mobile/android/base/sync/repositories/domain/BookmarkRecordFactory.java b/mobile/android/base/sync/repositories/domain/BookmarkRecordFactory.java index edf7b288ca..a1dd8297ae 100644 --- a/mobile/android/base/sync/repositories/domain/BookmarkRecordFactory.java +++ b/mobile/android/base/sync/repositories/domain/BookmarkRecordFactory.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.repositories.RecordFactory; /** * Turns CryptoRecords into BookmarkRecords. diff --git a/mobile/android/base/sync/repositories/domain/ClientRecord.java b/mobile/android/base/sync/repositories/domain/ClientRecord.java index 15b4466b6c..e13a9cfc61 100644 --- a/mobile/android/base/sync/repositories/domain/ClientRecord.java +++ b/mobile/android/base/sync/repositories/domain/ClientRecord.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; import org.json.simple.JSONArray; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonArrayJSONException; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.repositories.android.RepoUtils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonArrayJSONException; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.repositories.android.RepoUtils; public class ClientRecord extends Record { private static final String LOG_TAG = "ClientRecord"; diff --git a/mobile/android/base/sync/repositories/domain/ClientRecordFactory.java b/mobile/android/base/sync/repositories/domain/ClientRecordFactory.java index 897d2859c3..6b5fe6ac66 100644 --- a/mobile/android/base/sync/repositories/domain/ClientRecordFactory.java +++ b/mobile/android/base/sync/repositories/domain/ClientRecordFactory.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.repositories.RecordFactory; public class ClientRecordFactory extends RecordFactory { @Override diff --git a/mobile/android/base/sync/repositories/domain/FormHistoryRecord.java b/mobile/android/base/sync/repositories/domain/FormHistoryRecord.java index 4209c22561..1c4b21a225 100644 --- a/mobile/android/base/sync/repositories/domain/FormHistoryRecord.java +++ b/mobile/android/base/sync/repositories/domain/FormHistoryRecord.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.repositories.android.RepoUtils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.repositories.android.RepoUtils; /** * A FormHistoryRecord represents a saved form element. diff --git a/mobile/android/base/sync/repositories/domain/HistoryRecord.java b/mobile/android/base/sync/repositories/domain/HistoryRecord.java index 94eae13a7b..7aa3504b9c 100644 --- a/mobile/android/base/sync/repositories/domain/HistoryRecord.java +++ b/mobile/android/base/sync/repositories/domain/HistoryRecord.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; import java.util.HashMap; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonArrayJSONException; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.repositories.android.RepoUtils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonArrayJSONException; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.repositories.android.RepoUtils; /** * Visits are in microsecond precision. diff --git a/mobile/android/base/sync/repositories/domain/HistoryRecordFactory.java b/mobile/android/base/sync/repositories/domain/HistoryRecordFactory.java index ac2c6a1dcb..d40e4b29ab 100644 --- a/mobile/android/base/sync/repositories/domain/HistoryRecordFactory.java +++ b/mobile/android/base/sync/repositories/domain/HistoryRecordFactory.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.repositories.RecordFactory; /** * Turns CryptoRecords into HistoryRecords. diff --git a/mobile/android/base/sync/repositories/domain/PasswordRecord.java b/mobile/android/base/sync/repositories/domain/PasswordRecord.java index b2de60f3c1..0749190332 100644 --- a/mobile/android/base/sync/repositories/domain/PasswordRecord.java +++ b/mobile/android/base/sync/repositories/domain/PasswordRecord.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.repositories.android.RepoUtils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.repositories.android.RepoUtils; public class PasswordRecord extends Record { private static final String LOG_TAG = "PasswordRecord"; diff --git a/mobile/android/base/sync/repositories/domain/PasswordRecordFactory.java b/mobile/android/base/sync/repositories/domain/PasswordRecordFactory.java index fc7ef916d5..2af7fe6d72 100644 --- a/mobile/android/base/sync/repositories/domain/PasswordRecordFactory.java +++ b/mobile/android/base/sync/repositories/domain/PasswordRecordFactory.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.repositories.RecordFactory; -import org.mozilla.gecko.sync.repositories.domain.PasswordRecord; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.repositories.domain.PasswordRecord; +import org.mozilla.goanna.sync.repositories.domain.Record; public class PasswordRecordFactory extends RecordFactory { @Override diff --git a/mobile/android/base/sync/repositories/domain/Record.java b/mobile/android/base/sync/repositories/domain/Record.java index 145704c1c8..ecf93a380e 100644 --- a/mobile/android/base/sync/repositories/domain/Record.java +++ b/mobile/android/base/sync/repositories/domain/Record.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; import java.io.UnsupportedEncodingException; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.ExtendedJSONObject; /** * Record is the abstract base class for all entries that Sync processes: diff --git a/mobile/android/base/sync/repositories/domain/RecordParseException.java b/mobile/android/base/sync/repositories/domain/RecordParseException.java index 0d8fe90b2e..74639666b5 100644 --- a/mobile/android/base/sync/repositories/domain/RecordParseException.java +++ b/mobile/android/base/sync/repositories/domain/RecordParseException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; public class RecordParseException extends Exception { diff --git a/mobile/android/base/sync/repositories/domain/TabsRecord.java b/mobile/android/base/sync/repositories/domain/TabsRecord.java index eb3a4f6d04..f559a87307 100644 --- a/mobile/android/base/sync/repositories/domain/TabsRecord.java +++ b/mobile/android/base/sync/repositories/domain/TabsRecord.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; import java.util.ArrayList; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.db.Tab; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonArrayJSONException; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.db.Tab; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonArrayJSONException; +import org.mozilla.goanna.sync.Utils; import android.content.ContentValues; diff --git a/mobile/android/base/sync/repositories/domain/TabsRecordFactory.java b/mobile/android/base/sync/repositories/domain/TabsRecordFactory.java index 9504434d8c..e4605d0d31 100644 --- a/mobile/android/base/sync/repositories/domain/TabsRecordFactory.java +++ b/mobile/android/base/sync/repositories/domain/TabsRecordFactory.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.repositories.RecordFactory; public class TabsRecordFactory extends RecordFactory { @Override diff --git a/mobile/android/base/sync/repositories/domain/VersionConstants.java b/mobile/android/base/sync/repositories/domain/VersionConstants.java index 2d3d4fd32e..c30757cafc 100644 --- a/mobile/android/base/sync/repositories/domain/VersionConstants.java +++ b/mobile/android/base/sync/repositories/domain/VersionConstants.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.repositories.domain; +package org.mozilla.goanna.sync.repositories.domain; public class VersionConstants { public static final int BOOKMARKS_ENGINE_VERSION = 2; diff --git a/mobile/android/base/sync/setup/Constants.java b/mobile/android/base/sync/setup/Constants.java index 036ea30c1d..c0dbf835e1 100644 --- a/mobile/android/base/sync/setup/Constants.java +++ b/mobile/android/base/sync/setup/Constants.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup; +package org.mozilla.goanna.sync.setup; import android.content.Intent; diff --git a/mobile/android/base/sync/setup/InvalidSyncKeyException.java b/mobile/android/base/sync/setup/InvalidSyncKeyException.java index ac0fd58d04..cdf0df42b0 100644 --- a/mobile/android/base/sync/setup/InvalidSyncKeyException.java +++ b/mobile/android/base/sync/setup/InvalidSyncKeyException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup; +package org.mozilla.goanna.sync.setup; public class InvalidSyncKeyException extends Exception { private static final long serialVersionUID = -6504925951580479894L; diff --git a/mobile/android/base/sync/setup/SyncAccounts.java b/mobile/android/base/sync/setup/SyncAccounts.java index b7a8f2b028..a797cf18e2 100644 --- a/mobile/android/base/sync/setup/SyncAccounts.java +++ b/mobile/android/base/sync/setup/SyncAccounts.java @@ -2,23 +2,23 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup; +package org.mozilla.goanna.sync.setup; import java.io.File; import java.io.UnsupportedEncodingException; import java.security.NoSuchAlgorithmException; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.sync.CredentialException; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.config.AccountPickler; -import org.mozilla.gecko.sync.repositories.android.RepoUtils; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.sync.CredentialException; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.config.AccountPickler; +import org.mozilla.goanna.sync.repositories.android.RepoUtils; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/sync/setup/SyncAuthenticatorService.java b/mobile/android/base/sync/setup/SyncAuthenticatorService.java index afb7ca74be..0f35241730 100644 --- a/mobile/android/base/sync/setup/SyncAuthenticatorService.java +++ b/mobile/android/base/sync/setup/SyncAuthenticatorService.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup; +package org.mozilla.goanna.sync.setup; import java.io.UnsupportedEncodingException; import java.security.NoSuchAlgorithmException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.setup.activities.SetupSyncActivity; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.setup.activities.SetupSyncActivity; import android.accounts.AbstractAccountAuthenticator; import android.accounts.Account; diff --git a/mobile/android/base/sync/setup/activities/AccountActivity.java b/mobile/android/base/sync/setup/activities/AccountActivity.java index 1585e244fc..152ada99fb 100644 --- a/mobile/android/base/sync/setup/activities/AccountActivity.java +++ b/mobile/android/base/sync/setup/activities/AccountActivity.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; import java.util.Locale; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.setup.Constants; -import org.mozilla.gecko.sync.setup.InvalidSyncKeyException; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.sync.setup.SyncAccounts.SyncAccountParameters; -import org.mozilla.gecko.sync.setup.auth.AccountAuthenticator; -import org.mozilla.gecko.sync.setup.auth.AuthenticationResult; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.setup.Constants; +import org.mozilla.goanna.sync.setup.InvalidSyncKeyException; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.sync.setup.SyncAccounts.SyncAccountParameters; +import org.mozilla.goanna.sync.setup.auth.AccountAuthenticator; +import org.mozilla.goanna.sync.setup.auth.AuthenticationResult; import android.accounts.Account; import android.accounts.AccountAuthenticatorActivity; diff --git a/mobile/android/base/sync/setup/activities/ActivityUtils.java b/mobile/android/base/sync/setup/activities/ActivityUtils.java index 660a6e5cf0..b3e47142c7 100644 --- a/mobile/android/base/sync/setup/activities/ActivityUtils.java +++ b/mobile/android/base/sync/setup/activities/ActivityUtils.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; import java.util.Locale; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.setup.InvalidSyncKeyException; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.setup.InvalidSyncKeyException; import android.content.Context; import android.content.Intent; diff --git a/mobile/android/base/sync/setup/activities/ClientRecordArrayAdapter.java b/mobile/android/base/sync/setup/activities/ClientRecordArrayAdapter.java index 558f45ef2e..6bd86b253f 100644 --- a/mobile/android/base/sync/setup/activities/ClientRecordArrayAdapter.java +++ b/mobile/android/base/sync/setup/activities/ClientRecordArrayAdapter.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.mozilla.gecko.R; -import org.mozilla.gecko.sync.repositories.domain.ClientRecord; +import org.mozilla.goanna.R; +import org.mozilla.goanna.sync.repositories.domain.ClientRecord; import android.content.Context; import android.view.View; diff --git a/mobile/android/base/sync/setup/activities/RedirectToSetupActivity.java b/mobile/android/base/sync/setup/activities/RedirectToSetupActivity.java index e449a3ad0e..1372183154 100644 --- a/mobile/android/base/sync/setup/activities/RedirectToSetupActivity.java +++ b/mobile/android/base/sync/setup/activities/RedirectToSetupActivity.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.setup.Constants; import android.content.Intent; import android.os.Bundle; diff --git a/mobile/android/base/sync/setup/activities/SendTabActivity.java b/mobile/android/base/sync/setup/activities/SendTabActivity.java index 6c97735aa2..9e7c889e60 100644 --- a/mobile/android/base/sync/setup/activities/SendTabActivity.java +++ b/mobile/android/base/sync/setup/activities/SendTabActivity.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; import java.util.ArrayList; import java.util.Collection; @@ -10,25 +10,25 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.fxa.activities.FxAccountGetStartedActivity; -import org.mozilla.gecko.fxa.activities.FxAccountStatusActivity; -import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; -import org.mozilla.gecko.fxa.login.State.Action; -import org.mozilla.gecko.sync.CommandProcessor; -import org.mozilla.gecko.sync.CommandRunner; -import org.mozilla.gecko.sync.GlobalSession; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.android.ClientsDatabaseAccessor; -import org.mozilla.gecko.sync.repositories.domain.ClientRecord; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.Locales.LocaleAwareActivity; -import org.mozilla.gecko.sync.syncadapter.SyncAdapter; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.fxa.activities.FxAccountGetStartedActivity; +import org.mozilla.goanna.fxa.activities.FxAccountStatusActivity; +import org.mozilla.goanna.fxa.authenticator.AndroidFxAccount; +import org.mozilla.goanna.fxa.login.State.Action; +import org.mozilla.goanna.sync.CommandProcessor; +import org.mozilla.goanna.sync.CommandRunner; +import org.mozilla.goanna.sync.GlobalSession; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.android.ClientsDatabaseAccessor; +import org.mozilla.goanna.sync.repositories.domain.ClientRecord; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.Locales.LocaleAwareActivity; +import org.mozilla.goanna.sync.syncadapter.SyncAdapter; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/sync/setup/activities/SendTabData.java b/mobile/android/base/sync/setup/activities/SendTabData.java index 75a7be73b6..814ebc666b 100644 --- a/mobile/android/base/sync/setup/activities/SendTabData.java +++ b/mobile/android/base/sync/setup/activities/SendTabData.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; import java.util.Arrays; import java.util.List; diff --git a/mobile/android/base/sync/setup/activities/SetupFailureActivity.java b/mobile/android/base/sync/setup/activities/SetupFailureActivity.java index 612c8c5f52..bea36b4c09 100644 --- a/mobile/android/base/sync/setup/activities/SetupFailureActivity.java +++ b/mobile/android/base/sync/setup/activities/SetupFailureActivity.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; -import org.mozilla.gecko.R; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.R; +import org.mozilla.goanna.sync.setup.Constants; import android.content.Context; import android.content.Intent; diff --git a/mobile/android/base/sync/setup/activities/SetupSuccessActivity.java b/mobile/android/base/sync/setup/activities/SetupSuccessActivity.java index d4d3be1e8a..4650c72595 100644 --- a/mobile/android/base/sync/setup/activities/SetupSuccessActivity.java +++ b/mobile/android/base/sync/setup/activities/SetupSuccessActivity.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; -import org.mozilla.gecko.R; -import org.mozilla.gecko.sync.setup.Constants; -import org.mozilla.gecko.sync.setup.SyncAccounts; +import org.mozilla.goanna.R; +import org.mozilla.goanna.sync.setup.Constants; +import org.mozilla.goanna.sync.setup.SyncAccounts; import android.os.Bundle; import android.view.View; diff --git a/mobile/android/base/sync/setup/activities/SetupSyncActivity.java b/mobile/android/base/sync/setup/activities/SetupSyncActivity.java index a40b24d7db..5bfe4f43e1 100644 --- a/mobile/android/base/sync/setup/activities/SetupSyncActivity.java +++ b/mobile/android/base/sync/setup/activities/SetupSyncActivity.java @@ -2,22 +2,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; import java.io.UnsupportedEncodingException; import java.util.HashMap; import org.json.simple.JSONObject; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.jpake.JPakeClient; -import org.mozilla.gecko.sync.jpake.JPakeNoActivePairingException; -import org.mozilla.gecko.sync.setup.Constants; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.sync.setup.SyncAccounts.SyncAccountParameters; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.jpake.JPakeClient; +import org.mozilla.goanna.sync.jpake.JPakeNoActivePairingException; +import org.mozilla.goanna.sync.setup.Constants; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.sync.setup.SyncAccounts.SyncAccountParameters; import android.accounts.Account; import android.accounts.AccountAuthenticatorActivity; diff --git a/mobile/android/base/sync/setup/activities/SyncActivity.java b/mobile/android/base/sync/setup/activities/SyncActivity.java index ffe65f0482..68bbc2bbc4 100644 --- a/mobile/android/base/sync/setup/activities/SyncActivity.java +++ b/mobile/android/base/sync/setup/activities/SyncActivity.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; import android.app.Activity; import android.os.Bundle; diff --git a/mobile/android/base/sync/setup/activities/WebURLFinder.java b/mobile/android/base/sync/setup/activities/WebURLFinder.java index 016c1b2902..18faedfc6f 100644 --- a/mobile/android/base/sync/setup/activities/WebURLFinder.java +++ b/mobile/android/base/sync/setup/activities/WebURLFinder.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; import java.net.URI; import java.net.URISyntaxException; diff --git a/mobile/android/base/sync/setup/activities/WebViewActivity.java b/mobile/android/base/sync/setup/activities/WebViewActivity.java index 4e6923d125..77cd94bfb8 100644 --- a/mobile/android/base/sync/setup/activities/WebViewActivity.java +++ b/mobile/android/base/sync/setup/activities/WebViewActivity.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.activities; +package org.mozilla.goanna.sync.setup.activities; -import org.mozilla.gecko.R; -import org.mozilla.gecko.background.common.log.Logger; +import org.mozilla.goanna.R; +import org.mozilla.goanna.background.common.log.Logger; import android.app.Activity; import android.net.Uri; diff --git a/mobile/android/base/sync/setup/auth/AccountAuthenticator.java b/mobile/android/base/sync/setup/auth/AccountAuthenticator.java index 9b747a8ad0..3f49e811dd 100644 --- a/mobile/android/base/sync/setup/auth/AccountAuthenticator.java +++ b/mobile/android/base/sync/setup/auth/AccountAuthenticator.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.auth; +package org.mozilla.goanna.sync.setup.auth; import java.util.LinkedList; import java.util.Queue; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.setup.activities.AccountActivity; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.setup.activities.AccountActivity; public class AccountAuthenticator { private final String LOG_TAG = "AccountAuthenticator"; diff --git a/mobile/android/base/sync/setup/auth/AuthenticateAccountStage.java b/mobile/android/base/sync/setup/auth/AuthenticateAccountStage.java index c733881834..1c4b08e612 100644 --- a/mobile/android/base/sync/setup/auth/AuthenticateAccountStage.java +++ b/mobile/android/base/sync/setup/auth/AuthenticateAccountStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.auth; +package org.mozilla.goanna.sync.setup.auth; import java.io.BufferedReader; import java.io.IOException; @@ -13,11 +13,11 @@ import java.net.URISyntaxException; import java.security.GeneralSecurityException; import org.mozilla.apache.commons.codec.binary.Base64; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.setup.Constants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.setup.Constants; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.client.ClientProtocolException; diff --git a/mobile/android/base/sync/setup/auth/AuthenticationResult.java b/mobile/android/base/sync/setup/auth/AuthenticationResult.java index 028cc6fd73..7171e70352 100644 --- a/mobile/android/base/sync/setup/auth/AuthenticationResult.java +++ b/mobile/android/base/sync/setup/auth/AuthenticationResult.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.auth; +package org.mozilla.goanna.sync.setup.auth; public enum AuthenticationResult { SUCCESS, FAILURE_USERNAME, FAILURE_PASSWORD, FAILURE_SERVER, FAILURE_ACCOUNT, FAILURE_OTHER diff --git a/mobile/android/base/sync/setup/auth/AuthenticatorStage.java b/mobile/android/base/sync/setup/auth/AuthenticatorStage.java index e23004e252..cd7e23fd19 100644 --- a/mobile/android/base/sync/setup/auth/AuthenticatorStage.java +++ b/mobile/android/base/sync/setup/auth/AuthenticatorStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.auth; +package org.mozilla.goanna.sync.setup.auth; import java.io.UnsupportedEncodingException; import java.net.URISyntaxException; diff --git a/mobile/android/base/sync/setup/auth/EnsureUserExistenceStage.java b/mobile/android/base/sync/setup/auth/EnsureUserExistenceStage.java index 056172b566..dd7f120eb6 100644 --- a/mobile/android/base/sync/setup/auth/EnsureUserExistenceStage.java +++ b/mobile/android/base/sync/setup/auth/EnsureUserExistenceStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.auth; +package org.mozilla.goanna.sync.setup.auth; import java.io.BufferedReader; import java.io.IOException; @@ -12,10 +12,10 @@ import java.io.UnsupportedEncodingException; import java.net.URISyntaxException; import java.security.GeneralSecurityException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.client.ClientProtocolException; diff --git a/mobile/android/base/sync/setup/auth/FetchUserNodeStage.java b/mobile/android/base/sync/setup/auth/FetchUserNodeStage.java index b0a9bf99d5..bdf87bbee1 100644 --- a/mobile/android/base/sync/setup/auth/FetchUserNodeStage.java +++ b/mobile/android/base/sync/setup/auth/FetchUserNodeStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.setup.auth; +package org.mozilla.goanna.sync.setup.auth; import java.io.BufferedReader; import java.io.IOException; @@ -11,11 +11,11 @@ import java.io.InputStreamReader; import java.net.URISyntaxException; import java.security.GeneralSecurityException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.client.ClientProtocolException; diff --git a/mobile/android/base/sync/stage/AbstractNonRepositorySyncStage.java b/mobile/android/base/sync/stage/AbstractNonRepositorySyncStage.java index c910216eb0..21ebf53c2f 100644 --- a/mobile/android/base/sync/stage/AbstractNonRepositorySyncStage.java +++ b/mobile/android/base/sync/stage/AbstractNonRepositorySyncStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; /** diff --git a/mobile/android/base/sync/stage/AbstractSessionManagingSyncStage.java b/mobile/android/base/sync/stage/AbstractSessionManagingSyncStage.java index 6592c3baad..af6a930e9a 100644 --- a/mobile/android/base/sync/stage/AbstractSessionManagingSyncStage.java +++ b/mobile/android/base/sync/stage/AbstractSessionManagingSyncStage.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; -import org.mozilla.gecko.sync.GlobalSession; +import org.mozilla.goanna.sync.GlobalSession; /** * A global sync stage that manages a GlobalSession instance. This diff --git a/mobile/android/base/sync/stage/AndroidBrowserBookmarksServerSyncStage.java b/mobile/android/base/sync/stage/AndroidBrowserBookmarksServerSyncStage.java index ac4cf750f6..d52f3b32b4 100644 --- a/mobile/android/base/sync/stage/AndroidBrowserBookmarksServerSyncStage.java +++ b/mobile/android/base/sync/stage/AndroidBrowserBookmarksServerSyncStage.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; import java.net.URISyntaxException; -import org.mozilla.gecko.sync.JSONRecordFetcher; -import org.mozilla.gecko.sync.MetaGlobalException; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.repositories.RecordFactory; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.android.AndroidBrowserBookmarksRepository; -import org.mozilla.gecko.sync.repositories.domain.BookmarkRecordFactory; -import org.mozilla.gecko.sync.repositories.domain.VersionConstants; +import org.mozilla.goanna.sync.JSONRecordFetcher; +import org.mozilla.goanna.sync.MetaGlobalException; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.android.AndroidBrowserBookmarksRepository; +import org.mozilla.goanna.sync.repositories.domain.BookmarkRecordFactory; +import org.mozilla.goanna.sync.repositories.domain.VersionConstants; public class AndroidBrowserBookmarksServerSyncStage extends ServerSyncStage { protected static final String LOG_TAG = "BookmarksStage"; diff --git a/mobile/android/base/sync/stage/AndroidBrowserHistoryServerSyncStage.java b/mobile/android/base/sync/stage/AndroidBrowserHistoryServerSyncStage.java index 5d89bd7b68..de593ae9fb 100644 --- a/mobile/android/base/sync/stage/AndroidBrowserHistoryServerSyncStage.java +++ b/mobile/android/base/sync/stage/AndroidBrowserHistoryServerSyncStage.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; import java.net.URISyntaxException; -import org.mozilla.gecko.sync.MetaGlobalException; -import org.mozilla.gecko.sync.repositories.ConstrainedServer11Repository; -import org.mozilla.gecko.sync.repositories.RecordFactory; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.android.AndroidBrowserHistoryRepository; -import org.mozilla.gecko.sync.repositories.domain.HistoryRecordFactory; -import org.mozilla.gecko.sync.repositories.domain.VersionConstants; +import org.mozilla.goanna.sync.MetaGlobalException; +import org.mozilla.goanna.sync.repositories.ConstrainedServer11Repository; +import org.mozilla.goanna.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.android.AndroidBrowserHistoryRepository; +import org.mozilla.goanna.sync.repositories.domain.HistoryRecordFactory; +import org.mozilla.goanna.sync.repositories.domain.VersionConstants; public class AndroidBrowserHistoryServerSyncStage extends ServerSyncStage { protected static final String LOG_TAG = "HistoryStage"; diff --git a/mobile/android/base/sync/stage/CheckPreconditionsStage.java b/mobile/android/base/sync/stage/CheckPreconditionsStage.java index b33f83ad1d..b8875a4f2b 100644 --- a/mobile/android/base/sync/stage/CheckPreconditionsStage.java +++ b/mobile/android/base/sync/stage/CheckPreconditionsStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; public class CheckPreconditionsStage extends AbstractNonRepositorySyncStage { diff --git a/mobile/android/base/sync/stage/CompletedStage.java b/mobile/android/base/sync/stage/CompletedStage.java index 7ec7763247..b6ffec4dc6 100644 --- a/mobile/android/base/sync/stage/CompletedStage.java +++ b/mobile/android/base/sync/stage/CompletedStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; diff --git a/mobile/android/base/sync/stage/EnsureClusterURLStage.java b/mobile/android/base/sync/stage/EnsureClusterURLStage.java index 0111c606da..1e88d1eb1a 100644 --- a/mobile/android/base/sync/stage/EnsureClusterURLStage.java +++ b/mobile/android/base/sync/stage/EnsureClusterURLStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; import java.io.BufferedReader; import java.io.IOException; @@ -12,14 +12,14 @@ import java.net.URI; import java.net.URISyntaxException; import java.security.GeneralSecurityException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.NodeAuthenticationException; -import org.mozilla.gecko.sync.NullClusterURLException; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.delegates.NodeAssignmentCallback; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.NodeAuthenticationException; +import org.mozilla.goanna.sync.NullClusterURLException; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.delegates.NodeAssignmentCallback; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; import ch.boye.httpclientandroidlib.HttpEntity; import ch.boye.httpclientandroidlib.HttpResponse; diff --git a/mobile/android/base/sync/stage/EnsureCrypto5KeysStage.java b/mobile/android/base/sync/stage/EnsureCrypto5KeysStage.java index 5031cf770f..506fd42a30 100644 --- a/mobile/android/base/sync/stage/EnsureCrypto5KeysStage.java +++ b/mobile/android/base/sync/stage/EnsureCrypto5KeysStage.java @@ -2,24 +2,24 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; import java.net.URISyntaxException; import java.util.HashSet; import java.util.Set; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.CollectionKeys; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.InfoCollections; -import org.mozilla.gecko.sync.NoCollectionKeysSetException; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.crypto.PersistedCrypto5Keys; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.SyncStorageRecordRequest; -import org.mozilla.gecko.sync.net.SyncStorageRequestDelegate; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.CollectionKeys; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.InfoCollections; +import org.mozilla.goanna.sync.NoCollectionKeysSetException; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.crypto.PersistedCrypto5Keys; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.SyncStorageRecordRequest; +import org.mozilla.goanna.sync.net.SyncStorageRequestDelegate; +import org.mozilla.goanna.sync.net.SyncStorageResponse; public class EnsureCrypto5KeysStage extends AbstractNonRepositorySyncStage diff --git a/mobile/android/base/sync/stage/FennecTabsServerSyncStage.java b/mobile/android/base/sync/stage/FennecTabsServerSyncStage.java index 40a474ef47..b132e3dd2f 100644 --- a/mobile/android/base/sync/stage/FennecTabsServerSyncStage.java +++ b/mobile/android/base/sync/stage/FennecTabsServerSyncStage.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; -import org.mozilla.gecko.sync.repositories.RecordFactory; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.android.FennecTabsRepository; -import org.mozilla.gecko.sync.repositories.domain.TabsRecordFactory; -import org.mozilla.gecko.sync.repositories.domain.VersionConstants; +import org.mozilla.goanna.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.android.FennecTabsRepository; +import org.mozilla.goanna.sync.repositories.domain.TabsRecordFactory; +import org.mozilla.goanna.sync.repositories.domain.VersionConstants; public class FennecTabsServerSyncStage extends ServerSyncStage { private static final String COLLECTION = "tabs"; diff --git a/mobile/android/base/sync/stage/FetchInfoCollectionsStage.java b/mobile/android/base/sync/stage/FetchInfoCollectionsStage.java index 088321d5b4..3070c76426 100644 --- a/mobile/android/base/sync/stage/FetchInfoCollectionsStage.java +++ b/mobile/android/base/sync/stage/FetchInfoCollectionsStage.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; import java.net.URISyntaxException; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.InfoCollections; -import org.mozilla.gecko.sync.delegates.JSONRecordFetchDelegate; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.InfoCollections; +import org.mozilla.goanna.sync.delegates.JSONRecordFetchDelegate; +import org.mozilla.goanna.sync.net.SyncStorageResponse; public class FetchInfoCollectionsStage extends AbstractNonRepositorySyncStage { public class StageInfoCollectionsDelegate implements JSONRecordFetchDelegate { diff --git a/mobile/android/base/sync/stage/FetchMetaGlobalStage.java b/mobile/android/base/sync/stage/FetchMetaGlobalStage.java index b4407b26bb..d4c3e3bfed 100644 --- a/mobile/android/base/sync/stage/FetchMetaGlobalStage.java +++ b/mobile/android/base/sync/stage/FetchMetaGlobalStage.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.GlobalSession; -import org.mozilla.gecko.sync.InfoCollections; -import org.mozilla.gecko.sync.MetaGlobal; -import org.mozilla.gecko.sync.PersistedMetaGlobal; -import org.mozilla.gecko.sync.delegates.MetaGlobalDelegate; -import org.mozilla.gecko.sync.net.SyncStorageResponse; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.GlobalSession; +import org.mozilla.goanna.sync.InfoCollections; +import org.mozilla.goanna.sync.MetaGlobal; +import org.mozilla.goanna.sync.PersistedMetaGlobal; +import org.mozilla.goanna.sync.delegates.MetaGlobalDelegate; +import org.mozilla.goanna.sync.net.SyncStorageResponse; public class FetchMetaGlobalStage extends AbstractNonRepositorySyncStage { private static final String LOG_TAG = "FetchMetaGlobalStage"; diff --git a/mobile/android/base/sync/stage/FormHistoryServerSyncStage.java b/mobile/android/base/sync/stage/FormHistoryServerSyncStage.java index 554aa84d40..230f287897 100644 --- a/mobile/android/base/sync/stage/FormHistoryServerSyncStage.java +++ b/mobile/android/base/sync/stage/FormHistoryServerSyncStage.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; import java.net.URISyntaxException; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.repositories.ConstrainedServer11Repository; -import org.mozilla.gecko.sync.repositories.RecordFactory; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.android.FormHistoryRepositorySession; -import org.mozilla.gecko.sync.repositories.domain.FormHistoryRecord; -import org.mozilla.gecko.sync.repositories.domain.Record; -import org.mozilla.gecko.sync.repositories.domain.VersionConstants; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.repositories.ConstrainedServer11Repository; +import org.mozilla.goanna.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.android.FormHistoryRepositorySession; +import org.mozilla.goanna.sync.repositories.domain.FormHistoryRecord; +import org.mozilla.goanna.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.repositories.domain.VersionConstants; public class FormHistoryServerSyncStage extends ServerSyncStage { diff --git a/mobile/android/base/sync/stage/GlobalSyncStage.java b/mobile/android/base/sync/stage/GlobalSyncStage.java index 2ccc9082d0..aa79438564 100644 --- a/mobile/android/base/sync/stage/GlobalSyncStage.java +++ b/mobile/android/base/sync/stage/GlobalSyncStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; import java.util.Collection; import java.util.Collections; @@ -10,7 +10,7 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.Map; -import org.mozilla.gecko.sync.GlobalSession; +import org.mozilla.goanna.sync.GlobalSession; public interface GlobalSyncStage { diff --git a/mobile/android/base/sync/stage/NoSuchStageException.java b/mobile/android/base/sync/stage/NoSuchStageException.java index 14c9bb43ea..7056e5ca6b 100644 --- a/mobile/android/base/sync/stage/NoSuchStageException.java +++ b/mobile/android/base/sync/stage/NoSuchStageException.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; public class NoSuchStageException extends Exception { private static final long serialVersionUID = 8338484472880746971L; diff --git a/mobile/android/base/sync/stage/NoSyncIDException.java b/mobile/android/base/sync/stage/NoSyncIDException.java index db69ace69b..082023c2ee 100644 --- a/mobile/android/base/sync/stage/NoSyncIDException.java +++ b/mobile/android/base/sync/stage/NoSyncIDException.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; -import org.mozilla.gecko.sync.SyncException; +import org.mozilla.goanna.sync.SyncException; public class NoSyncIDException extends SyncException { public String engineName; diff --git a/mobile/android/base/sync/stage/PasswordsServerSyncStage.java b/mobile/android/base/sync/stage/PasswordsServerSyncStage.java index c781ce2cc5..134ea04926 100644 --- a/mobile/android/base/sync/stage/PasswordsServerSyncStage.java +++ b/mobile/android/base/sync/stage/PasswordsServerSyncStage.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; -import org.mozilla.gecko.sync.repositories.RecordFactory; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.android.PasswordsRepositorySession; -import org.mozilla.gecko.sync.repositories.domain.PasswordRecordFactory; -import org.mozilla.gecko.sync.repositories.domain.VersionConstants; +import org.mozilla.goanna.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.android.PasswordsRepositorySession; +import org.mozilla.goanna.sync.repositories.domain.PasswordRecordFactory; +import org.mozilla.goanna.sync.repositories.domain.VersionConstants; public class PasswordsServerSyncStage extends ServerSyncStage { @Override diff --git a/mobile/android/base/sync/stage/SafeConstrainedServer11Repository.java b/mobile/android/base/sync/stage/SafeConstrainedServer11Repository.java index 54fbf8df34..8ab8154654 100644 --- a/mobile/android/base/sync/stage/SafeConstrainedServer11Repository.java +++ b/mobile/android/base/sync/stage/SafeConstrainedServer11Repository.java @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; import java.net.URISyntaxException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.InfoCollections; -import org.mozilla.gecko.sync.InfoCounts; -import org.mozilla.gecko.sync.JSONRecordFetcher; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.repositories.ConstrainedServer11Repository; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.Server11RepositorySession; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.InfoCollections; +import org.mozilla.goanna.sync.InfoCounts; +import org.mozilla.goanna.sync.JSONRecordFetcher; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.repositories.ConstrainedServer11Repository; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.Server11RepositorySession; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; import android.content.Context; diff --git a/mobile/android/base/sync/stage/ServerSyncStage.java b/mobile/android/base/sync/stage/ServerSyncStage.java index bcb3ca7d06..cf17e07b68 100644 --- a/mobile/android/base/sync/stage/ServerSyncStage.java +++ b/mobile/android/base/sync/stage/ServerSyncStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; import java.io.IOException; import java.net.URISyntaxException; @@ -10,38 +10,38 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.EngineSettings; -import org.mozilla.gecko.sync.GlobalSession; -import org.mozilla.gecko.sync.HTTPFailureException; -import org.mozilla.gecko.sync.MetaGlobalException; -import org.mozilla.gecko.sync.NoCollectionKeysSetException; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.SynchronizerConfiguration; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.delegates.WipeServerDelegate; -import org.mozilla.gecko.sync.middleware.Crypto5MiddlewareRepository; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.SyncStorageRequest; -import org.mozilla.gecko.sync.net.SyncStorageRequestDelegate; -import org.mozilla.gecko.sync.net.SyncStorageResponse; -import org.mozilla.gecko.sync.repositories.InactiveSessionException; -import org.mozilla.gecko.sync.repositories.InvalidSessionTransitionException; -import org.mozilla.gecko.sync.repositories.RecordFactory; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.RepositorySession; -import org.mozilla.gecko.sync.repositories.RepositorySessionBundle; -import org.mozilla.gecko.sync.repositories.Server11Repository; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate; -import org.mozilla.gecko.sync.synchronizer.ServerLocalSynchronizer; -import org.mozilla.gecko.sync.synchronizer.Synchronizer; -import org.mozilla.gecko.sync.synchronizer.SynchronizerDelegate; -import org.mozilla.gecko.sync.synchronizer.SynchronizerSession; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.EngineSettings; +import org.mozilla.goanna.sync.GlobalSession; +import org.mozilla.goanna.sync.HTTPFailureException; +import org.mozilla.goanna.sync.MetaGlobalException; +import org.mozilla.goanna.sync.NoCollectionKeysSetException; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.SynchronizerConfiguration; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.delegates.WipeServerDelegate; +import org.mozilla.goanna.sync.middleware.Crypto5MiddlewareRepository; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.SyncStorageRequest; +import org.mozilla.goanna.sync.net.SyncStorageRequestDelegate; +import org.mozilla.goanna.sync.net.SyncStorageResponse; +import org.mozilla.goanna.sync.repositories.InactiveSessionException; +import org.mozilla.goanna.sync.repositories.InvalidSessionTransitionException; +import org.mozilla.goanna.sync.repositories.RecordFactory; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.RepositorySessionBundle; +import org.mozilla.goanna.sync.repositories.Server11Repository; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionBeginDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionWipeDelegate; +import org.mozilla.goanna.sync.synchronizer.ServerLocalSynchronizer; +import org.mozilla.goanna.sync.synchronizer.Synchronizer; +import org.mozilla.goanna.sync.synchronizer.SynchronizerDelegate; +import org.mozilla.goanna.sync.synchronizer.SynchronizerSession; import android.content.Context; diff --git a/mobile/android/base/sync/stage/SyncClientsEngineStage.java b/mobile/android/base/sync/stage/SyncClientsEngineStage.java index 7a45db368a..34f7ffc972 100644 --- a/mobile/android/base/sync/stage/SyncClientsEngineStage.java +++ b/mobile/android/base/sync/stage/SyncClientsEngineStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -13,31 +13,31 @@ import java.util.concurrent.atomic.AtomicInteger; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.CommandProcessor; -import org.mozilla.gecko.sync.CommandProcessor.Command; -import org.mozilla.gecko.sync.CryptoRecord; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.HTTPFailureException; -import org.mozilla.gecko.sync.NoCollectionKeysSetException; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.crypto.CryptoException; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.delegates.ClientsDataDelegate; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.SyncStorageCollectionRequest; -import org.mozilla.gecko.sync.net.SyncStorageRecordRequest; -import org.mozilla.gecko.sync.net.SyncStorageResponse; -import org.mozilla.gecko.sync.net.WBOCollectionRequestDelegate; -import org.mozilla.gecko.sync.net.WBORequestDelegate; -import org.mozilla.gecko.sync.repositories.NullCursorException; -import org.mozilla.gecko.sync.repositories.android.ClientsDatabaseAccessor; -import org.mozilla.gecko.sync.repositories.android.RepoUtils; -import org.mozilla.gecko.sync.repositories.domain.ClientRecord; -import org.mozilla.gecko.sync.repositories.domain.ClientRecordFactory; -import org.mozilla.gecko.sync.repositories.domain.VersionConstants; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.CommandProcessor; +import org.mozilla.goanna.sync.CommandProcessor.Command; +import org.mozilla.goanna.sync.CryptoRecord; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.HTTPFailureException; +import org.mozilla.goanna.sync.NoCollectionKeysSetException; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.crypto.CryptoException; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.delegates.ClientsDataDelegate; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.SyncStorageCollectionRequest; +import org.mozilla.goanna.sync.net.SyncStorageRecordRequest; +import org.mozilla.goanna.sync.net.SyncStorageResponse; +import org.mozilla.goanna.sync.net.WBOCollectionRequestDelegate; +import org.mozilla.goanna.sync.net.WBORequestDelegate; +import org.mozilla.goanna.sync.repositories.NullCursorException; +import org.mozilla.goanna.sync.repositories.android.ClientsDatabaseAccessor; +import org.mozilla.goanna.sync.repositories.android.RepoUtils; +import org.mozilla.goanna.sync.repositories.domain.ClientRecord; +import org.mozilla.goanna.sync.repositories.domain.ClientRecordFactory; +import org.mozilla.goanna.sync.repositories.domain.VersionConstants; import ch.boye.httpclientandroidlib.HttpStatus; diff --git a/mobile/android/base/sync/stage/UploadMetaGlobalStage.java b/mobile/android/base/sync/stage/UploadMetaGlobalStage.java index 77846c212d..d6490bebbf 100644 --- a/mobile/android/base/sync/stage/UploadMetaGlobalStage.java +++ b/mobile/android/base/sync/stage/UploadMetaGlobalStage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.stage; +package org.mozilla.goanna.sync.stage; public class UploadMetaGlobalStage extends AbstractNonRepositorySyncStage { diff --git a/mobile/android/base/sync/syncadapter/SyncAdapter.java b/mobile/android/base/sync/syncadapter/SyncAdapter.java index c8262485c8..8bb32bf11a 100644 --- a/mobile/android/base/sync/syncadapter/SyncAdapter.java +++ b/mobile/android/base/sync/syncadapter/SyncAdapter.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.syncadapter; +package org.mozilla.goanna.sync.syncadapter; import java.io.IOException; import java.net.URI; @@ -11,39 +11,39 @@ import java.util.Collection; import java.util.concurrent.atomic.AtomicBoolean; import org.json.simple.parser.ParseException; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.background.common.GlobalConstants; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.fxa.FxAccountConstants; -import org.mozilla.gecko.sync.AlreadySyncingException; -import org.mozilla.gecko.sync.BackoffHandler; -import org.mozilla.gecko.sync.CredentialException; -import org.mozilla.gecko.sync.GlobalSession; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.PrefsBackoffHandler; -import org.mozilla.gecko.sync.SharedPreferencesClientsDataDelegate; -import org.mozilla.gecko.sync.SharedPreferencesNodeAssignmentCallback; -import org.mozilla.gecko.sync.Sync11Configuration; -import org.mozilla.gecko.sync.SyncConfiguration; -import org.mozilla.gecko.sync.SyncConfigurationException; -import org.mozilla.gecko.sync.SyncConstants; -import org.mozilla.gecko.sync.SyncException; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.sync.config.AccountPickler; -import org.mozilla.gecko.sync.crypto.CryptoException; -import org.mozilla.gecko.sync.crypto.KeyBundle; -import org.mozilla.gecko.sync.delegates.BaseGlobalSessionCallback; -import org.mozilla.gecko.sync.delegates.ClientsDataDelegate; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BasicAuthHeaderProvider; -import org.mozilla.gecko.sync.net.ConnectionMonitorThread; -import org.mozilla.gecko.sync.receivers.SyncAccountDeletedService; -import org.mozilla.gecko.sync.setup.Constants; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.sync.setup.SyncAccounts.SyncAccountParameters; -import org.mozilla.gecko.sync.stage.GlobalSyncStage.Stage; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.background.common.GlobalConstants; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.fxa.FxAccountConstants; +import org.mozilla.goanna.sync.AlreadySyncingException; +import org.mozilla.goanna.sync.BackoffHandler; +import org.mozilla.goanna.sync.CredentialException; +import org.mozilla.goanna.sync.GlobalSession; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.PrefsBackoffHandler; +import org.mozilla.goanna.sync.SharedPreferencesClientsDataDelegate; +import org.mozilla.goanna.sync.SharedPreferencesNodeAssignmentCallback; +import org.mozilla.goanna.sync.Sync11Configuration; +import org.mozilla.goanna.sync.SyncConfiguration; +import org.mozilla.goanna.sync.SyncConfigurationException; +import org.mozilla.goanna.sync.SyncConstants; +import org.mozilla.goanna.sync.SyncException; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.sync.config.AccountPickler; +import org.mozilla.goanna.sync.crypto.CryptoException; +import org.mozilla.goanna.sync.crypto.KeyBundle; +import org.mozilla.goanna.sync.delegates.BaseGlobalSessionCallback; +import org.mozilla.goanna.sync.delegates.ClientsDataDelegate; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BasicAuthHeaderProvider; +import org.mozilla.goanna.sync.net.ConnectionMonitorThread; +import org.mozilla.goanna.sync.receivers.SyncAccountDeletedService; +import org.mozilla.goanna.sync.setup.Constants; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.sync.setup.SyncAccounts.SyncAccountParameters; +import org.mozilla.goanna.sync.stage.GlobalSyncStage.Stage; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/mobile/android/base/sync/syncadapter/SyncService.java b/mobile/android/base/sync/syncadapter/SyncService.java index aeff048637..f7845b0186 100644 --- a/mobile/android/base/sync/syncadapter/SyncService.java +++ b/mobile/android/base/sync/syncadapter/SyncService.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.syncadapter; +package org.mozilla.goanna.sync.syncadapter; import android.app.Service; import android.content.Intent; diff --git a/mobile/android/base/sync/synchronizer/ConcurrentRecordConsumer.java b/mobile/android/base/sync/synchronizer/ConcurrentRecordConsumer.java index 9b1ef3e85f..5f3ed82524 100644 --- a/mobile/android/base/sync/synchronizer/ConcurrentRecordConsumer.java +++ b/mobile/android/base/sync/synchronizer/ConcurrentRecordConsumer.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.domain.Record; /** * Consume records from a queue inside a RecordsChannel, as fast as we can. diff --git a/mobile/android/base/sync/synchronizer/RecordConsumer.java b/mobile/android/base/sync/synchronizer/RecordConsumer.java index 35e57d9c2a..1da35103c9 100644 --- a/mobile/android/base/sync/synchronizer/RecordConsumer.java +++ b/mobile/android/base/sync/synchronizer/RecordConsumer.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; public abstract class RecordConsumer implements Runnable { diff --git a/mobile/android/base/sync/synchronizer/RecordsChannel.java b/mobile/android/base/sync/synchronizer/RecordsChannel.java index f929cdc757..2e92bc60b1 100644 --- a/mobile/android/base/sync/synchronizer/RecordsChannel.java +++ b/mobile/android/base/sync/synchronizer/RecordsChannel.java @@ -2,23 +2,23 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.ThreadPool; -import org.mozilla.gecko.sync.repositories.InvalidSessionTransitionException; -import org.mozilla.gecko.sync.repositories.NoStoreDelegateException; -import org.mozilla.gecko.sync.repositories.RepositorySession; -import org.mozilla.gecko.sync.repositories.delegates.DeferredRepositorySessionBeginDelegate; -import org.mozilla.gecko.sync.repositories.delegates.DeferredRepositorySessionStoreDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionStoreDelegate; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.ThreadPool; +import org.mozilla.goanna.sync.repositories.InvalidSessionTransitionException; +import org.mozilla.goanna.sync.repositories.NoStoreDelegateException; +import org.mozilla.goanna.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.delegates.DeferredRepositorySessionBeginDelegate; +import org.mozilla.goanna.sync.repositories.delegates.DeferredRepositorySessionStoreDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionBeginDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionStoreDelegate; +import org.mozilla.goanna.sync.repositories.domain.Record; /** * Pulls records from `source`, applying them to `sink`. diff --git a/mobile/android/base/sync/synchronizer/RecordsChannelDelegate.java b/mobile/android/base/sync/synchronizer/RecordsChannelDelegate.java index 8daeb7ad53..b75ba99d6b 100644 --- a/mobile/android/base/sync/synchronizer/RecordsChannelDelegate.java +++ b/mobile/android/base/sync/synchronizer/RecordsChannelDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; public interface RecordsChannelDelegate { public void onFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd); diff --git a/mobile/android/base/sync/synchronizer/RecordsConsumerDelegate.java b/mobile/android/base/sync/synchronizer/RecordsConsumerDelegate.java index a00abf8483..7cc44cad2e 100644 --- a/mobile/android/base/sync/synchronizer/RecordsConsumerDelegate.java +++ b/mobile/android/base/sync/synchronizer/RecordsConsumerDelegate.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; import java.util.concurrent.ConcurrentLinkedQueue; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.sync.repositories.domain.Record; interface RecordsConsumerDelegate { public abstract ConcurrentLinkedQueue getQueue(); diff --git a/mobile/android/base/sync/synchronizer/SerialRecordConsumer.java b/mobile/android/base/sync/synchronizer/SerialRecordConsumer.java index 6ee44ea2ba..778477ae08 100644 --- a/mobile/android/base/sync/synchronizer/SerialRecordConsumer.java +++ b/mobile/android/base/sync/synchronizer/SerialRecordConsumer.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.domain.Record; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.domain.Record; /** * Consume records from a queue inside a RecordsChannel, storing them serially. diff --git a/mobile/android/base/sync/synchronizer/ServerLocalSynchronizer.java b/mobile/android/base/sync/synchronizer/ServerLocalSynchronizer.java index ac4f487895..afa4797ecf 100644 --- a/mobile/android/base/sync/synchronizer/ServerLocalSynchronizer.java +++ b/mobile/android/base/sync/synchronizer/ServerLocalSynchronizer.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; /** * A SynchronizerSession designed to be used between a remote diff --git a/mobile/android/base/sync/synchronizer/ServerLocalSynchronizerSession.java b/mobile/android/base/sync/synchronizer/ServerLocalSynchronizerSession.java index dc9eb01a0c..5ac8fd95a1 100644 --- a/mobile/android/base/sync/synchronizer/ServerLocalSynchronizerSession.java +++ b/mobile/android/base/sync/synchronizer/ServerLocalSynchronizerSession.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.FetchFailedException; -import org.mozilla.gecko.sync.repositories.StoreFailedException; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.FetchFailedException; +import org.mozilla.goanna.sync.repositories.StoreFailedException; /** * A SynchronizerSession designed to be used between a remote diff --git a/mobile/android/base/sync/synchronizer/SessionNotBegunException.java b/mobile/android/base/sync/synchronizer/SessionNotBegunException.java index 20c7fcd564..69a5c0c2dc 100644 --- a/mobile/android/base/sync/synchronizer/SessionNotBegunException.java +++ b/mobile/android/base/sync/synchronizer/SessionNotBegunException.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; -import org.mozilla.gecko.sync.SyncException; -import org.mozilla.gecko.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.SyncException; +import org.mozilla.goanna.sync.repositories.RepositorySession; public class SessionNotBegunException extends SyncException { diff --git a/mobile/android/base/sync/synchronizer/Synchronizer.java b/mobile/android/base/sync/synchronizer/Synchronizer.java index cc15b35a9b..0ee7dac362 100644 --- a/mobile/android/base/sync/synchronizer/Synchronizer.java +++ b/mobile/android/base/sync/synchronizer/Synchronizer.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.SynchronizerConfiguration; -import org.mozilla.gecko.sync.repositories.Repository; -import org.mozilla.gecko.sync.repositories.RepositorySessionBundle; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.SynchronizerConfiguration; +import org.mozilla.goanna.sync.repositories.Repository; +import org.mozilla.goanna.sync.repositories.RepositorySessionBundle; import android.content.Context; diff --git a/mobile/android/base/sync/synchronizer/SynchronizerDelegate.java b/mobile/android/base/sync/synchronizer/SynchronizerDelegate.java index a290188ab2..ef8d40a865 100644 --- a/mobile/android/base/sync/synchronizer/SynchronizerDelegate.java +++ b/mobile/android/base/sync/synchronizer/SynchronizerDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; public interface SynchronizerDelegate { public void onSynchronized(Synchronizer synchronizer); diff --git a/mobile/android/base/sync/synchronizer/SynchronizerSession.java b/mobile/android/base/sync/synchronizer/SynchronizerSession.java index c4d244b4cc..aa897946b3 100644 --- a/mobile/android/base/sync/synchronizer/SynchronizerSession.java +++ b/mobile/android/base/sync/synchronizer/SynchronizerSession.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.sync.repositories.InactiveSessionException; -import org.mozilla.gecko.sync.repositories.InvalidSessionTransitionException; -import org.mozilla.gecko.sync.repositories.RepositorySession; -import org.mozilla.gecko.sync.repositories.RepositorySessionBundle; -import org.mozilla.gecko.sync.repositories.delegates.DeferrableRepositorySessionCreationDelegate; -import org.mozilla.gecko.sync.repositories.delegates.DeferredRepositorySessionFinishDelegate; -import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.sync.repositories.InactiveSessionException; +import org.mozilla.goanna.sync.repositories.InvalidSessionTransitionException; +import org.mozilla.goanna.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.repositories.RepositorySessionBundle; +import org.mozilla.goanna.sync.repositories.delegates.DeferrableRepositorySessionCreationDelegate; +import org.mozilla.goanna.sync.repositories.delegates.DeferredRepositorySessionFinishDelegate; +import org.mozilla.goanna.sync.repositories.delegates.RepositorySessionFinishDelegate; import android.content.Context; diff --git a/mobile/android/base/sync/synchronizer/SynchronizerSessionDelegate.java b/mobile/android/base/sync/synchronizer/SynchronizerSessionDelegate.java index 1d55274e82..06a16ee66c 100644 --- a/mobile/android/base/sync/synchronizer/SynchronizerSessionDelegate.java +++ b/mobile/android/base/sync/synchronizer/SynchronizerSessionDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; public interface SynchronizerSessionDelegate { public void onInitialized(SynchronizerSession session); diff --git a/mobile/android/base/sync/synchronizer/UnbundleError.java b/mobile/android/base/sync/synchronizer/UnbundleError.java index fea779636e..a14ca69b8d 100644 --- a/mobile/android/base/sync/synchronizer/UnbundleError.java +++ b/mobile/android/base/sync/synchronizer/UnbundleError.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; -import org.mozilla.gecko.sync.SyncException; -import org.mozilla.gecko.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.SyncException; +import org.mozilla.goanna.sync.repositories.RepositorySession; public class UnbundleError extends SyncException { private static final long serialVersionUID = -8709503281041697522L; diff --git a/mobile/android/base/sync/synchronizer/UnexpectedSessionException.java b/mobile/android/base/sync/synchronizer/UnexpectedSessionException.java index 0237b884b5..d8642eec37 100644 --- a/mobile/android/base/sync/synchronizer/UnexpectedSessionException.java +++ b/mobile/android/base/sync/synchronizer/UnexpectedSessionException.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.synchronizer; +package org.mozilla.goanna.sync.synchronizer; -import org.mozilla.gecko.sync.SyncException; -import org.mozilla.gecko.sync.repositories.RepositorySession; +import org.mozilla.goanna.sync.SyncException; +import org.mozilla.goanna.sync.repositories.RepositorySession; /** * An exception class that indicates that a session was passed diff --git a/mobile/android/base/sync/telemetry/TelemetryContract.java b/mobile/android/base/sync/telemetry/TelemetryContract.java index c35ada5f53..c28cd8cfcc 100644 --- a/mobile/android/base/sync/telemetry/TelemetryContract.java +++ b/mobile/android/base/sync/telemetry/TelemetryContract.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.sync.telemetry; +package org.mozilla.goanna.sync.telemetry; public class TelemetryContract { /** diff --git a/mobile/android/base/tabs/PrivateTabsPanel.java b/mobile/android/base/tabs/PrivateTabsPanel.java index a4afe505b3..a976421476 100644 --- a/mobile/android/base/tabs/PrivateTabsPanel.java +++ b/mobile/android/base/tabs/PrivateTabsPanel.java @@ -3,16 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import java.util.Locale; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.NewTabletUI; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.tabs.TabsPanel.CloseAllPanelView; -import org.mozilla.gecko.tabs.TabsPanel.TabsLayout; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.NewTabletUI; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.tabs.TabsPanel.CloseAllPanelView; +import org.mozilla.goanna.tabs.TabsPanel.TabsLayout; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/tabs/TabCurve.java b/mobile/android/base/tabs/TabCurve.java index 0b6a30d7a0..df6cc43ec0 100644 --- a/mobile/android/base/tabs/TabCurve.java +++ b/mobile/android/base/tabs/TabCurve.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import android.graphics.Path; diff --git a/mobile/android/base/tabs/TabHistoryController.java b/mobile/android/base/tabs/TabHistoryController.java index 3c9499478b..6faf079e45 100644 --- a/mobile/android/base/tabs/TabHistoryController.java +++ b/mobile/android/base/tabs/TabHistoryController.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import java.util.ArrayList; import java.util.List; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.util.GoannaRequest; -import org.mozilla.gecko.util.NativeJSObject; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.util.GoannaRequest; +import org.mozilla.goanna.util.NativeJSObject; import android.util.Log; @@ -50,7 +50,7 @@ public class TabHistoryController { @Override public void onResponse(NativeJSObject nativeJSObject) { /* - * The response from gecko request is of the form + * The response from goanna request is of the form * { * "historyItems" : [ * { diff --git a/mobile/android/base/tabs/TabHistoryFragment.java b/mobile/android/base/tabs/TabHistoryFragment.java index ebef84c667..5868067c26 100644 --- a/mobile/android/base/tabs/TabHistoryFragment.java +++ b/mobile/android/base/tabs/TabHistoryFragment.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import java.util.ArrayList; import java.util.List; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.R; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.R; import android.content.Context; import android.content.DialogInterface; diff --git a/mobile/android/base/tabs/TabHistoryItemRow.java b/mobile/android/base/tabs/TabHistoryItemRow.java index 5c5eadf6cc..636a51f846 100644 --- a/mobile/android/base/tabs/TabHistoryItemRow.java +++ b/mobile/android/base/tabs/TabHistoryItemRow.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import java.lang.ref.WeakReference; -import org.mozilla.gecko.R; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.favicons.OnFaviconLoadedListener; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.widget.FaviconView; +import org.mozilla.goanna.R; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.favicons.OnFaviconLoadedListener; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.widget.FaviconView; import android.content.Context; import android.graphics.Bitmap; diff --git a/mobile/android/base/tabs/TabHistoryPage.java b/mobile/android/base/tabs/TabHistoryPage.java index 6c608b2ac7..fbe8a43c66 100644 --- a/mobile/android/base/tabs/TabHistoryPage.java +++ b/mobile/android/base/tabs/TabHistoryPage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import android.os.Parcel; import android.os.Parcelable; diff --git a/mobile/android/base/tabs/TabPanelBackButton.java b/mobile/android/base/tabs/TabPanelBackButton.java index 7ea02407e9..22e51114ce 100644 --- a/mobile/android/base/tabs/TabPanelBackButton.java +++ b/mobile/android/base/tabs/TabPanelBackButton.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/tabs/TabStrip.java b/mobile/android/base/tabs/TabStrip.java index b2b894bf07..e3a07c1d7b 100644 --- a/mobile/android/base/tabs/TabStrip.java +++ b/mobile/android/base/tabs/TabStrip.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import android.content.Context; import android.graphics.drawable.Drawable; @@ -15,12 +15,12 @@ import android.view.TouchDelegate; import android.view.View; import android.view.ViewTreeObserver; -import org.mozilla.gecko.BrowserApp.Refreshable; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.widget.ThemedImageButton; -import org.mozilla.gecko.widget.ThemedLinearLayout; +import org.mozilla.goanna.BrowserApp.Refreshable; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.widget.ThemedImageButton; +import org.mozilla.goanna.widget.ThemedLinearLayout; public class TabStrip extends ThemedLinearLayout implements Refreshable { diff --git a/mobile/android/base/tabs/TabStripAdapter.java b/mobile/android/base/tabs/TabStripAdapter.java index 03d0958034..21763be693 100644 --- a/mobile/android/base/tabs/TabStripAdapter.java +++ b/mobile/android/base/tabs/TabStripAdapter.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import android.content.Context; import android.view.LayoutInflater; @@ -14,9 +14,9 @@ import android.widget.BaseAdapter; import java.util.ArrayList; import java.util.List; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; class TabStripAdapter extends BaseAdapter { private static final String LOGTAG = "GoannaTabStripAdapter"; diff --git a/mobile/android/base/tabs/TabStripItemView.java b/mobile/android/base/tabs/TabStripItemView.java index f15117e473..2d93c1bd92 100644 --- a/mobile/android/base/tabs/TabStripItemView.java +++ b/mobile/android/base/tabs/TabStripItemView.java @@ -3,17 +3,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; -import org.mozilla.gecko.AboutPages; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.widget.ResizablePathDrawable; -import org.mozilla.gecko.widget.ResizablePathDrawable.NonScaledPathShape; -import org.mozilla.gecko.widget.ThemedImageButton; -import org.mozilla.gecko.widget.ThemedLinearLayout; -import org.mozilla.gecko.widget.ThemedTextView; +import org.mozilla.goanna.AboutPages; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.widget.ResizablePathDrawable; +import org.mozilla.goanna.widget.ResizablePathDrawable.NonScaledPathShape; +import org.mozilla.goanna.widget.ThemedImageButton; +import org.mozilla.goanna.widget.ThemedLinearLayout; +import org.mozilla.goanna.widget.ThemedTextView; import android.content.Context; import android.content.res.ColorStateList; diff --git a/mobile/android/base/tabs/TabStripView.java b/mobile/android/base/tabs/TabStripView.java index bdd3fc9136..656e07cde5 100644 --- a/mobile/android/base/tabs/TabStripView.java +++ b/mobile/android/base/tabs/TabStripView.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import android.content.Context; import android.content.res.Resources; @@ -26,11 +26,11 @@ import com.nineoldandroids.animation.ObjectAnimator; import java.util.ArrayList; import java.util.List; -import org.mozilla.gecko.animation.TransitionsTracker; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.widget.TwoWayView; +import org.mozilla.goanna.animation.TransitionsTracker; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.widget.TwoWayView; public class TabStripView extends TwoWayView { private static final String LOGTAG = "GoannaTabStrip"; diff --git a/mobile/android/base/tabs/TabsGridLayout.java b/mobile/android/base/tabs/TabsGridLayout.java index eeb947f8f3..27aa5c8b17 100644 --- a/mobile/android/base/tabs/TabsGridLayout.java +++ b/mobile/android/base/tabs/TabsGridLayout.java @@ -3,18 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import java.util.ArrayList; import java.util.List; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.tabs.TabsPanel.TabsLayout; -import org.mozilla.gecko.Tabs; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.tabs.TabsPanel.TabsLayout; +import org.mozilla.goanna.Tabs; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/tabs/TabsLayoutAdapter.java b/mobile/android/base/tabs/TabsLayoutAdapter.java index b19088fef9..82c1d1d0e8 100644 --- a/mobile/android/base/tabs/TabsLayoutAdapter.java +++ b/mobile/android/base/tabs/TabsLayoutAdapter.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; import android.content.Context; import android.view.LayoutInflater; diff --git a/mobile/android/base/tabs/TabsLayoutItemView.java b/mobile/android/base/tabs/TabsLayoutItemView.java index b7305d7b06..656460ad75 100644 --- a/mobile/android/base/tabs/TabsLayoutItemView.java +++ b/mobile/android/base/tabs/TabsLayoutItemView.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.widget.TabThumbnailWrapper; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.widget.TabThumbnailWrapper; import android.content.Context; import android.graphics.Rect; diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java index 0158ca079e..8dd5d52ee8 100644 --- a/mobile/android/base/tabs/TabsListLayout.java +++ b/mobile/android/base/tabs/TabsListLayout.java @@ -3,22 +3,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; import java.util.ArrayList; import java.util.List; -import org.mozilla.gecko.animation.PropertyAnimator.Property; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.tabs.TabsPanel.TabsLayout; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.widget.TwoWayView; +import org.mozilla.goanna.animation.PropertyAnimator.Property; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.tabs.TabsPanel.TabsLayout; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.widget.TwoWayView; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/tabs/TabsPanel.java b/mobile/android/base/tabs/TabsPanel.java index 23d5cd10e0..beb7c232e1 100644 --- a/mobile/android/base/tabs/TabsPanel.java +++ b/mobile/android/base/tabs/TabsPanel.java @@ -3,25 +3,25 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tabs; +package org.mozilla.goanna.tabs; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.GoannaApp; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.NewTabletUI; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.lwt.LightweightTheme; -import org.mozilla.gecko.lwt.LightweightThemeDrawable; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.widget.GoannaPopupMenu; -import org.mozilla.gecko.widget.IconTabWidget; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.GoannaApp; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.NewTabletUI; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.lwt.LightweightTheme; +import org.mozilla.goanna.lwt.LightweightThemeDrawable; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.widget.GoannaPopupMenu; +import org.mozilla.goanna.widget.IconTabWidget; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/tests/AboutHomeTest.java b/mobile/android/base/tests/AboutHomeTest.java index 812fdaae11..6d7208f8dd 100644 --- a/mobile/android/base/tests/AboutHomeTest.java +++ b/mobile/android/base/tests/AboutHomeTest.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.ArrayList; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.home.HomePager; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.home.HomePager; import android.support.v4.view.ViewPager; import android.text.TextUtils; diff --git a/mobile/android/base/tests/BaseRobocopTest.java b/mobile/android/base/tests/BaseRobocopTest.java index 725fb7d150..69560bbf6a 100644 --- a/mobile/android/base/tests/BaseRobocopTest.java +++ b/mobile/android/base/tests/BaseRobocopTest.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.Map; @@ -10,16 +10,16 @@ import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.DefaultHttpClient; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.Driver; -import org.mozilla.gecko.FennecInstrumentationTestRunner; -import org.mozilla.gecko.FennecMochitestAssert; -import org.mozilla.gecko.FennecNativeActions; -import org.mozilla.gecko.FennecNativeDriver; -import org.mozilla.gecko.FennecTalosAssert; -import org.mozilla.gecko.updater.UpdateServiceHelper; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.Driver; +import org.mozilla.goanna.FennecInstrumentationTestRunner; +import org.mozilla.goanna.FennecMochitestAssert; +import org.mozilla.goanna.FennecNativeActions; +import org.mozilla.goanna.FennecNativeDriver; +import org.mozilla.goanna.FennecTalosAssert; +import org.mozilla.goanna.updater.UpdateServiceHelper; import android.app.Activity; import android.content.Context; diff --git a/mobile/android/base/tests/BaseTest.java b/mobile/android/base/tests/BaseTest.java index dca21793e2..8403864ceb 100644 --- a/mobile/android/base/tests/BaseTest.java +++ b/mobile/android/base/tests/BaseTest.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.File; import java.io.IOException; @@ -16,17 +16,17 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Element; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.GoannaThread; -import org.mozilla.gecko.GoannaThread.LaunchState; -import org.mozilla.gecko.R; -import org.mozilla.gecko.RobocopUtils; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Element; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.GoannaThread; +import org.mozilla.goanna.GoannaThread.LaunchState; +import org.mozilla.goanna.R; +import org.mozilla.goanna.RobocopUtils; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; import android.app.Activity; import android.content.ContentValues; @@ -88,11 +88,11 @@ abstract class BaseTest extends BaseRobocopTest { protected void blockForGoannaReady() { try { - Actions.EventExpecter geckoReadyExpector = mActions.expectGoannaEvent("Goanna:Ready"); + Actions.EventExpecter goannaReadyExpector = mActions.expectGoannaEvent("Goanna:Ready"); if (!GoannaThread.checkLaunchState(LaunchState.GoannaRunning)) { - geckoReadyExpector.blockForEvent(GECKO_READY_WAIT_MS, true); + goannaReadyExpector.blockForEvent(GECKO_READY_WAIT_MS, true); } - geckoReadyExpector.unregisterListener(); + goannaReadyExpector.unregisterListener(); } catch (Exception e) { mAsserter.dumpLog("Exception in blockForGoannaReady", e); } @@ -248,7 +248,7 @@ abstract class BaseTest extends BaseRobocopTest { /** * Load url using reflection and the internal - * org.mozilla.gecko.Tabs API. + * org.mozilla.goanna.Tabs API. * * This method does not wait for any confirmation from Goanna before * returning. diff --git a/mobile/android/base/tests/ContentContextMenuTest.java b/mobile/android/base/tests/ContentContextMenuTest.java index 7f1f6bf38c..495e084883 100644 --- a/mobile/android/base/tests/ContentContextMenuTest.java +++ b/mobile/android/base/tests/ContentContextMenuTest.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.util.Clipboard; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.util.Clipboard; import android.util.DisplayMetrics; diff --git a/mobile/android/base/tests/ContentProviderTest.java b/mobile/android/base/tests/ContentProviderTest.java index 5496c97d2b..cd1ab1a01d 100644 --- a/mobile/android/base/tests/ContentProviderTest.java +++ b/mobile/android/base/tests/ContentProviderTest.java @@ -2,15 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.File; import java.util.ArrayList; import java.util.LinkedList; import java.util.concurrent.Callable; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserProvider; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserProvider; import android.content.ContentProvider; import android.content.ContentProviderOperation; diff --git a/mobile/android/base/tests/DatabaseHelper.java b/mobile/android/base/tests/DatabaseHelper.java index 5d3b8ad913..1f610bbde6 100644 --- a/mobile/android/base/tests/DatabaseHelper.java +++ b/mobile/android/base/tests/DatabaseHelper.java @@ -6,14 +6,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.ArrayList; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.db.BrowserDB; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.db.BrowserDB; import android.app.Activity; import android.content.ContentResolver; diff --git a/mobile/android/base/tests/JavascriptTest.java b/mobile/android/base/tests/JavascriptTest.java index 17b0b15e5f..70de96dba0 100644 --- a/mobile/android/base/tests/JavascriptTest.java +++ b/mobile/android/base/tests/JavascriptTest.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import org.json.JSONObject; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.tests.helpers.JavascriptBridge; -import org.mozilla.gecko.tests.helpers.JavascriptMessageParser; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.tests.helpers.JavascriptBridge; +import org.mozilla.goanna.tests.helpers.JavascriptMessageParser; import android.util.Log; diff --git a/mobile/android/base/tests/MotionEventHelper.java b/mobile/android/base/tests/MotionEventHelper.java index 6a4a7f2b3b..6e0f03943d 100644 --- a/mobile/android/base/tests/MotionEventHelper.java +++ b/mobile/android/base/tests/MotionEventHelper.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.gfx.LayerView; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.gfx.LayerView; import android.app.Instrumentation; import android.os.SystemClock; diff --git a/mobile/android/base/tests/MotionEventReplayer.java b/mobile/android/base/tests/MotionEventReplayer.java index 508c6b1979..9c1016ab47 100644 --- a/mobile/android/base/tests/MotionEventReplayer.java +++ b/mobile/android/base/tests/MotionEventReplayer.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.BufferedReader; import java.io.IOException; diff --git a/mobile/android/base/tests/PixelTest.java b/mobile/android/base/tests/PixelTest.java index 61c6435f95..a9d159e4ee 100644 --- a/mobile/android/base/tests/PixelTest.java +++ b/mobile/android/base/tests/PixelTest.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.PaintedSurface; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.PaintedSurface; abstract class PixelTest extends BaseTest { private static final long PAINT_CLEAR_DELAY = 10000; // milliseconds @@ -83,7 +83,7 @@ abstract class PixelTest extends BaseTest { } catch (InterruptedException ie) { ie.printStackTrace(); } - mAsserter.is(expecter.eventReceived(), false, "Checking gecko didn't draw unnecessarily"); + mAsserter.is(expecter.eventReceived(), false, "Checking goanna didn't draw unnecessarily"); PaintedSurface p = mDriver.getPaintedSurface(); if (p == null) { mAsserter.ok(p != null, "checking that painted surface loaded", diff --git a/mobile/android/base/tests/SessionTest.java b/mobile/android/base/tests/SessionTest.java index 1812ca2340..63941df2b9 100644 --- a/mobile/android/base/tests/SessionTest.java +++ b/mobile/android/base/tests/SessionTest.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.File; import java.io.FileReader; @@ -12,9 +12,9 @@ import java.io.IOException; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.FennecMochitestAssert; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.FennecMochitestAssert; public abstract class SessionTest extends BaseTest { protected Navigation mNavigation; diff --git a/mobile/android/base/tests/StringHelper.java b/mobile/android/base/tests/StringHelper.java index e9866e60d4..8d47d26e23 100644 --- a/mobile/android/base/tests/StringHelper.java +++ b/mobile/android/base/tests/StringHelper.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class StringHelper { diff --git a/mobile/android/base/tests/UITest.java b/mobile/android/base/tests/UITest.java index 89ff92a7a4..d75f605404 100644 --- a/mobile/android/base/tests/UITest.java +++ b/mobile/android/base/tests/UITest.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.BrowserApp; -import org.mozilla.gecko.Driver; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.tests.components.AboutHomeComponent; -import org.mozilla.gecko.tests.components.AppMenuComponent; -import org.mozilla.gecko.tests.components.BaseComponent; -import org.mozilla.gecko.tests.components.GoannaViewComponent; -import org.mozilla.gecko.tests.components.ToolbarComponent; -import org.mozilla.gecko.tests.helpers.HelperInitializer; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.BrowserApp; +import org.mozilla.goanna.Driver; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.tests.components.AboutHomeComponent; +import org.mozilla.goanna.tests.components.AppMenuComponent; +import org.mozilla.goanna.tests.components.BaseComponent; +import org.mozilla.goanna.tests.components.GoannaViewComponent; +import org.mozilla.goanna.tests.components.ToolbarComponent; +import org.mozilla.goanna.tests.helpers.HelperInitializer; import android.content.Intent; import android.text.TextUtils; diff --git a/mobile/android/base/tests/UITestContext.java b/mobile/android/base/tests/UITestContext.java index dfd695c8f7..65bba60ccb 100644 --- a/mobile/android/base/tests/UITestContext.java +++ b/mobile/android/base/tests/UITestContext.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.Driver; -import org.mozilla.gecko.tests.components.BaseComponent; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.Driver; +import org.mozilla.goanna.tests.components.BaseComponent; import android.app.Activity; import android.app.Instrumentation; diff --git a/mobile/android/base/tests/components/AboutHomeComponent.java b/mobile/android/base/tests/components/AboutHomeComponent.java index d7ab229b4b..a81aa8af9f 100644 --- a/mobile/android/base/tests/components/AboutHomeComponent.java +++ b/mobile/android/base/tests/components/AboutHomeComponent.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.components; +package org.mozilla.goanna.tests.components; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertEquals; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertTrue; import java.util.Arrays; -import org.mozilla.gecko.AboutPages; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.home.HomeConfig.PanelType; -import org.mozilla.gecko.tests.UITestContext; -import org.mozilla.gecko.tests.helpers.WaitHelper; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.AboutPages; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.home.HomeConfig.PanelType; +import org.mozilla.goanna.tests.UITestContext; +import org.mozilla.goanna.tests.helpers.WaitHelper; +import org.mozilla.goanna.util.HardwareUtils; import android.os.Build; import android.support.v4.view.ViewPager; diff --git a/mobile/android/base/tests/components/AppMenuComponent.java b/mobile/android/base/tests/components/AppMenuComponent.java index 30b7be953a..176dde98dc 100644 --- a/mobile/android/base/tests/components/AppMenuComponent.java +++ b/mobile/android/base/tests/components/AppMenuComponent.java @@ -2,22 +2,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.components; +package org.mozilla.goanna.tests.components; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertFalse; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertEquals; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertFalse; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertNotNull; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertTrue; import java.util.List; -import org.mozilla.gecko.R; -import org.mozilla.gecko.menu.MenuItemActionBar; -import org.mozilla.gecko.menu.MenuItemDefault; -import org.mozilla.gecko.tests.UITestContext; -import org.mozilla.gecko.tests.helpers.DeviceHelper; -import org.mozilla.gecko.tests.helpers.WaitHelper; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.menu.MenuItemActionBar; +import org.mozilla.goanna.menu.MenuItemDefault; +import org.mozilla.goanna.tests.UITestContext; +import org.mozilla.goanna.tests.helpers.DeviceHelper; +import org.mozilla.goanna.tests.helpers.WaitHelper; +import org.mozilla.goanna.util.HardwareUtils; import android.text.TextUtils; import android.view.View; diff --git a/mobile/android/base/tests/components/BaseComponent.java b/mobile/android/base/tests/components/BaseComponent.java index 4dcdf71ffd..4a72a3a643 100644 --- a/mobile/android/base/tests/components/BaseComponent.java +++ b/mobile/android/base/tests/components/BaseComponent.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.components; +package org.mozilla.goanna.tests.components; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.tests.UITestContext; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.tests.UITestContext; import android.app.Activity; diff --git a/mobile/android/base/tests/components/GeckoViewComponent.java b/mobile/android/base/tests/components/GeckoViewComponent.java index bf5f523bf0..164a4dba7b 100644 --- a/mobile/android/base/tests/components/GeckoViewComponent.java +++ b/mobile/android/base/tests/components/GeckoViewComponent.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.components; +package org.mozilla.goanna.tests.components; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotSame; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertNotNull; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertNotSame; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertTrue; -import org.mozilla.gecko.R; -import org.mozilla.gecko.tests.UITestContext; -import org.mozilla.gecko.tests.helpers.FrameworkHelper; -import org.mozilla.gecko.tests.helpers.WaitHelper; +import org.mozilla.goanna.R; +import org.mozilla.goanna.tests.UITestContext; +import org.mozilla.goanna.tests.helpers.FrameworkHelper; +import org.mozilla.goanna.tests.helpers.WaitHelper; import android.content.Context; import android.content.ContextWrapper; @@ -49,12 +49,12 @@ public class GoannaViewComponent extends BaseComponent { } private void setContext(final Context newContext) { - final View geckoView = getView(); + final View goannaView = getView(); // Switch to a no-InputMethodManager context to avoid interference mTestContext.getInstrumentation().runOnMainSync(new Runnable() { @Override public void run() { - FrameworkHelper.setViewContext(geckoView, newContext); + FrameworkHelper.setViewContext(goannaView, newContext); } }); } @@ -135,9 +135,9 @@ public class GoannaViewComponent extends BaseComponent { // GoannaInputConnection can run on another thread than the main thread, // so we need to be testing it on that same thread it's running on - final View geckoView = getView(); - final Handler inputConnectionHandler = geckoView.getHandler(); - final Context oldGoannaViewContext = FrameworkHelper.getViewContext(geckoView); + final View goannaView = getView(); + final Handler inputConnectionHandler = goannaView.getHandler(); + final Context oldGoannaViewContext = FrameworkHelper.getViewContext(goannaView); setContext(new ContextWrapper(oldGoannaViewContext) { @Override diff --git a/mobile/android/base/tests/components/ToolbarComponent.java b/mobile/android/base/tests/components/ToolbarComponent.java index 3b795b606a..8f7cf1c5e7 100644 --- a/mobile/android/base/tests/components/ToolbarComponent.java +++ b/mobile/android/base/tests/components/ToolbarComponent.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.components; +package org.mozilla.goanna.tests.components; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertFalse; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertEquals; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertFalse; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertNotNull; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertTrue; -import org.mozilla.gecko.NewTabletUI; -import org.mozilla.gecko.R; -import org.mozilla.gecko.tests.StringHelper; -import org.mozilla.gecko.tests.UITestContext; -import org.mozilla.gecko.tests.helpers.DeviceHelper; -import org.mozilla.gecko.tests.helpers.NavigationHelper; -import org.mozilla.gecko.tests.helpers.WaitHelper; +import org.mozilla.goanna.NewTabletUI; +import org.mozilla.goanna.R; +import org.mozilla.goanna.tests.StringHelper; +import org.mozilla.goanna.tests.UITestContext; +import org.mozilla.goanna.tests.helpers.DeviceHelper; +import org.mozilla.goanna.tests.helpers.NavigationHelper; +import org.mozilla.goanna.tests.helpers.WaitHelper; import android.view.View; import android.widget.EditText; diff --git a/mobile/android/base/tests/helpers/AssertionHelper.java b/mobile/android/base/tests/helpers/AssertionHelper.java index 894d134d1b..af90d632d2 100644 --- a/mobile/android/base/tests/helpers/AssertionHelper.java +++ b/mobile/android/base/tests/helpers/AssertionHelper.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.helpers; +package org.mozilla.goanna.tests.helpers; import java.util.Arrays; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.tests.UITestContext; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.tests.UITestContext; /** * Provides assertions in a JUnit-like API that wraps the robocop Assert interface. diff --git a/mobile/android/base/tests/helpers/DeviceHelper.java b/mobile/android/base/tests/helpers/DeviceHelper.java index 49774ad074..fc1f381357 100644 --- a/mobile/android/base/tests/helpers/DeviceHelper.java +++ b/mobile/android/base/tests/helpers/DeviceHelper.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.helpers; +package org.mozilla.goanna.tests.helpers; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertTrue; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.tests.UITestContext; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.tests.UITestContext; import android.app.Activity; import android.os.Build; diff --git a/mobile/android/base/tests/helpers/FrameworkHelper.java b/mobile/android/base/tests/helpers/FrameworkHelper.java index af5dd0fcad..fc2d92a780 100644 --- a/mobile/android/base/tests/helpers/FrameworkHelper.java +++ b/mobile/android/base/tests/helpers/FrameworkHelper.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.helpers; +package org.mozilla.goanna.tests.helpers; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fFail; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fFail; import java.lang.reflect.Field; diff --git a/mobile/android/base/tests/helpers/GeckoHelper.java b/mobile/android/base/tests/helpers/GeckoHelper.java index 34cb19ba8c..1700d8e57c 100644 --- a/mobile/android/base/tests/helpers/GeckoHelper.java +++ b/mobile/android/base/tests/helpers/GeckoHelper.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.helpers; +package org.mozilla.goanna.tests.helpers; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Actions.EventExpecter; -import org.mozilla.gecko.GoannaThread; -import org.mozilla.gecko.GoannaThread.LaunchState; -import org.mozilla.gecko.tests.UITestContext; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Actions.EventExpecter; +import org.mozilla.goanna.GoannaThread; +import org.mozilla.goanna.GoannaThread.LaunchState; +import org.mozilla.goanna.tests.UITestContext; import android.app.Activity; diff --git a/mobile/android/base/tests/helpers/HelperInitializer.java b/mobile/android/base/tests/helpers/HelperInitializer.java index 47e53ca75c..9dab4552bf 100644 --- a/mobile/android/base/tests/helpers/HelperInitializer.java +++ b/mobile/android/base/tests/helpers/HelperInitializer.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.helpers; +package org.mozilla.goanna.tests.helpers; -import org.mozilla.gecko.tests.UITestContext; +import org.mozilla.goanna.tests.UITestContext; /** * AssertionHelper is statically imported in many places. Thus we want to hide diff --git a/mobile/android/base/tests/helpers/JavascriptBridge.java b/mobile/android/base/tests/helpers/JavascriptBridge.java index 9b10be8bfb..e7af809d4a 100644 --- a/mobile/android/base/tests/helpers/JavascriptBridge.java +++ b/mobile/android/base/tests/helpers/JavascriptBridge.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.helpers; +package org.mozilla.goanna.tests.helpers; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -13,10 +13,10 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Actions.EventExpecter; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.tests.UITestContext; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Actions.EventExpecter; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.tests.UITestContext; /** * Javascript bridge allows calls to and from JavaScript. diff --git a/mobile/android/base/tests/helpers/JavascriptMessageParser.java b/mobile/android/base/tests/helpers/JavascriptMessageParser.java index 6237f1adcf..30c09adf33 100644 --- a/mobile/android/base/tests/helpers/JavascriptMessageParser.java +++ b/mobile/android/base/tests/helpers/JavascriptMessageParser.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.helpers; +package org.mozilla.goanna.tests.helpers; -import org.mozilla.gecko.Assert; +import org.mozilla.goanna.Assert; import junit.framework.AssertionFailedError; @@ -38,7 +38,7 @@ public final class JavascriptMessageParser { /** * Constructs a message parser for test result messages sent from JavaScript. When seeing an - * assertion failure, the message parser can use the given {@link org.mozilla.gecko.Assert} + * assertion failure, the message parser can use the given {@link org.mozilla.goanna.Assert} * instance to immediately end the test (typically if the underlying JS framework is not able * to end the test itself) or to swallow the Errors - this functionality is determined by the * endOnAssertionFailure parameter. diff --git a/mobile/android/base/tests/helpers/NavigationHelper.java b/mobile/android/base/tests/helpers/NavigationHelper.java index 0a4176ca15..5c1079506b 100644 --- a/mobile/android/base/tests/helpers/NavigationHelper.java +++ b/mobile/android/base/tests/helpers/NavigationHelper.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.helpers; +package org.mozilla.goanna.tests.helpers; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertNotNull; -import org.mozilla.gecko.tests.UITestContext; -import org.mozilla.gecko.tests.UITestContext.ComponentType; -import org.mozilla.gecko.tests.components.AppMenuComponent; -import org.mozilla.gecko.tests.components.ToolbarComponent; +import org.mozilla.goanna.tests.UITestContext; +import org.mozilla.goanna.tests.UITestContext.ComponentType; +import org.mozilla.goanna.tests.components.AppMenuComponent; +import org.mozilla.goanna.tests.components.ToolbarComponent; import com.jayway.android.robotium.solo.Solo; diff --git a/mobile/android/base/tests/helpers/TextInputHelper.java b/mobile/android/base/tests/helpers/TextInputHelper.java index 5f15e72a25..eb0182a0d4 100644 --- a/mobile/android/base/tests/helpers/TextInputHelper.java +++ b/mobile/android/base/tests/helpers/TextInputHelper.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.helpers; +package org.mozilla.goanna.tests.helpers; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertEquals; import android.view.inputmethod.ExtractedText; import android.view.inputmethod.ExtractedTextRequest; import android.view.inputmethod.InputConnection; diff --git a/mobile/android/base/tests/helpers/WaitHelper.java b/mobile/android/base/tests/helpers/WaitHelper.java index 543c8b3c8f..3dabf762bc 100644 --- a/mobile/android/base/tests/helpers/WaitHelper.java +++ b/mobile/android/base/tests/helpers/WaitHelper.java @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests.helpers; +package org.mozilla.goanna.tests.helpers; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertNotNull; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertTrue; import android.os.SystemClock; import java.util.regex.Pattern; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Actions.EventExpecter; -import org.mozilla.gecko.tests.UITestContext; -import org.mozilla.gecko.tests.UITestContext.ComponentType; -import org.mozilla.gecko.tests.components.ToolbarComponent; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Actions.EventExpecter; +import org.mozilla.goanna.tests.UITestContext; +import org.mozilla.goanna.tests.UITestContext.ComponentType; +import org.mozilla.goanna.tests.components.ToolbarComponent; import com.jayway.android.robotium.solo.Condition; import com.jayway.android.robotium.solo.Solo; diff --git a/mobile/android/base/tests/testANRReporter.java b/mobile/android/base/tests/testANRReporter.java index a1c1b8cdba..acc88bb60e 100644 --- a/mobile/android/base/tests/testANRReporter.java +++ b/mobile/android/base/tests/testANRReporter.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.AppConstants; +import org.mozilla.goanna.AppConstants; import android.content.Context; import android.content.Intent; @@ -40,9 +40,9 @@ public class testANRReporter extends BaseTest { + " | sysTid=3485 nice=0 sched=0/0 cgrp=apps handle=1074852180\n" + " | state=S schedstat=( 0 0 0 ) utm=1065 stm=152 core=0\n" + " at java.lang.Object.wait(Native Method)\n" - + " - waiting on <0x427ab340> (a org.mozilla.gecko.GoannaEditable$5)\n" + + " - waiting on <0x427ab340> (a org.mozilla.goanna.GoannaEditable$5)\n" + " at java.lang.Object.wait(Object.java:364)\n" - + " at org.mozilla.gecko.GoannaEditable$5.run(GoannaEditable.java:746)\n" + + " at org.mozilla.goanna.GoannaEditable$5.run(GoannaEditable.java:746)\n" + " at android.os.Handler.handleCallback(Handler.java:733)\n" + " at android.os.Handler.dispatchMessage(Handler.java:95)\n" + " at android.os.Looper.loop(Looper.java:137)\n" @@ -65,9 +65,9 @@ public class testANRReporter extends BaseTest { + " #05 pc 00049507 /system/lib/libdvm.so\n" + " #06 pc 0004d84b /system/lib/libdvm.so\n" + " #07 pc 0003f1df /dev/ashmem/libxul.so (deleted)\n" - + " at org.mozilla.gecko.mozglue.GoannaLoader.nativeRun(Native Method)\n" - + " at org.mozilla.gecko.GoannaAppShell.runGoanna(GoannaAppShell.java:384)\n" - + " at org.mozilla.gecko.GoannaThread.run(GoannaThread.java:177)\n" + + " at org.mozilla.goanna.mozglue.GoannaLoader.nativeRun(Native Method)\n" + + " at org.mozilla.goanna.GoannaAppShell.runGoanna(GoannaAppShell.java:384)\n" + + " at org.mozilla.goanna.GoannaThread.run(GoannaThread.java:177)\n" + "\n" + "----- end 1 -----\n" + "\n" diff --git a/mobile/android/base/tests/testAboutHomePageNavigation.java b/mobile/android/base/tests/testAboutHomePageNavigation.java index 0df2501f6a..edfe2dd19d 100644 --- a/mobile/android/base/tests/testAboutHomePageNavigation.java +++ b/mobile/android/base/tests/testAboutHomePageNavigation.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.home.HomeConfig; -import org.mozilla.gecko.home.HomeConfig.PanelType; -import org.mozilla.gecko.tests.helpers.DeviceHelper; -import org.mozilla.gecko.tests.helpers.GoannaHelper; +import org.mozilla.goanna.home.HomeConfig; +import org.mozilla.goanna.home.HomeConfig.PanelType; +import org.mozilla.goanna.tests.helpers.DeviceHelper; +import org.mozilla.goanna.tests.helpers.GoannaHelper; /** * Tests functionality related to navigating between the various about:home panels. diff --git a/mobile/android/base/tests/testAboutHomeVisibility.java b/mobile/android/base/tests/testAboutHomeVisibility.java index a97edcabd9..c12750141b 100644 --- a/mobile/android/base/tests/testAboutHomeVisibility.java +++ b/mobile/android/base/tests/testAboutHomeVisibility.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.home.HomeConfig; -import org.mozilla.gecko.home.HomeConfig.PanelType; -import org.mozilla.gecko.tests.helpers.GoannaHelper; -import org.mozilla.gecko.tests.helpers.NavigationHelper; +import org.mozilla.goanna.home.HomeConfig; +import org.mozilla.goanna.home.HomeConfig.PanelType; +import org.mozilla.goanna.tests.helpers.GoannaHelper; +import org.mozilla.goanna.tests.helpers.NavigationHelper; /** * Tests the visibility of about:home after various interactions with the browser. diff --git a/mobile/android/base/tests/testAboutPage.java b/mobile/android/base/tests/testAboutPage.java index 29e560a748..b95da6d871 100644 --- a/mobile/android/base/tests/testAboutPage.java +++ b/mobile/android/base/tests/testAboutPage.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Element; -import org.mozilla.gecko.NewTabletUI; -import org.mozilla.gecko.R; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Element; +import org.mozilla.goanna.NewTabletUI; +import org.mozilla.goanna.R; import android.app.Activity; diff --git a/mobile/android/base/tests/testAboutPasswords.java b/mobile/android/base/tests/testAboutPasswords.java index 97ee443ed3..ffba10dec7 100644 --- a/mobile/android/base/tests/testAboutPasswords.java +++ b/mobile/android/base/tests/testAboutPasswords.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.AppConstants; +import org.mozilla.goanna.AppConstants; public class testAboutPasswords extends JavascriptTest { private static final String LOGTAG = testAboutPasswords.class.getSimpleName(); diff --git a/mobile/android/base/tests/testAccounts.java b/mobile/android/base/tests/testAccounts.java index a1c07f48c9..2009b7ab79 100644 --- a/mobile/android/base/tests/testAccounts.java +++ b/mobile/android/base/tests/testAccounts.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testAccounts extends JavascriptTest { diff --git a/mobile/android/base/tests/testAddSearchEngine.java b/mobile/android/base/tests/testAddSearchEngine.java index c699b9a9fe..5670599cda 100644 --- a/mobile/android/base/tests/testAddSearchEngine.java +++ b/mobile/android/base/tests/testAddSearchEngine.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.File; import java.util.ArrayList; @@ -10,9 +10,9 @@ import java.util.ArrayList; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.home.HomePager; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.home.HomePager; import android.widget.ImageView; import android.widget.ListAdapter; diff --git a/mobile/android/base/tests/testAddonManager.java b/mobile/android/base/tests/testAddonManager.java index 5e4b0813e9..2946f9143f 100644 --- a/mobile/android/base/tests/testAddonManager.java +++ b/mobile/android/base/tests/testAddonManager.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import org.json.JSONObject; -import org.mozilla.gecko.Actions; +import org.mozilla.goanna.Actions; import android.util.DisplayMetrics; diff --git a/mobile/android/base/tests/testAdobeFlash.java b/mobile/android/base/tests/testAdobeFlash.java index 7dd55827a9..861d2b9b8a 100644 --- a/mobile/android/base/tests/testAdobeFlash.java +++ b/mobile/android/base/tests/testAdobeFlash.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import org.json.JSONObject; -import org.mozilla.gecko.PaintedSurface; +import org.mozilla.goanna.PaintedSurface; import android.os.Build; diff --git a/mobile/android/base/tests/testAndroidLog.java b/mobile/android/base/tests/testAndroidLog.java index 09d421ff73..5c496f3ea2 100644 --- a/mobile/android/base/tests/testAndroidLog.java +++ b/mobile/android/base/tests/testAndroidLog.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testAndroidLog extends JavascriptTest { diff --git a/mobile/android/base/tests/testAppConstants.java b/mobile/android/base/tests/testAppConstants.java index 2f1fd4f680..534c87148d 100644 --- a/mobile/android/base/tests/testAppConstants.java +++ b/mobile/android/base/tests/testAppConstants.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testAppConstants extends JavascriptTest { public testAppConstants() { diff --git a/mobile/android/base/tests/testAppMenuPathways.java b/mobile/android/base/tests/testAppMenuPathways.java index ea62bb9caa..abb10d9147 100644 --- a/mobile/android/base/tests/testAppMenuPathways.java +++ b/mobile/android/base/tests/testAppMenuPathways.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import org.json.JSONObject; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.tests.components.AppMenuComponent; -import org.mozilla.gecko.tests.helpers.GoannaHelper; -import org.mozilla.gecko.tests.helpers.NavigationHelper; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.tests.components.AppMenuComponent; +import org.mozilla.goanna.tests.helpers.GoannaHelper; +import org.mozilla.goanna.tests.helpers.NavigationHelper; /** * Set of tests to test UI App menu and submenus the user interact with. diff --git a/mobile/android/base/tests/testAwesomebar.java b/mobile/android/base/tests/testAwesomebar.java index 5b3c219aba..f8cbbf611a 100644 --- a/mobile/android/base/tests/testAwesomebar.java +++ b/mobile/android/base/tests/testAwesomebar.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testAwesomebar extends BaseTest { public void testAwesomebar() { diff --git a/mobile/android/base/tests/testAxisLocking.java b/mobile/android/base/tests/testAxisLocking.java index f764517dc6..8321535008 100644 --- a/mobile/android/base/tests/testAxisLocking.java +++ b/mobile/android/base/tests/testAxisLocking.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.PaintedSurface; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.PaintedSurface; /** * Basic test for axis locking behaviour. diff --git a/mobile/android/base/tests/testBackButtonInEditMode.java b/mobile/android/base/tests/testBackButtonInEditMode.java index ca973fae7d..102354d59b 100644 --- a/mobile/android/base/tests/testBackButtonInEditMode.java +++ b/mobile/android/base/tests/testBackButtonInEditMode.java @@ -1,6 +1,6 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.tests.helpers.GoannaHelper; +import org.mozilla.goanna.tests.helpers.GoannaHelper; import android.view.View; diff --git a/mobile/android/base/tests/testBookmark.java b/mobile/android/base/tests/testBookmark.java index ec3df11cdd..4f7a7c719d 100644 --- a/mobile/android/base/tests/testBookmark.java +++ b/mobile/android/base/tests/testBookmark.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import com.jayway.android.robotium.solo.Condition; diff --git a/mobile/android/base/tests/testBookmarkFolders.java b/mobile/android/base/tests/testBookmarkFolders.java index 060ab91cdd..dfe715a15e 100644 --- a/mobile/android/base/tests/testBookmarkFolders.java +++ b/mobile/android/base/tests/testBookmarkFolders.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.home.HomePager; -import org.mozilla.gecko.sync.Utils; +import org.mozilla.goanna.home.HomePager; +import org.mozilla.goanna.sync.Utils; import android.content.ContentResolver; import android.content.ContentValues; diff --git a/mobile/android/base/tests/testBookmarkKeyword.java b/mobile/android/base/tests/testBookmarkKeyword.java index a932eb011e..16aad676e7 100644 --- a/mobile/android/base/tests/testBookmarkKeyword.java +++ b/mobile/android/base/tests/testBookmarkKeyword.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testBookmarkKeyword extends AboutHomeTest { diff --git a/mobile/android/base/tests/testBookmarklets.java b/mobile/android/base/tests/testBookmarklets.java index e0b84284c8..d178464126 100644 --- a/mobile/android/base/tests/testBookmarklets.java +++ b/mobile/android/base/tests/testBookmarklets.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.home.HomePager; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.home.HomePager; import android.database.Cursor; import android.widget.ListView; diff --git a/mobile/android/base/tests/testBookmarksPanel.java b/mobile/android/base/tests/testBookmarksPanel.java index 95b1e0a483..5a0eaf3557 100644 --- a/mobile/android/base/tests/testBookmarksPanel.java +++ b/mobile/android/base/tests/testBookmarksPanel.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Element; -import org.mozilla.gecko.R; -import org.mozilla.gecko.util.StringUtils; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Element; +import org.mozilla.goanna.R; +import org.mozilla.goanna.util.StringUtils; public class testBookmarksPanel extends AboutHomeTest { public void testBookmarksPanel() { diff --git a/mobile/android/base/tests/testBrowserDiscovery.java b/mobile/android/base/tests/testBrowserDiscovery.java index 2dab2996c1..df81aaa69d 100644 --- a/mobile/android/base/tests/testBrowserDiscovery.java +++ b/mobile/android/base/tests/testBrowserDiscovery.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; diff --git a/mobile/android/base/tests/testBrowserProvider.java b/mobile/android/base/tests/testBrowserProvider.java index 12d862fe70..cdb93ef1fe 100644 --- a/mobile/android/base/tests/testBrowserProvider.java +++ b/mobile/android/base/tests/testBrowserProvider.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.ArrayList; import java.util.Random; -import org.mozilla.gecko.background.db.CursorDumper; -import org.mozilla.gecko.db.BrowserContract; +import org.mozilla.goanna.background.db.CursorDumper; +import org.mozilla.goanna.db.BrowserContract; import android.content.ContentProviderOperation; import android.content.ContentProviderResult; diff --git a/mobile/android/base/tests/testBrowserProviderPerf.java b/mobile/android/base/tests/testBrowserProviderPerf.java index 1cf2ff81a7..9c1554e5c0 100644 --- a/mobile/android/base/tests/testBrowserProviderPerf.java +++ b/mobile/android/base/tests/testBrowserProviderPerf.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.File; import java.util.EnumSet; import java.util.Random; import java.util.UUID; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserDB.FilterFlags; -import org.mozilla.gecko.db.BrowserProvider; -import org.mozilla.gecko.db.LocalBrowserDB; -import org.mozilla.gecko.util.FileUtils; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserDB.FilterFlags; +import org.mozilla.goanna.db.BrowserProvider; +import org.mozilla.goanna.db.LocalBrowserDB; +import org.mozilla.goanna.util.FileUtils; import android.content.ContentProvider; import android.content.ContentProviderClient; diff --git a/mobile/android/base/tests/testBrowserSearchVisibility.java b/mobile/android/base/tests/testBrowserSearchVisibility.java index a2d2df7587..1762edf835 100644 --- a/mobile/android/base/tests/testBrowserSearchVisibility.java +++ b/mobile/android/base/tests/testBrowserSearchVisibility.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import android.support.v4.app.Fragment; import android.view.KeyEvent; diff --git a/mobile/android/base/tests/testCheck.java b/mobile/android/base/tests/testCheck.java index 6edd7a7a30..a03513eba7 100644 --- a/mobile/android/base/tests/testCheck.java +++ b/mobile/android/base/tests/testCheck.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testCheck extends PixelTest { diff --git a/mobile/android/base/tests/testCheck2.java b/mobile/android/base/tests/testCheck2.java index 2363dc103a..2a32699ba6 100644 --- a/mobile/android/base/tests/testCheck2.java +++ b/mobile/android/base/tests/testCheck2.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import org.json.JSONObject; diff --git a/mobile/android/base/tests/testClearPrivateData.java b/mobile/android/base/tests/testClearPrivateData.java index e0ccc389b3..5ae62d1912 100644 --- a/mobile/android/base/tests/testClearPrivateData.java +++ b/mobile/android/base/tests/testClearPrivateData.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.R; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.R; import com.jayway.android.robotium.solo.Condition; diff --git a/mobile/android/base/tests/testDBUtils.java b/mobile/android/base/tests/testDBUtils.java index 700c1c2555..b1237e1d09 100644 --- a/mobile/android/base/tests/testDBUtils.java +++ b/mobile/android/base/tests/testDBUtils.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import org.mozilla.gecko.db.DBUtils; +import org.mozilla.goanna.db.DBUtils; import java.io.File; import java.io.IOException; diff --git a/mobile/android/base/tests/testDebuggerServer.java b/mobile/android/base/tests/testDebuggerServer.java index 6f983a02cd..4c486c36d1 100644 --- a/mobile/android/base/tests/testDebuggerServer.java +++ b/mobile/android/base/tests/testDebuggerServer.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testDebuggerServer extends JavascriptTest { public testDebuggerServer() { diff --git a/mobile/android/base/tests/testDeviceSearchEngine.java b/mobile/android/base/tests/testDeviceSearchEngine.java index 6885dab2f1..a4a82d8a5f 100644 --- a/mobile/android/base/tests/testDeviceSearchEngine.java +++ b/mobile/android/base/tests/testDeviceSearchEngine.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testDeviceSearchEngine extends JavascriptTest { public testDeviceSearchEngine() { diff --git a/mobile/android/base/tests/testDistribution.java b/mobile/android/base/tests/testDistribution.java index 078ef3f44e..96c7347455 100644 --- a/mobile/android/base/tests/testDistribution.java +++ b/mobile/android/base/tests/testDistribution.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.File; import java.io.FileOutputStream; @@ -18,17 +18,17 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.BrowserLocaleManager; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.SuggestedSites; -import org.mozilla.gecko.distribution.Distribution; -import org.mozilla.gecko.distribution.ReferrerDescriptor; -import org.mozilla.gecko.distribution.ReferrerReceiver; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.BrowserLocaleManager; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.SuggestedSites; +import org.mozilla.goanna.distribution.Distribution; +import org.mozilla.goanna.distribution.ReferrerDescriptor; +import org.mozilla.goanna.distribution.ReferrerReceiver; +import org.mozilla.goanna.util.ThreadUtils; import android.app.Activity; import android.content.BroadcastReceiver; @@ -55,7 +55,7 @@ import android.util.Log; * suggestedsites.json */ public class testDistribution extends ContentProviderTest { - private static final String CLASS_REFERRER_RECEIVER = "org.mozilla.gecko.distribution.ReferrerReceiver"; + private static final String CLASS_REFERRER_RECEIVER = "org.mozilla.goanna.distribution.ReferrerReceiver"; private static final String ACTION_INSTALL_REFERRER = "com.android.vending.INSTALL_REFERRER"; private static final int WAIT_TIMEOUT_MSEC = 10000; public static final String LOGTAG = "GoannaTestDistribution"; @@ -226,7 +226,7 @@ public class testDistribution extends ContentProviderTest { public void doTestValidReferrerIntent() throws Exception { // Equivalent to // am broadcast -a com.android.vending.INSTALL_REFERRER \ - // -n org.mozilla.fennec/org.mozilla.gecko.distribution.ReferrerReceiver \ + // -n org.mozilla.fennec/org.mozilla.goanna.distribution.ReferrerReceiver \ // --es "referrer" "utm_source=mozilla&utm_medium=testmedium&utm_term=testterm&utm_content=testcontent&utm_campaign=distribution" final String ref = "utm_source=mozilla&utm_medium=testmedium&utm_term=testterm&utm_content=testcontent&utm_campaign=distribution"; final TestableDistribution distribution = new TestableDistribution(mActivity); @@ -257,7 +257,7 @@ public class testDistribution extends ContentProviderTest { public void doTestInvalidReferrerIntent() throws Exception { // Equivalent to // am broadcast -a com.android.vending.INSTALL_REFERRER \ - // -n org.mozilla.fennec/org.mozilla.gecko.distribution.ReferrerReceiver \ + // -n org.mozilla.fennec/org.mozilla.goanna.distribution.ReferrerReceiver \ // --es "referrer" "utm_source=mozilla&utm_medium=testmedium&utm_term=testterm&utm_content=testcontent&utm_campaign=testname" final String ref = "utm_source=mozilla&utm_medium=testmedium&utm_term=testterm&utm_content=testcontent&utm_campaign=testname"; final TestableDistribution distribution = new TestableDistribution(mActivity); diff --git a/mobile/android/base/tests/testDoorHanger.java b/mobile/android/base/tests/testDoorHanger.java index 96cfe84887..5a995541f9 100644 --- a/mobile/android/base/tests/testDoorHanger.java +++ b/mobile/android/base/tests/testDoorHanger.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import android.widget.CheckBox; import android.view.View; @@ -10,7 +10,7 @@ import com.jayway.android.robotium.solo.Condition; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Actions; +import org.mozilla.goanna.Actions; /* This test will test if doorhangers are displayed and dismissed The test will test: diff --git a/mobile/android/base/tests/testEventDispatcher.java b/mobile/android/base/tests/testEventDispatcher.java index f305ff2573..62c8544424 100644 --- a/mobile/android/base/tests/testEventDispatcher.java +++ b/mobile/android/base/tests/testEventDispatcher.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.*; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.*; -import org.mozilla.gecko.tests.helpers.*; +import org.mozilla.goanna.tests.helpers.*; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.GoannaEventListener; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.GoannaEventListener; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.ThreadUtils; import android.os.Bundle; diff --git a/mobile/android/base/tests/testFilePicker.java b/mobile/android/base/tests/testFilePicker.java index 17d39e0162..2fa2b3dd43 100644 --- a/mobile/android/base/tests/testFilePicker.java +++ b/mobile/android/base/tests/testFilePicker.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fFail; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fFail; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.util.GoannaEventListener; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/tests/testFilterOpenTab.java b/mobile/android/base/tests/testFilterOpenTab.java index 0f399c00f4..ae16c37b95 100644 --- a/mobile/android/base/tests/testFilterOpenTab.java +++ b/mobile/android/base/tests/testFilterOpenTab.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.PrivateTab; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.TabsProvider; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.PrivateTab; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.TabsProvider; import android.content.ContentProvider; import android.content.Context; diff --git a/mobile/android/base/tests/testFindInPage.java b/mobile/android/base/tests/testFindInPage.java index 83c1bb6f65..7c6b12f37a 100644 --- a/mobile/android/base/tests/testFindInPage.java +++ b/mobile/android/base/tests/testFindInPage.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fFail; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fFail; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Element; -import org.mozilla.gecko.R; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Element; +import org.mozilla.goanna.R; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.util.GoannaEventListener; import org.json.JSONObject; diff --git a/mobile/android/base/tests/testFlingCorrectness.java b/mobile/android/base/tests/testFlingCorrectness.java index 3624707595..dc1444bce5 100644 --- a/mobile/android/base/tests/testFlingCorrectness.java +++ b/mobile/android/base/tests/testFlingCorrectness.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.PaintedSurface; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.PaintedSurface; /** * Basic fling correctness test. diff --git a/mobile/android/base/tests/testFormHistory.java b/mobile/android/base/tests/testFormHistory.java index be2eea87ad..0c3c732847 100644 --- a/mobile/android/base/tests/testFormHistory.java +++ b/mobile/android/base/tests/testFormHistory.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.File; -import org.mozilla.gecko.db.BrowserContract.FormHistory; +import org.mozilla.goanna.db.BrowserContract.FormHistory; import android.content.ContentResolver; import android.content.ContentValues; diff --git a/mobile/android/base/tests/testGeckoProfile.java b/mobile/android/base/tests/testGeckoProfile.java index f6f0c86014..5d16c91fa1 100644 --- a/mobile/android/base/tests/testGeckoProfile.java +++ b/mobile/android/base/tests/testGeckoProfile.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.File; import java.util.Enumeration; import java.util.Hashtable; -import org.mozilla.gecko.GoannaApp; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.GoannaProfileDirectories; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.util.INIParser; -import org.mozilla.gecko.util.INISection; +import org.mozilla.goanna.GoannaApp; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.GoannaProfileDirectories; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.util.INIParser; +import org.mozilla.goanna.util.INISection; import android.content.Context; import android.text.TextUtils; diff --git a/mobile/android/base/tests/testGeckoRequest.java b/mobile/android/base/tests/testGeckoRequest.java index 9849ae18bc..c5554a0f1f 100644 --- a/mobile/android/base/tests/testGeckoRequest.java +++ b/mobile/android/base/tests/testGeckoRequest.java @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.concurrent.atomic.AtomicBoolean; import com.jayway.android.robotium.solo.Condition; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.tests.helpers.AssertionHelper; -import org.mozilla.gecko.tests.helpers.GoannaHelper; -import org.mozilla.gecko.tests.helpers.JavascriptBridge; -import org.mozilla.gecko.tests.helpers.NavigationHelper; -import org.mozilla.gecko.tests.helpers.WaitHelper; -import org.mozilla.gecko.util.GoannaRequest; -import org.mozilla.gecko.util.NativeJSObject; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.tests.helpers.AssertionHelper; +import org.mozilla.goanna.tests.helpers.GoannaHelper; +import org.mozilla.goanna.tests.helpers.JavascriptBridge; +import org.mozilla.goanna.tests.helpers.NavigationHelper; +import org.mozilla.goanna.tests.helpers.WaitHelper; +import org.mozilla.goanna.util.GoannaRequest; +import org.mozilla.goanna.util.NativeJSObject; /** * Tests sending and receiving Goanna requests using the GoannaRequest API. diff --git a/mobile/android/base/tests/testGetUserMedia.java b/mobile/android/base/tests/testGetUserMedia.java index c89c45c10c..c7e3d5ad81 100644 --- a/mobile/android/base/tests/testGetUserMedia.java +++ b/mobile/android/base/tests/testGetUserMedia.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.AppConstants; +import org.mozilla.goanna.AppConstants; import android.widget.Spinner; import android.view.View; diff --git a/mobile/android/base/tests/testHistory.java b/mobile/android/base/tests/testHistory.java index 82af483f02..57ec2d02ff 100644 --- a/mobile/android/base/tests/testHistory.java +++ b/mobile/android/base/tests/testHistory.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import android.view.View; import android.view.ViewGroup; import android.widget.ListView; -import org.mozilla.gecko.home.HomePager; +import org.mozilla.goanna.home.HomePager; import com.jayway.android.robotium.solo.Condition; diff --git a/mobile/android/base/tests/testHistoryService.java b/mobile/android/base/tests/testHistoryService.java index 4c605f6c3d..a89d923dfc 100644 --- a/mobile/android/base/tests/testHistoryService.java +++ b/mobile/android/base/tests/testHistoryService.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testHistoryService extends JavascriptTest { diff --git a/mobile/android/base/tests/testHomeBanner.java b/mobile/android/base/tests/testHomeBanner.java index 0c39ad14d6..0ea084fad2 100644 --- a/mobile/android/base/tests/testHomeBanner.java +++ b/mobile/android/base/tests/testHomeBanner.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.tests.helpers.GoannaHelper; -import org.mozilla.gecko.tests.helpers.NavigationHelper; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.tests.helpers.GoannaHelper; +import org.mozilla.goanna.tests.helpers.NavigationHelper; public class testHomeBanner extends UITest { diff --git a/mobile/android/base/tests/testHomeListsProvider.java b/mobile/android/base/tests/testHomeListsProvider.java index fbe2df82f2..d4ce8985e0 100644 --- a/mobile/android/base/tests/testHomeListsProvider.java +++ b/mobile/android/base/tests/testHomeListsProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import android.content.ContentUris; import android.content.ContentValues; diff --git a/mobile/android/base/tests/testHomeProvider.java b/mobile/android/base/tests/testHomeProvider.java index 089e3f0c5a..66399a35c7 100644 --- a/mobile/android/base/tests/testHomeProvider.java +++ b/mobile/android/base/tests/testHomeProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testHomeProvider extends JavascriptTest { diff --git a/mobile/android/base/tests/testImportFromAndroid.java b/mobile/android/base/tests/testImportFromAndroid.java index 7d66d6ee56..8c48f84f1c 100644 --- a/mobile/android/base/tests/testImportFromAndroid.java +++ b/mobile/android/base/tests/testImportFromAndroid.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.ArrayList; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.GoannaProfile; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.GoannaProfile; import android.content.ContentResolver; import android.content.ContentValues; diff --git a/mobile/android/base/tests/testInputConnection.java b/mobile/android/base/tests/testInputConnection.java index f0e267e49e..6f2173d4a5 100644 --- a/mobile/android/base/tests/testInputConnection.java +++ b/mobile/android/base/tests/testInputConnection.java @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals; -import static org.mozilla.gecko.tests.helpers.TextInputHelper.assertSelection; -import static org.mozilla.gecko.tests.helpers.TextInputHelper.assertSelectionAt; -import static org.mozilla.gecko.tests.helpers.TextInputHelper.assertText; -import static org.mozilla.gecko.tests.helpers.TextInputHelper.assertTextAndSelection; -import static org.mozilla.gecko.tests.helpers.TextInputHelper.assertTextAndSelectionAt; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertEquals; +import static org.mozilla.goanna.tests.helpers.TextInputHelper.assertSelection; +import static org.mozilla.goanna.tests.helpers.TextInputHelper.assertSelectionAt; +import static org.mozilla.goanna.tests.helpers.TextInputHelper.assertText; +import static org.mozilla.goanna.tests.helpers.TextInputHelper.assertTextAndSelection; +import static org.mozilla.goanna.tests.helpers.TextInputHelper.assertTextAndSelectionAt; -import org.mozilla.gecko.tests.components.GoannaViewComponent.InputConnectionTest; -import org.mozilla.gecko.tests.helpers.GoannaHelper; -import org.mozilla.gecko.tests.helpers.NavigationHelper; +import org.mozilla.goanna.tests.components.GoannaViewComponent.InputConnectionTest; +import org.mozilla.goanna.tests.helpers.GoannaHelper; +import org.mozilla.goanna.tests.helpers.NavigationHelper; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; diff --git a/mobile/android/base/tests/testInputSelections.java b/mobile/android/base/tests/testInputSelections.java index 4cc4f1a476..c90b85617c 100644 --- a/mobile/android/base/tests/testInputSelections.java +++ b/mobile/android/base/tests/testInputSelections.java @@ -1,9 +1,9 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.tests.helpers.GoannaHelper; -import org.mozilla.gecko.tests.helpers.NavigationHelper; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.tests.helpers.GoannaHelper; +import org.mozilla.goanna.tests.helpers.NavigationHelper; import android.util.Log; diff --git a/mobile/android/base/tests/testInputUrlBar.java b/mobile/android/base/tests/testInputUrlBar.java index 5247fbd2e8..da429173c3 100644 --- a/mobile/android/base/tests/testInputUrlBar.java +++ b/mobile/android/base/tests/testInputUrlBar.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.Element; -import org.mozilla.gecko.R; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.Element; +import org.mozilla.goanna.R; import android.widget.EditText; diff --git a/mobile/android/base/tests/testJNI.java b/mobile/android/base/tests/testJNI.java index 57c60d1cfd..180666d352 100644 --- a/mobile/android/base/tests/testJNI.java +++ b/mobile/android/base/tests/testJNI.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; diff --git a/mobile/android/base/tests/testJNI.js b/mobile/android/base/tests/testJNI.js index fb37b0292c..7703da8a17 100644 --- a/mobile/android/base/tests/testJNI.js +++ b/mobile/android/base/tests/testJNI.js @@ -12,7 +12,7 @@ add_task(function test_JNI() { jenv = JNI.GetForThread(); // Test a simple static method. - var geckoAppShell = JNI.LoadClass(jenv, "org.mozilla.gecko.GoannaAppShell", { + var goannaAppShell = JNI.LoadClass(jenv, "org.mozilla.goanna.GoannaAppShell", { static_methods: [ { name: "getPreferredIconSize", sig: "()I" }, { name: "getContext", sig: "()Landroid/content/Context;" }, @@ -20,13 +20,13 @@ add_task(function test_JNI() { }); let iconSize = -1; - iconSize = geckoAppShell.getPreferredIconSize(); + iconSize = goannaAppShell.getPreferredIconSize(); do_check_neq(iconSize, -1); // Test GoannaNetworkManager methods that are accessed by PaymentsUI.js. // The return values can vary, so we can't test for equivalence, but we // can ensure that the method calls return values of the correct type. - let jGoannaNetworkManager = JNI.LoadClass(jenv, "org/mozilla/gecko/GoannaNetworkManager", { + let jGoannaNetworkManager = JNI.LoadClass(jenv, "org/mozilla/goanna/GoannaNetworkManager", { static_methods: [ { name: "getMNC", sig: "()I" }, { name: "getMCC", sig: "()I" }, @@ -47,7 +47,7 @@ add_task(function test_JNI() { { name: "getName", sig: "()Ljava/lang/String;" }, ], }); - do_check_eq("org.mozilla.gecko.BrowserApp", JNI.ReadString(jenv, geckoAppShell.getContext().getClass().getName())); + do_check_eq("org.mozilla.goanna.BrowserApp", JNI.ReadString(jenv, goannaAppShell.getContext().getClass().getName())); } finally { if (jenv) { JNI.UnloadClasses(jenv); diff --git a/mobile/android/base/tests/testJarReader.java b/mobile/android/base/tests/testJarReader.java index e547f34b4c..302d2b0bb5 100644 --- a/mobile/android/base/tests/testJarReader.java +++ b/mobile/android/base/tests/testJarReader.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.InputStream; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.util.GoannaJarReader; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.util.GoannaJarReader; /** * A basic jar reader test. Tests reading a png from fennec's apk, as well diff --git a/mobile/android/base/tests/testJavascriptBridge.java b/mobile/android/base/tests/testJavascriptBridge.java index b59b63d07f..f69f73abae 100644 --- a/mobile/android/base/tests/testJavascriptBridge.java +++ b/mobile/android/base/tests/testJavascriptBridge.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.*; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.*; -import org.mozilla.gecko.tests.helpers.*; +import org.mozilla.goanna.tests.helpers.*; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/tests/testLinkContextMenu.java b/mobile/android/base/tests/testLinkContextMenu.java index 94619214b8..21eede5531 100644 --- a/mobile/android/base/tests/testLinkContextMenu.java +++ b/mobile/android/base/tests/testLinkContextMenu.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testLinkContextMenu extends ContentContextMenuTest { diff --git a/mobile/android/base/tests/testLoad.java b/mobile/android/base/tests/testLoad.java index 1a939bd7e1..335e54292c 100644 --- a/mobile/android/base/tests/testLoad.java +++ b/mobile/android/base/tests/testLoad.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; /** * A basic page load test. diff --git a/mobile/android/base/tests/testMailToContextMenu.java b/mobile/android/base/tests/testMailToContextMenu.java index e097c1375f..6e0484d5f0 100644 --- a/mobile/android/base/tests/testMailToContextMenu.java +++ b/mobile/android/base/tests/testMailToContextMenu.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testMailToContextMenu extends ContentContextMenuTest { diff --git a/mobile/android/base/tests/testMasterPassword.java b/mobile/android/base/tests/testMasterPassword.java index 538cce80d6..4c3284077a 100644 --- a/mobile/android/base/tests/testMasterPassword.java +++ b/mobile/android/base/tests/testMasterPassword.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; +import org.mozilla.goanna.Actions; /* This patch tests the Master Password feature first by enabling the password, then testing it on a login page and finally disabling the password */ diff --git a/mobile/android/base/tests/testMozPay.java b/mobile/android/base/tests/testMozPay.java index c07a9f31f9..31af76ce1b 100644 --- a/mobile/android/base/tests/testMozPay.java +++ b/mobile/android/base/tests/testMozPay.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; diff --git a/mobile/android/base/tests/testNativeCrypto.java b/mobile/android/base/tests/testNativeCrypto.java index 357a2faff8..c0b590682c 100644 --- a/mobile/android/base/tests/testNativeCrypto.java +++ b/mobile/android/base/tests/testNativeCrypto.java @@ -2,21 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertArrayEquals; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fFail; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertArrayEquals; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertEquals; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fAssertNotNull; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fFail; import java.io.UnsupportedEncodingException; import java.security.GeneralSecurityException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import org.mozilla.gecko.background.nativecode.NativeCrypto; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.tests.helpers.GoannaHelper; +import org.mozilla.goanna.background.nativecode.NativeCrypto; +import org.mozilla.goanna.sync.Utils; +import org.mozilla.goanna.tests.helpers.GoannaHelper; import android.os.SystemClock; diff --git a/mobile/android/base/tests/testNetworkManager.java b/mobile/android/base/tests/testNetworkManager.java index 98ff5baadc..baf07686ba 100644 --- a/mobile/android/base/tests/testNetworkManager.java +++ b/mobile/android/base/tests/testNetworkManager.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testNetworkManager extends JavascriptTest { public testNetworkManager() { diff --git a/mobile/android/base/tests/testNewTab.java b/mobile/android/base/tests/testNewTab.java index 6241e058dc..0aa669a81f 100644 --- a/mobile/android/base/tests/testNewTab.java +++ b/mobile/android/base/tests/testNewTab.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Element; -import org.mozilla.gecko.R; +import org.mozilla.goanna.Element; +import org.mozilla.goanna.R; import android.app.Activity; import android.view.View; diff --git a/mobile/android/base/tests/testOSLocale.java b/mobile/android/base/tests/testOSLocale.java index 0adc31aa96..2791f8a34c 100644 --- a/mobile/android/base/tests/testOSLocale.java +++ b/mobile/android/base/tests/testOSLocale.java @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.Locale; -import org.mozilla.gecko.BrowserLocaleManager; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.PrefsHelper; +import org.mozilla.goanna.BrowserLocaleManager; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.PrefsHelper; import android.content.SharedPreferences; diff --git a/mobile/android/base/tests/testOfflinePage.java b/mobile/android/base/tests/testOfflinePage.java index e7d34db02a..e9f41590ba 100644 --- a/mobile/android/base/tests/testOfflinePage.java +++ b/mobile/android/base/tests/testOfflinePage.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testOfflinePage extends JavascriptTest { public testOfflinePage() { diff --git a/mobile/android/base/tests/testOrderedBroadcast.java b/mobile/android/base/tests/testOrderedBroadcast.java index f5137a14d2..d002a30b1e 100644 --- a/mobile/android/base/tests/testOrderedBroadcast.java +++ b/mobile/android/base/tests/testOrderedBroadcast.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import org.json.JSONException; import org.json.JSONObject; @@ -25,10 +25,10 @@ public class testOrderedBroadcast extends JavascriptTest { public void setUp() throws Exception { super.setUp(); - mAsserter.dumpLog("Registering org.mozilla.gecko.test.receiver broadcast receiver"); + mAsserter.dumpLog("Registering org.mozilla.goanna.test.receiver broadcast receiver"); IntentFilter filter = new IntentFilter(); - filter.addAction("org.mozilla.gecko.test.receiver"); + filter.addAction("org.mozilla.goanna.test.receiver"); mReceiver = new BroadcastReceiver() { @Override @@ -59,7 +59,7 @@ public class testOrderedBroadcast extends JavascriptTest { public void tearDown() throws Exception { super.tearDown(); - mAsserter.dumpLog("Unregistering org.mozilla.gecko.test.receiver broadcast receiver"); + mAsserter.dumpLog("Unregistering org.mozilla.goanna.test.receiver broadcast receiver"); if (mReceiver != null) { getActivity().getApplicationContext().unregisterReceiver(mReceiver); diff --git a/mobile/android/base/tests/testOrderedBroadcast.js b/mobile/android/base/tests/testOrderedBroadcast.js index 1e90fc9f90..9fd3ec807b 100644 --- a/mobile/android/base/tests/testOrderedBroadcast.js +++ b/mobile/android/base/tests/testOrderedBroadcast.js @@ -32,7 +32,7 @@ add_task(function test_send() { let observer = makeObserver(); let token = { a: "bcde", b: 1234 }; - sendOrderedBroadcast("org.mozilla.gecko.test.receiver", + sendOrderedBroadcast("org.mozilla.goanna.test.receiver", token, observer.callback); let value = yield observer.promise; @@ -42,7 +42,7 @@ add_task(function test_send() { // We get back the correct action and token. do_check_neq(value, null); do_check_matches(value.token, token); - do_check_eq(value.action, "org.mozilla.gecko.test.receiver"); + do_check_eq(value.action, "org.mozilla.goanna.test.receiver"); // Data is provided by testOrderedBroadcast.java.in. do_check_neq(value.data, null); @@ -61,7 +61,7 @@ add_task(function test_null_token() { let observer = makeObserver(); - sendOrderedBroadcast("org.mozilla.gecko.test.receiver", + sendOrderedBroadcast("org.mozilla.goanna.test.receiver", null, observer.callback); let value = yield observer.promise; @@ -71,7 +71,7 @@ add_task(function test_null_token() { // We get back the correct action and token. do_check_neq(value, null); do_check_eq(value.token, null); - do_check_eq(value.action, "org.mozilla.gecko.test.receiver"); + do_check_eq(value.action, "org.mozilla.goanna.test.receiver"); // Data is provided by testOrderedBroadcast.java.in. do_check_neq(value.data, null); @@ -86,7 +86,7 @@ add_task(function test_string_token() { let token = "string_token"; let permission = null; // means any receiver can listen for our intent - sendOrderedBroadcast("org.mozilla.gecko.test.receiver", + sendOrderedBroadcast("org.mozilla.goanna.test.receiver", token, observer.callback, permission); let value = yield observer.promise; @@ -97,7 +97,7 @@ add_task(function test_string_token() { do_check_neq(value, null); do_check_eq(value.token, token); do_check_eq(typeof(value.token), "string"); - do_check_eq(value.action, "org.mozilla.gecko.test.receiver"); + do_check_eq(value.action, "org.mozilla.goanna.test.receiver"); // Data is provided by testOrderedBroadcast.java.in. do_check_neq(value.data, null); @@ -111,9 +111,9 @@ add_task(function test_permission() { let observer = makeObserver(); - sendOrderedBroadcast("org.mozilla.gecko.test.receiver", + sendOrderedBroadcast("org.mozilla.goanna.test.receiver", null, observer.callback, - "org.mozilla.gecko.fake.permission"); + "org.mozilla.goanna.fake.permission"); let value = yield observer.promise; @@ -122,7 +122,7 @@ add_task(function test_permission() { // We get back the correct action and token. do_check_neq(value, null); do_check_eq(value.token, null); - do_check_eq(value.action, "org.mozilla.gecko.test.receiver"); + do_check_eq(value.action, "org.mozilla.goanna.test.receiver"); // Data would be provided by testOrderedBroadcast.java.in, except // the no package has the permission, so no responder exists. @@ -134,7 +134,7 @@ add_task(function test_send_no_receiver() { let observer = makeObserver(); - sendOrderedBroadcast("org.mozilla.gecko.test.no.receiver", + sendOrderedBroadcast("org.mozilla.goanna.test.no.receiver", { a: "bcd", b: 123 }, observer.callback); let value = yield observer.promise; @@ -147,7 +147,7 @@ add_task(function test_send_no_receiver() { do_check_neq(value.token, null); do_check_eq(value.token.a, "bcd"); do_check_eq(value.token.b, 123); - do_check_eq(value.action, "org.mozilla.gecko.test.no.receiver"); + do_check_eq(value.action, "org.mozilla.goanna.test.no.receiver"); do_check_eq(value.data, null); }); diff --git a/mobile/android/base/tests/testPan.java b/mobile/android/base/tests/testPan.java index 4d0351195e..c30e55f630 100644 --- a/mobile/android/base/tests/testPan.java +++ b/mobile/android/base/tests/testPan.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; /** diff --git a/mobile/android/base/tests/testPanCorrectness.java b/mobile/android/base/tests/testPanCorrectness.java index 96806899c9..bdd735ec99 100644 --- a/mobile/android/base/tests/testPanCorrectness.java +++ b/mobile/android/base/tests/testPanCorrectness.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.PaintedSurface; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.PaintedSurface; /** * A basic panning correctness test. diff --git a/mobile/android/base/tests/testPasswordEncrypt.java b/mobile/android/base/tests/testPasswordEncrypt.java index f963848fbe..4e4f70a289 100644 --- a/mobile/android/base/tests/testPasswordEncrypt.java +++ b/mobile/android/base/tests/testPasswordEncrypt.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.File; import org.json.JSONObject; -import org.mozilla.gecko.NSSBridge; -import org.mozilla.gecko.db.BrowserContract; +import org.mozilla.goanna.NSSBridge; +import org.mozilla.goanna.db.BrowserContract; import android.content.ContentResolver; import android.content.ContentValues; diff --git a/mobile/android/base/tests/testPasswordProvider.java b/mobile/android/base/tests/testPasswordProvider.java index 888e8f0648..671aee1275 100644 --- a/mobile/android/base/tests/testPasswordProvider.java +++ b/mobile/android/base/tests/testPasswordProvider.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.io.File; -import org.mozilla.gecko.db.BrowserContract.Passwords; +import org.mozilla.goanna.db.BrowserContract.Passwords; import android.content.ContentResolver; import android.content.ContentValues; diff --git a/mobile/android/base/tests/testPermissions.java b/mobile/android/base/tests/testPermissions.java index 8baf165abe..81d0983845 100644 --- a/mobile/android/base/tests/testPermissions.java +++ b/mobile/android/base/tests/testPermissions.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.ArrayList; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.PaintedSurface; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.PaintedSurface; import android.widget.CheckBox; diff --git a/mobile/android/base/tests/testPictureLinkContextMenu.java b/mobile/android/base/tests/testPictureLinkContextMenu.java index 88d5f9260c..8322f6abb1 100644 --- a/mobile/android/base/tests/testPictureLinkContextMenu.java +++ b/mobile/android/base/tests/testPictureLinkContextMenu.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testPictureLinkContextMenu extends ContentContextMenuTest { diff --git a/mobile/android/base/tests/testPrefsObserver.java b/mobile/android/base/tests/testPrefsObserver.java index 4b6b5feb45..409cd58010 100644 --- a/mobile/android/base/tests/testPrefsObserver.java +++ b/mobile/android/base/tests/testPrefsObserver.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Actions; +import org.mozilla.goanna.Actions; /** * Basic test to check bounce-back from overscroll. diff --git a/mobile/android/base/tests/testPrivateBrowsing.java b/mobile/android/base/tests/testPrivateBrowsing.java index 57d4b9afc2..e01073efdf 100644 --- a/mobile/android/base/tests/testPrivateBrowsing.java +++ b/mobile/android/base/tests/testPrivateBrowsing.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.ArrayList; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Actions; +import org.mozilla.goanna.Actions; /** * The test loads a new private tab and loads a page with a big link on it diff --git a/mobile/android/base/tests/testPromptGridInput.java b/mobile/android/base/tests/testPromptGridInput.java index f130024793..eff17c6a73 100644 --- a/mobile/android/base/tests/testPromptGridInput.java +++ b/mobile/android/base/tests/testPromptGridInput.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; +import org.mozilla.goanna.Actions; public class testPromptGridInput extends BaseTest { protected int index = 1; diff --git a/mobile/android/base/tests/testReaderMode.java b/mobile/android/base/tests/testReaderMode.java index adbc231e8c..02b46960a1 100644 --- a/mobile/android/base/tests/testReaderMode.java +++ b/mobile/android/base/tests/testReaderMode.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.home.HomePager; -import org.mozilla.gecko.R; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.home.HomePager; +import org.mozilla.goanna.R; import android.view.View; import android.view.ViewGroup; diff --git a/mobile/android/base/tests/testReadingListCache.java b/mobile/android/base/tests/testReadingListCache.java index 2006bbbfc9..d86e26dc3c 100644 --- a/mobile/android/base/tests/testReadingListCache.java +++ b/mobile/android/base/tests/testReadingListCache.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testReadingListCache extends JavascriptTest { diff --git a/mobile/android/base/tests/testReadingListProvider.java b/mobile/android/base/tests/testReadingListProvider.java index b61b606e60..49c44b77e0 100644 --- a/mobile/android/base/tests/testReadingListProvider.java +++ b/mobile/android/base/tests/testReadingListProvider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.HashSet; import java.util.Random; @@ -10,11 +10,11 @@ import java.util.concurrent.Callable; import android.app.Activity; import android.content.ContentResolver; -import org.mozilla.gecko.BrowserApp; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.db.ReadingListAccessor; -import org.mozilla.gecko.db.ReadingListProvider; +import org.mozilla.goanna.BrowserApp; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.ReadingListItems; +import org.mozilla.goanna.db.ReadingListAccessor; +import org.mozilla.goanna.db.ReadingListProvider; import android.content.ContentProvider; import android.content.ContentUris; @@ -23,26 +23,26 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.*; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.ADDED_ON; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.CLIENT_LAST_MODIFIED; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.EXCERPT; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.GUID; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.IS_UNREAD; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.RESOLVED_TITLE; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.RESOLVED_URL; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SERVER_LAST_MODIFIED; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SERVER_STORED_ON; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_FLAGS; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_NONE; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_RESOLVED; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_UNREAD_CHANGED; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS_MODIFIED; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS_NEW; -import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS_SYNCED; -import static org.mozilla.gecko.db.BrowserContract.URLColumns.TITLE; -import static org.mozilla.gecko.db.BrowserContract.URLColumns.URL; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.*; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.ADDED_ON; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.CLIENT_LAST_MODIFIED; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.EXCERPT; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.GUID; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.IS_UNREAD; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.RESOLVED_TITLE; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.RESOLVED_URL; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SERVER_LAST_MODIFIED; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SERVER_STORED_ON; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_CHANGE_FLAGS; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_CHANGE_NONE; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_CHANGE_RESOLVED; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_CHANGE_UNREAD_CHANGED; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_STATUS; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_STATUS_MODIFIED; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_STATUS_NEW; +import static org.mozilla.goanna.db.BrowserContract.ReadingListItems.SYNC_STATUS_SYNCED; +import static org.mozilla.goanna.db.BrowserContract.URLColumns.TITLE; +import static org.mozilla.goanna.db.BrowserContract.URLColumns.URL; public class testReadingListProvider extends ContentProviderTest { diff --git a/mobile/android/base/tests/testResourceSubstitutions.java b/mobile/android/base/tests/testResourceSubstitutions.java index 2d7a9fc951..00f58b9b73 100644 --- a/mobile/android/base/tests/testResourceSubstitutions.java +++ b/mobile/android/base/tests/testResourceSubstitutions.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; diff --git a/mobile/android/base/tests/testRestrictedProfiles.java b/mobile/android/base/tests/testRestrictedProfiles.java index 3fe97c050a..c17dc4542f 100644 --- a/mobile/android/base/tests/testRestrictedProfiles.java +++ b/mobile/android/base/tests/testRestrictedProfiles.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; diff --git a/mobile/android/base/tests/testRestrictedProfiles.js b/mobile/android/base/tests/testRestrictedProfiles.js index 08da0ae883..3ad6d918f2 100644 --- a/mobile/android/base/tests/testRestrictedProfiles.js +++ b/mobile/android/base/tests/testRestrictedProfiles.js @@ -37,7 +37,7 @@ add_task(function test_getUserRestrictions() { var jenv = null; try { jenv = JNI.GetForThread(); - var profile = JNI.LoadClass(jenv, "org.mozilla.gecko.RestrictedProfiles", { + var profile = JNI.LoadClass(jenv, "org.mozilla.goanna.RestrictedProfiles", { static_methods: [ { name: "getUserRestrictions", sig: "()Ljava/lang/String;" }, ], diff --git a/mobile/android/base/tests/testSearchHistoryProvider.java b/mobile/android/base/tests/testSearchHistoryProvider.java index 3c22703bcf..cde8a96f02 100644 --- a/mobile/android/base/tests/testSearchHistoryProvider.java +++ b/mobile/android/base/tests/testSearchHistoryProvider.java @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.concurrent.Callable; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.SearchHistory; -import org.mozilla.gecko.db.SearchHistoryProvider; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.SearchHistory; +import org.mozilla.goanna.db.SearchHistoryProvider; import android.content.ContentProvider; import android.content.ContentValues; diff --git a/mobile/android/base/tests/testSearchSuggestions.java b/mobile/android/base/tests/testSearchSuggestions.java index 3d056601f7..04e3725322 100644 --- a/mobile/android/base/tests/testSearchSuggestions.java +++ b/mobile/android/base/tests/testSearchSuggestions.java @@ -1,11 +1,11 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.ArrayList; import java.util.HashMap; -import org.mozilla.gecko.R; -import org.mozilla.gecko.SuggestClient; -import org.mozilla.gecko.home.BrowserSearch; +import org.mozilla.goanna.R; +import org.mozilla.goanna.SuggestClient; +import org.mozilla.goanna.home.BrowserSearch; import android.content.Context; import android.view.View; diff --git a/mobile/android/base/tests/testSelectionHandler.java b/mobile/android/base/tests/testSelectionHandler.java index 9b661b0ef2..6995f98c0a 100644 --- a/mobile/android/base/tests/testSelectionHandler.java +++ b/mobile/android/base/tests/testSelectionHandler.java @@ -1,9 +1,9 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.tests.helpers.GoannaHelper; -import org.mozilla.gecko.tests.helpers.NavigationHelper; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.tests.helpers.GoannaHelper; +import org.mozilla.goanna.tests.helpers.NavigationHelper; import android.util.Log; diff --git a/mobile/android/base/tests/testSessionFormData.java b/mobile/android/base/tests/testSessionFormData.java index 491492b34d..984ea1fc08 100644 --- a/mobile/android/base/tests/testSessionFormData.java +++ b/mobile/android/base/tests/testSessionFormData.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; public class testSessionFormData extends JavascriptTest { diff --git a/mobile/android/base/tests/testSessionHistory.java b/mobile/android/base/tests/testSessionHistory.java index a398fe9754..6dd2ab6beb 100644 --- a/mobile/android/base/tests/testSessionHistory.java +++ b/mobile/android/base/tests/testSessionHistory.java @@ -1,7 +1,7 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.tests.helpers.GoannaHelper; -import org.mozilla.gecko.tests.helpers.NavigationHelper; +import org.mozilla.goanna.tests.helpers.GoannaHelper; +import org.mozilla.goanna.tests.helpers.NavigationHelper; /** * Tests that navigating through session history (ex: forward, back) sets the correct UI state. diff --git a/mobile/android/base/tests/testSessionOOMRestore.java b/mobile/android/base/tests/testSessionOOMRestore.java index 552b5c918c..ff19951624 100644 --- a/mobile/android/base/tests/testSessionOOMRestore.java +++ b/mobile/android/base/tests/testSessionOOMRestore.java @@ -1,4 +1,4 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import android.content.Context; import android.content.Intent; diff --git a/mobile/android/base/tests/testSessionOOMSave.java b/mobile/android/base/tests/testSessionOOMSave.java index 82e5cc92ab..d45574cb3c 100644 --- a/mobile/android/base/tests/testSessionOOMSave.java +++ b/mobile/android/base/tests/testSessionOOMSave.java @@ -1,6 +1,6 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; +import org.mozilla.goanna.Actions; import com.jayway.android.robotium.solo.Condition; diff --git a/mobile/android/base/tests/testSettingsMenuItems.java b/mobile/android/base/tests/testSettingsMenuItems.java index 400984abc4..cc319d1159 100644 --- a/mobile/android/base/tests/testSettingsMenuItems.java +++ b/mobile/android/base/tests/testSettingsMenuItems.java @@ -1,4 +1,4 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.ArrayList; import java.util.Arrays; @@ -7,9 +7,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.util.HardwareUtils; /** This patch tests the Sections present in the Settings Menu and the * default values for them diff --git a/mobile/android/base/tests/testShareLink.java b/mobile/android/base/tests/testShareLink.java index 2104d8c419..2d734f8e98 100644 --- a/mobile/android/base/tests/testShareLink.java +++ b/mobile/android/base/tests/testShareLink.java @@ -1,10 +1,10 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; import java.util.ArrayList; import java.util.List; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.home.HomePager; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.home.HomePager; import android.app.Activity; import android.content.Intent; diff --git a/mobile/android/base/tests/testSharedPreferences.java b/mobile/android/base/tests/testSharedPreferences.java index fff2a6f486..80c920db9b 100644 --- a/mobile/android/base/tests/testSharedPreferences.java +++ b/mobile/android/base/tests/testSharedPreferences.java @@ -1,4 +1,4 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; diff --git a/mobile/android/base/tests/testSimpleDiscovery.java b/mobile/android/base/tests/testSimpleDiscovery.java index a410726f96..e4755ddf51 100644 --- a/mobile/android/base/tests/testSimpleDiscovery.java +++ b/mobile/android/base/tests/testSimpleDiscovery.java @@ -1,4 +1,4 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; diff --git a/mobile/android/base/tests/testStumblerSetting.java b/mobile/android/base/tests/testStumblerSetting.java index 12efdf848b..ec279d17c3 100644 --- a/mobile/android/base/tests/testStumblerSetting.java +++ b/mobile/android/base/tests/testStumblerSetting.java @@ -1,10 +1,10 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * * License, v. 2.0. If a copy of the MPL was not distributed with this * * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.preferences.GoannaPreferences; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.preferences.GoannaPreferences; import org.mozilla.mozstumbler.service.AppGlobals; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/tests/testSystemPages.java b/mobile/android/base/tests/testSystemPages.java index d3d97e1643..e72ecf774e 100644 --- a/mobile/android/base/tests/testSystemPages.java +++ b/mobile/android/base/tests/testSystemPages.java @@ -1,6 +1,6 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; +import org.mozilla.goanna.Actions; /** This patch tests the System Pages first by loading system pages from * the awesome bar and then from Firefox menu diff --git a/mobile/android/base/tests/testTextareaSelections.java b/mobile/android/base/tests/testTextareaSelections.java index 6b3b42cb79..f1741499c8 100644 --- a/mobile/android/base/tests/testTextareaSelections.java +++ b/mobile/android/base/tests/testTextareaSelections.java @@ -1,9 +1,9 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.tests.helpers.GoannaHelper; -import org.mozilla.gecko.tests.helpers.NavigationHelper; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.tests.helpers.GoannaHelper; +import org.mozilla.goanna.tests.helpers.NavigationHelper; import android.util.Log; diff --git a/mobile/android/base/tests/testThumbnails.java b/mobile/android/base/tests/testThumbnails.java index 46f70aff24..b286dd5b66 100644 --- a/mobile/android/base/tests/testThumbnails.java +++ b/mobile/android/base/tests/testThumbnails.java @@ -1,6 +1,6 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.db.BrowserDB; +import org.mozilla.goanna.db.BrowserDB; import android.content.ContentResolver; import android.graphics.Color; diff --git a/mobile/android/base/tests/testTitleBar.java b/mobile/android/base/tests/testTitleBar.java index 0fb947a311..734292d4e2 100644 --- a/mobile/android/base/tests/testTitleBar.java +++ b/mobile/android/base/tests/testTitleBar.java @@ -1,7 +1,7 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.util.HardwareUtils; /** * This patch tests the option that shows the full URL and title in the URL Bar diff --git a/mobile/android/base/tests/testTrackingProtection.java b/mobile/android/base/tests/testTrackingProtection.java index 80d3ea1886..33f64b031d 100644 --- a/mobile/android/base/tests/testTrackingProtection.java +++ b/mobile/android/base/tests/testTrackingProtection.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import static org.mozilla.gecko.tests.helpers.AssertionHelper.fFail; +import static org.mozilla.goanna.tests.helpers.AssertionHelper.fFail; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.util.GoannaEventListener; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.util.GoannaEventListener; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/tests/testUITelemetry.java b/mobile/android/base/tests/testUITelemetry.java index a622eac140..22bac8e090 100644 --- a/mobile/android/base/tests/testUITelemetry.java +++ b/mobile/android/base/tests/testUITelemetry.java @@ -1,12 +1,12 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract.Event; -import org.mozilla.gecko.TelemetryContract.Method; -import org.mozilla.gecko.TelemetryContract.Reason; -import org.mozilla.gecko.TelemetryContract.Session; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract.Event; +import org.mozilla.goanna.TelemetryContract.Method; +import org.mozilla.goanna.TelemetryContract.Reason; +import org.mozilla.goanna.TelemetryContract.Session; import android.util.Log; diff --git a/mobile/android/base/tests/testVideoControls.java b/mobile/android/base/tests/testVideoControls.java index 5164815c43..a859fd8171 100644 --- a/mobile/android/base/tests/testVideoControls.java +++ b/mobile/android/base/tests/testVideoControls.java @@ -1,4 +1,4 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; diff --git a/mobile/android/base/tests/testVideoDiscovery.java b/mobile/android/base/tests/testVideoDiscovery.java index 589d450eec..9d6e862da4 100644 --- a/mobile/android/base/tests/testVideoDiscovery.java +++ b/mobile/android/base/tests/testVideoDiscovery.java @@ -1,4 +1,4 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; diff --git a/mobile/android/base/tests/testVkbOverlap.java b/mobile/android/base/tests/testVkbOverlap.java index 77fc7b0929..c2baa2ceca 100644 --- a/mobile/android/base/tests/testVkbOverlap.java +++ b/mobile/android/base/tests/testVkbOverlap.java @@ -1,7 +1,7 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.PaintedSurface; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.PaintedSurface; import android.net.Uri; diff --git a/mobile/android/base/tests/test_bug720538.java b/mobile/android/base/tests/test_bug720538.java index 4c80f21f1c..21b29e1000 100644 --- a/mobile/android/base/tests/test_bug720538.java +++ b/mobile/android/base/tests/test_bug720538.java @@ -1,7 +1,7 @@ -package org.mozilla.gecko.tests; +package org.mozilla.goanna.tests; -import org.mozilla.gecko.Actions; -import org.mozilla.gecko.PaintedSurface; +import org.mozilla.goanna.Actions; +import org.mozilla.goanna.PaintedSurface; public class test_bug720538 extends PixelTest { public void test_bug720538() { diff --git a/mobile/android/base/tiles/Tile.java b/mobile/android/base/tiles/Tile.java index 0c05137262..e56c14a0ee 100644 --- a/mobile/android/base/tiles/Tile.java +++ b/mobile/android/base/tiles/Tile.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tiles; +package org.mozilla.goanna.tiles; /** * Metadata for a tile shown on the top sites grid. diff --git a/mobile/android/base/tiles/TilesRecorder.java b/mobile/android/base/tiles/TilesRecorder.java index 19cd1758f7..d9da7520e0 100644 --- a/mobile/android/base/tiles/TilesRecorder.java +++ b/mobile/android/base/tiles/TilesRecorder.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tiles; +package org.mozilla.goanna.tiles; import java.util.List; @@ -10,9 +10,9 @@ import org.json.JSONArray; import org.json.JSONObject; import org.json.JSONException; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.Tab; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.Tab; import android.util.Log; diff --git a/mobile/android/base/tokenserver/TokenServerClient.java b/mobile/android/base/tokenserver/TokenServerClient.java index 93ec0008d5..067230f82b 100644 --- a/mobile/android/base/tokenserver/TokenServerClient.java +++ b/mobile/android/base/tokenserver/TokenServerClient.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tokenserver; +package org.mozilla.goanna.tokenserver; import java.io.IOException; import java.net.URI; @@ -12,22 +12,22 @@ import java.util.List; import java.util.concurrent.Executor; import org.json.simple.JSONObject; -import org.mozilla.gecko.background.common.log.Logger; -import org.mozilla.gecko.background.fxa.SkewHandler; -import org.mozilla.gecko.sync.ExtendedJSONObject; -import org.mozilla.gecko.sync.NonArrayJSONException; -import org.mozilla.gecko.sync.NonObjectJSONException; -import org.mozilla.gecko.sync.UnexpectedJSONException.BadRequiredFieldJSONException; -import org.mozilla.gecko.sync.net.AuthHeaderProvider; -import org.mozilla.gecko.sync.net.BaseResource; -import org.mozilla.gecko.sync.net.BaseResourceDelegate; -import org.mozilla.gecko.sync.net.BrowserIDAuthHeaderProvider; -import org.mozilla.gecko.sync.net.SyncResponse; -import org.mozilla.gecko.tokenserver.TokenServerException.TokenServerConditionsRequiredException; -import org.mozilla.gecko.tokenserver.TokenServerException.TokenServerInvalidCredentialsException; -import org.mozilla.gecko.tokenserver.TokenServerException.TokenServerMalformedRequestException; -import org.mozilla.gecko.tokenserver.TokenServerException.TokenServerMalformedResponseException; -import org.mozilla.gecko.tokenserver.TokenServerException.TokenServerUnknownServiceException; +import org.mozilla.goanna.background.common.log.Logger; +import org.mozilla.goanna.background.fxa.SkewHandler; +import org.mozilla.goanna.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.NonArrayJSONException; +import org.mozilla.goanna.sync.NonObjectJSONException; +import org.mozilla.goanna.sync.UnexpectedJSONException.BadRequiredFieldJSONException; +import org.mozilla.goanna.sync.net.AuthHeaderProvider; +import org.mozilla.goanna.sync.net.BaseResource; +import org.mozilla.goanna.sync.net.BaseResourceDelegate; +import org.mozilla.goanna.sync.net.BrowserIDAuthHeaderProvider; +import org.mozilla.goanna.sync.net.SyncResponse; +import org.mozilla.goanna.tokenserver.TokenServerException.TokenServerConditionsRequiredException; +import org.mozilla.goanna.tokenserver.TokenServerException.TokenServerInvalidCredentialsException; +import org.mozilla.goanna.tokenserver.TokenServerException.TokenServerMalformedRequestException; +import org.mozilla.goanna.tokenserver.TokenServerException.TokenServerMalformedResponseException; +import org.mozilla.goanna.tokenserver.TokenServerException.TokenServerUnknownServiceException; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.HttpHeaders; diff --git a/mobile/android/base/tokenserver/TokenServerClientDelegate.java b/mobile/android/base/tokenserver/TokenServerClientDelegate.java index e1dfe24229..b10a5c9d87 100644 --- a/mobile/android/base/tokenserver/TokenServerClientDelegate.java +++ b/mobile/android/base/tokenserver/TokenServerClientDelegate.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tokenserver; +package org.mozilla.goanna.tokenserver; public interface TokenServerClientDelegate { diff --git a/mobile/android/base/tokenserver/TokenServerException.java b/mobile/android/base/tokenserver/TokenServerException.java index 099e51867b..b2dcebf127 100644 --- a/mobile/android/base/tokenserver/TokenServerException.java +++ b/mobile/android/base/tokenserver/TokenServerException.java @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tokenserver; +package org.mozilla.goanna.tokenserver; import java.util.List; -import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.goanna.sync.ExtendedJSONObject; public class TokenServerException extends Exception { private static final long serialVersionUID = 7185692034925819696L; diff --git a/mobile/android/base/tokenserver/TokenServerToken.java b/mobile/android/base/tokenserver/TokenServerToken.java index 916586cdcb..9def6ce041 100644 --- a/mobile/android/base/tokenserver/TokenServerToken.java +++ b/mobile/android/base/tokenserver/TokenServerToken.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.tokenserver; +package org.mozilla.goanna.tokenserver; public class TokenServerToken { public final String id; diff --git a/mobile/android/base/toolbar/ActionBarViewFlipper.java b/mobile/android/base/toolbar/ActionBarViewFlipper.java index 1dec2a69ce..0268b45470 100644 --- a/mobile/android/base/toolbar/ActionBarViewFlipper.java +++ b/mobile/android/base/toolbar/ActionBarViewFlipper.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.NewTabletUI; -import org.mozilla.gecko.R; -import org.mozilla.gecko.widget.GoannaViewFlipper; +import org.mozilla.goanna.NewTabletUI; +import org.mozilla.goanna.R; +import org.mozilla.goanna.widget.GoannaViewFlipper; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/toolbar/AutocompleteHandler.java b/mobile/android/base/toolbar/AutocompleteHandler.java index 4a1559823a..7fe6efd6a7 100644 --- a/mobile/android/base/toolbar/AutocompleteHandler.java +++ b/mobile/android/base/toolbar/AutocompleteHandler.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; public interface AutocompleteHandler { void onAutocomplete(String res); diff --git a/mobile/android/base/toolbar/BackButton.java b/mobile/android/base/toolbar/BackButton.java index a1463233a8..a802ebaed3 100644 --- a/mobile/android/base/toolbar/BackButton.java +++ b/mobile/android/base/toolbar/BackButton.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; import android.content.Context; import android.graphics.Path; diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java index da1020a84c..3177c5e825 100644 --- a/mobile/android/base/toolbar/BrowserToolbar.java +++ b/mobile/android/base/toolbar/BrowserToolbar.java @@ -3,37 +3,37 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.BrowserApp; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.PropertyAnimator.PropertyAnimationListener; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.lwt.LightweightTheme; -import org.mozilla.gecko.lwt.LightweightThemeDrawable; -import org.mozilla.gecko.menu.GoannaMenu; -import org.mozilla.gecko.menu.MenuPopup; -import org.mozilla.gecko.tabs.TabHistoryController; -import org.mozilla.gecko.toolbar.ToolbarDisplayLayout.OnStopListener; -import org.mozilla.gecko.toolbar.ToolbarDisplayLayout.OnTitleChangeListener; -import org.mozilla.gecko.toolbar.ToolbarDisplayLayout.UpdateFlags; -import org.mozilla.gecko.util.Clipboard; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.MenuUtils; -import org.mozilla.gecko.widget.ThemedImageButton; -import org.mozilla.gecko.widget.ThemedImageView; -import org.mozilla.gecko.widget.ThemedRelativeLayout; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.BrowserApp; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.PropertyAnimator.PropertyAnimationListener; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.lwt.LightweightTheme; +import org.mozilla.goanna.lwt.LightweightThemeDrawable; +import org.mozilla.goanna.menu.GoannaMenu; +import org.mozilla.goanna.menu.MenuPopup; +import org.mozilla.goanna.tabs.TabHistoryController; +import org.mozilla.goanna.toolbar.ToolbarDisplayLayout.OnStopListener; +import org.mozilla.goanna.toolbar.ToolbarDisplayLayout.OnTitleChangeListener; +import org.mozilla.goanna.toolbar.ToolbarDisplayLayout.UpdateFlags; +import org.mozilla.goanna.util.Clipboard; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.MenuUtils; +import org.mozilla.goanna.widget.ThemedImageButton; +import org.mozilla.goanna.widget.ThemedImageView; +import org.mozilla.goanna.widget.ThemedRelativeLayout; import android.content.Context; import android.content.res.Resources; @@ -60,7 +60,7 @@ import android.widget.PopupWindow; * package. * * {@code BrowserToolbar} serves at the single event bus for all -* sub-components in the toolbar. It tracks tab events and gecko messages +* sub-components in the toolbar. It tracks tab events and goanna messages * and update the state of its inner components accordingly. * * It has two states, display and edit, which are controlled by diff --git a/mobile/android/base/toolbar/BrowserToolbarPhone.java b/mobile/android/base/toolbar/BrowserToolbarPhone.java index 962771c825..8eba49e483 100644 --- a/mobile/android/base/toolbar/BrowserToolbarPhone.java +++ b/mobile/android/base/toolbar/BrowserToolbarPhone.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.PropertyAnimator.PropertyAnimationListener; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.PropertyAnimator.PropertyAnimationListener; +import org.mozilla.goanna.util.HardwareUtils; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java index 0d909501fb..c31e945a83 100644 --- a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java +++ b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java @@ -3,17 +3,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; import java.util.Arrays; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.widget.ThemedImageView; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.widget.ThemedImageView; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/toolbar/BrowserToolbarPreHC.java b/mobile/android/base/toolbar/BrowserToolbarPreHC.java index 454c9a6352..68323b26de 100644 --- a/mobile/android/base/toolbar/BrowserToolbarPreHC.java +++ b/mobile/android/base/toolbar/BrowserToolbarPreHC.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.util.HardwareUtils; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/toolbar/BrowserToolbarTablet.java b/mobile/android/base/toolbar/BrowserToolbarTablet.java index 40fe4826ce..86c1de9b6f 100644 --- a/mobile/android/base/toolbar/BrowserToolbarTablet.java +++ b/mobile/android/base/toolbar/BrowserToolbarTablet.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.R; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.ViewHelper; +import org.mozilla.goanna.R; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.ViewHelper; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java index 9c3e705568..dc35db063e 100644 --- a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java +++ b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java @@ -3,16 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; import java.util.Arrays; -import org.mozilla.gecko.NewTabletUI; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.tabs.TabHistoryController; -import org.mozilla.gecko.menu.MenuItemActionBar; +import org.mozilla.goanna.NewTabletUI; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.tabs.TabHistoryController; +import org.mozilla.goanna.menu.MenuItemActionBar; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/mobile/android/base/toolbar/CanvasDelegate.java b/mobile/android/base/toolbar/CanvasDelegate.java index 7cc959f17b..e5add59055 100644 --- a/mobile/android/base/toolbar/CanvasDelegate.java +++ b/mobile/android/base/toolbar/CanvasDelegate.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.AppConstants.Versions; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/mobile/android/base/toolbar/ForwardButton.java b/mobile/android/base/toolbar/ForwardButton.java index f95bb5e8a5..12aff7e769 100644 --- a/mobile/android/base/toolbar/ForwardButton.java +++ b/mobile/android/base/toolbar/ForwardButton.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/toolbar/NavButton.java b/mobile/android/base/toolbar/NavButton.java index 8045e55a98..3036ee2208 100644 --- a/mobile/android/base/toolbar/NavButton.java +++ b/mobile/android/base/toolbar/NavButton.java @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.NewTabletUI; -import org.mozilla.gecko.R; +import org.mozilla.goanna.NewTabletUI; +import org.mozilla.goanna.R; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/toolbar/PageActionLayout.java b/mobile/android/base/toolbar/PageActionLayout.java index 99c6cba84a..372f95122a 100644 --- a/mobile/android/base/toolbar/PageActionLayout.java +++ b/mobile/android/base/toolbar/PageActionLayout.java @@ -3,18 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.R; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.gecko.widget.GoannaPopupMenu; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.R; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.ThreadUtils; +import org.mozilla.goanna.widget.GoannaPopupMenu; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/toolbar/PhoneTabsButton.java b/mobile/android/base/toolbar/PhoneTabsButton.java index 4164854945..fafaac2453 100644 --- a/mobile/android/base/toolbar/PhoneTabsButton.java +++ b/mobile/android/base/toolbar/PhoneTabsButton.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; import android.content.Context; import android.util.AttributeSet; -import org.mozilla.gecko.tabs.TabCurve; +import org.mozilla.goanna.tabs.TabCurve; public class PhoneTabsButton extends ShapedButton { public PhoneTabsButton(Context context, AttributeSet attrs) { diff --git a/mobile/android/base/toolbar/ShapedButton.java b/mobile/android/base/toolbar/ShapedButton.java index 878591eedc..9088dd6a44 100644 --- a/mobile/android/base/toolbar/ShapedButton.java +++ b/mobile/android/base/toolbar/ShapedButton.java @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.R; -import org.mozilla.gecko.lwt.LightweightTheme; -import org.mozilla.gecko.lwt.LightweightThemeDrawable; -import org.mozilla.gecko.tabs.TabCurve; -import org.mozilla.gecko.widget.ThemedImageButton; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.R; +import org.mozilla.goanna.lwt.LightweightTheme; +import org.mozilla.goanna.lwt.LightweightThemeDrawable; +import org.mozilla.goanna.tabs.TabCurve; +import org.mozilla.goanna.widget.ThemedImageButton; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/toolbar/SiteIdentityPopup.java b/mobile/android/base/toolbar/SiteIdentityPopup.java index 9caf2f196e..85a76aecbb 100644 --- a/mobile/android/base/toolbar/SiteIdentityPopup.java +++ b/mobile/android/base/toolbar/SiteIdentityPopup.java @@ -2,21 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.AboutPages; -import org.mozilla.gecko.R; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.SiteIdentity; -import org.mozilla.gecko.SiteIdentity.SecurityMode; -import org.mozilla.gecko.SiteIdentity.MixedMode; -import org.mozilla.gecko.SiteIdentity.TrackingMode; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.widget.ArrowPopup; -import org.mozilla.gecko.widget.DoorHanger; -import org.mozilla.gecko.widget.DoorHanger.OnButtonClickListener; +import org.mozilla.goanna.AboutPages; +import org.mozilla.goanna.R; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.SiteIdentity; +import org.mozilla.goanna.SiteIdentity.SecurityMode; +import org.mozilla.goanna.SiteIdentity.MixedMode; +import org.mozilla.goanna.SiteIdentity.TrackingMode; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.widget.ArrowPopup; +import org.mozilla.goanna.widget.DoorHanger; +import org.mozilla.goanna.widget.DoorHanger.OnButtonClickListener; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/toolbar/TabCounter.java b/mobile/android/base/toolbar/TabCounter.java index 94e59e2927..6ca91eee3d 100644 --- a/mobile/android/base/toolbar/TabCounter.java +++ b/mobile/android/base/toolbar/TabCounter.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.R; -import org.mozilla.gecko.animation.Rotate3DAnimation; -import org.mozilla.gecko.widget.ThemedTextSwitcher; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.R; +import org.mozilla.goanna.animation.Rotate3DAnimation; +import org.mozilla.goanna.widget.ThemedTextSwitcher; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/toolbar/ToolbarDisplayLayout.java b/mobile/android/base/toolbar/ToolbarDisplayLayout.java index 8b9ba1cad2..109ee92845 100644 --- a/mobile/android/base/toolbar/ToolbarDisplayLayout.java +++ b/mobile/android/base/toolbar/ToolbarDisplayLayout.java @@ -3,31 +3,31 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; import java.util.Arrays; import java.util.EnumSet; import java.util.List; -import org.mozilla.gecko.AboutPages; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.BrowserApp; -import org.mozilla.gecko.NewTabletUI; -import org.mozilla.gecko.R; -import org.mozilla.gecko.ReaderModeUtils; -import org.mozilla.gecko.SiteIdentity; -import org.mozilla.gecko.SiteIdentity.SecurityMode; -import org.mozilla.gecko.SiteIdentity.MixedMode; -import org.mozilla.gecko.SiteIdentity.TrackingMode; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.ViewHelper; -import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.toolbar.BrowserToolbarTabletBase.ForwardButtonAnimation; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.StringUtils; -import org.mozilla.gecko.widget.ThemedLinearLayout; -import org.mozilla.gecko.widget.ThemedTextView; +import org.mozilla.goanna.AboutPages; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.BrowserApp; +import org.mozilla.goanna.NewTabletUI; +import org.mozilla.goanna.R; +import org.mozilla.goanna.ReaderModeUtils; +import org.mozilla.goanna.SiteIdentity; +import org.mozilla.goanna.SiteIdentity.SecurityMode; +import org.mozilla.goanna.SiteIdentity.MixedMode; +import org.mozilla.goanna.SiteIdentity.TrackingMode; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.ViewHelper; +import org.mozilla.goanna.favicons.Favicons; +import org.mozilla.goanna.toolbar.BrowserToolbarTabletBase.ForwardButtonAnimation; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.StringUtils; +import org.mozilla.goanna.widget.ThemedLinearLayout; +import org.mozilla.goanna.widget.ThemedTextView; import android.content.Context; import android.content.res.Resources; @@ -52,7 +52,7 @@ import android.widget.LinearLayout; * {@code ToolbarDisplayLayout} is the UI for when the toolbar is in * display state. It's used to display the state of the currently selected * tab. It should always be updated through a single entry point -* (updateFromTab) and should never track any tab events or gecko messages +* (updateFromTab) and should never track any tab events or goanna messages * on its own to keep it as dumb as possible. * * The UI has two possible modes: progress and display which are triggered diff --git a/mobile/android/base/toolbar/ToolbarEditLayout.java b/mobile/android/base/toolbar/ToolbarEditLayout.java index f2be1fb430..19ab81c63b 100644 --- a/mobile/android/base/toolbar/ToolbarEditLayout.java +++ b/mobile/android/base/toolbar/ToolbarEditLayout.java @@ -3,16 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.R; -import org.mozilla.gecko.animation.PropertyAnimator; -import org.mozilla.gecko.animation.PropertyAnimator.PropertyAnimationListener; -import org.mozilla.gecko.toolbar.BrowserToolbar.OnCommitListener; -import org.mozilla.gecko.toolbar.BrowserToolbar.OnDismissListener; -import org.mozilla.gecko.toolbar.BrowserToolbar.OnFilterListener; -import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState; -import org.mozilla.gecko.widget.ThemedLinearLayout; +import org.mozilla.goanna.R; +import org.mozilla.goanna.animation.PropertyAnimator; +import org.mozilla.goanna.animation.PropertyAnimator.PropertyAnimationListener; +import org.mozilla.goanna.toolbar.BrowserToolbar.OnCommitListener; +import org.mozilla.goanna.toolbar.BrowserToolbar.OnDismissListener; +import org.mozilla.goanna.toolbar.BrowserToolbar.OnFilterListener; +import org.mozilla.goanna.toolbar.BrowserToolbar.TabEditingState; +import org.mozilla.goanna.widget.ThemedLinearLayout; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/toolbar/ToolbarEditText.java b/mobile/android/base/toolbar/ToolbarEditText.java index 302a7d94f2..93fe6193d5 100644 --- a/mobile/android/base/toolbar/ToolbarEditText.java +++ b/mobile/android/base/toolbar/ToolbarEditText.java @@ -3,21 +3,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.ActivityHandlerHelper; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.CustomEditText; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.InputMethods; -import org.mozilla.gecko.R; -import org.mozilla.gecko.toolbar.BrowserToolbar.OnCommitListener; -import org.mozilla.gecko.toolbar.BrowserToolbar.OnDismissListener; -import org.mozilla.gecko.toolbar.BrowserToolbar.OnFilterListener; -import org.mozilla.gecko.util.ActivityResultHandler; -import org.mozilla.gecko.util.GamepadUtils; -import org.mozilla.gecko.util.StringUtils; +import org.mozilla.goanna.ActivityHandlerHelper; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.CustomEditText; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.InputMethods; +import org.mozilla.goanna.R; +import org.mozilla.goanna.toolbar.BrowserToolbar.OnCommitListener; +import org.mozilla.goanna.toolbar.BrowserToolbar.OnDismissListener; +import org.mozilla.goanna.toolbar.BrowserToolbar.OnFilterListener; +import org.mozilla.goanna.util.ActivityResultHandler; +import org.mozilla.goanna.util.GamepadUtils; +import org.mozilla.goanna.util.StringUtils; import android.app.Activity; import android.app.AlertDialog; diff --git a/mobile/android/base/toolbar/ToolbarPrefs.java b/mobile/android/base/toolbar/ToolbarPrefs.java index 666334d5cf..e1cb1b5c3b 100644 --- a/mobile/android/base/toolbar/ToolbarPrefs.java +++ b/mobile/android/base/toolbar/ToolbarPrefs.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.ThreadUtils; class ToolbarPrefs { private static final String PREF_AUTOCOMPLETE_ENABLED = "browser.urlbar.autocomplete.enabled"; diff --git a/mobile/android/base/toolbar/ToolbarProgressView.java b/mobile/android/base/toolbar/ToolbarProgressView.java index 4e4c3a837a..313d5c1e10 100644 --- a/mobile/android/base/toolbar/ToolbarProgressView.java +++ b/mobile/android/base/toolbar/ToolbarProgressView.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.mozilla.gecko.toolbar; +package org.mozilla.goanna.toolbar; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.AppConstants.Versions; import android.content.Context; import android.graphics.Canvas; diff --git a/mobile/android/base/updater/UpdateService.java b/mobile/android/base/updater/UpdateService.java index 95afd08f0c..17dab35657 100644 --- a/mobile/android/base/updater/UpdateService.java +++ b/mobile/android/base/updater/UpdateService.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.updater; +package org.mozilla.goanna.updater; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.CrashHandler; -import org.mozilla.gecko.R; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.CrashHandler; +import org.mozilla.goanna.R; import org.mozilla.apache.commons.codec.binary.Hex; diff --git a/mobile/android/base/updater/UpdateServiceHelper.java b/mobile/android/base/updater/UpdateServiceHelper.java index 22cb6bb4bf..31a69d545b 100644 --- a/mobile/android/base/updater/UpdateServiceHelper.java +++ b/mobile/android/base/updater/UpdateServiceHelper.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.updater; +package org.mozilla.goanna.updater; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.mozglue.RobocopTarget; -import org.mozilla.gecko.util.GoannaJarReader; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.PrefsHelper; +import org.mozilla.goanna.mozglue.RobocopTarget; +import org.mozilla.goanna.util.GoannaJarReader; import android.content.Context; import android.content.Intent; diff --git a/mobile/android/base/util/ActivityResultHandler.java b/mobile/android/base/util/ActivityResultHandler.java index 6f40ee96b5..e9572a7b6e 100644 --- a/mobile/android/base/util/ActivityResultHandler.java +++ b/mobile/android/base/util/ActivityResultHandler.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.content.Intent; diff --git a/mobile/android/base/util/ActivityResultHandlerMap.java b/mobile/android/base/util/ActivityResultHandlerMap.java index dc1d26cecd..4874f9a872 100644 --- a/mobile/android/base/util/ActivityResultHandlerMap.java +++ b/mobile/android/base/util/ActivityResultHandlerMap.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.util.SparseArray; diff --git a/mobile/android/base/util/ActivityUtils.java b/mobile/android/base/util/ActivityUtils.java index 7237016024..d52d829cd6 100644 --- a/mobile/android/base/util/ActivityUtils.java +++ b/mobile/android/base/util/ActivityUtils.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.app.Activity; import android.view.View; import android.view.Window; import android.view.WindowManager; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.AppConstants.Versions; public class ActivityUtils { private ActivityUtils() { diff --git a/mobile/android/base/util/Clipboard.java b/mobile/android/base/util/Clipboard.java index c0595a1718..65ab4855eb 100644 --- a/mobile/android/base/util/Clipboard.java +++ b/mobile/android/base/util/Clipboard.java @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import java.util.concurrent.SynchronousQueue; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI; import android.content.ClipData; import android.content.Context; diff --git a/mobile/android/base/util/EventCallback.java b/mobile/android/base/util/EventCallback.java index b10f568005..3f3e2f53fd 100644 --- a/mobile/android/base/util/EventCallback.java +++ b/mobile/android/base/util/EventCallback.java @@ -1,6 +1,6 @@ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; /** * Callback interface for Goanna requests. diff --git a/mobile/android/base/util/FileUtils.java b/mobile/android/base/util/FileUtils.java index 520344e0c2..25a7c105cb 100644 --- a/mobile/android/base/util/FileUtils.java +++ b/mobile/android/base/util/FileUtils.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.util.Log; @@ -11,7 +11,7 @@ import java.io.IOException; import java.io.FilenameFilter; import java.util.Scanner; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; public class FileUtils { private static final String LOGTAG= "GoannaFileUtils"; diff --git a/mobile/android/base/util/FloatUtils.java b/mobile/android/base/util/FloatUtils.java index fbcd7254f6..087678ed82 100644 --- a/mobile/android/base/util/FloatUtils.java +++ b/mobile/android/base/util/FloatUtils.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.graphics.PointF; diff --git a/mobile/android/base/util/GamepadUtils.java b/mobile/android/base/util/GamepadUtils.java index a140d7504c..75955b4228 100644 --- a/mobile/android/base/util/GamepadUtils.java +++ b/mobile/android/base/util/GamepadUtils.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.annotation.TargetApi; import android.os.Build; diff --git a/mobile/android/base/util/GeckoBackgroundThread.java b/mobile/android/base/util/GeckoBackgroundThread.java index 2cf598c1e9..4da8b500ae 100644 --- a/mobile/android/base/util/GeckoBackgroundThread.java +++ b/mobile/android/base/util/GeckoBackgroundThread.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.os.Handler; import android.os.Looper; diff --git a/mobile/android/base/util/GeckoEventListener.java b/mobile/android/base/util/GeckoEventListener.java index eb228aab87..14afb94ed8 100644 --- a/mobile/android/base/util/GeckoEventListener.java +++ b/mobile/android/base/util/GeckoEventListener.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import org.json.JSONObject; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; @RobocopTarget public interface GoannaEventListener { diff --git a/mobile/android/base/util/GeckoJarReader.java b/mobile/android/base/util/GeckoJarReader.java index cf208d8c95..ae0f75eec0 100644 --- a/mobile/android/base/util/GeckoJarReader.java +++ b/mobile/android/base/util/GeckoJarReader.java @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.content.Context; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.mozglue.NativeZip; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.mozglue.NativeZip; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.util.Log; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; import java.io.BufferedReader; import java.io.File; diff --git a/mobile/android/base/util/GeckoRequest.java b/mobile/android/base/util/GeckoRequest.java index 1f30578f28..23d323b6cf 100644 --- a/mobile/android/base/util/GeckoRequest.java +++ b/mobile/android/base/util/GeckoRequest.java @@ -1,14 +1,14 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import java.util.concurrent.atomic.AtomicInteger; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; import android.util.Log; diff --git a/mobile/android/base/util/HardwareUtils.java b/mobile/android/base/util/HardwareUtils.java index 158fa21e6c..2190c32359 100644 --- a/mobile/android/base/util/HardwareUtils.java +++ b/mobile/android/base/util/HardwareUtils.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; -import org.mozilla.gecko.SysInfo; +import org.mozilla.goanna.SysInfo; import android.content.Context; import android.content.pm.PackageManager; diff --git a/mobile/android/base/util/INIParser.java b/mobile/android/base/util/INIParser.java index 2a68036bcd..fe30160859 100644 --- a/mobile/android/base/util/INIParser.java +++ b/mobile/android/base/util/INIParser.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/mobile/android/base/util/INISection.java b/mobile/android/base/util/INISection.java index 484245acbd..ed53001eeb 100644 --- a/mobile/android/base/util/INISection.java +++ b/mobile/android/base/util/INISection.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.text.TextUtils; import android.util.Log; diff --git a/mobile/android/base/util/IOUtils.java b/mobile/android/base/util/IOUtils.java index d4335aa5a4..e474d18bc9 100644 --- a/mobile/android/base/util/IOUtils.java +++ b/mobile/android/base/util/IOUtils.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.util.Log; diff --git a/mobile/android/base/util/JSONUtils.java b/mobile/android/base/util/JSONUtils.java index b783a30f5a..5540132d8f 100644 --- a/mobile/android/base/util/JSONUtils.java +++ b/mobile/android/base/util/JSONUtils.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import org.json.JSONArray; import org.json.JSONException; diff --git a/mobile/android/base/util/MenuUtils.java b/mobile/android/base/util/MenuUtils.java index e44fdd541a..b19c3dbf41 100644 --- a/mobile/android/base/util/MenuUtils.java +++ b/mobile/android/base/util/MenuUtils.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.view.Menu; import android.view.MenuItem; diff --git a/mobile/android/base/util/NativeEventListener.java b/mobile/android/base/util/NativeEventListener.java index a54c1f5a63..9ee96a4502 100644 --- a/mobile/android/base/util/NativeEventListener.java +++ b/mobile/android/base/util/NativeEventListener.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; @RobocopTarget public interface NativeEventListener { diff --git a/mobile/android/base/util/NativeJSContainer.java b/mobile/android/base/util/NativeJSContainer.java index 5fca12b107..492123a566 100644 --- a/mobile/android/base/util/NativeJSContainer.java +++ b/mobile/android/base/util/NativeJSContainer.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; -import org.mozilla.gecko.mozglue.JNITarget; +import org.mozilla.goanna.mozglue.JNITarget; /** * NativeJSContainer is a wrapper around the SpiderMonkey JSAPI to make it possible to diff --git a/mobile/android/base/util/NativeJSObject.java b/mobile/android/base/util/NativeJSObject.java index 9e6eadc6a4..9c01a1d371 100644 --- a/mobile/android/base/util/NativeJSObject.java +++ b/mobile/android/base/util/NativeJSObject.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; -import org.mozilla.gecko.mozglue.JNITarget; +import org.mozilla.goanna.mozglue.JNITarget; import android.os.Bundle; diff --git a/mobile/android/base/util/NonEvictingLruCache.java b/mobile/android/base/util/NonEvictingLruCache.java index 299ce2e688..ab9fae855a 100644 --- a/mobile/android/base/util/NonEvictingLruCache.java +++ b/mobile/android/base/util/NonEvictingLruCache.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.support.v4.util.LruCache; diff --git a/mobile/android/base/util/PrefUtils.java b/mobile/android/base/util/PrefUtils.java index 565e54ab21..2d2c29d327 100644 --- a/mobile/android/base/util/PrefUtils.java +++ b/mobile/android/base/util/PrefUtils.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import java.util.HashSet; import java.util.Set; import org.json.JSONArray; import org.json.JSONException; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.AppConstants.Versions; import android.content.SharedPreferences; import android.util.Log; diff --git a/mobile/android/base/util/ProxySelector.java b/mobile/android/base/util/ProxySelector.java index 77e4d31ac6..0559ea5cb9 100644 --- a/mobile/android/base/util/ProxySelector.java +++ b/mobile/android/base/util/ProxySelector.java @@ -16,7 +16,7 @@ // This code is based on AOSP /libcore/luni/src/main/java/java/net/ProxySelectorImpl.java -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.text.TextUtils; diff --git a/mobile/android/base/util/RawResource.java b/mobile/android/base/util/RawResource.java index 5bcad1c602..a02e7175f7 100644 --- a/mobile/android/base/util/RawResource.java +++ b/mobile/android/base/util/RawResource.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/util/StringUtils.java b/mobile/android/base/util/StringUtils.java index cd6725297f..77f1cc2cba 100644 --- a/mobile/android/base/util/StringUtils.java +++ b/mobile/android/base/util/StringUtils.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.net.Uri; import android.text.TextUtils; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.AppConstants.Versions; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/mobile/android/base/util/ThreadUtils.java b/mobile/android/base/util/ThreadUtils.java index 0c15e0bcb8..d8709b3b6a 100644 --- a/mobile/android/base/util/ThreadUtils.java +++ b/mobile/android/base/util/ThreadUtils.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.goanna.mozglue.RobocopTarget; import java.util.Map; diff --git a/mobile/android/base/util/UIAsyncTask.java b/mobile/android/base/util/UIAsyncTask.java index ba5367f348..7c91024275 100644 --- a/mobile/android/base/util/UIAsyncTask.java +++ b/mobile/android/base/util/UIAsyncTask.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import android.os.Handler; import android.os.Looper; diff --git a/mobile/android/base/util/WebActivityMapper.java b/mobile/android/base/util/WebActivityMapper.java index 791d8f037f..f7c5f62543 100644 --- a/mobile/android/base/util/WebActivityMapper.java +++ b/mobile/android/base/util/WebActivityMapper.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; import org.json.JSONArray; import org.json.JSONException; diff --git a/mobile/android/base/util/WindowUtils.java b/mobile/android/base/util/WindowUtils.java index d7a34a12ab..202ce35b67 100644 --- a/mobile/android/base/util/WindowUtils.java +++ b/mobile/android/base/util/WindowUtils.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.util; +package org.mozilla.goanna.util; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.AppConstants.Versions; import android.content.Context; import android.util.DisplayMetrics; diff --git a/mobile/android/base/webapp/Allocator.java b/mobile/android/base/webapp/Allocator.java index 95474e5115..65bc4ffea5 100644 --- a/mobile/android/base/webapp/Allocator.java +++ b/mobile/android/base/webapp/Allocator.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.webapp; +package org.mozilla.goanna.webapp; import java.util.ArrayList; -import org.mozilla.gecko.GoannaAppShell; +import org.mozilla.goanna.GoannaAppShell; import android.content.Context; import android.content.SharedPreferences; diff --git a/mobile/android/base/webapp/ApkResources.java b/mobile/android/base/webapp/ApkResources.java index 74c97daac9..74a92baa26 100644 --- a/mobile/android/base/webapp/ApkResources.java +++ b/mobile/android/base/webapp/ApkResources.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.webapp; +package org.mozilla.goanna.webapp; import java.io.BufferedReader; import java.io.File; diff --git a/mobile/android/base/webapp/Dispatcher.java b/mobile/android/base/webapp/Dispatcher.java index cbcb9cee94..75cc822269 100644 --- a/mobile/android/base/webapp/Dispatcher.java +++ b/mobile/android/base/webapp/Dispatcher.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.webapp; +package org.mozilla.goanna.webapp; import android.app.Activity; import android.content.Intent; @@ -45,7 +45,7 @@ public class Dispatcher extends Activity { Intent intent = new Intent(getIntent()); // Only change its destination. - intent.setClassName(getApplicationContext(), "org.mozilla.gecko.webapp.Webapps$Webapp" + index); + intent.setClassName(getApplicationContext(), "org.mozilla.goanna.webapp.Webapps$Webapp" + index); // If and only if we haven't seen this before. intent.putExtra("isInstalled", isInstalled); diff --git a/mobile/android/base/webapp/EventListener.java b/mobile/android/base/webapp/EventListener.java index 529c6c2394..b955ecbf2b 100644 --- a/mobile/android/base/webapp/EventListener.java +++ b/mobile/android/base/webapp/EventListener.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.webapp; +package org.mozilla.goanna.webapp; import java.io.File; import java.util.Arrays; @@ -13,16 +13,16 @@ import java.util.Set; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.ActivityHandlerHelper; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.util.ActivityResultHandler; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.ActivityHandlerHelper; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.util.ActivityResultHandler; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.ThreadUtils; import android.app.Activity; import android.app.ActivityManager; diff --git a/mobile/android/base/webapp/InstallHelper.java b/mobile/android/base/webapp/InstallHelper.java index c55af9a62f..d5676000f1 100644 --- a/mobile/android/base/webapp/InstallHelper.java +++ b/mobile/android/base/webapp/InstallHelper.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.webapp; +package org.mozilla.goanna.webapp; import java.io.Closeable; import java.io.File; @@ -14,15 +14,15 @@ import java.io.OutputStream; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.EventDispatcher; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.util.EventCallback; -import org.mozilla.gecko.util.NativeEventListener; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.EventDispatcher; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.gfx.BitmapUtils; +import org.mozilla.goanna.util.EventCallback; +import org.mozilla.goanna.util.NativeEventListener; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.util.ThreadUtils; import android.content.Context; import android.graphics.Bitmap; diff --git a/mobile/android/base/webapp/InstallListener.java b/mobile/android/base/webapp/InstallListener.java index ee49ff5b44..1f1fa39d89 100644 --- a/mobile/android/base/webapp/InstallListener.java +++ b/mobile/android/base/webapp/InstallListener.java @@ -3,15 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.webapp; +package org.mozilla.goanna.webapp; import java.io.File; import java.io.IOException; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.Assert; -import org.mozilla.gecko.GoannaThread; +import org.mozilla.goanna.Assert; +import org.mozilla.goanna.GoannaThread; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/webapp/TaskKiller.java b/mobile/android/base/webapp/TaskKiller.java index 3d3dab890c..4055c5f557 100644 --- a/mobile/android/base/webapp/TaskKiller.java +++ b/mobile/android/base/webapp/TaskKiller.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.webapp; +package org.mozilla.goanna.webapp; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/mobile/android/base/webapp/UninstallListener.java b/mobile/android/base/webapp/UninstallListener.java index 766e7d24ba..e68554b60b 100644 --- a/mobile/android/base/webapp/UninstallListener.java +++ b/mobile/android/base/webapp/UninstallListener.java @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.webapp; +package org.mozilla.goanna.webapp; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.GoannaApp; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.GoannaApp; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.util.ThreadUtils; import android.app.ActivityManager; import android.content.BroadcastReceiver; diff --git a/mobile/android/base/webapp/WebappImpl.java b/mobile/android/base/webapp/WebappImpl.java index f22cf51ff0..36699a798e 100644 --- a/mobile/android/base/webapp/WebappImpl.java +++ b/mobile/android/base/webapp/WebappImpl.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.webapp; +package org.mozilla.goanna.webapp; import java.io.File; import java.io.IOException; @@ -11,19 +11,19 @@ import java.net.URI; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.GoannaApp; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.GoannaEvent; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.GoannaThread; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tab; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.StubBrowserDB; -import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent; -import org.mozilla.gecko.util.NativeJSObject; -import org.mozilla.gecko.webapp.InstallHelper.InstallCallback; +import org.mozilla.goanna.GoannaApp; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.GoannaEvent; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.GoannaThread; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tab; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.db.BrowserDB; +import org.mozilla.goanna.db.StubBrowserDB; +import org.mozilla.goanna.mozglue.ContextUtils.SafeIntent; +import org.mozilla.goanna.util.NativeJSObject; +import org.mozilla.goanna.webapp.InstallHelper.InstallCallback; import android.content.Intent; import android.content.pm.PackageManager.NameNotFoundException; @@ -249,7 +249,7 @@ public class WebappImpl extends GoannaApp implements InstallCallback { } /* (non-Javadoc) - * @see org.mozilla.gecko.GoannaApp#getDefaultProfileName() + * @see org.mozilla.goanna.GoannaApp#getDefaultProfileName() */ @Override protected String getDefaultProfileName() { diff --git a/mobile/android/base/webapp/Webapps.java b/mobile/android/base/webapp/Webapps.java index 7ef3424e93..b75cf01179 100644 --- a/mobile/android/base/webapp/Webapps.java +++ b/mobile/android/base/webapp/Webapps.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.webapp; +package org.mozilla.goanna.webapp; /** * Declare a predefined number of Webapp classes to the Webapps class. diff --git a/mobile/android/base/widget/ActivityChooserModel.java b/mobile/android/base/widget/ActivityChooserModel.java index 090c7d8437..9a224a8393 100644 --- a/mobile/android/base/widget/ActivityChooserModel.java +++ b/mobile/android/base/widget/ActivityChooserModel.java @@ -18,18 +18,18 @@ * Mozilla: Changing the package. */ //package android.widget; -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; // Mozilla: New import import android.accounts.Account; import android.content.pm.PackageManager; -import org.mozilla.gecko.distribution.Distribution; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.fxa.FirefoxAccounts; -import org.mozilla.gecko.overlays.ui.ShareDialog; -import org.mozilla.gecko.sync.repositories.android.ClientsDatabaseAccessor; -import org.mozilla.gecko.sync.setup.SyncAccounts; -import org.mozilla.gecko.R; +import org.mozilla.goanna.distribution.Distribution; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.fxa.FirefoxAccounts; +import org.mozilla.goanna.overlays.ui.ShareDialog; +import org.mozilla.goanna.sync.repositories.android.ClientsDatabaseAccessor; +import org.mozilla.goanna.sync.setup.SyncAccounts; +import org.mozilla.goanna.R; import java.io.File; import android.content.BroadcastReceiver; diff --git a/mobile/android/base/widget/AllCapsTextView.java b/mobile/android/base/widget/AllCapsTextView.java index 6bd1e36e46..aca6e9392a 100644 --- a/mobile/android/base/widget/AllCapsTextView.java +++ b/mobile/android/base/widget/AllCapsTextView.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/widget/AnimatedHeightLayout.java b/mobile/android/base/widget/AnimatedHeightLayout.java index 18875bbf96..53ecf4da90 100644 --- a/mobile/android/base/widget/AnimatedHeightLayout.java +++ b/mobile/android/base/widget/AnimatedHeightLayout.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.animation.HeightChangeAnimation; +import org.mozilla.goanna.animation.HeightChangeAnimation; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/widget/ArrowPopup.java b/mobile/android/base/widget/ArrowPopup.java index ece1a70c8b..e4a7b33ea9 100644 --- a/mobile/android/base/widget/ArrowPopup.java +++ b/mobile/android/base/widget/ArrowPopup.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.R; -import org.mozilla.gecko.util.HardwareUtils; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.R; +import org.mozilla.goanna.util.HardwareUtils; import android.app.Activity; import android.content.Context; diff --git a/mobile/android/base/widget/BasicColorPicker.java b/mobile/android/base/widget/BasicColorPicker.java index 24d6250f1b..60abb15ef9 100644 --- a/mobile/android/base/widget/BasicColorPicker.java +++ b/mobile/android/base/widget/BasicColorPicker.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import java.util.ArrayList; import java.util.Arrays; diff --git a/mobile/android/base/widget/ButtonToast.java b/mobile/android/base/widget/ButtonToast.java index c5b8dcd80e..8b61ed1d6f 100644 --- a/mobile/android/base/widget/ButtonToast.java +++ b/mobile/android/base/widget/ButtonToast.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; -import org.mozilla.gecko.animation.PropertyAnimator; +import org.mozilla.goanna.R; +import org.mozilla.goanna.animation.PropertyAnimator; import android.graphics.drawable.Drawable; import android.os.Handler; diff --git a/mobile/android/base/widget/CheckableLinearLayout.java b/mobile/android/base/widget/CheckableLinearLayout.java index b740592fe2..eac0f2a670 100644 --- a/mobile/android/base/widget/CheckableLinearLayout.java +++ b/mobile/android/base/widget/CheckableLinearLayout.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/widget/ClickableWhenDisabledEditText.java b/mobile/android/base/widget/ClickableWhenDisabledEditText.java index 206341212c..1d4eb535be 100644 --- a/mobile/android/base/widget/ClickableWhenDisabledEditText.java +++ b/mobile/android/base/widget/ClickableWhenDisabledEditText.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/widget/DateTimePicker.java b/mobile/android/base/widget/DateTimePicker.java index 104700787c..37cc707957 100644 --- a/mobile/android/base/widget/DateTimePicker.java +++ b/mobile/android/base/widget/DateTimePicker.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Calendar; import java.util.Locale; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.R; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.R; import android.content.Context; import android.text.format.DateFormat; diff --git a/mobile/android/base/widget/Divider.java b/mobile/android/base/widget/Divider.java index 8ce379dcd7..06ee4255ac 100644 --- a/mobile/android/base/widget/Divider.java +++ b/mobile/android/base/widget/Divider.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/widget/DoorHanger.java b/mobile/android/base/widget/DoorHanger.java index aac24bf984..84d9f73488 100644 --- a/mobile/android/base/widget/DoorHanger.java +++ b/mobile/android/base/widget/DoorHanger.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Tabs; -import org.mozilla.gecko.prompts.PromptInput; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Tabs; +import org.mozilla.goanna.prompts.PromptInput; import org.json.JSONArray; import org.json.JSONException; diff --git a/mobile/android/base/widget/EllipsisTextView.java b/mobile/android/base/widget/EllipsisTextView.java index 44f88e668f..0debc0f219 100644 --- a/mobile/android/base/widget/EllipsisTextView.java +++ b/mobile/android/base/widget/EllipsisTextView.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/FadedMultiColorTextView.java b/mobile/android/base/widget/FadedMultiColorTextView.java index 319bd4778c..0fb7510565 100644 --- a/mobile/android/base/widget/FadedMultiColorTextView.java +++ b/mobile/android/base/widget/FadedMultiColorTextView.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.content.res.ColorStateList; @@ -18,11 +18,11 @@ import android.graphics.Shader; import android.util.AttributeSet; /** - * Fades the end of the text by gecko:fadeWidth amount, + * Fades the end of the text by goanna:fadeWidth amount, * if the text is too long and requires an ellipsis. * * This implementation is an improvement over Android's built-in fadingEdge - * but potentially slower than the {@link org.mozilla.gecko.widget.FadedSingleColorTextView}. + * but potentially slower than the {@link org.mozilla.goanna.widget.FadedSingleColorTextView}. * It works for text of multiple colors but only one background color. It works by * drawing a gradient rectangle with the background color over the text, fading it out. */ diff --git a/mobile/android/base/widget/FadedSingleColorTextView.java b/mobile/android/base/widget/FadedSingleColorTextView.java index 866b7ecbd0..b7754266d4 100644 --- a/mobile/android/base/widget/FadedSingleColorTextView.java +++ b/mobile/android/base/widget/FadedSingleColorTextView.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.content.Context; import android.graphics.Canvas; @@ -12,7 +12,7 @@ import android.graphics.Shader; import android.util.AttributeSet; /** - * Fades the end of the text by gecko:fadeWidth amount, + * Fades the end of the text by goanna:fadeWidth amount, * if the text is too long and requires an ellipsis. * * This implementation is an improvement over Android's built-in fadingEdge diff --git a/mobile/android/base/widget/FadedTextView.java b/mobile/android/base/widget/FadedTextView.java index 79dee7ea21..77aca2cbb3 100644 --- a/mobile/android/base/widget/FadedTextView.java +++ b/mobile/android/base/widget/FadedTextView.java @@ -3,18 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.content.Context; import android.content.res.TypedArray; import android.text.Layout; import android.util.AttributeSet; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; /** * An implementation of FadedTextView should fade the end of the text - * by gecko:fadeWidth amount, if the text is too long and requires an ellipsis. + * by goanna:fadeWidth amount, if the text is too long and requires an ellipsis. */ public abstract class FadedTextView extends ThemedTextView { // Width of the fade effect from end of the view. diff --git a/mobile/android/base/widget/FaviconView.java b/mobile/android/base/widget/FaviconView.java index 799240dcda..088a81a948 100644 --- a/mobile/android/base/widget/FaviconView.java +++ b/mobile/android/base/widget/FaviconView.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; -import org.mozilla.gecko.favicons.Favicons; +import org.mozilla.goanna.R; +import org.mozilla.goanna.favicons.Favicons; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/FloatingHintEditText.java b/mobile/android/base/widget/FloatingHintEditText.java index 2a87c31466..750c767cce 100644 --- a/mobile/android/base/widget/FloatingHintEditText.java +++ b/mobile/android/base/widget/FloatingHintEditText.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.content.Context; import android.content.res.ColorStateList; @@ -14,7 +14,7 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.widget.EditText; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; public class FloatingHintEditText extends EditText { private static enum Animation { NONE, SHRINK, GROW } diff --git a/mobile/android/base/widget/FlowLayout.java b/mobile/android/base/widget/FlowLayout.java index 042e748510..04aced67ca 100644 --- a/mobile/android/base/widget/FlowLayout.java +++ b/mobile/android/base/widget/FlowLayout.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.content.res.TypedArray; @@ -21,7 +21,7 @@ public class FlowLayout extends ViewGroup { public FlowLayout(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.obtainStyledAttributes(attrs, org.mozilla.gecko.R.styleable.FlowLayout); + TypedArray a = context.obtainStyledAttributes(attrs, org.mozilla.goanna.R.styleable.FlowLayout); mSpacing = a.getDimensionPixelSize(R.styleable.FlowLayout_spacing, (int) context.getResources().getDimension(R.dimen.flow_layout_spacing)); a.recycle(); } diff --git a/mobile/android/base/widget/GeckoActionProvider.java b/mobile/android/base/widget/GeckoActionProvider.java index 47b9a0c6f1..96f0a60fe5 100644 --- a/mobile/android/base/widget/GeckoActionProvider.java +++ b/mobile/android/base/widget/GeckoActionProvider.java @@ -3,17 +3,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.view.Menu; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.menu.MenuItemActionView; -import org.mozilla.gecko.menu.QuickShareBarActionView; -import org.mozilla.gecko.overlays.ui.ShareDialog; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.menu.MenuItemActionView; +import org.mozilla.goanna.menu.QuickShareBarActionView; +import org.mozilla.goanna.overlays.ui.ShareDialog; +import org.mozilla.goanna.util.ThreadUtils; import android.content.Context; import android.content.Intent; diff --git a/mobile/android/base/widget/GeckoPopupMenu.java b/mobile/android/base/widget/GeckoPopupMenu.java index d3a0a01b56..d68763a62b 100644 --- a/mobile/android/base/widget/GeckoPopupMenu.java +++ b/mobile/android/base/widget/GeckoPopupMenu.java @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.menu.GoannaMenu; -import org.mozilla.gecko.menu.GoannaMenuInflater; -import org.mozilla.gecko.menu.MenuPanel; -import org.mozilla.gecko.menu.MenuPopup; +import org.mozilla.goanna.menu.GoannaMenu; +import org.mozilla.goanna.menu.GoannaMenuInflater; +import org.mozilla.goanna.menu.MenuPanel; +import org.mozilla.goanna.menu.MenuPopup; import android.content.Context; import android.view.Menu; diff --git a/mobile/android/base/widget/GeckoSwipeRefreshLayout.java b/mobile/android/base/widget/GeckoSwipeRefreshLayout.java index cfbbc0472e..6a72041c2c 100644 --- a/mobile/android/base/widget/GeckoSwipeRefreshLayout.java +++ b/mobile/android/base/widget/GeckoSwipeRefreshLayout.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.goanna.AppConstants.Versions; import android.content.Context; import android.content.res.Resources; diff --git a/mobile/android/base/widget/GeckoViewFlipper.java b/mobile/android/base/widget/GeckoViewFlipper.java index 74cc56a217..e48ed7bcbe 100644 --- a/mobile/android/base/widget/GeckoViewFlipper.java +++ b/mobile/android/base/widget/GeckoViewFlipper.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.animation.ViewHelper; +import org.mozilla.goanna.AppConstants.Versions; +import org.mozilla.goanna.animation.ViewHelper; import android.content.Context; import android.graphics.Rect; diff --git a/mobile/android/base/widget/IconTabWidget.java b/mobile/android/base/widget/IconTabWidget.java index 579f819f4d..a2becfcd8e 100644 --- a/mobile/android/base/widget/IconTabWidget.java +++ b/mobile/android/base/widget/IconTabWidget.java @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/ResizablePathDrawable.java b/mobile/android/base/widget/ResizablePathDrawable.java index ff0709cb76..cdde9fb219 100644 --- a/mobile/android/base/widget/ResizablePathDrawable.java +++ b/mobile/android/base/widget/ResizablePathDrawable.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.content.res.ColorStateList; import android.graphics.Canvas; diff --git a/mobile/android/base/widget/SquaredImageView.java b/mobile/android/base/widget/SquaredImageView.java index 0b77e9d1ca..0c06e2a3f5 100644 --- a/mobile/android/base/widget/SquaredImageView.java +++ b/mobile/android/base/widget/SquaredImageView.java @@ -1,4 +1,4 @@ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/mobile/android/base/widget/SwipeDismissListViewTouchListener.java b/mobile/android/base/widget/SwipeDismissListViewTouchListener.java index 0b18146433..c5423c6636 100644 --- a/mobile/android/base/widget/SwipeDismissListViewTouchListener.java +++ b/mobile/android/base/widget/SwipeDismissListViewTouchListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.graphics.Rect; import android.view.MotionEvent; @@ -32,7 +32,7 @@ import com.nineoldandroids.animation.ValueAnimator; import com.nineoldandroids.view.ViewHelper; import com.nineoldandroids.view.ViewPropertyAnimator; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; /** * This code is based off of Jake Wharton's NOA port (https://github.com/JakeWharton/SwipeToDismissNOA) diff --git a/mobile/android/base/widget/TabThumbnailWrapper.java b/mobile/android/base/widget/TabThumbnailWrapper.java index 156f920466..235f0799ea 100644 --- a/mobile/android/base/widget/TabThumbnailWrapper.java +++ b/mobile/android/base/widget/TabThumbnailWrapper.java @@ -1,9 +1,9 @@ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; import android.content.Context; import android.util.AttributeSet; import android.widget.FrameLayout; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; public class TabThumbnailWrapper extends FrameLayout { diff --git a/mobile/android/base/widget/ThemedEditText.java b/mobile/android/base/widget/ThemedEditText.java index df769345dd..e6c1bdd97b 100644 --- a/mobile/android/base/widget/ThemedEditText.java +++ b/mobile/android/base/widget/ThemedEditText.java @@ -4,11 +4,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.R; -import org.mozilla.gecko.lwt.LightweightTheme; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.R; +import org.mozilla.goanna.lwt.LightweightTheme; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/ThemedImageButton.java b/mobile/android/base/widget/ThemedImageButton.java index 0968619e47..5842238986 100644 --- a/mobile/android/base/widget/ThemedImageButton.java +++ b/mobile/android/base/widget/ThemedImageButton.java @@ -4,11 +4,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.R; -import org.mozilla.gecko.lwt.LightweightTheme; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.R; +import org.mozilla.goanna.lwt.LightweightTheme; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/ThemedImageView.java b/mobile/android/base/widget/ThemedImageView.java index 5f3a3fb026..5ed63e6e11 100644 --- a/mobile/android/base/widget/ThemedImageView.java +++ b/mobile/android/base/widget/ThemedImageView.java @@ -4,11 +4,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.R; -import org.mozilla.gecko.lwt.LightweightTheme; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.R; +import org.mozilla.goanna.lwt.LightweightTheme; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/ThemedLinearLayout.java b/mobile/android/base/widget/ThemedLinearLayout.java index 0f226c0e35..9898d48563 100644 --- a/mobile/android/base/widget/ThemedLinearLayout.java +++ b/mobile/android/base/widget/ThemedLinearLayout.java @@ -4,11 +4,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.R; -import org.mozilla.gecko.lwt.LightweightTheme; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.R; +import org.mozilla.goanna.lwt.LightweightTheme; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/ThemedRelativeLayout.java b/mobile/android/base/widget/ThemedRelativeLayout.java index 571a6f326f..54fe2916c2 100644 --- a/mobile/android/base/widget/ThemedRelativeLayout.java +++ b/mobile/android/base/widget/ThemedRelativeLayout.java @@ -4,11 +4,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.R; -import org.mozilla.gecko.lwt.LightweightTheme; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.R; +import org.mozilla.goanna.lwt.LightweightTheme; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/ThemedTextSwitcher.java b/mobile/android/base/widget/ThemedTextSwitcher.java index c6024e6644..59ab309d9d 100644 --- a/mobile/android/base/widget/ThemedTextSwitcher.java +++ b/mobile/android/base/widget/ThemedTextSwitcher.java @@ -4,11 +4,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.R; -import org.mozilla.gecko.lwt.LightweightTheme; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.R; +import org.mozilla.goanna.lwt.LightweightTheme; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/ThemedTextView.java b/mobile/android/base/widget/ThemedTextView.java index b7f1e8ed4b..58994efac6 100644 --- a/mobile/android/base/widget/ThemedTextView.java +++ b/mobile/android/base/widget/ThemedTextView.java @@ -4,11 +4,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.R; -import org.mozilla.gecko.lwt.LightweightTheme; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.R; +import org.mozilla.goanna.lwt.LightweightTheme; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/ThemedView.java b/mobile/android/base/widget/ThemedView.java index 5120937c5e..b5227a4664 100644 --- a/mobile/android/base/widget/ThemedView.java +++ b/mobile/android/base/widget/ThemedView.java @@ -4,11 +4,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.R; -import org.mozilla.gecko.lwt.LightweightTheme; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.R; +import org.mozilla.goanna.lwt.LightweightTheme; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/ThemedView.java.frag b/mobile/android/base/widget/ThemedView.java.frag index dfb3c9362d..a3ad199f00 100644 --- a/mobile/android/base/widget/ThemedView.java.frag +++ b/mobile/android/base/widget/ThemedView.java.frag @@ -5,11 +5,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.GoannaApplication; -import org.mozilla.gecko.LightweightTheme; -import org.mozilla.gecko.R; +import org.mozilla.goanna.GoannaApplication; +import org.mozilla.goanna.LightweightTheme; +import org.mozilla.goanna.R; import android.content.Context; import android.content.res.TypedArray; diff --git a/mobile/android/base/widget/ThumbnailView.java b/mobile/android/base/widget/ThumbnailView.java index 61dd3ab254..1cb8c9e2a3 100644 --- a/mobile/android/base/widget/ThumbnailView.java +++ b/mobile/android/base/widget/ThumbnailView.java @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.graphics.Canvas; diff --git a/mobile/android/base/widget/TwoWayView.java b/mobile/android/base/widget/TwoWayView.java index 79cc4f6125..90ca09e2cd 100644 --- a/mobile/android/base/widget/TwoWayView.java +++ b/mobile/android/base/widget/TwoWayView.java @@ -19,9 +19,9 @@ * limitations under the License. */ -package org.mozilla.gecko.widget; +package org.mozilla.goanna.widget; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import java.util.ArrayList; import java.util.List; diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 090c311a55..4d7f81beb3 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -3392,7 +3392,7 @@ Tab.prototype = { stub = true; } else { let jenv = JNI.GetForThread(); - let jTabs = JNI.LoadClass(jenv, "org.mozilla.gecko.Tabs", { + let jTabs = JNI.LoadClass(jenv, "org.mozilla.goanna.Tabs", { static_methods: [ { name: "getNextTabId", sig: "()I" } ], @@ -3671,11 +3671,11 @@ Tab.prototype = { return; // "zoom" is the user-visible zoom of the "this" tab - // "resolution" is the zoom at which we wish gecko to render "this" tab at + // "resolution" is the zoom at which we wish goanna to render "this" tab at // these two may be different if we are, for example, trying to render a // large area of the page at low resolution because the user is panning real // fast. - // The gecko scroll position is in CSS pixels. The display port rect + // The goanna scroll position is in CSS pixels. The display port rect // values (aDisplayPort), however, are in CSS pixels multiplied by the desired // rendering resolution. Therefore care must be taken when doing math with // these sets of values, to ensure that they are normalized to the same coordinate diff --git a/mobile/android/components/HelperAppDialog.js b/mobile/android/components/HelperAppDialog.js index d2e2d10708..aedc622e82 100644 --- a/mobile/android/components/HelperAppDialog.js +++ b/mobile/android/components/HelperAppDialog.js @@ -142,7 +142,7 @@ HelperAppLauncherDialog.prototype = { // Add a fake intent for save to disk at the top of the list. apps.unshift({ name: bundle.GetStringFromName("helperapps.saveToDisk"), - packageName: "org.mozilla.gecko.Download", + packageName: "org.mozilla.goanna.Download", iconUri: "drawable://icon", selected: true, // Default to download for files launch: function() { diff --git a/mobile/android/components/PaymentProviderStrategy.js b/mobile/android/components/PaymentProviderStrategy.js index 2b4ef5a284..3142d45e16 100644 --- a/mobile/android/components/PaymentProviderStrategy.js +++ b/mobile/android/components/PaymentProviderStrategy.js @@ -27,7 +27,7 @@ PaymentProviderStrategy.prototype = { let jenv = JNI.GetForThread(); let jMethodName = "get" + type.toUpperCase(); let jGoannaNetworkManager = JNI.LoadClass( - jenv, "org/mozilla/gecko/GoannaNetworkManager", { + jenv, "org/mozilla/goanna/GoannaNetworkManager", { static_methods: [ { name: jMethodName, sig: "()I" }, ], diff --git a/mobile/android/components/WebappsUpdateTimer.js b/mobile/android/components/WebappsUpdateTimer.js index 8ba5d434f2..5d8c27871b 100644 --- a/mobile/android/components/WebappsUpdateTimer.js +++ b/mobile/android/components/WebappsUpdateTimer.js @@ -24,7 +24,7 @@ function getContextClassName() { try { jenv = JNI.GetForThread(); - let GoannaAppShell = JNI.LoadClass(jenv, "org.mozilla.gecko.GoannaAppShell", { + let GoannaAppShell = JNI.LoadClass(jenv, "org.mozilla.goanna.GoannaAppShell", { static_methods: [ { name: "getContext", sig: "()Landroid/content/Context;" } ], @@ -62,7 +62,7 @@ WebappsUpdateTimer.prototype = { // is a webapp process (since we only want to bug people about updates // from the browser process). if (Services.prefs.getIntPref("browser.webapps.checkForUpdates") == 0 || - getContextClassName().startsWith("org.mozilla.gecko.webapp")) { + getContextClassName().startsWith("org.mozilla.goanna.webapp")) { return; } diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg index 5da9f1baca..f541901799 100644 --- a/mobile/android/config/proguard/proguard.cfg +++ b/mobile/android/config/proguard/proguard.cfg @@ -16,8 +16,8 @@ -keep public class * extends android.content.BroadcastReceiver -keep public class * extends android.content.ContentProvider -keep public class * extends android.preference.Preference --keep public class * extends org.mozilla.gecko.sync.syncadapter.SyncAdapter --keep class org.mozilla.gecko.sync.syncadapter.SyncAdapter +-keep public class * extends org.mozilla.goanna.sync.syncadapter.SyncAdapter +-keep class org.mozilla.goanna.sync.syncadapter.SyncAdapter -keep public class * extends android.support.v4.app.Fragment @@ -118,19 +118,19 @@ # Keep miscellaneous targets. # Keep the annotation. --keep @interface org.mozilla.gecko.mozglue.JNITarget +-keep @interface org.mozilla.goanna.mozglue.JNITarget # Keep classes tagged with the annotation. --keep @org.mozilla.gecko.mozglue.JNITarget class * +-keep @org.mozilla.goanna.mozglue.JNITarget class * # Keep all members of an annotated class. --keepclassmembers @org.mozilla.gecko.mozglue.JNITarget class * { +-keepclassmembers @org.mozilla.goanna.mozglue.JNITarget class * { *; } # Keep annotated members of any class. -keepclassmembers class * { - @org.mozilla.gecko.mozglue.JNITarget *; + @org.mozilla.goanna.mozglue.JNITarget *; } # Keep classes which contain at least one annotated element. Split over two directives @@ -138,72 +138,72 @@ # doesn't combine well with the '*' wildcard" (And, indeed, using it causes things to # be deleted that we want to keep.) -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.JNITarget ; + @org.mozilla.goanna.mozglue.JNITarget ; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.JNITarget ; + @org.mozilla.goanna.mozglue.JNITarget ; } # Keep Robocop targets. TODO: Can omit these from release builds. Also, Bug 916507. # Same formula as above... --keep @interface org.mozilla.gecko.mozglue.RobocopTarget --keep @org.mozilla.gecko.mozglue.RobocopTarget class * +-keep @interface org.mozilla.goanna.mozglue.RobocopTarget +-keep @org.mozilla.goanna.mozglue.RobocopTarget class * -keepclassmembers class * { - @org.mozilla.gecko.mozglue.RobocopTarget *; + @org.mozilla.goanna.mozglue.RobocopTarget *; } --keepclassmembers @org.mozilla.gecko.mozglue.RobocopTarget class * { +-keepclassmembers @org.mozilla.goanna.mozglue.RobocopTarget class * { *; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.RobocopTarget ; + @org.mozilla.goanna.mozglue.RobocopTarget ; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.RobocopTarget ; + @org.mozilla.goanna.mozglue.RobocopTarget ; } # Keep WebRTC targets. --keep @interface org.mozilla.gecko.mozglue.WebRTCJNITarget --keep @org.mozilla.gecko.mozglue.WebRTCJNITarget class * +-keep @interface org.mozilla.goanna.mozglue.WebRTCJNITarget +-keep @org.mozilla.goanna.mozglue.WebRTCJNITarget class * -keepclassmembers class * { - @org.mozilla.gecko.mozglue.WebRTCJNITarget *; + @org.mozilla.goanna.mozglue.WebRTCJNITarget *; } --keepclassmembers @org.mozilla.gecko.mozglue.WebRTCJNITarget class * { +-keepclassmembers @org.mozilla.goanna.mozglue.WebRTCJNITarget class * { *; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.WebRTCJNITarget ; + @org.mozilla.goanna.mozglue.WebRTCJNITarget ; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.WebRTCJNITarget ; + @org.mozilla.goanna.mozglue.WebRTCJNITarget ; } # Keep generator-targeted entry points. --keep @interface org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI --keep @org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI class * +-keep @interface org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI +-keep @org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI class * -keepclassmembers class * { - @org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI *; + @org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI *; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI ; + @org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI ; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI ; + @org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI ; } --keep @interface org.mozilla.gecko.mozglue.generatorannotations.WrapEntireClassForJNI --keep @org.mozilla.gecko.mozglue.generatorannotations.WrapEntireClassForJNI class * --keepclassmembers @org.mozilla.gecko.mozglue.generatorannotations.WrapEntireClassForJNI class * { +-keep @interface org.mozilla.goanna.mozglue.generatorannotations.WrapEntireClassForJNI +-keep @org.mozilla.goanna.mozglue.generatorannotations.WrapEntireClassForJNI class * +-keepclassmembers @org.mozilla.goanna.mozglue.generatorannotations.WrapEntireClassForJNI class * { *; } -keep class **.R$* # Keep classes, and all their contents, compiled before mozglue.RobocopTarget. --keep class org.mozilla.gecko.AppConstants { +-keep class org.mozilla.goanna.AppConstants { *; } --keep class org.mozilla.gecko.SysInfo { +-keep class org.mozilla.goanna.SysInfo { *; } @@ -211,7 +211,7 @@ -dontobfuscate # Suppress warnings about missing descriptor classes. -#-dontnote **,!ch.boye.**,!org.mozilla.gecko.sync.** +#-dontnote **,!ch.boye.**,!org.mozilla.goanna.sync.** -include "play-services-keeps.cfg" diff --git a/mobile/android/geckoview_library/.classpath b/mobile/android/geckoview_library/.classpath index 46d9cf7cbb..20f0fa0ea7 100644 --- a/mobile/android/geckoview_library/.classpath +++ b/mobile/android/geckoview_library/.classpath @@ -5,7 +5,7 @@ - + diff --git a/mobile/android/geckoview_library/AndroidManifest.xml.in b/mobile/android/geckoview_library/AndroidManifest.xml.in index db3230cfd7..9ee3ba5eda 100644 --- a/mobile/android/geckoview_library/AndroidManifest.xml.in +++ b/mobile/android/geckoview_library/AndroidManifest.xml.in @@ -1,6 +1,6 @@ #filter substitution diff --git a/mobile/android/geckoview_library/Makefile.in b/mobile/android/geckoview_library/Makefile.in index 5a5aaef3f0..b8bec732c1 100644 --- a/mobile/android/geckoview_library/Makefile.in +++ b/mobile/android/geckoview_library/Makefile.in @@ -33,19 +33,19 @@ _ABS_DIST = $(abspath $(DIST)) package: local.properties project.properties AndroidManifest.xml FORCE # Make directory for the zips - $(MKDIR) -p $(_ABS_DIST)/geckoview_library + $(MKDIR) -p $(_ABS_DIST)/goannaview_library - # Zip the assets into $(DIST)/geckoview_library/geckoview_assets.zip + # Zip the assets into $(DIST)/goannaview_library/goannaview_assets.zip cd $(_ABS_DIST)/$(MOZ_APP_NAME) && \ - $(ZIP) -q -r $(_ABS_DIST)/geckoview_library/geckoview_assets.zip assets + $(ZIP) -q -r $(_ABS_DIST)/goannaview_library/goannaview_assets.zip assets # Make empty directories to fit an Android project structure $(MKDIR) -p bin gen libs/$(ANDROID_CPU_ARCH) src - # Copy the JARs, except for the jar containing org.mozilla.gecko.R. - # org.mozilla.gecko.R will be provided by the embedding application. + # Copy the JARs, except for the jar containing org.mozilla.goanna.R. + # org.mozilla.goanna.R will be provided by the embedding application. cp $(DEPTH)/mobile/android/base/*.jar libs/ - $(RM) libs/gecko-R.jar + $(RM) libs/goanna-R.jar # Copy the SOs. The latter should be $(MOZ_CHILD_PROCESS_NAME), but # it includes a "lib/" prefix. @@ -55,8 +55,8 @@ package: local.properties project.properties AndroidManifest.xml FORCE $(RM) -rf res $(MKDIR) -p res cd res && \ - $(UNZIP) -q -u -o $(_ABS_DIST)/bin/geckoview_resources.zip + $(UNZIP) -q -u -o $(_ABS_DIST)/bin/goannaview_resources.zip # Zip the directory cd $(DEPTH)/mobile/android && \ - $(ZIP) -q -r $(_ABS_DIST)/geckoview_library/geckoview_library.zip geckoview_library -x geckoview_library/backend.mk geckoview_library/Makefile + $(ZIP) -q -r $(_ABS_DIST)/goannaview_library/goannaview_library.zip goannaview_library -x goannaview_library/backend.mk goannaview_library/Makefile diff --git a/mobile/android/geckoview_library/geckolibs/AndroidManifest.xml b/mobile/android/geckoview_library/geckolibs/AndroidManifest.xml index b65434ed8c..eede29c276 100644 --- a/mobile/android/geckoview_library/geckolibs/AndroidManifest.xml +++ b/mobile/android/geckoview_library/geckolibs/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="org.mozilla.goanna.libs"> diff --git a/mobile/android/gradle/app/build.gradle b/mobile/android/gradle/app/build.gradle index ac2b9b0c7b..84d9154a5b 100644 --- a/mobile/android/gradle/app/build.gradle +++ b/mobile/android/gradle/app/build.gradle @@ -32,7 +32,7 @@ android { defaultConfig { testApplicationId 'org.mozilla.roboexample.test' - testInstrumentationRunner 'org.mozilla.gecko.FennecInstrumentationTestRunner' + testInstrumentationRunner 'org.mozilla.goanna.FennecInstrumentationTestRunner' } sourceSets { diff --git a/mobile/android/gradle/base/AndroidManifest.xml b/mobile/android/gradle/base/AndroidManifest.xml index 2ff0cfd0f2..de78d0e3f7 100644 --- a/mobile/android/gradle/base/AndroidManifest.xml +++ b/mobile/android/gradle/base/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="org.mozilla.goanna"> diff --git a/mobile/android/gradle/base/build.gradle b/mobile/android/gradle/base/build.gradle index f8f0ebfc53..76e1017528 100644 --- a/mobile/android/gradle/base/build.gradle +++ b/mobile/android/gradle/base/build.gradle @@ -32,10 +32,10 @@ android { sourceSets { main { java { - exclude 'org/mozilla/gecko/tests/**' - exclude 'org/mozilla/gecko/resources/**' + exclude 'org/mozilla/goanna/tests/**' + exclude 'org/mozilla/goanna/resources/**' if (!mozconfig.substs.MOZ_CRASHREPORTER) { - exclude 'org/mozilla/gecko/CrashReporter.java' + exclude 'org/mozilla/goanna/CrashReporter.java' } } @@ -73,7 +73,7 @@ apply plugin: 'idea' idea { module { - excludeDirs += file('org/mozilla/gecko/resources') - excludeDirs += file('org/mozilla/gecko/tests') + excludeDirs += file('org/mozilla/goanna/resources') + excludeDirs += file('org/mozilla/goanna/tests') } } diff --git a/mobile/android/gradle/branding/AndroidManifest.xml b/mobile/android/gradle/branding/AndroidManifest.xml index 6f0ecf04b9..9093d9b5bf 100644 --- a/mobile/android/gradle/branding/AndroidManifest.xml +++ b/mobile/android/gradle/branding/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="org.mozilla.goanna.branding"> diff --git a/mobile/android/gradle/omnijar/AndroidManifest.xml b/mobile/android/gradle/omnijar/AndroidManifest.xml index 0182de9afe..3565d4832d 100644 --- a/mobile/android/gradle/omnijar/AndroidManifest.xml +++ b/mobile/android/gradle/omnijar/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="org.mozilla.goanna.omnijar"> diff --git a/mobile/android/gradle/preprocessed_code/AndroidManifest.xml b/mobile/android/gradle/preprocessed_code/AndroidManifest.xml index b51508815c..802fcd1908 100644 --- a/mobile/android/gradle/preprocessed_code/AndroidManifest.xml +++ b/mobile/android/gradle/preprocessed_code/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="org.mozilla.goanna.preprocessed_code"> diff --git a/mobile/android/gradle/preprocessed_resources/AndroidManifest.xml b/mobile/android/gradle/preprocessed_resources/AndroidManifest.xml index 40744740af..6446f853d6 100644 --- a/mobile/android/gradle/preprocessed_resources/AndroidManifest.xml +++ b/mobile/android/gradle/preprocessed_resources/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="org.mozilla.goanna.preprocessed_resources"> diff --git a/mobile/android/gradle/thirdparty/AndroidManifest.xml b/mobile/android/gradle/thirdparty/AndroidManifest.xml index 7a08283ee7..3d1c8b89ea 100644 --- a/mobile/android/gradle/thirdparty/AndroidManifest.xml +++ b/mobile/android/gradle/thirdparty/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="org.mozilla.goanna.thirdparty"> diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index f0aec8b44e..8b07df5140 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -127,7 +127,7 @@ @BINPATH@/components/compartments.xpt @BINPATH@/components/composer.xpt @BINPATH@/components/content_events.xpt -@BINPATH@/components/content_geckomediaplugins.xpt +@BINPATH@/components/content_goannamediaplugins.xpt @BINPATH@/components/content_html.xpt @BINPATH@/components/content_webrtc.xpt @BINPATH@/components/content_xslt.xpt diff --git a/mobile/android/locales/Makefile.in b/mobile/android/locales/Makefile.in index bcd7c783d3..c42c12354a 100644 --- a/mobile/android/locales/Makefile.in +++ b/mobile/android/locales/Makefile.in @@ -80,7 +80,7 @@ FENNEC_APPLICATION_INI_PATH='$(STAGEDIST)/application.ini' endif ident: - @printf 'gecko_revision ' + @printf 'goanna_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(GECKO_PLATFORM_INI_PATH) Build SourceStamp @printf 'fennec_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(FENNEC_APPLICATION_INI_PATH) App SourceStamp diff --git a/mobile/android/locales/filter.py b/mobile/android/locales/filter.py index 9afe0a6f59..26332e7499 100644 --- a/mobile/android/locales/filter.py +++ b/mobile/android/locales/filter.py @@ -36,8 +36,8 @@ def test(mod, path, entity = None): if (re.match(r"browser\.search\.order\.[1-9]", entity) or re.match(r"browser\.search\.[a-zA-Z]+\.US", entity) or re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or - re.match(r"gecko\.handlerService\.schemes\.", entity) or - re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity) or + re.match(r"goanna\.handlerService\.schemes\.", entity) or + re.match(r"goanna\.handlerService\.defaultHandlersVersion", entity) or re.match(r"browser\.suggestedsites\.", entity)): return "ignore" diff --git a/mobile/android/mach_commands.py b/mobile/android/mach_commands.py index a0cae04718..835711b914 100644 --- a/mobile/android/mach_commands.py +++ b/mobile/android/mach_commands.py @@ -117,16 +117,16 @@ class MachCommands(MachCommandBase): objdir('app/src/debug/assets', 'dist/fennec/assets') objdir('app/src/debug/jniLibs', 'dist/fennec/lib') # Test code. - srcdir('app/src/robocop_harness/org/mozilla/gecko', 'build/mobile/robocop') - srcdir('app/src/robocop/org/mozilla/gecko/tests', 'mobile/android/base/tests') - srcdir('app/src/background/org/mozilla/gecko', 'mobile/android/tests/background/junit3/src') - srcdir('app/src/browser/org/mozilla/gecko', 'mobile/android/tests/browser/junit3/src') + srcdir('app/src/robocop_harness/org/mozilla/goanna', 'build/mobile/robocop') + srcdir('app/src/robocop/org/mozilla/goanna/tests', 'mobile/android/base/tests') + srcdir('app/src/background/org/mozilla/goanna', 'mobile/android/tests/background/junit3/src') + srcdir('app/src/browser/org/mozilla/goanna', 'mobile/android/tests/browser/junit3/src') # Test libraries. srcdir('app/libs', 'build/mobile/robocop') srcdir('base/build.gradle', 'mobile/android/gradle/base/build.gradle') srcdir('base/src/main/AndroidManifest.xml', 'mobile/android/gradle/base/AndroidManifest.xml') - srcdir('base/src/main/java/org/mozilla/gecko', 'mobile/android/base') + srcdir('base/src/main/java/org/mozilla/goanna', 'mobile/android/base') srcdir('base/src/main/java/org/mozilla/mozstumbler', 'mobile/android/stumbler/java/org/mozilla/mozstumbler') srcdir('base/src/main/java/org/mozilla/search', 'mobile/android/search/java/org/mozilla/search') srcdir('base/src/main/res', 'mobile/android/base/resources') diff --git a/mobile/android/modules/OrderedBroadcast.jsm b/mobile/android/modules/OrderedBroadcast.jsm index b28f61fb32..5c156080d4 100644 --- a/mobile/android/modules/OrderedBroadcast.jsm +++ b/mobile/android/modules/OrderedBroadcast.jsm @@ -20,7 +20,7 @@ let _callbackId = 1; * Internally calls Context.sendOrderedBroadcast. * * action {String} should be a string with a qualified name (like - * org.mozilla.gecko.action) that will be broadcast. + * org.mozilla.goanna.action) that will be broadcast. * * token {Object} is a piece of arbitrary data that will be given as * a parameter to the callback (possibly null). diff --git a/mobile/android/moz.build b/mobile/android/moz.build index 8c12accb59..e936c3bf7f 100644 --- a/mobile/android/moz.build +++ b/mobile/android/moz.build @@ -22,7 +22,7 @@ DIRS += [ 'themes/core', 'app', 'fonts', - 'geckoview_library', + 'goannaview_library', 'extensions', ] diff --git a/mobile/android/search/java/org/mozilla/search/PostSearchFragment.java b/mobile/android/search/java/org/mozilla/search/PostSearchFragment.java index 076aa7e482..df5cb6e113 100644 --- a/mobile/android/search/java/org/mozilla/search/PostSearchFragment.java +++ b/mobile/android/search/java/org/mozilla/search/PostSearchFragment.java @@ -8,10 +8,10 @@ import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; import org.mozilla.search.providers.SearchEngine; import android.content.Intent; diff --git a/mobile/android/search/java/org/mozilla/search/PreSearchFragment.java b/mobile/android/search/java/org/mozilla/search/PreSearchFragment.java index 446e0bac5b..da0593175b 100644 --- a/mobile/android/search/java/org/mozilla/search/PreSearchFragment.java +++ b/mobile/android/search/java/org/mozilla/search/PreSearchFragment.java @@ -26,13 +26,13 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.SearchHistory; -import org.mozilla.gecko.widget.SwipeDismissListViewTouchListener; -import org.mozilla.gecko.widget.SwipeDismissListViewTouchListener.OnDismissCallback; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.BrowserContract; +import org.mozilla.goanna.db.BrowserContract.SearchHistory; +import org.mozilla.goanna.widget.SwipeDismissListViewTouchListener; +import org.mozilla.goanna.widget.SwipeDismissListViewTouchListener.OnDismissCallback; import org.mozilla.search.AcceptsSearchQuery.SuggestionAnimation; /** diff --git a/mobile/android/search/java/org/mozilla/search/SearchActivity.java b/mobile/android/search/java/org/mozilla/search/SearchActivity.java index bc7b31fffa..6317dbde54 100644 --- a/mobile/android/search/java/org/mozilla/search/SearchActivity.java +++ b/mobile/android/search/java/org/mozilla/search/SearchActivity.java @@ -4,14 +4,14 @@ package org.mozilla.search; -import org.mozilla.gecko.GoannaAppShell; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.BrowserContract.SearchHistory; -import org.mozilla.gecko.distribution.Distribution; -import org.mozilla.gecko.health.BrowserHealthRecorder; +import org.mozilla.goanna.GoannaAppShell; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.BrowserContract.SearchHistory; +import org.mozilla.goanna.distribution.Distribution; +import org.mozilla.goanna.health.BrowserHealthRecorder; import org.mozilla.search.autocomplete.SearchBar; import org.mozilla.search.autocomplete.SuggestionsFragment; import org.mozilla.search.providers.SearchEngine; diff --git a/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java b/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java index f7ca16d4cc..a5f6af9894 100644 --- a/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java +++ b/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java @@ -4,12 +4,12 @@ package org.mozilla.search; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.db.BrowserContract; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.db.BrowserContract; import android.app.AlertDialog; import android.content.DialogInterface; diff --git a/mobile/android/search/java/org/mozilla/search/SearchWidget.java b/mobile/android/search/java/org/mozilla/search/SearchWidget.java index ffedf15511..633717aac3 100644 --- a/mobile/android/search/java/org/mozilla/search/SearchWidget.java +++ b/mobile/android/search/java/org/mozilla/search/SearchWidget.java @@ -5,11 +5,11 @@ package org.mozilla.search; -import org.mozilla.gecko.AboutPages; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; +import org.mozilla.goanna.AboutPages; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; import android.annotation.SuppressLint; import android.app.PendingIntent; diff --git a/mobile/android/search/java/org/mozilla/search/autocomplete/AutoCompleteAdapter.java b/mobile/android/search/java/org/mozilla/search/autocomplete/AutoCompleteAdapter.java index 5a0cc8fb65..0ae8717583 100644 --- a/mobile/android/search/java/org/mozilla/search/autocomplete/AutoCompleteAdapter.java +++ b/mobile/android/search/java/org/mozilla/search/autocomplete/AutoCompleteAdapter.java @@ -6,7 +6,7 @@ package org.mozilla.search.autocomplete; import java.util.List; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import org.mozilla.search.AcceptsSearchQuery; import org.mozilla.search.autocomplete.SuggestionsFragment.Suggestion; diff --git a/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java b/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java index f6f47f064f..99986b7fe0 100644 --- a/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java +++ b/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java @@ -4,10 +4,10 @@ package org.mozilla.search.autocomplete; -import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; -import org.mozilla.gecko.gfx.BitmapUtils; +import org.mozilla.goanna.R; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; +import org.mozilla.goanna.gfx.BitmapUtils; import org.mozilla.search.providers.SearchEngine; import android.content.Context; diff --git a/mobile/android/search/java/org/mozilla/search/autocomplete/SuggestionsFragment.java b/mobile/android/search/java/org/mozilla/search/autocomplete/SuggestionsFragment.java index 436ae5d4a2..bc1f262963 100644 --- a/mobile/android/search/java/org/mozilla/search/autocomplete/SuggestionsFragment.java +++ b/mobile/android/search/java/org/mozilla/search/autocomplete/SuggestionsFragment.java @@ -7,10 +7,10 @@ package org.mozilla.search.autocomplete; import java.util.ArrayList; import java.util.List; -import org.mozilla.gecko.R; -import org.mozilla.gecko.SuggestClient; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; +import org.mozilla.goanna.R; +import org.mozilla.goanna.SuggestClient; +import org.mozilla.goanna.Telemetry; +import org.mozilla.goanna.TelemetryContract; import org.mozilla.search.AcceptsSearchQuery; import org.mozilla.search.AcceptsSearchQuery.SuggestionAnimation; import org.mozilla.search.providers.SearchEngine; diff --git a/mobile/android/search/java/org/mozilla/search/providers/SearchEngine.java b/mobile/android/search/java/org/mozilla/search/providers/SearchEngine.java index 892a05429b..a359041f48 100644 --- a/mobile/android/search/java/org/mozilla/search/providers/SearchEngine.java +++ b/mobile/android/search/java/org/mozilla/search/providers/SearchEngine.java @@ -8,7 +8,7 @@ import android.net.Uri; import android.util.Log; import android.util.Xml; -import org.mozilla.gecko.util.StringUtils; +import org.mozilla.goanna.util.StringUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java b/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java index 3b7ddc4fa8..8bc860c572 100644 --- a/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java +++ b/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java @@ -10,17 +10,17 @@ import android.text.TextUtils; import android.util.Log; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.GoannaProfile; -import org.mozilla.gecko.GoannaSharedPrefs; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.R; -import org.mozilla.gecko.distribution.Distribution; -import org.mozilla.gecko.util.FileUtils; -import org.mozilla.gecko.util.GoannaJarReader; -import org.mozilla.gecko.util.HardwareUtils; -import org.mozilla.gecko.util.RawResource; -import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.goanna.AppConstants; +import org.mozilla.goanna.GoannaProfile; +import org.mozilla.goanna.GoannaSharedPrefs; +import org.mozilla.goanna.Locales; +import org.mozilla.goanna.R; +import org.mozilla.goanna.distribution.Distribution; +import org.mozilla.goanna.util.FileUtils; +import org.mozilla.goanna.util.GoannaJarReader; +import org.mozilla.goanna.util.HardwareUtils; +import org.mozilla.goanna.util.RawResource; +import org.mozilla.goanna.util.ThreadUtils; import org.xmlpull.v1.XmlPullParserException; import java.io.BufferedInputStream; diff --git a/mobile/android/search/java/org/mozilla/search/ui/FacetBar.java b/mobile/android/search/java/org/mozilla/search/ui/FacetBar.java index 7fcf3dc9bb..76b9b60e4a 100644 --- a/mobile/android/search/java/org/mozilla/search/ui/FacetBar.java +++ b/mobile/android/search/java/org/mozilla/search/ui/FacetBar.java @@ -4,7 +4,7 @@ package org.mozilla.search.ui; -import org.mozilla.gecko.R; +import org.mozilla.goanna.R; import android.content.Context; import android.graphics.Canvas; diff --git a/mobile/android/services/manifests/FxAccountAndroidManifest_activities.xml.in b/mobile/android/services/manifests/FxAccountAndroidManifest_activities.xml.in index 61976f2189..12e04c257e 100644 --- a/mobile/android/services/manifests/FxAccountAndroidManifest_activities.xml.in +++ b/mobile/android/services/manifests/FxAccountAndroidManifest_activities.xml.in @@ -3,7 +3,7 @@ android:label="@string/fxaccount_status_activity_label" android:clearTaskOnLaunch="true" android:taskAffinity="@ANDROID_PACKAGE_NAME@.FXA" - android:name="org.mozilla.gecko.fxa.activities.FxAccountStatusActivity" + android:name="org.mozilla.goanna.fxa.activities.FxAccountStatusActivity" android:configChanges="locale|layoutDirection" android:windowSoftInputMode="adjustResize"> + android:name="org.mozilla.goanna.fxa.sync.FxAccountSyncService" > diff --git a/mobile/android/services/manifests/HealthReportAndroidManifest_activities.xml.in b/mobile/android/services/manifests/HealthReportAndroidManifest_activities.xml.in index c0c8b6216e..cebbfef71e 100644 --- a/mobile/android/services/manifests/HealthReportAndroidManifest_activities.xml.in +++ b/mobile/android/services/manifests/HealthReportAndroidManifest_activities.xml.in @@ -1,4 +1,4 @@ - @@ -7,7 +7,7 @@ start the background service in response to external events, some sent by the system and some particular to Health Report. --> - + diff --git a/mobile/android/services/manifests/HealthReportAndroidManifest_services.xml.in b/mobile/android/services/manifests/HealthReportAndroidManifest_services.xml.in index b100c8fe39..c2a742821d 100644 --- a/mobile/android/services/manifests/HealthReportAndroidManifest_services.xml.in +++ b/mobile/android/services/manifests/HealthReportAndroidManifest_services.xml.in @@ -5,13 +5,13 @@ --> + android:name="org.mozilla.goanna.background.healthreport.HealthReportBroadcastService" > + android:name="org.mozilla.goanna.background.healthreport.upload.HealthReportUploadService" > + android:name="org.mozilla.goanna.background.healthreport.prune.HealthReportPruneService" > diff --git a/mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in b/mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in index 77e16d8da6..3f3e42b230 100644 --- a/mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in +++ b/mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in @@ -4,8 +4,8 @@ android:label="@string/sync_app_name" android:configChanges="keyboardHidden|orientation|screenSize" android:windowSoftInputMode="adjustResize|stateAlwaysHidden" - android:taskAffinity="org.mozilla.gecko.sync.setup" - android:name="org.mozilla.gecko.sync.setup.activities.SetupSyncActivity" > + android:taskAffinity="org.mozilla.goanna.sync.setup" + android:name="org.mozilla.goanna.sync.setup.activities.SetupSyncActivity" > @@ -19,18 +19,18 @@ we want for install instructions. --> + android:name="org.mozilla.goanna.sync.setup.activities.WebViewActivity" /> ' % + if self.goanna_locale_revisions: + goanna_l10n_git_root = None + if self.query_do_translate_hg_to_git(goanna_config_key='goanna_l10n_git_root'): + goanna_l10n_git_root = self.goanna_config['goanna_l10n_git_root'] + for locale in self.goanna_locale_revisions.keys(): + repo = self.goanna_locale_revisions[locale]['repo'] + revision = self.goanna_locale_revisions[locale]['revision'] + locale_manifest.append(' ' % (repo.replace('https://hg.mozilla.org/', ''), locale, revision)) - if gecko_l10n_git_root: + if goanna_l10n_git_root: locale_manifest.append( self._generate_git_locale_manifest( locale, manifest_config['translate_base_url'], - gecko_l10n_git_root % {'locale': locale}, + goanna_l10n_git_root % {'locale': locale}, revision, git_base_url, - "gecko-l10n/%s" % locale, + "goanna-l10n/%s" % locale, ) ) return locale_manifest @@ -487,7 +487,7 @@ class B2GBuild(LocalesMixin, PurgeMixin, manifest.appendChild(dom.createTextNode("\n ")) manifest.appendChild(dom.createComment('Mercurial-Information: ')) manifest.appendChild(dom.createTextNode("\n ")) - manifest.appendChild(dom.createComment('Mercurial-Information: ' % + manifest.appendChild(dom.createComment('Mercurial-Information: ' % (self.query_repo(), self.query_revision()))) if self.query_do_translate_hg_to_git(): @@ -509,14 +509,14 @@ class B2GBuild(LocalesMixin, PurgeMixin, manifest.appendChild(dom.createTextNode("\n ")) url = manifest_config['translate_base_url'] # increase timeout from 15m to 60m until bug 1044515 is resolved (attempts = 120) - gecko_git = self.query_mapper_git_revision(url, 'gecko', + goanna_git = self.query_mapper_git_revision(url, 'goanna', self.query_revision(), require_answer=self.config.get('require_git_rev', True), attempts=120) - project_name = "https://git.mozilla.org/releases/gecko.git".replace(git_base_url, '') + project_name = "https://git.mozilla.org/releases/goanna.git".replace(git_base_url, '') # XXX This assumes that we have a mozillaorg remote - add_project(dom, name=project_name, path="gecko", remote="mozillaorg", revision=gecko_git) + add_project(dom, name=project_name, path="goanna", remote="mozillaorg", revision=goanna_git) manifest.appendChild(dom.createTextNode("\n")) self.write_to_file(sourcesfile, dom.toxml(), verbose=False) @@ -538,8 +538,8 @@ class B2GBuild(LocalesMixin, PurgeMixin, def build(self): dirs = self.query_abs_dirs() - gecko_config = self.load_gecko_config() - build_targets = gecko_config.get('build_targets', []) + goanna_config = self.load_goanna_config() + build_targets = goanna_config.get('build_targets', []) build_targets.extend(self.config.get("build_targets", [])) if not build_targets: cmds = [self.generate_build_command()] @@ -577,8 +577,8 @@ class B2GBuild(LocalesMixin, PurgeMixin, def build_symbols(self): dirs = self.query_abs_dirs() - gecko_config = self.load_gecko_config() - if gecko_config.get('config_version', 0) < 1: + goanna_config = self.load_goanna_config() + if goanna_config.get('config_version', 0) < 1: self.info("Skipping build_symbols for old configuration") return @@ -608,7 +608,7 @@ class B2GBuild(LocalesMixin, PurgeMixin, self.info("Not a nightly build. Skipping...") return dirs = self.query_abs_dirs() - self.load_gecko_config() + self.load_goanna_config() cmd = self.make_updates_cmd[:] env = self.query_build_env() @@ -643,19 +643,19 @@ class B2GBuild(LocalesMixin, PurgeMixin, dirs = self.query_abs_dirs() # Copy stuff into build/upload directory - gecko_config = self.load_gecko_config() + goanna_config = self.load_goanna_config() output_dir = self.query_device_outputdir() # Zip up stuff files = [] - for item in gecko_config.get('zip_files', []): + for item in goanna_config.get('zip_files', []): if isinstance(item, list): pattern, target = item else: pattern, target = item, None - pattern = pattern.format(objdir=self.objdir, workdir=dirs['work_dir'], srcdir=dirs['gecko_src']) + pattern = pattern.format(objdir=self.objdir, workdir=dirs['work_dir'], srcdir=dirs['goanna_src']) for f in glob.glob(pattern): files.append((f, target)) @@ -687,9 +687,9 @@ class B2GBuild(LocalesMixin, PurgeMixin, public_files = [] public_upload_patterns = [] - public_upload_patterns = gecko_config.get('public_upload_files', []) + public_upload_patterns = goanna_config.get('public_upload_files', []) # Copy gaia profile - if gecko_config.get('package_gaia', True): + if goanna_config.get('package_gaia', True): zip_name = os.path.join(dirs['work_dir'], "gaia.zip") self.info("creating %s" % zip_name) cmd = ['zip', '-r', '-9', '-u', zip_name, 'gaia/profile'] @@ -704,9 +704,9 @@ class B2GBuild(LocalesMixin, PurgeMixin, files.append(os.path.join(output_dir, 'system', 'build.prop')) - upload_patterns = gecko_config.get('upload_files', []) + upload_patterns = goanna_config.get('upload_files', []) for base_pattern in upload_patterns + public_upload_patterns: - pattern = base_pattern.format(objdir=self.objdir, workdir=dirs['work_dir'], srcdir=dirs['gecko_src']) + pattern = base_pattern.format(objdir=self.objdir, workdir=dirs['work_dir'], srcdir=dirs['goanna_src']) for f in glob.glob(pattern): if base_pattern in upload_patterns: files.append(f) @@ -849,7 +849,7 @@ class B2GBuild(LocalesMixin, PurgeMixin, dirs = self.query_abs_dirs() c = self.config - target = self.load_gecko_config().get('upload_platform', self.config['target']) + target = self.load_goanna_config().get('upload_platform', self.config['target']) if c.get("target_suffix"): target += c["target_suffix"] if self.config.get('debug_build'): @@ -962,7 +962,7 @@ class B2GBuild(LocalesMixin, PurgeMixin, upload_dir = dirs['abs_upload_dir'] + '-manifest' # Delete the upload dir so we don't upload previous stuff by accident self.rmtree(upload_dir) - target = self.load_gecko_config().get('upload_platform', self.config['target']) + target = self.load_goanna_config().get('upload_platform', self.config['target']) if self.config['manifest'].get('target_suffix'): target += self.config['manifest']['target_suffix'] buildid = self.query_buildid() diff --git a/testing/mozharness/scripts/b2g_bumper.py b/testing/mozharness/scripts/b2g_bumper.py index d34a5ac3af..32a3adf66a 100755 --- a/testing/mozharness/scripts/b2g_bumper.py +++ b/testing/mozharness/scripts/b2g_bumper.py @@ -6,12 +6,12 @@ # ***** END LICENSE BLOCK ***** """ b2g_bumper.py - Updates a gecko repo with up to date information from B2G repositories. + Updates a goanna repo with up to date information from B2G repositories. In particular, it updates gaia.json which is used by B2G desktop builds, and updates the XML manifests used by device builds. - This is to tie the external repository revisions to a visible gecko commit + This is to tie the external repository revisions to a visible goanna commit which appears on TBPL, so sheriffs can blame the appropriate changes. """ @@ -58,7 +58,7 @@ class B2GBumper(VCSScript, MapperMixin): 'import-git-ref-cache', 'clobber', 'check-treestatus', - 'checkout-gecko', + 'checkout-goanna', 'bump-gaia', 'checkout-manifests', 'massage-manifests', @@ -105,9 +105,9 @@ class B2GBumper(VCSScript, MapperMixin): abs_dirs.update({ 'manifests_dir': os.path.join(abs_dirs['abs_work_dir'], 'manifests'), - 'gecko_local_dir': + 'goanna_local_dir': os.path.join(abs_dirs['abs_work_dir'], - self.config['gecko_local_dir']), + self.config['goanna_local_dir']), }) self.abs_dirs = abs_dirs return self.abs_dirs @@ -263,9 +263,9 @@ class B2GBumper(VCSScript, MapperMixin): dirs = self.query_abs_dirs() device_config = self.config['devices'][device] manifest_file = os.path.join( - dirs['gecko_local_dir'], + dirs['goanna_local_dir'], 'b2g', 'config', - device_config.get('gecko_device_dir', device), + device_config.get('goanna_device_dir', device), 'sources.xml') return manifest_file @@ -294,7 +294,7 @@ class B2GBumper(VCSScript, MapperMixin): "ssh -oIdentityFile=%s -l %s" % ( self.config["ssh_key"], self.config["ssh_user"], ), - self.config["gecko_push_url"]] + self.config["goanna_push_url"]] status = self.run_command(command, cwd=repo_path, error_list=HgErrorList) if status != 0: @@ -420,7 +420,7 @@ class B2GBumper(VCSScript, MapperMixin): "Return True if we can land based on treestatus" c = self.config dirs = self.query_abs_dirs() - tree = c.get('treestatus_tree', os.path.basename(c['gecko_pull_url'].rstrip("/"))) + tree = c.get('treestatus_tree', os.path.basename(c['goanna_pull_url'].rstrip("/"))) treestatus_url = "%s/%s?format=json" % (c['treestatus_base_url'], tree) treestatus_json = os.path.join(dirs['abs_work_dir'], 'treestatus.json') if not os.path.exists(dirs['abs_work_dir']): @@ -467,13 +467,13 @@ class B2GBumper(VCSScript, MapperMixin): self.info("breaking early since treestatus is closed") sys.exit(0) - def checkout_gecko(self): + def checkout_goanna(self): c = self.config dirs = self.query_abs_dirs() - dest = dirs['gecko_local_dir'] + dest = dirs['goanna_local_dir'] repos = [{ - 'repo': c['gecko_pull_url'], - 'tag': c.get('gecko_tag', 'default'), + 'repo': c['goanna_pull_url'], + 'tag': c.get('goanna_tag', 'default'), 'dest': dest, 'vcs': 'hgtool', 'hgtool_base_bundle_urls': c.get('hgtool_base_bundle_urls'), @@ -521,7 +521,7 @@ class B2GBumper(VCSScript, MapperMixin): def commit_manifests(self): dirs = self.query_abs_dirs() - repo_path = dirs['gecko_local_dir'] + repo_path = dirs['goanna_local_dir'] for device, device_config in self.query_devices().items(): manifest_path = self.query_manifest_path(device) self.hg_add(repo_path, manifest_path) @@ -531,7 +531,7 @@ class B2GBumper(VCSScript, MapperMixin): def bump_gaia(self): dirs = self.query_abs_dirs() - repo_path = dirs['gecko_local_dir'] + repo_path = dirs['goanna_local_dir'] gaia_json_path = os.path.join(repo_path, self.config['gaia_revision_file']) contents = self._read_json(gaia_json_path) @@ -576,7 +576,7 @@ class B2GBumper(VCSScript, MapperMixin): def push(self): dirs = self.query_abs_dirs() - repo_path = dirs['gecko_local_dir'] + repo_path = dirs['goanna_local_dir'] return self.hg_push(repo_path) def push_loop(self): @@ -588,7 +588,7 @@ class B2GBumper(VCSScript, MapperMixin): self.info("breaking early since treestatus is closed") break - self.checkout_gecko() + self.checkout_goanna() if not self.config.get('skip_gaia_json') and self.bump_gaia(): changed = True self.checkout_manifests() diff --git a/testing/mozharness/scripts/b2g_desktop_multilocale.py b/testing/mozharness/scripts/b2g_desktop_multilocale.py index 266831f493..6ab56bf3aa 100755 --- a/testing/mozharness/scripts/b2g_desktop_multilocale.py +++ b/testing/mozharness/scripts/b2g_desktop_multilocale.py @@ -38,17 +38,17 @@ class B2gMultilocale(LocalesMixin, BaseScript, VCSMixin, GaiaLocalesMixin): "dest": "gaia_languages_file", "help": "languages file for gaia multilocale profile", }], - [["--gecko-languages-file"], { + [["--goanna-languages-file"], { "dest": "locales_file", - "help": "languages file for gecko multilocale", + "help": "languages file for goanna multilocale", }], - [["--gecko-l10n-root"], { + [["--goanna-l10n-root"], { "dest": "hg_l10n_base", - "help": "root location for gecko l10n repos", + "help": "root location for goanna l10n repos", }], - [["--gecko-l10n-base-dir"], { + [["--goanna-l10n-base-dir"], { "dest": "l10n_dir", - "help": "dir to clone gecko l10n repos into, relative to the work directory", + "help": "dir to clone goanna l10n repos into, relative to the work directory", }], [["--merge-locales"], { "dest": "merge_locales", @@ -85,11 +85,11 @@ class B2gMultilocale(LocalesMixin, BaseScript, VCSMixin, GaiaLocalesMixin): 'gaia_l10n_vcs': 'hg', 'vcs_share_base': os.environ.get('HG_SHARE_BASE_DIR'), 'locales_dir': 'b2g/locales', - 'l10n_dir': 'gecko-l10n', + 'l10n_dir': 'goanna-l10n', # I forget what this was for. Copied from the Android multilocale stuff 'ignore_locales': ["en-US", "multi"], # This only has 2 locales in it. We probably need files that mirror gaia's locale lists - # We need 2 sets of locales files because the locale names in gaia are different than gecko, e.g. 'es' vs 'es-ES' + # We need 2 sets of locales files because the locale names in gaia are different than goanna, e.g. 'es' vs 'es-ES' # We'll need to override this for localizer buidls 'locales_file': 'build/b2g/locales/all-locales', 'mozilla_dir': 'build', @@ -110,9 +110,9 @@ class B2gMultilocale(LocalesMixin, BaseScript, VCSMixin, GaiaLocalesMixin): if 'gaia_l10n_root' not in self.config: message += 'Must specify --gaia-l10n-root!\n' if 'locales_file' not in self.config: - message += 'Must specify --gecko-languages-file!\n' + message += 'Must specify --goanna-languages-file!\n' if 'hg_l10n_base' not in self.config: - message += 'Must specify --gecko-l10n-root!\n' + message += 'Must specify --goanna-l10n-root!\n' if message: self.fatal(message) @@ -123,7 +123,7 @@ class B2gMultilocale(LocalesMixin, BaseScript, VCSMixin, GaiaLocalesMixin): c = self.config dirs = { - 'src': os.path.join(c['work_dir'], 'gecko'), + 'src': os.path.join(c['work_dir'], 'goanna'), 'work_dir': abs_dirs['abs_work_dir'], 'gaia_l10n_base_dir': os.path.join(abs_dirs['abs_work_dir'], self.config['gaia_l10n_base_dir']), 'abs_compare_locales_dir': os.path.join(abs_dirs['base_work_dir'], 'compare-locales'), @@ -135,7 +135,7 @@ class B2gMultilocale(LocalesMixin, BaseScript, VCSMixin, GaiaLocalesMixin): # Actions {{{2 def pull(self): - """ Clone gaia and gecko locale repos + """ Clone gaia and goanna locale repos """ languages_file = self.config['gaia_languages_file'] l10n_base_dir = self.query_abs_dirs()['gaia_l10n_base_dir'] @@ -146,10 +146,10 @@ class B2gMultilocale(LocalesMixin, BaseScript, VCSMixin, GaiaLocalesMixin): self.pull_gaia_locale_source(l10n_config, parse_config_file(languages_file).keys(), l10n_base_dir) self.pull_locale_source() - gecko_locales = self.query_locales() - # populate b2g/overrides, which isn't in gecko atm + goanna_locales = self.query_locales() + # populate b2g/overrides, which isn't in goanna atm dirs = self.query_abs_dirs() - for locale in gecko_locales: + for locale in goanna_locales: self.mkdir_p(os.path.join(dirs['abs_l10n_dir'], locale, 'b2g', 'chrome', 'overrides')) self.copytree(os.path.join(dirs['abs_l10n_dir'], locale, 'mobile', 'overrides'), os.path.join(dirs['abs_l10n_dir'], locale, 'b2g', 'chrome', 'overrides'), @@ -159,12 +159,12 @@ class B2gMultilocale(LocalesMixin, BaseScript, VCSMixin, GaiaLocalesMixin): """ Do the multilocale portion of the build + packaging. """ dirs = self.query_abs_dirs() - gecko_locales = self.query_locales() + goanna_locales = self.query_locales() make = self.query_exe('make', return_type='string') env = self.query_env( partial_env={ 'LOCALE_MERGEDIR': dirs['abs_merge_dir'], - 'MOZ_CHROME_MULTILOCALE': 'en-US ' + ' '.join(gecko_locales), + 'MOZ_CHROME_MULTILOCALE': 'en-US ' + ' '.join(goanna_locales), } ) merge_env = self.query_env( @@ -175,7 +175,7 @@ class B2gMultilocale(LocalesMixin, BaseScript, VCSMixin, GaiaLocalesMixin): } ) - for locale in gecko_locales: + for locale in goanna_locales: command = make + ' merge-%s L10NBASEDIR=%s LOCALE_MERGEDIR=%s' % (locale, dirs['abs_l10n_dir'], dirs['abs_merge_dir']) status = self.run_command(command, cwd=dirs['abs_locales_dir'], diff --git a/testing/mozharness/scripts/b2g_desktop_unittest.py b/testing/mozharness/scripts/b2g_desktop_unittest.py index abe650d5df..b9759bae57 100755 --- a/testing/mozharness/scripts/b2g_desktop_unittest.py +++ b/testing/mozharness/scripts/b2g_desktop_unittest.py @@ -64,7 +64,7 @@ class B2GDesktopTest(BlobUploadMixin, TestingMixin, MercurialScript): {'substr': 'FAILED (errors=', 'level': ERROR}, {'substr': r'''Could not successfully complete transport of message to Goanna, socket closed''', 'level': ERROR}, {'substr': r'''Could not communicate with Marionette server. Is the Goanna process still running''', 'level': ERROR}, - {'substr': r'''Connection to Marionette server is lost. Check gecko''', 'level': ERROR}, + {'substr': r'''Connection to Marionette server is lost. Check goanna''', 'level': ERROR}, {'substr': 'Timeout waiting for marionette on port', 'level': ERROR}, {'regex': re.compile(r'''(Timeout|NoSuchAttribute|Javascript|NoSuchElement|XPathLookup|NoSuchWindow|StaleElement|ScriptTimeout|ElementNotVisible|NoSuchFrame|InvalidElementState|NoAlertPresent|InvalidCookieDomain|UnableToSetCookie|InvalidSelector|MoveTargetOutOfBounds)Exception'''), 'level': ERROR}, ] @@ -175,7 +175,7 @@ class B2GDesktopTest(BlobUploadMixin, TestingMixin, MercurialScript): self.fatal("'%s' not defined in the in-tree config! Please add it to '%s'. " "See bug 981030 for more details." % (suite, - os.path.join('gecko', 'testing', self.config['in_tree_config']))) + os.path.join('goanna', 'testing', self.config['in_tree_config']))) if options: for option in options: diff --git a/testing/mozharness/scripts/b2g_emulator_unittest.py b/testing/mozharness/scripts/b2g_emulator_unittest.py index 4be6ec0e62..a5f4e93880 100755 --- a/testing/mozharness/scripts/b2g_emulator_unittest.py +++ b/testing/mozharness/scripts/b2g_emulator_unittest.py @@ -57,11 +57,11 @@ class B2GEmulatorTest(TestingMixin, VCSMixin, BaseScript, BlobUploadMixin): "help": "URL to the desktop xre zip", } ], [ - ["--gecko-url"], + ["--goanna-url"], {"action": "store", - "dest": "gecko_url", + "dest": "goanna_url", "default": None, - "help": "URL to the gecko build injected into the emulator", + "help": "URL to the goanna build injected into the emulator", } ], [ ["--test-manifest"], @@ -110,7 +110,7 @@ class B2GEmulatorTest(TestingMixin, VCSMixin, BaseScript, BlobUploadMixin): {'substr': 'FAILED (errors=', 'level': ERROR}, {'substr': r'''Could not successfully complete transport of message to Goanna, socket closed''', 'level': ERROR}, {'substr': r'''Could not communicate with Marionette server. Is the Goanna process still running''', 'level': ERROR}, - {'substr': r'''Connection to Marionette server is lost. Check gecko''', 'level': ERROR}, + {'substr': r'''Connection to Marionette server is lost. Check goanna''', 'level': ERROR}, {'substr': 'Timeout waiting for marionette on port', 'level': ERROR}, {'regex': re.compile(r'''(Timeout|NoSuchAttribute|Javascript|NoSuchElement|XPathLookup|NoSuchWindow|StaleElement|ScriptTimeout|ElementNotVisible|NoSuchFrame|InvalidElementState|NoAlertPresent|InvalidCookieDomain|UnableToSetCookie|InvalidSelector|MoveTargetOutOfBounds)Exception'''), 'level': ERROR}, ] @@ -297,7 +297,7 @@ class B2GEmulatorTest(TestingMixin, VCSMixin, BaseScript, BlobUploadMixin): if missing_key: self.fatal("Key '%s' not defined in the in-tree config! Please add it to '%s'." \ "See bug 981030 for more details." % (suite, - os.path.join('gecko', 'testing', self.config['in_tree_config']))) + os.path.join('goanna', 'testing', self.config['in_tree_config']))) if options: for option in options: diff --git a/testing/mozharness/scripts/desktop_l10n.py b/testing/mozharness/scripts/desktop_l10n.py index 17a811e70f..f894c2950d 100755 --- a/testing/mozharness/scripts/desktop_l10n.py +++ b/testing/mozharness/scripts/desktop_l10n.py @@ -415,7 +415,7 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin, """ if self.revision: return self.revision - r = re.compile(r"^(gecko|fx)_revision ([0-9a-f]{12}\+?)$") + r = re.compile(r"^(goanna|fx)_revision ([0-9a-f]{12}\+?)$") output = self._query_make_ident_output() for line in output.splitlines(): match = r.match(line) diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py index 45df7a1f9d..ed93a6abae 100755 --- a/testing/mozharness/scripts/desktop_unittest.py +++ b/testing/mozharness/scripts/desktop_unittest.py @@ -379,7 +379,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix self.fatal("'%s' not defined in the in-tree config! Please add it to '%s'. " "See bug 981030 for more details." % (suite_category, - os.path.join('gecko', 'testing', self.config['in_tree_config']))) + os.path.join('goanna', 'testing', self.config['in_tree_config']))) if options: for option in options: diff --git a/testing/mozharness/scripts/firefox_ui_updates.py b/testing/mozharness/scripts/firefox_ui_updates.py index e3a484376f..5e44634b4e 100644 --- a/testing/mozharness/scripts/firefox_ui_updates.py +++ b/testing/mozharness/scripts/firefox_ui_updates.py @@ -291,14 +291,14 @@ class FirefoxUIUpdates(FirefoxUITests): env = self.query_env(avoid_host_env=True) bin_dir = os.path.dirname(self.query_python_path()) fx_ui_tests_bin = os.path.join(bin_dir, 'firefox-ui-update') - gecko_log=os.path.join(dirs['abs_work_dir'], 'gecko.log') + goanna_log=os.path.join(dirs['abs_work_dir'], 'goanna.log') # Build the command cmd = [ fx_ui_tests_bin, '--installer', installer_path, # Log to stdout until tests are stable. - '--gecko-log=-', + '--goanna-log=-', '--address=localhost:%s' % marionette_port, ] @@ -319,20 +319,20 @@ class FirefoxUIUpdates(FirefoxUITests): # Return more output if we fail if return_code != 0: - if os.path.exists(gecko_log): - contents = self.read_from_file(gecko_log, verbose=False) - self.warning('== Dumping gecko output ==') + if os.path.exists(goanna_log): + contents = self.read_from_file(goanna_log, verbose=False) + self.warning('== Dumping goanna output ==') self.warning(contents) - self.warning('== End of gecko output ==') + self.warning('== End of goanna output ==') else: - # We're outputting to stdout with --gecko-log=- so there is not log to + # We're outputting to stdout with --goanna-log=- so there is not log to # complaing about. Remove the commented line below when changing # this behaviour. - # self.warning('No gecko.log was found: %s' % gecko_log) + # self.warning('No goanna.log was found: %s' % goanna_log) pass if cleanup: - for filepath in (installer_path, gecko_log): + for filepath in (installer_path, goanna_log): if os.path.exists(filepath): self.debug('Removing %s' % filepath) os.remove(filepath) diff --git a/testing/mozharness/scripts/hazard_build.py b/testing/mozharness/scripts/hazard_build.py index c3aac74908..ce02e5a846 100755 --- a/testing/mozharness/scripts/hazard_build.py +++ b/testing/mozharness/scripts/hazard_build.py @@ -76,7 +76,7 @@ class B2GHazardBuild(PurgeMixin, B2GBuildBaseScript): config={ 'default_vcs': 'hgtool', 'ccache': False, - 'mozilla_dir': 'build/gecko', + 'mozilla_dir': 'build/goanna', 'upload_ssh_server': None, 'upload_remote_basepath': None, @@ -126,7 +126,7 @@ class B2GHazardBuild(PurgeMixin, B2GBuildBaseScript): 'abs_analyzed_objdir': os.path.join(abs_work_dir, self.config['srcdir'], self.config['analysis-objdir']), 'analysis_scriptdir': - os.path.join(abs_dirs['gecko_src'], self.config['analysis-scriptdir']) + os.path.join(abs_dirs['goanna_src'], self.config['analysis-scriptdir']) } abs_dirs.update(dirs) @@ -250,10 +250,10 @@ class B2GHazardBuild(PurgeMixin, B2GBuildBaseScript): if not os.path.exists(dest): self.mkdir_p(dest) - # The gecko config is required before enabling mock, because it determines + # The goanna config is required before enabling mock, because it determines # what mock target to use. def enable_mock(self): - self.load_gecko_config() + self.load_goanna_config() super(B2GHazardBuild, self).enable_mock() # Actions {{{2 @@ -292,7 +292,7 @@ class B2GHazardBuild(PurgeMixin, B2GBuildBaseScript): if not os.path.exists(dirs['shell_objdir']): self.mkdir_p(dirs['shell_objdir']) - js_src_dir = os.path.join(dirs['gecko_src'], 'js', 'src') + js_src_dir = os.path.join(dirs['goanna_src'], 'js', 'src') rc = self.run_command(['autoconf-2.13'], cwd=js_src_dir, env=self.env, @@ -378,7 +378,7 @@ jobs = 2 mozconfig = os.path.join(gonk_misc, 'hazard-analysis-config') mozconfig_text = '' mozconfig_text += 'CXXFLAGS="-Wno-attributes"\n' - mozconfig_text += '. "%s/default-gecko-config"\n' % gonk_misc + mozconfig_text += '. "%s/default-goanna-config"\n' % gonk_misc basecc = os.path.join(dirs['abs_work_dir'], self.config['sixgill'], 'scripts', 'wrap_gcc', 'basecc') mozconfig_text += "ac_add_options --with-compiler-wrapper=" + basecc + "\n" mozconfig_text += "ac_add_options --without-ccache\n" @@ -387,7 +387,7 @@ jobs = 2 # Stuff I set in my .userconfig for manual builds env['B2G_SOURCE'] = dirs['b2g_src'] env['MOZCONFIG_PATH'] = mozconfig - env['GECKO_PATH'] = dirs['gecko_src'] + env['GECKO_PATH'] = dirs['goanna_src'] env['TARGET_TOOLS_PREFIX'] = os.path.join(dirs['abs_work_dir'], self.config['b2g_target_compiler_prefix']) try: diff --git a/testing/mozharness/scripts/marionette.py b/testing/mozharness/scripts/marionette.py index fc29da542e..f8a4cbc292 100755 --- a/testing/mozharness/scripts/marionette.py +++ b/testing/mozharness/scripts/marionette.py @@ -146,7 +146,7 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix error_list = [ {'substr': 'FAILED (errors=', 'level': WARNING}, {'substr': r'''Could not successfully complete transport of message to Goanna, socket closed''', 'level': ERROR}, - {'substr': r'''Connection to Marionette server is lost. Check gecko''', 'level': ERROR}, + {'substr': r'''Connection to Marionette server is lost. Check goanna''', 'level': ERROR}, {'substr': 'Timeout waiting for marionette on port', 'level': ERROR}, {'regex': re.compile(r'''(TEST-UNEXPECTED|PROCESS-CRASH)'''), 'level': ERROR}, {'regex': re.compile(r'''(\b((?!Marionette|TestMarionette|NoSuchElement|XPathLookup|NoSuchWindow|StaleElement|ScriptTimeout|ElementNotVisible|NoSuchFrame|InvalidResponse|Javascript|Timeout|InvalidElementState|NoAlertPresent|InvalidCookieDomain|UnableToSetCookie|InvalidSelector|MoveTargetOutOfBounds)\w*)Exception)'''), 'level': ERROR}, @@ -203,8 +203,8 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix dirs['abs_marionette_tests_dir'] = os.path.join( dirs['abs_test_install_dir'], 'marionette', 'tests', 'testing', 'marionette', 'client', 'marionette', 'tests') - dirs['abs_gecko_dir'] = os.path.join( - abs_dirs['abs_work_dir'], 'gecko') + dirs['abs_goanna_dir'] = os.path.join( + abs_dirs['abs_work_dir'], 'goanna') dirs['abs_emulator_dir'] = os.path.join( abs_dirs['abs_work_dir'], 'emulator') dirs['abs_b2g-distro_dir'] = os.path.join( @@ -357,7 +357,7 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix 'binary': self.binary_path, 'address': self.config.get('marionette_address'), 'raw_log_file': raw_log_file, - 'gecko_log': dirs["abs_blob_upload_dir"], + 'goanna_log': dirs["abs_blob_upload_dir"], 'this_chunk': self.config.get('this_chunk', 1), 'total_chunks': self.config.get('total_chunks', 1) } @@ -434,8 +434,8 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix if self.config.get('e10s'): cmd.append('--e10s') - cmd.append('--gecko-log=%s' % os.path.join(dirs["abs_blob_upload_dir"], - 'gecko.log')) + cmd.append('--goanna-log=%s' % os.path.join(dirs["abs_blob_upload_dir"], + 'goanna.log')) options_group = self._get_options_group(self.config.get('emulator'), self.config.get('gaiatest')) @@ -502,14 +502,14 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix else: self.info('no logcat file found') else: - # .. or gecko.log if it exists - gecko_log = os.path.join(self.config['base_work_dir'], 'gecko.log') - if os.access(gecko_log, os.F_OK): - self.info('dumping gecko.log') - self.run_command(['cat', gecko_log]) - self.rmtree(gecko_log) + # .. or goanna.log if it exists + goanna_log = os.path.join(self.config['base_work_dir'], 'goanna.log') + if os.access(goanna_log, os.F_OK): + self.info('dumping goanna.log') + self.run_command(['cat', goanna_log]) + self.rmtree(goanna_log) else: - self.info('gecko.log not found') + self.info('goanna.log not found') marionette_parser.print_summary('marionette') diff --git a/testing/mozharness/scripts/merge_day/b2g_tag.py b/testing/mozharness/scripts/merge_day/b2g_tag.py index e528a9fc36..5187ec39dc 100755 --- a/testing/mozharness/scripts/merge_day/b2g_tag.py +++ b/testing/mozharness/scripts/merge_day/b2g_tag.py @@ -31,11 +31,11 @@ from mozharness.base.vcs.vcsbase import MercurialScript # B2GTag {{{1 class B2GTag(TransferMixin, MercurialScript): config_options = [ - [['--gecko-repo', ], { + [['--goanna-repo', ], { "action": "extend", - "dest": "gecko_repos", + "dest": "goanna_repos", "type": "string", - "help": "Specify which gecko repo(s) to tag, along with gaia." + "help": "Specify which goanna repo(s) to tag, along with gaia." }], [['--date-string', ], { "action": "store", @@ -45,7 +45,7 @@ class B2GTag(TransferMixin, MercurialScript): "help": "Specify the date string to use in the tag name." }], ] - gecko_repos = None + goanna_repos = None def __init__(self, require_config_file=True): super(B2GTag, self).__init__( @@ -72,7 +72,7 @@ class B2GTag(TransferMixin, MercurialScript): """ Make sure we're set up correctly before we start cloning or tagging anything. - First, verify any specified gecko_repos exist in the b2g_branches + First, verify any specified goanna_repos exist in the b2g_branches dict. Next, make sure we can reach mapper and it's working. @@ -80,9 +80,9 @@ class B2GTag(TransferMixin, MercurialScript): If there are any errors, compile the list and fatal(). """ sanity_message = "" - if self.config.get("gecko_repos"): + if self.config.get("goanna_repos"): bad_branch_names = [] - for repo_name in self.query_gecko_repos(): + for repo_name in self.query_goanna_repos(): if repo_name not in self.config["b2g_branches"].keys(): bad_branch_names.append(repo_name) if bad_branch_names: @@ -99,17 +99,17 @@ class B2GTag(TransferMixin, MercurialScript): if sanity_message: self.fatal(sanity_message) - def query_gecko_repos(self): - """ Which gecko repos + gaia are we converting? + def query_goanna_repos(self): + """ Which goanna repos + gaia are we converting? By default everything in self.config['b2g_branches'], - but we can override that list with --gecko-repos. + but we can override that list with --goanna-repos. """ - if self.gecko_repos: - return self.gecko_repos - self.gecko_repos = list(self.config.get("gecko_repos", + if self.goanna_repos: + return self.goanna_repos + self.goanna_repos = list(self.config.get("goanna_repos", self.config['b2g_branches'].keys())) - self.gecko_repos.sort() - return self.gecko_repos + self.goanna_repos.sort() + return self.goanna_repos def query_repo_pull_config(self, repo_name, b2g_branch_config): """ Build the repo pull url for a repo. This is for convenience. @@ -182,7 +182,7 @@ class B2GTag(TransferMixin, MercurialScript): return b2g_branch_config["tag_name"].split("_%")[0] def hg_tag(self, repo_name, b2g_branch_config): - """ Attempt to tag and push gecko. This assumes the trees are open. + """ Attempt to tag and push goanna. This assumes the trees are open. On failure, throw a VCSException. """ @@ -257,7 +257,7 @@ class B2GTag(TransferMixin, MercurialScript): dirs = self.query_abs_dirs() hg = self.query_exe("hg", return_type="list") git = self.query_exe("git", return_type="list") - hg_repos = self.query_gecko_repos() + hg_repos = self.query_goanna_repos() hg_strip_error_list = [{ 'substr': r'''abort: empty revision set''', 'level': INFO, 'explanation': "Nothing to clean up; we're good!", @@ -322,7 +322,7 @@ class B2GTag(TransferMixin, MercurialScript): dirs = self.query_abs_dirs() git = self.query_exe("git", return_type="list") hg_repos = [] - for repo_name in self.query_gecko_repos(): + for repo_name in self.query_goanna_repos(): b2g_branch_config = self.config['b2g_branches'][repo_name] hg_repos.append(self.query_repo_pull_config(repo_name, b2g_branch_config)) self.debug("HG repos: %s" % pprint.pformat(hg_repos)) @@ -343,10 +343,10 @@ class B2GTag(TransferMixin, MercurialScript): ) def push_loop(self): - """ Create the tag and push for each gecko+gaia pair. + """ Create the tag and push for each goanna+gaia pair. This sometimes requires a pull+rebase, hence the loop. """ - for repo_name in self.query_gecko_repos(): + for repo_name in self.query_goanna_repos(): b2g_branch_config = self.config['b2g_branches'][repo_name] repo_config = self.query_repo_pull_config(repo_name, b2g_branch_config) super(B2GTag, self).pull(repos=[repo_config]) diff --git a/testing/mozharness/scripts/merge_day/gecko_migration.py b/testing/mozharness/scripts/merge_day/gecko_migration.py index f605a1383c..169041282b 100755 --- a/testing/mozharness/scripts/merge_day/gecko_migration.py +++ b/testing/mozharness/scripts/merge_day/gecko_migration.py @@ -5,9 +5,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. # ***** END LICENSE BLOCK ***** -""" gecko_migration.py +""" goanna_migration.py -Merge day script for gecko (mozilla-central -> mozilla-aurora, +Merge day script for goanna (mozilla-central -> mozilla-aurora, mozilla-aurora -> mozilla-beta, mozilla-beta -> mozilla-release). Ported largely from @@ -67,7 +67,7 @@ class GoannaMigration(MercurialScript, BalrogMixin, VirtualenvMixin, SelfServeMi "help": "Comma separated list of locales to remove from the 'to' repo.", }], ] - gecko_repos = None + goanna_repos = None def __init__(self, require_config_file=True): super(GoannaMigration, self).__init__( @@ -130,24 +130,24 @@ class GoannaMigration(MercurialScript, BalrogMixin, VirtualenvMixin, SelfServeMi ) return self.abs_dirs - def query_gecko_repos(self): + def query_goanna_repos(self): """ Build a list of repos to clone. """ - if self.gecko_repos: - return self.gecko_repos - self.info("Building gecko_repos list...") + if self.goanna_repos: + return self.goanna_repos + self.info("Building goanna_repos list...") dirs = self.query_abs_dirs() - self.gecko_repos = [] + self.goanna_repos = [] for k in ('from', 'to'): url = self.config["%s_repo_url" % k] - self.gecko_repos.append({ + self.goanna_repos.append({ "repo": url, "revision": self.config.get("%s_repo_revision", "default"), "dest": dirs['abs_%s_dir' % k], "vcs": "hg", }) - self.info(pprint.pformat(self.gecko_repos)) - return self.gecko_repos + self.info(pprint.pformat(self.goanna_repos)) + return self.goanna_repos def query_hg_revision(self, path): """ Avoid making 'pull' a required action every run, by being able @@ -480,7 +480,7 @@ class GoannaMigration(MercurialScript, BalrogMixin, VirtualenvMixin, SelfServeMi """ dirs = self.query_abs_dirs() hg = self.query_exe("hg", return_type="list") - hg_repos = self.query_gecko_repos() + hg_repos = self.query_goanna_repos() hg_strip_error_list = [{ 'substr': r'''abort: empty revision set''', 'level': INFO, 'explanation': "Nothing to clean up; we're good!", @@ -520,14 +520,14 @@ class GoannaMigration(MercurialScript, BalrogMixin, VirtualenvMixin, SelfServeMi ) def pull(self): - """ Pull tools first, then use hgtool for the gecko repos + """ Pull tools first, then use hgtool for the goanna repos """ repos = [{ "repo": self.config["tools_repo_url"], "revision": self.config["tools_repo_revision"], "dest": "tools", "vcs": "hg", - }] + self.query_gecko_repos() + }] + self.query_goanna_repos() super(GoannaMigration, self).pull(repos=repos) def lock_update_paths(self): @@ -626,7 +626,7 @@ The second run will be faster.""" There are two different types of things we trigger: 1) Nightly builds ("post_merge_nightly_branches" in the config). These are triggered with buildapi's nightly build endpoint to avoid - duplicating all of the nightly builder names into the gecko + duplicating all of the nightly builder names into the goanna migration mozharness configs. (Which would surely get out of date very quickly). 2) Arbitrary builders ("post_merge_builders"). These are additional @@ -649,5 +649,5 @@ The second run will be faster.""" # __main__ {{{1 if __name__ == '__main__': - gecko_migration = GoannaMigration() - gecko_migration.run_and_exit() + goanna_migration = GoannaMigration() + goanna_migration.run_and_exit() diff --git a/testing/mozharness/scripts/mobile_l10n.py b/testing/mozharness/scripts/mobile_l10n.py index 321fa07210..ca6efd754c 100755 --- a/testing/mozharness/scripts/mobile_l10n.py +++ b/testing/mozharness/scripts/mobile_l10n.py @@ -205,7 +205,7 @@ class MobileSingleLocale(MockMixin, LocalesMixin, ReleaseMixin, """ if self.revision: return self.revision - r = re.compile(r"gecko_revision ([0-9a-f]{12}\+?)") + r = re.compile(r"goanna_revision ([0-9a-f]{12}\+?)") output = self._query_make_ident_output() for line in output.splitlines(): m = r.match(line) diff --git a/testing/mozharness/scripts/release/antivirus.py b/testing/mozharness/scripts/release/antivirus.py index 0d044c5d98..0e85fe32d0 100644 --- a/testing/mozharness/scripts/release/antivirus.py +++ b/testing/mozharness/scripts/release/antivirus.py @@ -69,7 +69,7 @@ class AntivirusScan(BaseScript, VirtualenvMixin): r"^.*json$", r"^.*/host.*$", r"^.*/mar-tools/.*$", - r"^.*gecko-unsigned-unaligned.apk$", + r"^.*goanna-unsigned-unaligned.apk$", r"^.*robocop.apk$", r"^.*contrib.*" ] diff --git a/testing/mozharness/scripts/release/push-candidate-to-releases.py b/testing/mozharness/scripts/release/push-candidate-to-releases.py index 1150086c55..2683bcf78e 100644 --- a/testing/mozharness/scripts/release/push-candidate-to-releases.py +++ b/testing/mozharness/scripts/release/push-candidate-to-releases.py @@ -91,7 +91,7 @@ class ReleasePusher(BaseScript, VirtualenvMixin): r"^.*json$", r"^.*/host.*$", r"^.*/mar-tools/.*$", - r"^.*gecko-unsigned-unaligned.apk$", + r"^.*goanna-unsigned-unaligned.apk$", r"^.*robocop.apk$", r"^.*contrib.*" ] diff --git a/testing/mozharness/scripts/spidermonkey/build.b2g b/testing/mozharness/scripts/spidermonkey/build.b2g index d08dad5a4a..d53b6df7d6 100755 --- a/testing/mozharness/scripts/spidermonkey/build.b2g +++ b/testing/mozharness/scripts/spidermonkey/build.b2g @@ -1,4 +1,4 @@ #!/bin/bash -e cd $B2G_SOURCE -exec ./build.sh -j3 MOZCONFIG_PATH=$MOZCONFIG_PATH gecko +exec ./build.sh -j3 MOZCONFIG_PATH=$MOZCONFIG_PATH goanna diff --git a/testing/mozharness/scripts/spidermonkey_build.py b/testing/mozharness/scripts/spidermonkey_build.py index e901d5ecfe..fb83f4acea 100755 --- a/testing/mozharness/scripts/spidermonkey_build.py +++ b/testing/mozharness/scripts/spidermonkey_build.py @@ -49,11 +49,11 @@ class SpidermonkeyBuild(MockMixin, config_options = [ [["--repo"], { "dest": "repo", - "help": "which gecko repo to get spidermonkey from", + "help": "which goanna repo to get spidermonkey from", }], [["--source"], { "dest": "source", - "help": "directory containing gecko source tree (instead of --repo)", + "help": "directory containing goanna source tree (instead of --repo)", }], [["--revision"], { "dest": "revision", @@ -191,7 +191,7 @@ class SpidermonkeyBuild(MockMixin, os.path.join(self.config['srcdir'], self.config['analysis-scriptdir']), 'abs_tools_dir': os.path.join(abs_dirs['base_work_dir'], 'tools'), - 'gecko_src': + 'goanna_src': os.path.join(abs_work_dir, self.config['srcdir']), 'abs_blob_upload_dir': os.path.join(abs_work_dir, 'blobber_upload_dir'), @@ -362,7 +362,7 @@ class SpidermonkeyBuild(MockMixin, return dirs = self.query_abs_dirs() - dest = dirs['gecko_src'] + dest = dirs['goanna_src'] # Pre-create the directory to appease the share extension if not os.path.exists(dest): diff --git a/testing/mozharness/scripts/vcs-sync/initial_beagle.py b/testing/mozharness/scripts/vcs-sync/initial_beagle.py index 7374599f25..39db08930d 100644 --- a/testing/mozharness/scripts/vcs-sync/initial_beagle.py +++ b/testing/mozharness/scripts/vcs-sync/initial_beagle.py @@ -7,7 +7,7 @@ """initial_beagle.py Multi-repo m-c hg->git initial conversion with cvs prepending, specifically for -gecko.git and beagle support. +goanna.git and beagle support. Separated from hg_git.py for a) simplifying hg_git.py for its main purpose, and b) somewhat protecting the initial conversion steps from future edits. @@ -43,7 +43,7 @@ class HgGitScript(VirtualenvMixin, TooltoolMixin, TransferMixin, VCSScript): Beagle is a git repo of mozilla-central, with full cvs history, and a number of developer-oriented repositories and branches added. - The partner-oriented gecko.git could also be incorporated into this + The partner-oriented goanna.git could also be incorporated into this script with some changes. """ diff --git a/testing/mozharness/scripts/vcs-sync/vcs_sync.py b/testing/mozharness/scripts/vcs-sync/vcs_sync.py index febbcb68d3..53fb14e8cb 100755 --- a/testing/mozharness/scripts/vcs-sync/vcs_sync.py +++ b/testing/mozharness/scripts/vcs-sync/vcs_sync.py @@ -6,7 +6,7 @@ # ***** END LICENSE BLOCK ***** """vcs_sync.py -hg<->git conversions. Needs to support both the monolithic beagle/gecko.git +hg<->git conversions. Needs to support both the monolithic beagle/goanna.git type conversions, as well as many-to-many (l10n, build repos, etc.) """ @@ -48,7 +48,7 @@ class HgGitScript(VirtualenvMixin, TooltoolMixin, TransferMixin, VCSSyncScript): Beagle is a git repo of mozilla-central, with full cvs history, and a number of developer-oriented repositories and branches added. - The partner-oriented gecko.git could also be incorporated into this + The partner-oriented goanna.git could also be incorporated into this script with some changes. """ @@ -177,7 +177,7 @@ intree=1 self.write_to_file(hgrc, hgrc_update, open_mode='a') def _process_locale(self, locale, type, config, l10n_remote_targets, name, l10n_repos): - """ This contains the common processing that we do on both gecko_config + """ This contains the common processing that we do on both goanna_config and gaia_config for a given locale. """ replace_dict = {'locale': locale} @@ -227,16 +227,16 @@ intree=1 l10n_repos = [] l10n_remote_targets = deepcopy(self.config['remote_targets']) dirs = self.query_abs_dirs() - gecko_dict = deepcopy(self.config['l10n_config'].get('gecko_config', {})) - for name, gecko_config in gecko_dict.items(): - file_name = self.download_file(gecko_config['locales_file_url'], + goanna_dict = deepcopy(self.config['l10n_config'].get('goanna_config', {})) + for name, goanna_config in goanna_dict.items(): + file_name = self.download_file(goanna_config['locales_file_url'], parent_dir=dirs['abs_work_dir']) if not os.path.exists(file_name): - self.error("Can't download locales from %s; skipping!" % gecko_config['locales_file_url']) + self.error("Can't download locales from %s; skipping!" % goanna_config['locales_file_url']) continue contents = self.read_from_file(file_name) for locale in contents.splitlines(): - self._process_locale(locale, 'gecko', gecko_config, l10n_remote_targets, name, l10n_repos) + self._process_locale(locale, 'goanna', goanna_config, l10n_remote_targets, name, l10n_repos) gaia_dict = deepcopy(self.config['l10n_config'].get('gaia_config', {})) for name, gaia_config in gaia_dict.items(): @@ -884,7 +884,7 @@ intree=1 generated_mapfile = os.path.join(dest, '.hg', 'git-mapfile') self.copy_to_upload_dir( generated_mapfile, - dest=repo_config.get('mapfile_name', self.config.get('mapfile_name', "gecko-mapfile")), + dest=repo_config.get('mapfile_name', self.config.get('mapfile_name', "goanna-mapfile")), log_level=INFO ) for (branch, target_branch) in branch_map.items(): @@ -1020,7 +1020,7 @@ intree=1 if repo_config.get("mapfile_name"): mapfiles.append(repo_config['mapfile_name']) else: - mapfiles.append(self.config.get('mapfile_name', 'gecko-mapfile')) + mapfiles.append(self.config.get('mapfile_name', 'goanna-mapfile')) if self.config.get('external_mapfile_urls'): for url in self.config['external_mapfile_urls']: file_name = self.download_file( diff --git a/testing/taskcluster/README.md b/testing/taskcluster/README.md index 287804d2bb..39a1484ca2 100644 --- a/testing/taskcluster/README.md +++ b/testing/taskcluster/README.md @@ -84,7 +84,7 @@ task: - repository: Target HG repository (ex: https://hg.mozilla.org/mozilla-central) - - revision: Target HG revision for gecko + - revision: Target HG revision for goanna - owner: Email address of the committer @@ -100,7 +100,7 @@ locations in the future) - repository: Target HG repository (ex: https://hg.mozilla.org/mozilla-central) - - revision: Target HG revision for gecko + - revision: Target HG revision for goanna - owner: Email address of the committer diff --git a/testing/taskcluster/mach_commands.py b/testing/taskcluster/mach_commands.py index e91bf433c2..bfae92c230 100644 --- a/testing/taskcluster/mach_commands.py +++ b/testing/taskcluster/mach_commands.py @@ -96,7 +96,7 @@ def get_task(task_id): def gaia_info(): ''' Fetch details from in tree gaia.json (which links this version of - gecko->gaia) and construct the usual base/head/ref/rev pairing... + goanna->gaia) and construct the usual base/head/ref/rev pairing... ''' gaia = json.load(open(os.path.join(GECKO, 'b2g', 'config', 'gaia.json'))) @@ -495,21 +495,21 @@ class CIDockerRun(object): @Command('taskcluster-docker-run', category='ci', description='Run a docker image and optionally mount local hg repos. ' \ 'Repos will be mounted to /home/worker/x/source accordingly. ' \ - 'For example, to run a centos image and mount local gecko ' \ - 'and gaia repos: mach ci-docker-run --local-gecko-repo ' \ + 'For example, to run a centos image and mount local goanna ' \ + 'and gaia repos: mach ci-docker-run --local-goanna-repo ' \ '/home/user/mozilla-central/ --local-gaia-repo /home/user/gaia/ '\ '--docker-flags="-t -i" centos:centos7 /bin/bash') - @CommandArgument('--local-gecko-repo', - action='store', dest='local_gecko_repo', - help='local gecko hg repository for volume mount') - @CommandArgument('--gecko-revision', - action='store', dest='gecko_revision', - help='local gecko repo revision (defaults to latest)') + @CommandArgument('--local-goanna-repo', + action='store', dest='local_goanna_repo', + help='local goanna hg repository for volume mount') + @CommandArgument('--goanna-revision', + action='store', dest='goanna_revision', + help='local goanna repo revision (defaults to latest)') @CommandArgument('--local-gaia-repo', action='store', dest='local_gaia_repo', help='local gaia hg repository for volume mount') @CommandArgument('--mozconfig', - help='The mozconfig file for building gecko') + help='The mozconfig file for building goanna') @CommandArgument('--docker-flags', action='store', dest='flags', help='string of run flags (i.e. --docker-flags="-i -t")') @@ -518,23 +518,23 @@ class CIDockerRun(object): @CommandArgument('command', nargs='*', help='command to run inside the docker image') - def ci_docker_run(self, local_gecko_repo='', gecko_revision='', + def ci_docker_run(self, local_goanna_repo='', goanna_revision='', local_gaia_repo='', mozconfig="", flags="", **kwargs): ''' Run docker image and optionally volume mount specified local repos ''' - gecko_mount_point='/home/worker/mozilla-central/source/' + goanna_mount_point='/home/worker/mozilla-central/source/' gaia_mount_point='/home/worker/gaia/source/' cmd_out = ['docker', 'run'] if flags: cmd_out.extend(flags.split()) - if local_gecko_repo: - if not os.path.exists(local_gecko_repo): - print("Goanna repository path doesn't exist: %s" % local_gecko_repo) + if local_goanna_repo: + if not os.path.exists(local_goanna_repo): + print("Goanna repository path doesn't exist: %s" % local_goanna_repo) sys.exit(1) - if not gecko_revision: - gecko_revision = get_latest_hg_revision(local_gecko_repo) - cmd_out.extend(['-v', '%s:%s' % (local_gecko_repo, gecko_mount_point)]) - cmd_out.extend(['-e', 'REPOSITORY=%s' % gecko_mount_point]) - cmd_out.extend(['-e', 'REVISION=%s' % gecko_revision]) + if not goanna_revision: + goanna_revision = get_latest_hg_revision(local_goanna_repo) + cmd_out.extend(['-v', '%s:%s' % (local_goanna_repo, goanna_mount_point)]) + cmd_out.extend(['-e', 'REPOSITORY=%s' % goanna_mount_point]) + cmd_out.extend(['-e', 'REVISION=%s' % goanna_revision]) if local_gaia_repo: if not os.path.exists(local_gaia_repo): print("Gaia repository path doesn't exist: %s" % local_gaia_repo) diff --git a/testing/taskcluster/tasks/branches/alder/job_flags.yml b/testing/taskcluster/tasks/branches/alder/job_flags.yml index 124453d451..b56859e8f7 100644 --- a/testing/taskcluster/tasks/branches/alder/job_flags.yml +++ b/testing/taskcluster/tasks/branches/alder/job_flags.yml @@ -1,12 +1,12 @@ --- # For complete sample of all build and test jobs, -# see /testing/taskcluster/tasks/job_flags.yml +# see /testing/taskcluster/tasks/job_flags.yml $inherits: from: tasks/branches/base_job_flags.yml builds: - linux64_gecko: + linux64_goanna: platforms: - b2g types: diff --git a/testing/taskcluster/tasks/branches/base_job_flags.yml b/testing/taskcluster/tasks/branches/base_job_flags.yml index d67875c34a..8ebae9903d 100644 --- a/testing/taskcluster/tasks/branches/base_job_flags.yml +++ b/testing/taskcluster/tasks/branches/base_job_flags.yml @@ -6,11 +6,11 @@ flags: - emulator - emulator-jb - emulator-kk - - linux32_gecko # b2g desktop linux 32 bit - - linux64_gecko # b2g desktop linux 64 bit - - linux64-mulet # Firefox desktop - b2g gecko linux 64 bit - - macosx64_gecko # b2g desktop osx 64 bit - - win32_gecko # b2g desktop win 32 bit + - linux32_goanna # b2g desktop linux 32 bit + - linux64_goanna # b2g desktop linux 64 bit + - linux64-mulet # Firefox desktop - b2g goanna linux 64 bit + - macosx64_goanna # b2g desktop osx 64 bit + - win32_goanna # b2g desktop win 32 bit - flame-kk # b2g flame kitkat - flame-kk-eng # b2g flame eng build diff --git a/testing/taskcluster/tasks/branches/cedar/job_flags.yml b/testing/taskcluster/tasks/branches/cedar/job_flags.yml index 994d50e33e..096219954f 100644 --- a/testing/taskcluster/tasks/branches/cedar/job_flags.yml +++ b/testing/taskcluster/tasks/branches/cedar/job_flags.yml @@ -1,12 +1,12 @@ --- # For complete sample of all build and test jobs, -# see /testing/taskcluster/tasks/job_flags.yml +# see /testing/taskcluster/tasks/job_flags.yml $inherits: from: tasks/branches/base_job_flags.yml builds: - linux64_gecko: + linux64_goanna: platforms: - b2g types: diff --git a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml index 26a693850a..4d8e86cc13 100644 --- a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml +++ b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml @@ -1,12 +1,12 @@ --- # For complete sample of all build and test jobs, -# see /testing/taskcluster/tasks/job_flags.yml +# see /testing/taskcluster/tasks/job_flags.yml $inherits: from: tasks/branches/base_job_flags.yml builds: - linux64_gecko: + linux64_goanna: platforms: - b2g types: diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml index 9778ac92ec..69080ca523 100644 --- a/testing/taskcluster/tasks/branches/try/job_flags.yml +++ b/testing/taskcluster/tasks/branches/try/job_flags.yml @@ -1,12 +1,12 @@ --- # For complete sample of all build and test jobs, -# see /testing/taskcluster/tasks/job_flags.yml +# see /testing/taskcluster/tasks/job_flags.yml $inherits: from: tasks/branches/base_job_flags.yml builds: - linux64_gecko: + linux64_goanna: platforms: - b2g types: diff --git a/testing/taskcluster/tasks/build.yml b/testing/taskcluster/tasks/build.yml index ec91de529a..a664179dcd 100644 --- a/testing/taskcluster/tasks/build.yml +++ b/testing/taskcluster/tasks/build.yml @@ -44,7 +44,7 @@ task: env: - # Common environment variables for checking out gecko + # Common environment variables for checking out goanna GECKO_BASE_REPOSITORY: '{{base_repository}}' GECKO_HEAD_REPOSITORY: '{{head_repository}}' GECKO_HEAD_REV: '{{head_rev}}' diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_base.yml b/testing/taskcluster/tasks/builds/b2g_desktop_base.yml index 984b140dc0..52acf0dcbd 100644 --- a/testing/taskcluster/tasks/builds/b2g_desktop_base.yml +++ b/testing/taskcluster/tasks/builds/b2g_desktop_base.yml @@ -7,16 +7,16 @@ task: workerType: b2gbuild-desktop scopes: - - 'docker-worker:cache:sources-gecko' + - 'docker-worker:cache:sources-goanna' - 'docker-worker:cache:sources-gaia' payload: cache: sources-gaia: '/home/worker/gaia' - sources-gecko: '/home/worker/gecko' + sources-goanna: '/home/worker/goanna' env: - MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly' + MOZCONFIG: 'b2g/config/mozconfigs/linux64_goanna/nightly' MOZTT_GIT_URL: '{{moztt_git_url}}' MOZTT_REVISION: '{{moztt_revision}}' diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml index 07b446d958..dc373f5e46 100644 --- a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml +++ b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml @@ -18,4 +18,4 @@ task: payload: env: - MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/debug' + MOZCONFIG: 'b2g/config/mozconfigs/linux64_goanna/debug' diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml b/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml index 4b9f8abac7..56365693d5 100644 --- a/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml @@ -13,4 +13,4 @@ task: payload: env: - MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly' + MOZCONFIG: 'b2g/config/mozconfigs/linux64_goanna/nightly' diff --git a/testing/taskcluster/tasks/builds/mulet_linux.yml b/testing/taskcluster/tasks/builds/mulet_linux.yml index 4e4ed5b341..df093079a2 100644 --- a/testing/taskcluster/tasks/builds/mulet_linux.yml +++ b/testing/taskcluster/tasks/builds/mulet_linux.yml @@ -7,13 +7,13 @@ task: workerType: b2gbuild-desktop scopes: - - 'docker-worker:cache:sources-gecko' + - 'docker-worker:cache:sources-goanna' - 'docker-worker:cache:build-mulet-linux-objects' - 'docker-worker:cache:tooltool-cache' payload: cache: - sources-gecko: '/home/worker/gecko' + sources-goanna: '/home/worker/goanna' build-mulet-linux-objects: '/home/worker/object-folder' tooltool-cache: '/home/worker/tools/tooltool-cache' diff --git a/testing/taskcluster/tasks/decision/branch.yml b/testing/taskcluster/tasks/decision/branch.yml index 86fc09c6be..4af36c38cd 100644 --- a/testing/taskcluster/tasks/decision/branch.yml +++ b/testing/taskcluster/tasks/decision/branch.yml @@ -28,7 +28,7 @@ tasks: tags: createdForUser: {{owner}} - workerType: "gecko-decision" + workerType: "goanna-decision" provisionerId: "aws-provisioner" scopes: diff --git a/testing/taskcluster/tasks/decision/periodic_alder.yml b/testing/taskcluster/tasks/decision/periodic_alder.yml index b23bdd9b43..9040ea3a0e 100644 --- a/testing/taskcluster/tasks/decision/periodic_alder.yml +++ b/testing/taskcluster/tasks/decision/periodic_alder.yml @@ -9,7 +9,7 @@ task: description: | Decision task for testing purposes for alder. - workerType: gecko-decision + workerType: goanna-decision provisionerId: aws-provisioner scopes: diff --git a/testing/taskcluster/tasks/decision/try.yml b/testing/taskcluster/tasks/decision/try.yml index 692645dc6e..51f0d75870 100644 --- a/testing/taskcluster/tasks/decision/try.yml +++ b/testing/taskcluster/tasks/decision/try.yml @@ -26,7 +26,7 @@ tasks: This is the single most important task as it decides how all other tasks get built. - workerType: "gecko-decision" + workerType: "goanna-decision" provisionerId: "aws-provisioner" tags: diff --git a/testing/taskcluster/tasks/job_flags.yml b/testing/taskcluster/tasks/job_flags.yml index 3be915c06e..7cb40719e2 100644 --- a/testing/taskcluster/tasks/job_flags.yml +++ b/testing/taskcluster/tasks/job_flags.yml @@ -8,11 +8,11 @@ flags: - emulator - emulator-jb - emulator-kk - - linux32_gecko # b2g desktop linux 32 bit - - linux64_gecko # b2g desktop linux 64 bit - - linux64-mulet # Firefox desktop - b2g gecko linux 64 bit - - macosx64_gecko # b2g desktop osx 64 bit - - win32_gecko # b2g desktop win 32 bit + - linux32_goanna # b2g desktop linux 32 bit + - linux64_goanna # b2g desktop linux 64 bit + - linux64-mulet # Firefox desktop - b2g goanna linux 64 bit + - macosx64_goanna # b2g desktop osx 64 bit + - win32_goanna # b2g desktop win 32 bit tests: - cppunit @@ -63,7 +63,7 @@ builds: # opt: # debug: # - linux64_gecko: + linux64_goanna: platforms: - b2g types: diff --git a/testing/taskcluster/tasks/phone_build.yml b/testing/taskcluster/tasks/phone_build.yml index cfc5aba7e0..d0a2f878f4 100644 --- a/testing/taskcluster/tasks/phone_build.yml +++ b/testing/taskcluster/tasks/phone_build.yml @@ -41,7 +41,7 @@ task: env: - # Common environment variables for checking out gecko + # Common environment variables for checking out goanna GECKO_BASE_REPOSITORY: '{{base_repository}}' GECKO_HEAD_REPOSITORY: '{{head_repository}}' GECKO_HEAD_REV: '{{head_rev}}' diff --git a/testing/taskcluster/tasks/test.yml b/testing/taskcluster/tasks/test.yml index b6679dd324..b17c1d0425 100644 --- a/testing/taskcluster/tasks/test.yml +++ b/testing/taskcluster/tasks/test.yml @@ -1,4 +1,4 @@ -# This task is the base for most tests in gecko. +# This task is the base for most tests in goanna. task: created: '{{now}}' deadline: '{{#from_now}}24 hours{{/from_now}}' diff --git a/testing/web-platform/README.md b/testing/web-platform/README.md index f5842fbdba..6e26f3df8a 100644 --- a/testing/web-platform/README.md +++ b/testing/web-platform/README.md @@ -156,7 +156,7 @@ to test in Chrome: 1. Download the chromedriver binary and place it somewhere sensible e.g. `~/bin` -2. In your gecko source tree activate the virtualenv created by mach, +2. In your goanna source tree activate the virtualenv created by mach, since this has most dependencies already installed. This is typically in objdir/_virtualenv and is activated via e.g. diff --git a/testing/web-platform/mozilla/README b/testing/web-platform/mozilla/README index a586769844..24a80239ec 100644 --- a/testing/web-platform/mozilla/README +++ b/testing/web-platform/mozilla/README @@ -1,4 +1,4 @@ This directory is intended for web-platform-tests that currently cannot be upstreamed for some reason (e.g. because they depend on -gecko-specific APIs). When run they are mounted on the server under +goanna-specific APIs). When run they are mounted on the server under /_mozilla/. \ No newline at end of file diff --git a/testing/web-platform/update/update.py b/testing/web-platform/update/update.py index 65831dbd71..879ce77dd1 100644 --- a/testing/web-platform/update/update.py +++ b/testing/web-platform/update/update.py @@ -12,7 +12,7 @@ from .tree import GitTree, HgTree, GoannaCommit from .upstream import SyncToUpstream class LoadTrees(Step): - """Load gecko tree and sync tree containing web-platform-tests""" + """Load goanna tree and sync tree containing web-platform-tests""" provides = ["local_tree", "sync_tree"] diff --git a/testing/web-platform/update/upstream.py b/testing/web-platform/update/upstream.py index a36daae23d..603ac489e2 100644 --- a/testing/web-platform/update/upstream.py +++ b/testing/web-platform/update/upstream.py @@ -100,7 +100,7 @@ class CheckoutBranch(Step): class GetLastSyncCommit(Step): - """Find the gecko commit at which we last performed a sync with upstream.""" + """Find the goanna commit at which we last performed a sync with upstream.""" provides = ["last_sync_path", "last_sync_commit"] @@ -131,7 +131,7 @@ class GetBaseCommit(Step): class LoadCommits(Step): - """Get a list of commits in the gecko tree that need to be upstreamed""" + """Get a list of commits in the goanna tree that need to be upstreamed""" provides = ["source_commits"] @@ -159,7 +159,7 @@ class LoadCommits(Step): self.logger.debug("Source commits: %s" % state.source_commits) class MovePatches(Step): - """Convert gecko commits into patches against upstream and commit these to the sync tree.""" + """Convert goanna commits into patches against upstream and commit these to the sync tree.""" provides = ["commits_loaded"] @@ -244,7 +244,7 @@ class MergeUpstream(Step): state.merge_index += 1 class UpdateLastSyncCommit(Step): - """Update the gecko commit at which we last performed a sync with upstream.""" + """Update the goanna commit at which we last performed a sync with upstream.""" provides = [] diff --git a/testing/xpcshell/runtestsb2g.py b/testing/xpcshell/runtestsb2g.py index 8e1de0b3a3..f31a92690f 100644 --- a/testing/xpcshell/runtestsb2g.py +++ b/testing/xpcshell/runtestsb2g.py @@ -123,11 +123,11 @@ class B2GOptions(RemoteXPCShellOptions): dest='use_device_libs', help="Don't push .so's") defaults['use_device_libs'] = False - self.add_option("--gecko-path", action="store", - type="string", dest="geckoPath", - help="the path to a gecko distribution that should " + self.add_option("--goanna-path", action="store", + type="string", dest="goannaPath", + help="the path to a goanna distribution that should " "be installed on the emulator prior to test") - defaults["geckoPath"] = None + defaults["goannaPath"] = None self.add_option("--logdir", action="store", type="string", dest="logdir", help="directory to store log files") @@ -148,8 +148,8 @@ class B2GOptions(RemoteXPCShellOptions): if options.b2g_path is None: self.error("Need to specify a --b2gpath") - if options.geckoPath and not options.emulator: - self.error("You must specify --emulator if you specify --gecko-path") + if options.goannaPath and not options.emulator: + self.error("You must specify --emulator if you specify --goanna-path") if options.logdir and not options.emulator: self.error("You must specify --emulator if you specify --logdir") @@ -164,8 +164,8 @@ def run_remote_xpcshell(parser, options, args, log): kwargs['emulator'] = options.emulator if options.no_window: kwargs['noWindow'] = True - if options.geckoPath: - kwargs['gecko_path'] = options.geckoPath + if options.goannaPath: + kwargs['goanna_path'] = options.goannaPath if options.logdir: kwargs['logdir'] = options.logdir if options.busybox: diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp index a854977067..c6516ccd28 100644 --- a/toolkit/crashreporter/nsExceptionHandler.cpp +++ b/toolkit/crashreporter/nsExceptionHandler.cpp @@ -943,7 +943,7 @@ bool MinidumpCallback( "/system/bin/am", "start", "--user", androidUserSerial, - "-a", "org.mozilla.gecko.reportCrash", + "-a", "org.mozilla.goanna.reportCrash", "-n", crashReporterPath, "--es", "minidumpPath", minidumpPath, (char*)0); @@ -951,7 +951,7 @@ bool MinidumpCallback( unused << execlp("/system/bin/am", "/system/bin/am", "start", - "-a", "org.mozilla.gecko.reportCrash", + "-a", "org.mozilla.goanna.reportCrash", "-n", crashReporterPath, "--es", "minidumpPath", minidumpPath, (char*)0); @@ -1131,7 +1131,7 @@ nsresult SetExceptionHandler(nsIFile* aXREDirectory, #else // On Android, we launch using the application package name // instead of a filename, so use ANDROID_PACKAGE_NAME to do that here. - nsCString package(ANDROID_PACKAGE_NAME "/org.mozilla.gecko.CrashReporter"); + nsCString package(ANDROID_PACKAGE_NAME "/org.mozilla.goanna.CrashReporter"); crashReporterPath = ToNewCString(package); #endif } @@ -2719,7 +2719,7 @@ OOPInit() #if defined(XP_WIN) childCrashNotifyPipe = - PR_smprintf("\\\\.\\pipe\\gecko-crash-server-pipe.%i", + PR_smprintf("\\\\.\\pipe\\goanna-crash-server-pipe.%i", static_cast(::GetCurrentProcessId())); const std::wstring dumpPath = gExceptionHandler->dump_path(); @@ -2749,7 +2749,7 @@ OOPInit() #elif defined(XP_MACOSX) childCrashNotifyPipe = - PR_smprintf("gecko-crash-server-pipe.%i", + PR_smprintf("goanna-crash-server-pipe.%i", static_cast(getpid())); const std::string dumpPath = gExceptionHandler->dump_path(); diff --git a/toolkit/devtools/server/actors/device.js b/toolkit/devtools/server/actors/device.js index 3e50af6017..8158fee577 100644 --- a/toolkit/devtools/server/actors/device.js +++ b/toolkit/devtools/server/actors/device.js @@ -79,8 +79,8 @@ let DeviceActor = exports.DeviceActor = protocol.ActorClass({ appbuildid: appInfo.appBuildID, platformbuildid: appInfo.platformBuildID, platformversion: appInfo.platformVersion, - geckobuildid: appInfo.platformBuildID, - geckoversion: appInfo.platformVersion, + goannabuildid: appInfo.platformBuildID, + goannaversion: appInfo.platformVersion, changeset: this._getAppIniString("App", "SourceStamp"), locale: Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global"), os: null, diff --git a/toolkit/devtools/server/tests/mochitest/test_device.html b/toolkit/devtools/server/tests/mochitest/test_device.html index b068839602..f7224ac9c7 100644 --- a/toolkit/devtools/server/tests/mochitest/test_device.html +++ b/toolkit/devtools/server/tests/mochitest/test_device.html @@ -51,8 +51,8 @@ window.onload = function() { appbuildid: appInfo.appBuildID, platformbuildid: appInfo.platformBuildID, platformversion: appInfo.platformVersion, - geckobuildid: appInfo.platformBuildID, - geckoversion: appInfo.platformVersion, + goannabuildid: appInfo.platformBuildID, + goannaversion: appInfo.platformVersion, useragent: window.navigator.userAgent, locale: Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global"), os: appInfo.OS, diff --git a/toolkit/forgetaboutsite/ForgetAboutSite.jsm b/toolkit/forgetaboutsite/ForgetAboutSite.jsm index 652015683c..7bc9ead7ac 100644 --- a/toolkit/forgetaboutsite/ForgetAboutSite.jsm +++ b/toolkit/forgetaboutsite/ForgetAboutSite.jsm @@ -81,7 +81,7 @@ this.ForgetAboutSite = { } // EME - let mps = Cc["@mozilla.org/gecko-media-plugin-service;1"]. + let mps = Cc["@mozilla.org/goanna-media-plugin-service;1"]. getService(Ci.mozIGoannaMediaPluginService); mps.forgetThisSite(aDomain); diff --git a/toolkit/locales/compare-locales.pl b/toolkit/locales/compare-locales.pl index fbc7ab5c21..597e5157a9 100644 --- a/toolkit/locales/compare-locales.pl +++ b/toolkit/locales/compare-locales.pl @@ -93,8 +93,8 @@ sub compareProperties if ($path !~ /chrome\/browser-region\/region\.properties$/ or ($entity !~ /browser\.search\.order\.[1-9]/ and $entity !~ /browser\.contentHandlers\.types\.[0-5]/ and - $entity !~ /gecko\.handlerService\.schemes\./ and - $entity !~ /gecko\.handlerService\.defaultHandlersVersion/)) { + $entity !~ /goanna\.handlerService\.schemes\./ and + $entity !~ /goanna\.handlerService\.defaultHandlersVersion/)) { push @extra1, $entity; } } @@ -104,8 +104,8 @@ sub compareProperties foreach $entity (keys(%entities2)) { if ($entity =~ /browser\.search\.order\.[1-9]/ || $entity =~ /browser\.contentHandlers\.types\.[0-5]/ || - $entity =~ /gecko\.handlerService\.schemes\./ || - $entity =~ /gecko\.handlerService\.defaultHandlersVersion/) { + $entity =~ /goanna\.handlerService\.schemes\./ || + $entity =~ /goanna\.handlerService\.defaultHandlersVersion/) { delete $entities2{$entity}; } } diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm index bf92aadf8a..1c9468992c 100644 --- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm +++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm @@ -62,7 +62,7 @@ const GMP_PLUGINS = [ XPCOMUtils.defineLazyGetter(this, "pluginsBundle", () => Services.strings.createBundle("chrome://global/locale/plugins.properties")); XPCOMUtils.defineLazyGetter(this, "gmpService", - () => Cc["@mozilla.org/gecko-media-plugin-service;1"].getService(Ci.mozIGoannaMediaPluginService)); + () => Cc["@mozilla.org/goanna-media-plugin-service;1"].getService(Ci.mozIGoannaMediaPluginService)); let messageManager = Cc["@mozilla.org/globalmessagemanager;1"] .getService(Ci.nsIMessageListenerManager); diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk index 456bad4660..e10745db4c 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -318,7 +318,7 @@ NON_DIST_FILES = \ classes.dex \ $(NULL) -UPLOAD_EXTRA_FILES += gecko-unsigned-unaligned.apk +UPLOAD_EXTRA_FILES += goanna-unsigned-unaligned.apk DIST_FILES += $(MOZ_CHILD_PROCESS_NAME) @@ -329,9 +329,9 @@ INNER_ROBOCOP_PACKAGE=echo ifeq ($(MOZ_BUILD_APP),mobile/android) UPLOAD_EXTRA_FILES += robocop.apk UPLOAD_EXTRA_FILES += fennec_ids.txt -UPLOAD_EXTRA_FILES += geckoview_library/geckoview_library.zip -UPLOAD_EXTRA_FILES += geckoview_library/geckoview_assets.zip -UPLOAD_EXTRA_FILES += ../embedding/android/geckoview_example/geckoview_example.apk +UPLOAD_EXTRA_FILES += goannaview_library/goannaview_library.zip +UPLOAD_EXTRA_FILES += goannaview_library/goannaview_assets.zip +UPLOAD_EXTRA_FILES += ../embedding/android/goannaview_example/goannaview_example.apk # Robocop/Robotium tests, Android Background tests, and Fennec need to # be signed with the same key, which means release signing them all. @@ -348,13 +348,13 @@ else INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Android Robocop for you' endif -# Create geckoview_library/geckoview_{assets,library}.zip for third-party GoannaView consumers. +# Create goannaview_library/goannaview_{assets,library}.zip for third-party GoannaView consumers. ifdef NIGHTLY_BUILD ifndef MOZ_DISABLE_GECKOVIEW INNER_MAKE_GECKOVIEW_LIBRARY= \ - $(MAKE) -C ../mobile/android/geckoview_library package + $(MAKE) -C ../mobile/android/goannaview_library package INNER_MAKE_GECKOVIEW_EXAMPLE= \ - $(MAKE) -C ../embedding/android/geckoview_example package + $(MAKE) -C ../embedding/android/goannaview_example package else INNER_MAKE_GECKOVIEW_LIBRARY=echo 'GoannaView library packaging is disabled' INNER_MAKE_GECKOVIEW_EXAMPLE=echo 'GoannaView example packaging is disabled' @@ -364,29 +364,29 @@ INNER_MAKE_GECKOVIEW_LIBRARY=echo 'GoannaView library packaging is only enabled INNER_MAKE_GECKOVIEW_EXAMPLE=echo 'GoannaView example packaging is only enabled on Nightly' endif -# Create geckolibs Android ARchive and metadata for download by local +# Create goannalibs Android ARchive and metadata for download by local # developers using Gradle. ifdef MOZ_ANDROID_GECKOLIBS_AAR -geckolibs-revision := $(BUILDID) +goannalibs-revision := $(BUILDID) UPLOAD_EXTRA_FILES += \ - geckolibs-$(geckolibs-revision).aar \ - geckolibs-$(geckolibs-revision).aar.sha1 \ - geckolibs-$(geckolibs-revision).pom \ - geckolibs-$(geckolibs-revision).pom.sha1 \ - ivy-geckolibs-$(geckolibs-revision).xml \ - ivy-geckolibs-$(geckolibs-revision).xml.sha1 \ + goannalibs-$(goannalibs-revision).aar \ + goannalibs-$(goannalibs-revision).aar.sha1 \ + goannalibs-$(goannalibs-revision).pom \ + goannalibs-$(goannalibs-revision).pom.sha1 \ + ivy-goannalibs-$(goannalibs-revision).xml \ + ivy-goannalibs-$(goannalibs-revision).xml.sha1 \ $(NULL) INNER_MAKE_GECKOLIBS_AAR= \ - $(PYTHON) -m mozbuild.action.package_geckolibs_aar \ + $(PYTHON) -m mozbuild.action.package_goannalibs_aar \ --verbose \ - --revision $(geckolibs-revision) \ + --revision $(goannalibs-revision) \ --topsrcdir '$(topsrcdir)' \ --distdir '$(_ABS_DIST)' \ '$(_ABS_DIST)' else -INNER_MAKE_GECKOLIBS_AAR=echo 'Android geckolibs.aar packaging is disabled' +INNER_MAKE_GECKOLIBS_AAR=echo 'Android goannalibs.aar packaging is disabled' endif ifdef MOZ_OMX_PLUGIN @@ -445,25 +445,25 @@ OMNIJAR_NAME := $(notdir $(OMNIJAR_NAME)) PKG_SUFFIX = .apk INNER_MAKE_PACKAGE = \ $(if $(ALREADY_SZIPPED),,$(foreach lib,$(SZIP_LIBRARIES),host/bin/szip $(MOZ_SZIP_FLAGS) $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib) && )) \ - make -C $(GECKO_APP_AP_PATH) gecko-nodeps.ap_ && \ - cp $(GECKO_APP_AP_PATH)/gecko-nodeps.ap_ $(_ABS_DIST)/gecko.ap_ && \ + make -C $(GECKO_APP_AP_PATH) goanna-nodeps.ap_ && \ + cp $(GECKO_APP_AP_PATH)/goanna-nodeps.ap_ $(_ABS_DIST)/goanna.ap_ && \ ( (test ! -f $(GECKO_APP_AP_PATH)/R.txt && echo "*** Warning: The R.txt that is being packaged might not agree with the R.txt that was built. This is normal during l10n repacks.") || \ - diff $(GECKO_APP_AP_PATH)/R.txt $(GECKO_APP_AP_PATH)/gecko-nodeps/R.txt >/dev/null || \ + diff $(GECKO_APP_AP_PATH)/R.txt $(GECKO_APP_AP_PATH)/goanna-nodeps/R.txt >/dev/null || \ (echo "*** Error: The R.txt that was built and the R.txt that is being packaged are not the same. Rebuild mobile/android/base and re-package." && exit 1)) && \ ( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \ - unzip -o $(_ABS_DIST)/gecko.ap_ && \ - rm $(_ABS_DIST)/gecko.ap_ && \ - $(ZIP) $(if $(MOZ_ENABLE_SZIP),-0 )$(_ABS_DIST)/gecko.ap_ $(ASSET_SO_LIBRARIES) && \ - $(ZIP) -r9D $(_ABS_DIST)/gecko.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) $(SZIP_LIBRARIES) && \ + unzip -o $(_ABS_DIST)/goanna.ap_ && \ + rm $(_ABS_DIST)/goanna.ap_ && \ + $(ZIP) $(if $(MOZ_ENABLE_SZIP),-0 )$(_ABS_DIST)/goanna.ap_ $(ASSET_SO_LIBRARIES) && \ + $(ZIP) -r9D $(_ABS_DIST)/goanna.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) $(SZIP_LIBRARIES) && \ $(if $(filter-out ./,$(OMNIJAR_DIR)), \ mkdir -p $(OMNIJAR_DIR) && mv $(OMNIJAR_NAME) $(OMNIJAR_DIR) && ) \ - $(ZIP) -0 $(_ABS_DIST)/gecko.ap_ $(OMNIJAR_DIR)$(OMNIJAR_NAME)) && \ - rm -f $(_ABS_DIST)/gecko.apk && \ - cp $(_ABS_DIST)/gecko.ap_ $(_ABS_DIST)/gecko.apk && \ - $(ZIP) -j0 $(_ABS_DIST)/gecko.apk $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex && \ - cp $(_ABS_DIST)/gecko.apk $(_ABS_DIST)/gecko-unsigned-unaligned.apk && \ - $(RELEASE_JARSIGNER) $(_ABS_DIST)/gecko.apk && \ - $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/gecko.apk $(PACKAGE) && \ + $(ZIP) -0 $(_ABS_DIST)/goanna.ap_ $(OMNIJAR_DIR)$(OMNIJAR_NAME)) && \ + rm -f $(_ABS_DIST)/goanna.apk && \ + cp $(_ABS_DIST)/goanna.ap_ $(_ABS_DIST)/goanna.apk && \ + $(ZIP) -j0 $(_ABS_DIST)/goanna.apk $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex && \ + cp $(_ABS_DIST)/goanna.apk $(_ABS_DIST)/goanna-unsigned-unaligned.apk && \ + $(RELEASE_JARSIGNER) $(_ABS_DIST)/goanna.apk && \ + $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/goanna.apk $(PACKAGE) && \ $(INNER_ROBOCOP_PACKAGE) && \ $(INNER_MAKE_GECKOLIBS_AAR) && \ $(INNER_MAKE_GECKOVIEW_LIBRARY) && \ diff --git a/toolkit/mozapps/update/tests/marionette/update_smoketest_ota_same_version.js b/toolkit/mozapps/update/tests/marionette/update_smoketest_ota_same_version.js index 69c6f3209b..bd99d9adb7 100644 --- a/toolkit/mozapps/update/tests/marionette/update_smoketest_ota_same_version.js +++ b/toolkit/mozapps/update/tests/marionette/update_smoketest_ota_same_version.js @@ -5,12 +5,12 @@ function testSameVersion() { let mozSettings = window.navigator.mozSettings; let forceSent = false; - mozSettings.addObserver("gecko.updateStatus", function statusObserver(setting) { + mozSettings.addObserver("goanna.updateStatus", function statusObserver(setting) { if (!forceSent) { return; } - mozSettings.removeObserver("gecko.updateStatus", statusObserver); + mozSettings.removeObserver("goanna.updateStatus", statusObserver); is(setting.settingValue, "already-latest-version"); cleanUp(); }); diff --git a/toolkit/mozapps/update/tests/marionette/update_test_status.js b/toolkit/mozapps/update/tests/marionette/update_test_status.js index d3e4d955f7..50b14387bc 100644 --- a/toolkit/mozapps/update/tests/marionette/update_test_status.js +++ b/toolkit/mozapps/update/tests/marionette/update_test_status.js @@ -11,13 +11,13 @@ function forceCheckAndTestStatus(status, next) { let mozSettings = window.navigator.mozSettings; let forceSent = false; - mozSettings.addObserver("gecko.updateStatus", function statusObserver(setting) { + mozSettings.addObserver("goanna.updateStatus", function statusObserver(setting) { if (!forceSent) { return; } - mozSettings.removeObserver("gecko.updateStatus", statusObserver); - is(setting.settingValue, status, "gecko.updateStatus"); + mozSettings.removeObserver("goanna.updateStatus", statusObserver); + is(setting.settingValue, status, "goanna.updateStatus"); next(); }); diff --git a/toolkit/mozapps/update/tests/unit_aus_update/head_update.js b/toolkit/mozapps/update/tests/unit_aus_update/head_update.js index 493c5f4dfd..8bdc090f7b 100644 --- a/toolkit/mozapps/update/tests/unit_aus_update/head_update.js +++ b/toolkit/mozapps/update/tests/unit_aus_update/head_update.js @@ -3287,7 +3287,7 @@ function stop_httpserver(aCallback) { * @param aVersion * The version of the application * @param aPlatformVersion - * The gecko version of the application + * The goanna version of the application */ function createAppInfo(aID, aName, aVersion, aPlatformVersion) { const XULAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1"; diff --git a/tools/docs/Vagrantfile b/tools/docs/Vagrantfile index 247afe1b3d..5599b19084 100644 --- a/tools/docs/Vagrantfile +++ b/tools/docs/Vagrantfile @@ -6,7 +6,7 @@ Vagrant::Config.run do |config| config.vm.box = "precise64" config.vm.box_url = "http://files.vagrantup.com/precise64.box" - config.vm.share_folder("gecko", "/gecko", "../..") + config.vm.share_folder("goanna", "/goanna", "../..") # Doxygen needs more than the default memory or it will swap and be # extremely slow. config.vm.customize ["modifyvm", :id, "--memory", 2048] diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h index 2a839bda49..b13edf4ae2 100644 --- a/tools/profiler/GeckoProfilerImpl.h +++ b/tools/profiler/GeckoProfilerImpl.h @@ -344,7 +344,7 @@ static inline void profiler_tracing(const char* aCategory, const char* aInfo, /* A 1ms sampling interval has been shown to be a large perf hit * (10fps) on memory-contrained (low-end) platforms, and additionally * to yield different results from the profiler. Where this is the - * important case, b2g, there are also many gecko processes which + * important case, b2g, there are also many goanna processes which * magnify these effects. */ # define PROFILE_DEFAULT_INTERVAL 10 #elif defined(ANDROID) diff --git a/tools/profiler/ProfilerMarkers.h b/tools/profiler/ProfilerMarkers.h index 238fc3581a..8961b667b9 100644 --- a/tools/profiler/ProfilerMarkers.h +++ b/tools/profiler/ProfilerMarkers.h @@ -153,7 +153,7 @@ private: }; /** - * Tracks when touch events are processed by gecko, not when + * Tracks when touch events are processed by goanna, not when * the touch actually occured in gonk/android. */ class TouchDataPayload : public ProfilerMarkerPayload diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp index 668a2f794c..cd5e80d9fa 100644 --- a/tools/profiler/platform.cpp +++ b/tools/profiler/platform.cpp @@ -69,10 +69,10 @@ TableTicker* Sampler::sActiveSampler; static mozilla::StaticAutoPtr sInterposeObserver; -// The name that identifies the gecko thread for calls to +// The name that identifies the goanna thread for calls to // profiler_register_thread. For all platform except metro // the thread that calls mozilla_sampler_init is considered -// the gecko thread. With metro the gecko thread is +// the goanna thread. With metro the goanna thread is // registered later based on this thread name. static const char * gGoannaThreadName = "GoannaMain"; diff --git a/tools/profiler/tests/test_get_features.js b/tools/profiler/tests/test_get_features.js index 4fbd5891c2..772985acd1 100644 --- a/tools/profiler/tests/test_get_features.js +++ b/tools/profiler/tests/test_get_features.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ function run_test() { - // If we can't get the profiler component then assume gecko was + // If we can't get the profiler component then assume goanna was // built without it and pass all the tests var profilerCc = Cc["@mozilla.org/tools/profiler;1"]; if (!profilerCc) diff --git a/tools/profiler/tests/test_pause.js b/tools/profiler/tests/test_pause.js index fedff70c41..7045fd8cc4 100644 --- a/tools/profiler/tests/test_pause.js +++ b/tools/profiler/tests/test_pause.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ function run_test() { - // If we can't get the profiler component then assume gecko was + // If we can't get the profiler component then assume goanna was // built without it and pass all the tests var profilerCc = Cc["@mozilla.org/tools/profiler;1"]; if (!profilerCc) diff --git a/tools/profiler/tests/test_run.js b/tools/profiler/tests/test_run.js index fef03a07d8..7c6d951565 100644 --- a/tools/profiler/tests/test_run.js +++ b/tools/profiler/tests/test_run.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ function run_test() { - // If we can't get the profiler component then assume gecko was + // If we can't get the profiler component then assume goanna was // built without it and pass all the tests var profilerCc = Cc["@mozilla.org/tools/profiler;1"]; if (!profilerCc) diff --git a/tools/profiler/tests/test_shared_library.js b/tools/profiler/tests/test_shared_library.js index 2bdbc01094..ee70fdf4ec 100644 --- a/tools/profiler/tests/test_shared_library.js +++ b/tools/profiler/tests/test_shared_library.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ function run_test() { - // If we can't get the profiler component then assume gecko was + // If we can't get the profiler component then assume goanna was // built without it and pass all the tests var profilerCc = Cc["@mozilla.org/tools/profiler;1"]; if (!profilerCc) diff --git a/tools/profiler/tests/test_start.js b/tools/profiler/tests/test_start.js index b04b130ff1..f1623478be 100644 --- a/tools/profiler/tests/test_start.js +++ b/tools/profiler/tests/test_start.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ function run_test() { - // If we can't get the profiler component then assume gecko was + // If we can't get the profiler component then assume goanna was // built without it and pass all the tests var profilerCc = Cc["@mozilla.org/tools/profiler;1"]; if (!profilerCc) diff --git a/uriloader/exthandler/nsHandlerService.js b/uriloader/exthandler/nsHandlerService.js index 6aaf8efd8e..edad348b0e 100644 --- a/uriloader/exthandler/nsHandlerService.js +++ b/uriloader/exthandler/nsHandlerService.js @@ -200,7 +200,7 @@ HandlerService.prototype = { // get handler service pref branch var prefSvc = Cc["@mozilla.org/preferences-service;1"]. getService(Ci.nsIPrefService); - var handlerSvcBranch = prefSvc.getBranch("gecko.handlerService."); + var handlerSvcBranch = prefSvc.getBranch("goanna.handlerService."); // get the version of the preferences for this locale return Number(handlerSvcBranch. @@ -213,7 +213,7 @@ HandlerService.prototype = { var prefSvc = Cc["@mozilla.org/preferences-service;1"]. getService(Ci.nsIPrefService); - let schemesPrefBranch = prefSvc.getBranch("gecko.handlerService.schemes."); + let schemesPrefBranch = prefSvc.getBranch("goanna.handlerService.schemes."); let schemePrefList = schemesPrefBranch.getChildList(""); var schemes = {}; diff --git a/uriloader/exthandler/nsWebHandlerApp.js b/uriloader/exthandler/nsWebHandlerApp.js index 30cc17f5e8..8b85ad0fae 100644 --- a/uriloader/exthandler/nsWebHandlerApp.js +++ b/uriloader/exthandler/nsWebHandlerApp.js @@ -113,7 +113,7 @@ nsWebHandlerApp.prototype = { .browserDOMWindow; // if we got an exception, there are several possible reasons why: - // a) this gecko embedding doesn't provide an nsIBrowserDOMWindow + // a) this goanna embedding doesn't provide an nsIBrowserDOMWindow // implementation (i.e. doesn't support browser-style functionality), // so we need to kick the URL out to the OS default browser. This is // the subject of bug 394479. diff --git a/uriloader/exthandler/tests/unit/test_handlerService.js b/uriloader/exthandler/tests/unit/test_handlerService.js index d94a26230d..bb83e73742 100644 --- a/uriloader/exthandler/tests/unit/test_handlerService.js +++ b/uriloader/exthandler/tests/unit/test_handlerService.js @@ -130,7 +130,7 @@ function run_test() { // Bug 395131 has been filed to make this test work more generically // by providing our own prefs for this test rather than this icky // special casing. - rootPrefBranch.getCharPref("gecko.handlerService.defaultHandlersVersion"); + rootPrefBranch.getCharPref("goanna.handlerService.defaultHandlersVersion"); haveDefaultHandlersVersion = true; } catch (ex) {} diff --git a/view/nsView.h b/view/nsView.h index 3c9c932638..fcb9668206 100644 --- a/view/nsView.h +++ b/view/nsView.h @@ -254,7 +254,7 @@ public: /** * Attach/detach a top level widget from this view. When attached, the view * updates the widget's device context and allows the view to begin receiving - * gecko events. The underlying base window associated with the widget will + * goanna events. The underlying base window associated with the widget will * continues to receive events it expects. * * An attached widget will not be destroyed when the view is destroyed, diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp index 6017bb3282..8c0b4ea54c 100644 --- a/widget/android/AndroidBridge.cpp +++ b/widget/android/AndroidBridge.cpp @@ -242,7 +242,7 @@ AndroidBridge::Init(JNIEnv *jEnv, Object::Param clsLoader) InitAndroidJavaWrappers(jEnv); // jEnv should NOT be cached here by anything -- the jEnv here - // is not valid for the real gecko main thread, which is set + // is not valid for the real goanna main thread, which is set // at SetMainThread time. return true; @@ -1676,7 +1676,7 @@ AndroidBridge::AddPluginView(jobject view, const LayoutDeviceRect& rect, bool is extern "C" __attribute__ ((visibility("default"))) jobject JNICALL -Java_org_mozilla_gecko_GoannaAppShell_allocateDirectBuffer(JNIEnv *env, jclass, jlong size); +Java_org_mozilla_goanna_GoannaAppShell_allocateDirectBuffer(JNIEnv *env, jclass, jlong size); bool AndroidBridge::GetThreadNameJavaProfiling(uint32_t aThreadId, nsCString & aResult) diff --git a/widget/android/AndroidJNI.cpp b/widget/android/AndroidJNI.cpp index de11356c27..4b90ab616d 100644 --- a/widget/android/AndroidJNI.cpp +++ b/widget/android/AndroidJNI.cpp @@ -59,19 +59,19 @@ extern "C" { */ NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_registerJavaUiThread(JNIEnv *jenv, jclass jc) +Java_org_mozilla_goanna_GoannaAppShell_registerJavaUiThread(JNIEnv *jenv, jclass jc) { AndroidBridge::RegisterJavaUiThread(); } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_nativeInit(JNIEnv *jenv, jclass, jobject clsLoader) +Java_org_mozilla_goanna_GoannaAppShell_nativeInit(JNIEnv *jenv, jclass, jobject clsLoader) { AndroidBridge::ConstructBridge(jenv, jni::Object::Ref::From(clsLoader)); } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_notifyGoannaOfEvent(JNIEnv *jenv, jclass jc, jobject event) +Java_org_mozilla_goanna_GoannaAppShell_notifyGoannaOfEvent(JNIEnv *jenv, jclass jc, jobject event) { // poke the appshell if (nsAppShell::gAppShell) @@ -79,7 +79,7 @@ Java_org_mozilla_gecko_GoannaAppShell_notifyGoannaOfEvent(JNIEnv *jenv, jclass j } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_notifyGoannaObservers(JNIEnv *aEnv, jclass, +Java_org_mozilla_goanna_GoannaAppShell_notifyGoannaObservers(JNIEnv *aEnv, jclass, jstring aTopic, jstring aData) { if (!NS_IsMainThread()) { @@ -102,7 +102,7 @@ Java_org_mozilla_gecko_GoannaAppShell_notifyGoannaObservers(JNIEnv *aEnv, jclass } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_processNextNativeEvent(JNIEnv *jenv, jclass, jboolean mayWait) +Java_org_mozilla_goanna_GoannaAppShell_processNextNativeEvent(JNIEnv *jenv, jclass, jboolean mayWait) { // poke the appshell if (nsAppShell::gAppShell) @@ -110,7 +110,7 @@ Java_org_mozilla_gecko_GoannaAppShell_processNextNativeEvent(JNIEnv *jenv, jclas } NS_EXPORT jlong JNICALL -Java_org_mozilla_gecko_GoannaAppShell_runUiThreadCallback(JNIEnv* env, jclass) +Java_org_mozilla_goanna_GoannaAppShell_runUiThreadCallback(JNIEnv* env, jclass) { if (!AndroidBridge::Bridge()) { return -1; @@ -120,14 +120,14 @@ Java_org_mozilla_gecko_GoannaAppShell_runUiThreadCallback(JNIEnv* env, jclass) } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_onResume(JNIEnv *jenv, jclass jc) +Java_org_mozilla_goanna_GoannaAppShell_onResume(JNIEnv *jenv, jclass jc) { if (nsAppShell::gAppShell) nsAppShell::gAppShell->OnResume(); } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_reportJavaCrash(JNIEnv *jenv, jclass, jstring jStackTrace) +Java_org_mozilla_goanna_GoannaAppShell_reportJavaCrash(JNIEnv *jenv, jclass, jstring jStackTrace) { #ifdef MOZ_CRASHREPORTER const nsJNICString stackTrace(jStackTrace, jenv); @@ -142,7 +142,7 @@ Java_org_mozilla_gecko_GoannaAppShell_reportJavaCrash(JNIEnv *jenv, jclass, jstr } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_notifyBatteryChange(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaAppShell_notifyBatteryChange(JNIEnv* jenv, jclass, jdouble aLevel, jboolean aCharging, jdouble aRemainingTime) @@ -173,7 +173,7 @@ Java_org_mozilla_gecko_GoannaAppShell_notifyBatteryChange(JNIEnv* jenv, jclass, #ifdef MOZ_WEBSMS_BACKEND NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifySmsReceived(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifySmsReceived(JNIEnv* jenv, jclass, jstring aSender, jstring aBody, jint aMessageClass, @@ -212,7 +212,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifySmsReceived(JNIEnv* jenv, jclass, } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifySmsSent(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifySmsSent(JNIEnv* jenv, jclass, jint aId, jstring aReceiver, jstring aBody, @@ -265,7 +265,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifySmsSent(JNIEnv* jenv, jclass, } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifySmsDelivery(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifySmsDelivery(JNIEnv* jenv, jclass, jint aId, jint aDeliveryStatus, jstring aReceiver, @@ -310,7 +310,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifySmsDelivery(JNIEnv* jenv, jclass, } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifySmsSendFailed(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifySmsSendFailed(JNIEnv* jenv, jclass, jint aError, jint aRequestId) { @@ -343,7 +343,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifySmsSendFailed(JNIEnv* jenv, jclass } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifyGetSms(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifyGetSms(JNIEnv* jenv, jclass, jint aId, jint aDeliveryStatus, jstring aReceiver, @@ -393,7 +393,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifyGetSms(JNIEnv* jenv, jclass, } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifyGetSmsFailed(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifyGetSmsFailed(JNIEnv* jenv, jclass, jint aError, jint aRequestId) { @@ -426,7 +426,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifyGetSmsFailed(JNIEnv* jenv, jclass, } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifySmsDeleted(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifySmsDeleted(JNIEnv* jenv, jclass, jboolean aDeleted, jint aRequestId) { @@ -459,7 +459,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifySmsDeleted(JNIEnv* jenv, jclass, } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifySmsDeleteFailed(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifySmsDeleteFailed(JNIEnv* jenv, jclass, jint aError, jint aRequestId) { @@ -492,7 +492,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifySmsDeleteFailed(JNIEnv* jenv, jcla } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifyNoMessageInList(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifyNoMessageInList(JNIEnv* jenv, jclass, jint aRequestId) { class NotifyNoMessageInListRunnable : public nsRunnable { @@ -521,7 +521,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifyNoMessageInList(JNIEnv* jenv, jcla } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifyListCreated(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifyListCreated(JNIEnv* jenv, jclass, jint aListId, jint aMessageId, jint aDeliveryStatus, @@ -577,7 +577,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifyListCreated(JNIEnv* jenv, jclass, } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifyGotNextMessage(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifyGotNextMessage(JNIEnv* jenv, jclass, jint aMessageId, jint aDeliveryStatus, jstring aReceiver, @@ -629,7 +629,7 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifyGotNextMessage(JNIEnv* jenv, jclas } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaSmsManager_notifyReadingMessageListFailed(JNIEnv* jenv, jclass, +Java_org_mozilla_goanna_GoannaSmsManager_notifyReadingMessageListFailed(JNIEnv* jenv, jclass, jint aError, jint aRequestId) { @@ -664,25 +664,25 @@ Java_org_mozilla_gecko_GoannaSmsManager_notifyReadingMessageListFailed(JNIEnv* j #endif // MOZ_WEBSMS_BACKEND NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_scheduleComposite(JNIEnv*, jclass) +Java_org_mozilla_goanna_GoannaAppShell_scheduleComposite(JNIEnv*, jclass) { nsWindow::ScheduleComposite(); } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_scheduleResumeComposition(JNIEnv*, jclass, jint width, jint height) +Java_org_mozilla_goanna_GoannaAppShell_scheduleResumeComposition(JNIEnv*, jclass, jint width, jint height) { nsWindow::ScheduleResumeComposition(width, height); } NS_EXPORT float JNICALL -Java_org_mozilla_gecko_GoannaAppShell_computeRenderIntegrity(JNIEnv*, jclass) +Java_org_mozilla_goanna_GoannaAppShell_computeRenderIntegrity(JNIEnv*, jclass) { return nsWindow::ComputeRenderIntegrity(); } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_notifyFilePickerResult(JNIEnv* jenv, jclass, jstring filePath, jlong callback) +Java_org_mozilla_goanna_GoannaAppShell_notifyFilePickerResult(JNIEnv* jenv, jclass, jstring filePath, jlong callback) { class NotifyFilePickerResultRunnable : public nsRunnable { public: @@ -738,7 +738,7 @@ static bool LockWindowWithRetry(void* window, unsigned char** bits, int* width, } NS_EXPORT jobject JNICALL -Java_org_mozilla_gecko_GoannaAppShell_getSurfaceBits(JNIEnv* jenv, jclass, jobject surface) +Java_org_mozilla_goanna_GoannaAppShell_getSurfaceBits(JNIEnv* jenv, jclass, jobject surface) { static jclass jSurfaceBitsClass = nullptr; static jmethodID jSurfaceBitsCtor = 0; @@ -789,7 +789,7 @@ Java_org_mozilla_gecko_GoannaAppShell_getSurfaceBits(JNIEnv* jenv, jclass, jobje } if (!jSurfaceBitsClass) { - jSurfaceBitsClass = (jclass)jenv->NewGlobalRef(jenv->FindClass("org/mozilla/gecko/SurfaceBits")); + jSurfaceBitsClass = (jclass)jenv->NewGlobalRef(jenv->FindClass("org/mozilla/goanna/SurfaceBits")); jSurfaceBitsCtor = jenv->GetMethodID(jSurfaceBitsClass, "", "()V"); jSurfaceBitsWidth = jenv->GetFieldID(jSurfaceBitsClass, "width", "I"); @@ -812,7 +812,7 @@ cleanup: } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_onFullScreenPluginHidden(JNIEnv* jenv, jclass, jobject view) +Java_org_mozilla_goanna_GoannaAppShell_onFullScreenPluginHidden(JNIEnv* jenv, jclass, jobject view) { class ExitFullScreenRunnable : public nsRunnable { public: @@ -834,7 +834,7 @@ Java_org_mozilla_gecko_GoannaAppShell_onFullScreenPluginHidden(JNIEnv* jenv, jcl } NS_EXPORT jobject JNICALL -Java_org_mozilla_gecko_GoannaAppShell_getNextMessageFromQueue(JNIEnv* jenv, jclass, jobject queue) +Java_org_mozilla_goanna_GoannaAppShell_getNextMessageFromQueue(JNIEnv* jenv, jclass, jobject queue) { static jclass jMessageQueueCls = nullptr; static jfieldID jMessagesField; @@ -861,7 +861,7 @@ Java_org_mozilla_gecko_GoannaAppShell_getNextMessageFromQueue(JNIEnv* jenv, jcla } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_onSurfaceTextureFrameAvailable(JNIEnv* jenv, jclass, jobject surfaceTexture, jint id) +Java_org_mozilla_goanna_GoannaAppShell_onSurfaceTextureFrameAvailable(JNIEnv* jenv, jclass, jobject surfaceTexture, jint id) { mozilla::gl::AndroidSurfaceTexture* st = mozilla::gl::AndroidSurfaceTexture::Find(id); if (!st) { @@ -873,19 +873,19 @@ Java_org_mozilla_gecko_GoannaAppShell_onSurfaceTextureFrameAvailable(JNIEnv* jen } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_GoannaAppShell_dispatchMemoryPressure(JNIEnv* jenv, jclass) +Java_org_mozilla_goanna_GoannaAppShell_dispatchMemoryPressure(JNIEnv* jenv, jclass) { NS_DispatchMemoryPressure(MemPressure_New); } NS_EXPORT jdouble JNICALL -Java_org_mozilla_gecko_GoannaJavaSampler_getProfilerTime(JNIEnv *jenv, jclass jc) +Java_org_mozilla_goanna_GoannaJavaSampler_getProfilerTime(JNIEnv *jenv, jclass jc) { return profiler_time(); } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_gfx_NativePanZoomController_abortAnimation(JNIEnv* env, jobject instance) +Java_org_mozilla_goanna_gfx_NativePanZoomController_abortAnimation(JNIEnv* env, jobject instance) { APZCTreeManager *controller = nsWindow::GetAPZCTreeManager(); if (controller) { @@ -895,7 +895,7 @@ Java_org_mozilla_gecko_gfx_NativePanZoomController_abortAnimation(JNIEnv* env, j } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_gfx_NativePanZoomController_init(JNIEnv* env, jobject instance) +Java_org_mozilla_goanna_gfx_NativePanZoomController_init(JNIEnv* env, jobject instance) { if (!AndroidBridge::Bridge()) { return; @@ -909,7 +909,7 @@ Java_org_mozilla_gecko_gfx_NativePanZoomController_init(JNIEnv* env, jobject ins } NS_EXPORT jboolean JNICALL -Java_org_mozilla_gecko_gfx_NativePanZoomController_handleTouchEvent(JNIEnv* env, jobject instance, jobject event) +Java_org_mozilla_goanna_gfx_NativePanZoomController_handleTouchEvent(JNIEnv* env, jobject instance, jobject event) { APZCTreeManager *controller = nsWindow::GetAPZCTreeManager(); if (!controller) { @@ -934,13 +934,13 @@ Java_org_mozilla_gecko_gfx_NativePanZoomController_handleTouchEvent(JNIEnv* env, } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_gfx_NativePanZoomController_handleMotionEvent(JNIEnv* env, jobject instance, jobject event) +Java_org_mozilla_goanna_gfx_NativePanZoomController_handleMotionEvent(JNIEnv* env, jobject instance, jobject event) { // FIXME implement this } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_gfx_NativePanZoomController_destroy(JNIEnv* env, jobject instance) +Java_org_mozilla_goanna_gfx_NativePanZoomController_destroy(JNIEnv* env, jobject instance) { if (!AndroidBridge::Bridge()) { return; @@ -953,27 +953,27 @@ Java_org_mozilla_gecko_gfx_NativePanZoomController_destroy(JNIEnv* env, jobject } NS_EXPORT jboolean JNICALL -Java_org_mozilla_gecko_gfx_NativePanZoomController_getRedrawHint(JNIEnv* env, jobject instance) +Java_org_mozilla_goanna_gfx_NativePanZoomController_getRedrawHint(JNIEnv* env, jobject instance) { // FIXME implement this return true; } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_gfx_NativePanZoomController_setOverScrollMode(JNIEnv* env, jobject instance, jint overscrollMode) +Java_org_mozilla_goanna_gfx_NativePanZoomController_setOverScrollMode(JNIEnv* env, jobject instance, jint overscrollMode) { // FIXME implement this } NS_EXPORT jint JNICALL -Java_org_mozilla_gecko_gfx_NativePanZoomController_getOverScrollMode(JNIEnv* env, jobject instance) +Java_org_mozilla_goanna_gfx_NativePanZoomController_getOverScrollMode(JNIEnv* env, jobject instance) { // FIXME implement this return 0; } NS_EXPORT jboolean JNICALL -Java_org_mozilla_gecko_ANRReporter_requestNativeStack(JNIEnv*, jclass, jboolean aUnwind) +Java_org_mozilla_goanna_ANRReporter_requestNativeStack(JNIEnv*, jclass, jboolean aUnwind) { if (profiler_is_active()) { // Don't proceed if profiler is already running @@ -1006,7 +1006,7 @@ Java_org_mozilla_gecko_ANRReporter_requestNativeStack(JNIEnv*, jclass, jboolean } NS_EXPORT jstring JNICALL -Java_org_mozilla_gecko_ANRReporter_getNativeStack(JNIEnv* jenv, jclass) +Java_org_mozilla_goanna_ANRReporter_getNativeStack(JNIEnv* jenv, jclass) { if (!profiler_is_active()) { // Maybe profiler support is disabled? @@ -1039,7 +1039,7 @@ Java_org_mozilla_gecko_ANRReporter_getNativeStack(JNIEnv* jenv, jclass) } NS_EXPORT void JNICALL -Java_org_mozilla_gecko_ANRReporter_releaseNativeStack(JNIEnv* jenv, jclass) +Java_org_mozilla_goanna_ANRReporter_releaseNativeStack(JNIEnv* jenv, jclass) { if (!profiler_is_active()) { // Maybe profiler support is disabled? diff --git a/widget/android/AndroidJavaWrappers.cpp b/widget/android/AndroidJavaWrappers.cpp index 4edc079ca5..6cc47e64b8 100644 --- a/widget/android/AndroidJavaWrappers.cpp +++ b/widget/android/AndroidJavaWrappers.cpp @@ -122,61 +122,61 @@ mozilla::InitAndroidJavaWrappers(JNIEnv *jEnv) void AndroidGoannaEvent::InitGoannaEventClass(JNIEnv *jEnv) { - AutoJNIClass geckoEvent(jEnv, "org/mozilla/gecko/GoannaEvent"); - jGoannaEventClass = geckoEvent.getGlobalRef(); + AutoJNIClass goannaEvent(jEnv, "org/mozilla/goanna/GoannaEvent"); + jGoannaEventClass = goannaEvent.getGlobalRef(); - jActionField = geckoEvent.getField("mAction", "I"); - jTypeField = geckoEvent.getField("mType", "I"); - jAckNeededField = geckoEvent.getField("mAckNeeded", "Z"); - jTimeField = geckoEvent.getField("mTime", "J"); - jPoints = geckoEvent.getField("mPoints", "[Landroid/graphics/Point;"); - jPointIndicies = geckoEvent.getField("mPointIndicies", "[I"); - jOrientations = geckoEvent.getField("mOrientations", "[F"); - jPressures = geckoEvent.getField("mPressures", "[F"); - jToolTypes = geckoEvent.getField("mToolTypes", "[I"); - jPointRadii = geckoEvent.getField("mPointRadii", "[Landroid/graphics/Point;"); - jXField = geckoEvent.getField("mX", "D"); - jYField = geckoEvent.getField("mY", "D"); - jZField = geckoEvent.getField("mZ", "D"); - jRectField = geckoEvent.getField("mRect", "Landroid/graphics/Rect;"); + jActionField = goannaEvent.getField("mAction", "I"); + jTypeField = goannaEvent.getField("mType", "I"); + jAckNeededField = goannaEvent.getField("mAckNeeded", "Z"); + jTimeField = goannaEvent.getField("mTime", "J"); + jPoints = goannaEvent.getField("mPoints", "[Landroid/graphics/Point;"); + jPointIndicies = goannaEvent.getField("mPointIndicies", "[I"); + jOrientations = goannaEvent.getField("mOrientations", "[F"); + jPressures = goannaEvent.getField("mPressures", "[F"); + jToolTypes = goannaEvent.getField("mToolTypes", "[I"); + jPointRadii = goannaEvent.getField("mPointRadii", "[Landroid/graphics/Point;"); + jXField = goannaEvent.getField("mX", "D"); + jYField = goannaEvent.getField("mY", "D"); + jZField = goannaEvent.getField("mZ", "D"); + jRectField = goannaEvent.getField("mRect", "Landroid/graphics/Rect;"); - jCharactersField = geckoEvent.getField("mCharacters", "Ljava/lang/String;"); - jCharactersExtraField = geckoEvent.getField("mCharactersExtra", "Ljava/lang/String;"); - jDataField = geckoEvent.getField("mData", "Ljava/lang/String;"); - jKeyCodeField = geckoEvent.getField("mKeyCode", "I"); - jScanCodeField = geckoEvent.getField("mScanCode", "I"); - jMetaStateField = geckoEvent.getField("mMetaState", "I"); - jFlagsField = geckoEvent.getField("mFlags", "I"); - jUnicodeCharField = geckoEvent.getField("mUnicodeChar", "I"); - jBaseUnicodeCharField = geckoEvent.getField("mBaseUnicodeChar", "I"); - jDOMPrintableKeyValueField = geckoEvent.getField("mDOMPrintableKeyValue", "I"); - jRepeatCountField = geckoEvent.getField("mRepeatCount", "I"); - jCountField = geckoEvent.getField("mCount", "I"); - jStartField = geckoEvent.getField("mStart", "I"); - jEndField = geckoEvent.getField("mEnd", "I"); - jPointerIndexField = geckoEvent.getField("mPointerIndex", "I"); - jRangeTypeField = geckoEvent.getField("mRangeType", "I"); - jRangeStylesField = geckoEvent.getField("mRangeStyles", "I"); - jRangeLineStyleField = geckoEvent.getField("mRangeLineStyle", "I"); - jRangeBoldLineField = geckoEvent.getField("mRangeBoldLine", "Z"); - jRangeForeColorField = geckoEvent.getField("mRangeForeColor", "I"); - jRangeBackColorField = geckoEvent.getField("mRangeBackColor", "I"); - jRangeLineColorField = geckoEvent.getField("mRangeLineColor", "I"); - jLocationField = geckoEvent.getField("mLocation", "Landroid/location/Location;"); - jConnectionTypeField = geckoEvent.getField("mConnectionType", "I"); - jIsWifiField = geckoEvent.getField("mIsWifi", "Z"); - jDHCPGatewayField = geckoEvent.getField("mDHCPGateway", "I"); - jScreenOrientationField = geckoEvent.getField("mScreenOrientation", "S"); - jByteBufferField = geckoEvent.getField("mBuffer", "Ljava/nio/ByteBuffer;"); - jWidthField = geckoEvent.getField("mWidth", "I"); - jHeightField = geckoEvent.getField("mHeight", "I"); - jIDField = geckoEvent.getField("mID", "I"); - jGamepadButtonField = geckoEvent.getField("mGamepadButton", "I"); - jGamepadButtonPressedField = geckoEvent.getField("mGamepadButtonPressed", "Z"); - jGamepadButtonValueField = geckoEvent.getField("mGamepadButtonValue", "F"); - jGamepadValuesField = geckoEvent.getField("mGamepadValues", "[F"); - jPrefNamesField = geckoEvent.getField("mPrefNames", "[Ljava/lang/String;"); - jObjectField = geckoEvent.getField("mObject", "Ljava/lang/Object;"); + jCharactersField = goannaEvent.getField("mCharacters", "Ljava/lang/String;"); + jCharactersExtraField = goannaEvent.getField("mCharactersExtra", "Ljava/lang/String;"); + jDataField = goannaEvent.getField("mData", "Ljava/lang/String;"); + jKeyCodeField = goannaEvent.getField("mKeyCode", "I"); + jScanCodeField = goannaEvent.getField("mScanCode", "I"); + jMetaStateField = goannaEvent.getField("mMetaState", "I"); + jFlagsField = goannaEvent.getField("mFlags", "I"); + jUnicodeCharField = goannaEvent.getField("mUnicodeChar", "I"); + jBaseUnicodeCharField = goannaEvent.getField("mBaseUnicodeChar", "I"); + jDOMPrintableKeyValueField = goannaEvent.getField("mDOMPrintableKeyValue", "I"); + jRepeatCountField = goannaEvent.getField("mRepeatCount", "I"); + jCountField = goannaEvent.getField("mCount", "I"); + jStartField = goannaEvent.getField("mStart", "I"); + jEndField = goannaEvent.getField("mEnd", "I"); + jPointerIndexField = goannaEvent.getField("mPointerIndex", "I"); + jRangeTypeField = goannaEvent.getField("mRangeType", "I"); + jRangeStylesField = goannaEvent.getField("mRangeStyles", "I"); + jRangeLineStyleField = goannaEvent.getField("mRangeLineStyle", "I"); + jRangeBoldLineField = goannaEvent.getField("mRangeBoldLine", "Z"); + jRangeForeColorField = goannaEvent.getField("mRangeForeColor", "I"); + jRangeBackColorField = goannaEvent.getField("mRangeBackColor", "I"); + jRangeLineColorField = goannaEvent.getField("mRangeLineColor", "I"); + jLocationField = goannaEvent.getField("mLocation", "Landroid/location/Location;"); + jConnectionTypeField = goannaEvent.getField("mConnectionType", "I"); + jIsWifiField = goannaEvent.getField("mIsWifi", "Z"); + jDHCPGatewayField = goannaEvent.getField("mDHCPGateway", "I"); + jScreenOrientationField = goannaEvent.getField("mScreenOrientation", "S"); + jByteBufferField = goannaEvent.getField("mBuffer", "Ljava/nio/ByteBuffer;"); + jWidthField = goannaEvent.getField("mWidth", "I"); + jHeightField = goannaEvent.getField("mHeight", "I"); + jIDField = goannaEvent.getField("mID", "I"); + jGamepadButtonField = goannaEvent.getField("mGamepadButton", "I"); + jGamepadButtonPressedField = goannaEvent.getField("mGamepadButtonPressed", "Z"); + jGamepadButtonValueField = goannaEvent.getField("mGamepadButtonValue", "F"); + jGamepadValuesField = goannaEvent.getField("mGamepadValues", "[F"); + jPrefNamesField = goannaEvent.getField("mPrefNames", "[Ljava/lang/String;"); + jObjectField = goannaEvent.getField("mObject", "Ljava/lang/Object;"); } void @@ -256,7 +256,7 @@ AndroidRectF::InitRectFClass(JNIEnv *jEnv) void AndroidLayerRendererFrame::InitLayerRendererFrameClass(JNIEnv *jEnv) { - AutoJNIClass layerRendererFrame(jEnv, "org/mozilla/gecko/gfx/LayerRenderer$Frame"); + AutoJNIClass layerRendererFrame(jEnv, "org/mozilla/goanna/gfx/LayerRenderer$Frame"); jLayerRendererFrameClass = layerRendererFrame.getGlobalRef(); jBeginDrawingMethod = layerRendererFrame.getMethod("beginDrawing", "()V"); diff --git a/widget/android/GeneratedJNIWrappers.h b/widget/android/GeneratedJNIWrappers.h index 92169677e0..29c4b085f0 100644 --- a/widget/android/GeneratedJNIWrappers.h +++ b/widget/android/GeneratedJNIWrappers.h @@ -21,7 +21,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/DownloadsIntegration"; + "org/mozilla/goanna/DownloadsIntegration"; protected: DownloadsIntegration(jobject instance) : Class(instance) {} @@ -52,7 +52,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/GoannaAppShell"; + "org/mozilla/goanna/GoannaAppShell"; protected: GoannaAppShell(jobject instance) : Class(instance) {} @@ -709,7 +709,7 @@ public: typedef void SetterType; static constexpr char name[] = "handleGoannaMessage"; static constexpr char signature[] = - "(Lorg/mozilla/gecko/util/NativeJSContainer;)V"; + "(Lorg/mozilla/goanna/util/NativeJSContainer;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; @@ -1298,7 +1298,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/GoannaJavaSampler"; + "org/mozilla/goanna/GoannaJavaSampler"; protected: GoannaJavaSampler(jobject instance) : Class(instance) {} @@ -1419,7 +1419,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/RestrictedProfiles"; + "org/mozilla/goanna/RestrictedProfiles"; protected: RestrictedProfiles(jobject instance) : Class(instance) {} @@ -1480,7 +1480,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/SurfaceBits"; + "org/mozilla/goanna/SurfaceBits"; protected: SurfaceBits(jobject instance) : Class(instance) {} @@ -1579,7 +1579,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/ThumbnailHelper"; + "org/mozilla/goanna/ThumbnailHelper"; protected: ThumbnailHelper(jobject instance) : Class(instance) {} @@ -1610,7 +1610,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/gfx/DisplayPortMetrics"; + "org/mozilla/goanna/gfx/DisplayPortMetrics"; protected: DisplayPortMetrics(jobject instance) : Class(instance) {} @@ -1671,7 +1671,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/gfx/GLController"; + "org/mozilla/goanna/gfx/GLController"; protected: GLController(jobject instance) : Class(instance) {} @@ -1702,7 +1702,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/gfx/GoannaLayerClient"; + "org/mozilla/goanna/gfx/GoannaLayerClient"; protected: GoannaLayerClient(jobject instance) : Class(instance) {} @@ -1744,7 +1744,7 @@ public: typedef mozilla::jni::Object::Param SetterType; static constexpr char name[] = "createFrame"; static constexpr char signature[] = - "()Lorg/mozilla/gecko/gfx/LayerRenderer$Frame;"; + "()Lorg/mozilla/goanna/gfx/LayerRenderer$Frame;"; static const bool isStatic = false; static const bool isMultithreaded = true; static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; @@ -1774,7 +1774,7 @@ public: typedef mozilla::jni::Object::Param SetterType; static constexpr char name[] = "getDisplayPort"; static constexpr char signature[] = - "(ZZILorg/mozilla/gecko/gfx/ImmutableViewportMetrics;)Lorg/mozilla/gecko/gfx/DisplayPortMetrics;"; + "(ZZILorg/mozilla/goanna/gfx/ImmutableViewportMetrics;)Lorg/mozilla/goanna/gfx/DisplayPortMetrics;"; static const bool isStatic = false; static const bool isMultithreaded = false; static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; @@ -1804,7 +1804,7 @@ public: typedef mozilla::jni::Object::Param SetterType; static constexpr char name[] = "progressiveUpdateCallback"; static constexpr char signature[] = - "(ZFFFFFZ)Lorg/mozilla/gecko/gfx/ProgressiveUpdateData;"; + "(ZFFFFFZ)Lorg/mozilla/goanna/gfx/ProgressiveUpdateData;"; static const bool isStatic = false; static const bool isMultithreaded = true; static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; @@ -1849,7 +1849,7 @@ public: typedef mozilla::jni::Object::Param SetterType; static constexpr char name[] = "syncFrameMetrics"; static constexpr char signature[] = - "(FFFFFFFZIIIIFZ)Lorg/mozilla/gecko/gfx/ViewTransform;"; + "(FFFFFFFZIIIIFZ)Lorg/mozilla/goanna/gfx/ViewTransform;"; static const bool isStatic = false; static const bool isMultithreaded = true; static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; @@ -1864,7 +1864,7 @@ public: typedef mozilla::jni::Object::Param SetterType; static constexpr char name[] = "syncViewportInfo"; static constexpr char signature[] = - "(IIIIFZ)Lorg/mozilla/gecko/gfx/ViewTransform;"; + "(IIIIFZ)Lorg/mozilla/goanna/gfx/ViewTransform;"; static const bool isStatic = false; static const bool isMultithreaded = true; static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; @@ -1883,7 +1883,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/gfx/ImmutableViewportMetrics"; + "org/mozilla/goanna/gfx/ImmutableViewportMetrics"; protected: ImmutableViewportMetrics(jobject instance) : Class(instance) {} @@ -1914,7 +1914,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/gfx/LayerView"; + "org/mozilla/goanna/gfx/LayerView"; protected: LayerView(jobject instance) : Class(instance) {} @@ -1926,7 +1926,7 @@ public: typedef mozilla::jni::Object::Param SetterType; static constexpr char name[] = "registerCxxCompositor"; static constexpr char signature[] = - "()Lorg/mozilla/gecko/gfx/GLController;"; + "()Lorg/mozilla/goanna/gfx/GLController;"; static const bool isStatic = true; static const bool isMultithreaded = true; static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; @@ -1960,7 +1960,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/gfx/NativePanZoomController"; + "org/mozilla/goanna/gfx/NativePanZoomController"; protected: NativePanZoomController(jobject instance) : Class(instance) {} @@ -1991,7 +1991,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/gfx/ProgressiveUpdateData"; + "org/mozilla/goanna/gfx/ProgressiveUpdateData"; protected: ProgressiveUpdateData(jobject instance) : Class(instance) {} @@ -2018,7 +2018,7 @@ public: typedef void SetterType; static constexpr char name[] = "setViewport"; static constexpr char signature[] = - "(Lorg/mozilla/gecko/gfx/ImmutableViewportMetrics;)V"; + "(Lorg/mozilla/goanna/gfx/ImmutableViewportMetrics;)V"; static const bool isStatic = false; static const bool isMultithreaded = true; static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; @@ -2105,7 +2105,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/gfx/ViewTransform"; + "org/mozilla/goanna/gfx/ViewTransform"; protected: ViewTransform(jobject instance) : Class(instance) {} @@ -2289,7 +2289,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/mozglue/NativeZip"; + "org/mozilla/goanna/mozglue/NativeZip"; protected: NativeZip(jobject instance) : Class(instance) {} @@ -2320,7 +2320,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/sqlite/MatrixBlobCursor"; + "org/mozilla/goanna/sqlite/MatrixBlobCursor"; protected: MatrixBlobCursor(jobject instance) : Class(instance) {} @@ -2411,7 +2411,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/sqlite/SQLiteBridgeException"; + "org/mozilla/goanna/sqlite/SQLiteBridgeException"; protected: SQLiteBridgeException(jobject instance) : Class(instance) {} @@ -2472,7 +2472,7 @@ public: typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = - "org/mozilla/gecko/util/Clipboard"; + "org/mozilla/goanna/util/Clipboard"; protected: Clipboard(jobject instance) : Class(instance) {} diff --git a/widget/android/NativeJSContainer.cpp b/widget/android/NativeJSContainer.cpp index 66d537c712..0ad47e7784 100644 --- a/widget/android/NativeJSContainer.cpp +++ b/widget/android/NativeJSContainer.cpp @@ -25,7 +25,7 @@ public: return; } jNativeJSContainer = AndroidBridge::GetClassGlobalRef( - env, "org/mozilla/gecko/util/NativeJSContainer"); + env, "org/mozilla/goanna/util/NativeJSContainer"); MOZ_ASSERT(jNativeJSContainer); jContainerNativeObject = AndroidBridge::GetFieldID( env, jNativeJSContainer, "mNativeObject", "J"); @@ -35,18 +35,18 @@ public: MOZ_ASSERT(jContainerConstructor); jNativeJSObject = AndroidBridge::GetClassGlobalRef( - env, "org/mozilla/gecko/util/NativeJSObject"); + env, "org/mozilla/goanna/util/NativeJSObject"); MOZ_ASSERT(jNativeJSObject); jObjectContainer = AndroidBridge::GetFieldID( env, jNativeJSObject, "mContainer", - "Lorg/mozilla/gecko/util/NativeJSContainer;"); + "Lorg/mozilla/goanna/util/NativeJSContainer;"); MOZ_ASSERT(jObjectContainer); jObjectIndex = AndroidBridge::GetFieldID( env, jNativeJSObject, "mObjectIndex", "I"); MOZ_ASSERT(jObjectIndex); jObjectConstructor = AndroidBridge::GetMethodID( env, jNativeJSObject, "", - "(Lorg/mozilla/gecko/util/NativeJSContainer;I)V"); + "(Lorg/mozilla/goanna/util/NativeJSContainer;I)V"); MOZ_ASSERT(jContainerConstructor); jBundle = AndroidBridge::GetClassGlobalRef( @@ -408,7 +408,7 @@ template bool CheckProperty(JNIEnv* env, JSContext* cx, JS::HandleValue val) { if (!(*InValue)(cx, val)) { AndroidBridge::ThrowException(env, - "org/mozilla/gecko/util/NativeJSObject$InvalidPropertyException", + "org/mozilla/goanna/util/NativeJSObject$InvalidPropertyException", "Property type mismatch"); return false; } @@ -679,7 +679,7 @@ GetProperty(JNIEnv* env, jobject instance, jstring name, if (val.isUndefined() || val.isNull()) { if (option == FallbackOption::THROW) { AndroidBridge::ThrowException(env, - "org/mozilla/gecko/util/NativeJSObject$InvalidPropertyException", + "org/mozilla/goanna/util/NativeJSObject$InvalidPropertyException", "Property does not exist"); } return fallback; @@ -784,189 +784,189 @@ GetBundle(JNIEnv* env, jobject instance, JSContext* cx, JS::HandleObject obj) extern "C" { NS_EXPORT void JNICALL -Java_org_mozilla_gecko_util_NativeJSContainer_dispose(JNIEnv* env, jobject instance) +Java_org_mozilla_goanna_util_NativeJSContainer_dispose(JNIEnv* env, jobject instance) { MOZ_ASSERT(env); NativeJSContainer::DisposeInstance(env, instance); } NS_EXPORT jobject JNICALL -Java_org_mozilla_gecko_util_NativeJSContainer_clone(JNIEnv* env, jobject instance) +Java_org_mozilla_goanna_util_NativeJSContainer_clone(JNIEnv* env, jobject instance) { MOZ_ASSERT(env); return NativeJSContainer::CloneInstance(env, instance); } NS_EXPORT jboolean JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getBoolean(JNIEnv* env, jobject instance, jstring name) +Java_org_mozilla_goanna_util_NativeJSObject_getBoolean(JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jboolean JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optBoolean(JNIEnv* env, jobject instance, +Java_org_mozilla_goanna_util_NativeJSObject_optBoolean(JNIEnv* env, jobject instance, jstring name, jboolean fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jbooleanArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getBooleanArray( +Java_org_mozilla_goanna_util_NativeJSObject_getBooleanArray( JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jbooleanArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optBooleanArray( +Java_org_mozilla_goanna_util_NativeJSObject_optBooleanArray( JNIEnv* env, jobject instance, jstring name, jbooleanArray fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jobject JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getBundle(JNIEnv* env, jobject instance, jstring name) +Java_org_mozilla_goanna_util_NativeJSObject_getBundle(JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jobject JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optBundle(JNIEnv* env, jobject instance, +Java_org_mozilla_goanna_util_NativeJSObject_optBundle(JNIEnv* env, jobject instance, jstring name, jobject fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jobjectArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getBundleArray( +Java_org_mozilla_goanna_util_NativeJSObject_getBundleArray( JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jobjectArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optBundleArray( +Java_org_mozilla_goanna_util_NativeJSObject_optBundleArray( JNIEnv* env, jobject instance, jstring name, jobjectArray fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jdouble JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getDouble(JNIEnv* env, jobject instance, jstring name) +Java_org_mozilla_goanna_util_NativeJSObject_getDouble(JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jdouble JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optDouble(JNIEnv* env, jobject instance, +Java_org_mozilla_goanna_util_NativeJSObject_optDouble(JNIEnv* env, jobject instance, jstring name, jdouble fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jdoubleArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getDoubleArray( +Java_org_mozilla_goanna_util_NativeJSObject_getDoubleArray( JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jdoubleArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optDoubleArray( +Java_org_mozilla_goanna_util_NativeJSObject_optDoubleArray( JNIEnv* env, jobject instance, jstring name, jdoubleArray fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jint JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getInt(JNIEnv* env, jobject instance, jstring name) +Java_org_mozilla_goanna_util_NativeJSObject_getInt(JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jint JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optInt(JNIEnv* env, jobject instance, +Java_org_mozilla_goanna_util_NativeJSObject_optInt(JNIEnv* env, jobject instance, jstring name, jint fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jintArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getIntArray( +Java_org_mozilla_goanna_util_NativeJSObject_getIntArray( JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jintArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optIntArray( +Java_org_mozilla_goanna_util_NativeJSObject_optIntArray( JNIEnv* env, jobject instance, jstring name, jintArray fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jobject JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getObject(JNIEnv* env, jobject instance, jstring name) +Java_org_mozilla_goanna_util_NativeJSObject_getObject(JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jobject JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optObject(JNIEnv* env, jobject instance, +Java_org_mozilla_goanna_util_NativeJSObject_optObject(JNIEnv* env, jobject instance, jstring name, jobject fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jobjectArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getObjectArray( +Java_org_mozilla_goanna_util_NativeJSObject_getObjectArray( JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jobjectArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optObjectArray( +Java_org_mozilla_goanna_util_NativeJSObject_optObjectArray( JNIEnv* env, jobject instance, jstring name, jobjectArray fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jstring JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getString(JNIEnv* env, jobject instance, jstring name) +Java_org_mozilla_goanna_util_NativeJSObject_getString(JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jstring JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optString(JNIEnv* env, jobject instance, +Java_org_mozilla_goanna_util_NativeJSObject_optString(JNIEnv* env, jobject instance, jstring name, jstring fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jobjectArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_getStringArray( +Java_org_mozilla_goanna_util_NativeJSObject_getStringArray( JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name); } NS_EXPORT jobjectArray JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_optStringArray( +Java_org_mozilla_goanna_util_NativeJSObject_optStringArray( JNIEnv* env, jobject instance, jstring name, jobjectArray fallback) { return GetProperty(env, instance, name, FallbackOption::RETURN, fallback); } NS_EXPORT jboolean JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_has(JNIEnv* env, jobject instance, jstring name) +Java_org_mozilla_goanna_util_NativeJSObject_has(JNIEnv* env, jobject instance, jstring name) { return GetProperty(env, instance, name, FallbackOption::RETURN, JNI_FALSE); } NS_EXPORT jobject JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_toBundle(JNIEnv* env, jobject instance) +Java_org_mozilla_goanna_util_NativeJSObject_toBundle(JNIEnv* env, jobject instance) { MOZ_ASSERT(env); MOZ_ASSERT(instance); @@ -984,7 +984,7 @@ Java_org_mozilla_gecko_util_NativeJSObject_toBundle(JNIEnv* env, jobject instanc } NS_EXPORT jstring JNICALL -Java_org_mozilla_gecko_util_NativeJSObject_toString(JNIEnv* env, jobject instance) +Java_org_mozilla_goanna_util_NativeJSObject_toString(JNIEnv* env, jobject instance) { MOZ_ASSERT(env); MOZ_ASSERT(instance); diff --git a/widget/android/bindings/Makefile.in b/widget/android/bindings/Makefile.in index 09b0eef936..0fe53addf7 100644 --- a/widget/android/bindings/Makefile.in +++ b/widget/android/bindings/Makefile.in @@ -12,7 +12,7 @@ sdk_processor := \ $(JAVA) \ -Dcom.android.tools.lint.bindir='$(ANDROID_TOOLS)' \ -classpath $(annotation_processor_jar_files) \ - org.mozilla.gecko.annotationProcessors.SDKProcessor + org.mozilla.goanna.annotationProcessors.SDKProcessor # For the benefit of readers: the following pattern rule says that, # for example, MediaCodec.cpp and MediaCodec.h can be produced from diff --git a/widget/cocoa/NativeKeyBindings.mm b/widget/cocoa/NativeKeyBindings.mm index f5011f62f0..de5a896349 100644 --- a/widget/cocoa/NativeKeyBindings.mm +++ b/widget/cocoa/NativeKeyBindings.mm @@ -232,7 +232,7 @@ NativeKeyBindings::Execute(const WidgetKeyboardEvent& aEvent, ("%p NativeKeyBindings::KeyPress, bindingCommands=%u", this, bindingCommands.Length())); - nsAutoTArray geckoCommands; + nsAutoTArray goannaCommands; for (uint32_t i = 0; i < bindingCommands.Length(); i++) { SEL selector = bindingCommands[i].selector; @@ -250,42 +250,42 @@ NativeKeyBindings::Execute(const WidgetKeyboardEvent& aEvent, #endif // Try to find a simple mapping in the hashtable - Command geckoCommand = static_cast(mSelectorToCommand.Get( + Command goannaCommand = static_cast(mSelectorToCommand.Get( reinterpret_cast(selector))); - if (geckoCommand) { - geckoCommands.AppendElement(geckoCommand); + if (goannaCommand) { + goannaCommands.AppendElement(goannaCommand); } else if (selector == @selector(selectLine:)) { // This is functional, but Cocoa's version is direction-less in that // selection direction is not determined until some future directed action // is taken. See bug 282097, comment 79 for more details. - geckoCommands.AppendElement(CommandBeginLine); - geckoCommands.AppendElement(CommandSelectEndLine); + goannaCommands.AppendElement(CommandBeginLine); + goannaCommands.AppendElement(CommandSelectEndLine); } else if (selector == @selector(selectWord:)) { // This is functional, but Cocoa's version is direction-less in that // selection direction is not determined until some future directed action // is taken. See bug 282097, comment 79 for more details. - geckoCommands.AppendElement(CommandWordPrevious); - geckoCommands.AppendElement(CommandSelectWordNext); + goannaCommands.AppendElement(CommandWordPrevious); + goannaCommands.AppendElement(CommandSelectWordNext); } } - if (geckoCommands.IsEmpty()) { + if (goannaCommands.IsEmpty()) { PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS, ("%p NativeKeyBindings::KeyPress, handled=false", this)); return false; } - for (uint32_t i = 0; i < geckoCommands.Length(); i++) { - Command geckoCommand = geckoCommands[i]; + for (uint32_t i = 0; i < goannaCommands.Length(); i++) { + Command goannaCommand = goannaCommands[i]; PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS, ("%p NativeKeyBindings::KeyPress, command=%s", - this, WidgetKeyboardEvent::GetCommandStr(geckoCommand))); + this, WidgetKeyboardEvent::GetCommandStr(goannaCommand))); // Execute the Goanna command - aCallback(geckoCommand, aCallbackData); + aCallback(goannaCommand, aCallbackData); } PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS, diff --git a/widget/cocoa/mozView.h b/widget/cocoa/mozView.h index fff847477c..d5a6b0f3f7 100644 --- a/widget/cocoa/mozView.h +++ b/widget/cocoa/mozView.h @@ -17,7 +17,7 @@ class TextInputHandler; } // namespace mozilla // A protocol listing all the methods that an object which wants -// to live in gecko's widget hierarchy must implement. |nsChildView| +// to live in goanna's widget hierarchy must implement. |nsChildView| // makes assumptions that any NSView with which it comes in contact will // implement this protocol. @protocol mozView @@ -54,7 +54,7 @@ class TextInputHandler; // An informal protocol implemented by the NSWindow of the host application. // -// It's used to prevent re-entrant calls to -makeKeyAndOrderFront: when gecko +// It's used to prevent re-entrant calls to -makeKeyAndOrderFront: when goanna // focus/activate events propagate out to the embedder's // nsIEmbeddingSiteWindow::SetFocus implementation. @interface NSObject(mozWindow) diff --git a/widget/cocoa/nsAppShell.mm b/widget/cocoa/nsAppShell.mm index 250fed5e29..4b8db6144c 100644 --- a/widget/cocoa/nsAppShell.mm +++ b/widget/cocoa/nsAppShell.mm @@ -844,13 +844,13 @@ nsAppShell::AfterProcessNextEvent(nsIThreadInternal *aThread, // // Roll up our context menu (if any) when some other app (or the OS) opens // any sort of menu. But make sure we don't do this for notifications we -// send ourselves (whose 'sender' will be @"org.mozilla.gecko.PopupWindow"). +// send ourselves (whose 'sender' will be @"org.mozilla.goanna.PopupWindow"). - (void)beginMenuTracking:(NSNotification*)aNotification { NS_OBJC_BEGIN_TRY_ABORT_BLOCK; NSString *sender = [aNotification object]; - if (!sender || ![sender isEqualToString:@"org.mozilla.gecko.PopupWindow"]) { + if (!sender || ![sender isEqualToString:@"org.mozilla.goanna.PopupWindow"]) { nsIRollupListener* rollupListener = nsBaseWidget::GetActiveRollupListener(); nsCOMPtr rollupWidget = rollupListener->GetRollupWidget(); if (rollupWidget) diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 68656cf99a..568ad4fab7 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -144,11 +144,11 @@ static uint32_t gNumberOfWidgetsNeedingEventThread = 0; @interface ChildView(Private) -// sets up our view, attaching it to its owning gecko view -- (id)initWithFrame:(NSRect)inFrame geckoChild:(nsChildView*)inChild; +// sets up our view, attaching it to its owning goanna view +- (id)initWithFrame:(NSRect)inFrame goannaChild:(nsChildView*)inChild; - (void)forceRefreshOpenGL; -// set up a gecko mouse event based on a cocoa mouse event +// set up a goanna mouse event based on a cocoa mouse event - (void) convertCocoaMouseWheelEvent:(NSEvent*)aMouseEvent toGoannaEvent:(WidgetWheelEvent*)outWheelEvent; - (void) convertCocoaMouseEvent:(NSEvent*)aMouseEvent @@ -558,7 +558,7 @@ nsChildView::CreateCocoaView(NSRect inFrame) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - return [[[ChildView alloc] initWithFrame:inFrame geckoChild:this] autorelease]; + return [[[ChildView alloc] initWithFrame:inFrame goannaChild:this] autorelease]; NS_OBJC_END_TRY_ABORT_BLOCK_NIL; } @@ -606,7 +606,7 @@ nsChildView::GetXULWindowWidget() { id windowDelegate = [[mView window] delegate]; if (windowDelegate && [windowDelegate isKindOfClass:[WindowDelegate class]]) { - return [(WindowDelegate *)windowDelegate geckoWidget]; + return [(WindowDelegate *)windowDelegate goannaWidget]; } return nullptr; } @@ -1782,44 +1782,44 @@ nsChildView::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, DispatchWindowEvent(query); if (query.mSucceeded && query.mReply.mWritingMode.IsVertical()) { - uint32_t geckoKey = 0; + uint32_t goannaKey = 0; uint32_t cocoaKey = 0; switch (aEvent.keyCode) { case nsIDOMKeyEvent::DOM_VK_LEFT: if (query.mReply.mWritingMode.IsVerticalLR()) { - geckoKey = nsIDOMKeyEvent::DOM_VK_UP; + goannaKey = nsIDOMKeyEvent::DOM_VK_UP; cocoaKey = kVK_UpArrow; } else { - geckoKey = nsIDOMKeyEvent::DOM_VK_DOWN; + goannaKey = nsIDOMKeyEvent::DOM_VK_DOWN; cocoaKey = kVK_DownArrow; } break; case nsIDOMKeyEvent::DOM_VK_RIGHT: if (query.mReply.mWritingMode.IsVerticalLR()) { - geckoKey = nsIDOMKeyEvent::DOM_VK_DOWN; + goannaKey = nsIDOMKeyEvent::DOM_VK_DOWN; cocoaKey = kVK_DownArrow; } else { - geckoKey = nsIDOMKeyEvent::DOM_VK_UP; + goannaKey = nsIDOMKeyEvent::DOM_VK_UP; cocoaKey = kVK_UpArrow; } break; case nsIDOMKeyEvent::DOM_VK_UP: - geckoKey = nsIDOMKeyEvent::DOM_VK_LEFT; + goannaKey = nsIDOMKeyEvent::DOM_VK_LEFT; cocoaKey = kVK_LeftArrow; break; case nsIDOMKeyEvent::DOM_VK_DOWN: - geckoKey = nsIDOMKeyEvent::DOM_VK_RIGHT; + goannaKey = nsIDOMKeyEvent::DOM_VK_RIGHT; cocoaKey = kVK_RightArrow; break; } return ExecuteNativeKeyBindingRemapped(aType, aEvent, aCallback, aCallbackData, - geckoKey, cocoaKey); + goannaKey, cocoaKey); } } @@ -2934,8 +2934,8 @@ NSEvent* gLastDragMouseDownEvent = nil; nil]]; } -// initWithFrame:geckoChild: -- (id)initWithFrame:(NSRect)inFrame geckoChild:(nsChildView*)inChild +// initWithFrame:goannaChild: +- (id)initWithFrame:(NSRect)inFrame goannaChild:(nsChildView*)inChild { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; @@ -3124,7 +3124,7 @@ NSEvent* gLastDragMouseDownEvent = nil; NS_IF_RELEASE(mDragService); } -// mozView method, return our gecko child view widget. Note this does not AddRef. +// mozView method, return our goanna child view widget. Note this does not AddRef. - (nsIWidget*) widget { return static_cast(mGoannaChild); @@ -3228,12 +3228,12 @@ NSEvent* gLastDragMouseDownEvent = nil; { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - return [NSString stringWithFormat:@"ChildView %p, gecko child %p, frame %@", self, mGoannaChild, NSStringFromRect([self frame])]; + return [NSString stringWithFormat:@"ChildView %p, goanna child %p, frame %@", self, mGoannaChild, NSStringFromRect([self frame])]; NS_OBJC_END_TRY_ABORT_BLOCK_NIL; } -// Make the origin of this view the topLeft corner (gecko origin) rather +// Make the origin of this view the topLeft corner (goanna origin) rather // than the bottomLeft corner (standard cocoa origin). - (BOOL)isFlipped { @@ -3377,7 +3377,7 @@ NSEvent* gLastDragMouseDownEvent = nil; } // The display system has told us that a portion of our view is dirty. Tell -// gecko to paint it +// goanna to paint it - (void)drawRect:(NSRect)aRect { CGContextRef cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; @@ -3396,13 +3396,13 @@ NSEvent* gLastDragMouseDownEvent = nil; return; #ifdef DEBUG_UPDATE - nsIntRect geckoBounds; - mGoannaChild->GetBounds(geckoBounds); + nsIntRect goannaBounds; + mGoannaChild->GetBounds(goannaBounds); - fprintf (stderr, "---- Update[%p][%p] [%f %f %f %f] cgc: %p\n gecko bounds: [%d %d %d %d]\n", + fprintf (stderr, "---- Update[%p][%p] [%f %f %f %f] cgc: %p\n goanna bounds: [%d %d %d %d]\n", self, mGoannaChild, aRect.origin.x, aRect.origin.y, aRect.size.width, aRect.size.height, aContext, - geckoBounds.x, geckoBounds.y, geckoBounds.width, geckoBounds.height); + goannaBounds.x, goannaBounds.y, goannaBounds.width, goannaBounds.height); CGAffineTransform xform = CGContextGetCTM(aContext); fprintf (stderr, " xform in: [%f %f %f %f %f %f]\n", xform.a, xform.b, xform.c, xform.d, xform.tx, xform.ty); @@ -3559,9 +3559,9 @@ NSEvent* gLastDragMouseDownEvent = nil; mWaitingForPaint = NO; - nsIntRect geckoBounds; - mGoannaChild->GetBounds(geckoBounds); - nsIntRegion region(geckoBounds); + nsIntRect goannaBounds; + mGoannaChild->GetBounds(goannaBounds); + nsIntRegion region(goannaBounds); mGoannaChild->PaintWindow(region); @@ -3814,7 +3814,7 @@ NSEvent* gLastDragMouseDownEvent = nil; [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.beginMenuTrackingNotification" - object:@"org.mozilla.gecko.PopupWindow"]; + object:@"org.mozilla.goanna.PopupWindow"]; [(PopupWindow*)popupWindow setIsContextMenu:YES]; NS_OBJC_END_TRY_ABORT_BLOCK; @@ -3913,24 +3913,24 @@ NSEvent* gLastDragMouseDownEvent = nil; float deltaY = [anEvent deltaY]; // up=1.0, down=-1.0 // Setup the "swipe" event. - WidgetSimpleGestureEvent geckoEvent(true, NS_SIMPLE_GESTURE_SWIPE, + WidgetSimpleGestureEvent goannaEvent(true, NS_SIMPLE_GESTURE_SWIPE, mGoannaChild); - [self convertCocoaMouseEvent:anEvent toGoannaEvent:&geckoEvent]; + [self convertCocoaMouseEvent:anEvent toGoannaEvent:&goannaEvent]; // Record the left/right direction. if (deltaX > 0.0) - geckoEvent.direction |= nsIDOMSimpleGestureEvent::DIRECTION_LEFT; + goannaEvent.direction |= nsIDOMSimpleGestureEvent::DIRECTION_LEFT; else if (deltaX < 0.0) - geckoEvent.direction |= nsIDOMSimpleGestureEvent::DIRECTION_RIGHT; + goannaEvent.direction |= nsIDOMSimpleGestureEvent::DIRECTION_RIGHT; // Record the up/down direction. if (deltaY > 0.0) - geckoEvent.direction |= nsIDOMSimpleGestureEvent::DIRECTION_UP; + goannaEvent.direction |= nsIDOMSimpleGestureEvent::DIRECTION_UP; else if (deltaY < 0.0) - geckoEvent.direction |= nsIDOMSimpleGestureEvent::DIRECTION_DOWN; + goannaEvent.direction |= nsIDOMSimpleGestureEvent::DIRECTION_DOWN; // Send the event. - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); NS_OBJC_END_TRY_ABORT_BLOCK; } @@ -3983,12 +3983,12 @@ NSEvent* gLastDragMouseDownEvent = nil; } // Setup the event. - WidgetSimpleGestureEvent geckoEvent(true, msg, mGoannaChild); - geckoEvent.delta = deltaZ; - [self convertCocoaMouseEvent:anEvent toGoannaEvent:&geckoEvent]; + WidgetSimpleGestureEvent goannaEvent(true, msg, mGoannaChild); + goannaEvent.delta = deltaZ; + [self convertCocoaMouseEvent:anEvent toGoannaEvent:&goannaEvent]; // Send the event. - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); // Keep track of the cumulative magnification for the final "magnify" event. mCumulativeMagnification += deltaZ; @@ -4007,13 +4007,13 @@ NSEvent* gLastDragMouseDownEvent = nil; nsAutoRetainCocoaObject kungFuDeathGrip(self); // Setup the "double tap" event. - WidgetSimpleGestureEvent geckoEvent(true, NS_SIMPLE_GESTURE_TAP, + WidgetSimpleGestureEvent goannaEvent(true, NS_SIMPLE_GESTURE_TAP, mGoannaChild); - [self convertCocoaMouseEvent:anEvent toGoannaEvent:&geckoEvent]; - geckoEvent.clickCount = 1; + [self convertCocoaMouseEvent:anEvent toGoannaEvent:&goannaEvent]; + goannaEvent.clickCount = 1; // Send the event. - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); // Clear the gesture state mGestureState = eGestureState_None; @@ -4050,17 +4050,17 @@ NSEvent* gLastDragMouseDownEvent = nil; } // Setup the event. - WidgetSimpleGestureEvent geckoEvent(true, msg, mGoannaChild); - [self convertCocoaMouseEvent:anEvent toGoannaEvent:&geckoEvent]; - geckoEvent.delta = -rotation; + WidgetSimpleGestureEvent goannaEvent(true, msg, mGoannaChild); + [self convertCocoaMouseEvent:anEvent toGoannaEvent:&goannaEvent]; + goannaEvent.delta = -rotation; if (rotation > 0.0) { - geckoEvent.direction = nsIDOMSimpleGestureEvent::ROTATION_COUNTERCLOCKWISE; + goannaEvent.direction = nsIDOMSimpleGestureEvent::ROTATION_COUNTERCLOCKWISE; } else { - geckoEvent.direction = nsIDOMSimpleGestureEvent::ROTATION_CLOCKWISE; + goannaEvent.direction = nsIDOMSimpleGestureEvent::ROTATION_CLOCKWISE; } // Send the event. - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); // Keep track of the cumulative rotation for the final "rotate" event. mCumulativeRotation += rotation; @@ -4086,31 +4086,31 @@ NSEvent* gLastDragMouseDownEvent = nil; case eGestureState_MagnifyGesture: { // Setup the "magnify" event. - WidgetSimpleGestureEvent geckoEvent(true, NS_SIMPLE_GESTURE_MAGNIFY, + WidgetSimpleGestureEvent goannaEvent(true, NS_SIMPLE_GESTURE_MAGNIFY, mGoannaChild); - geckoEvent.delta = mCumulativeMagnification; - [self convertCocoaMouseEvent:anEvent toGoannaEvent:&geckoEvent]; + goannaEvent.delta = mCumulativeMagnification; + [self convertCocoaMouseEvent:anEvent toGoannaEvent:&goannaEvent]; // Send the event. - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); } break; case eGestureState_RotateGesture: { // Setup the "rotate" event. - WidgetSimpleGestureEvent geckoEvent(true, NS_SIMPLE_GESTURE_ROTATE, + WidgetSimpleGestureEvent goannaEvent(true, NS_SIMPLE_GESTURE_ROTATE, mGoannaChild); - [self convertCocoaMouseEvent:anEvent toGoannaEvent:&geckoEvent]; - geckoEvent.delta = -mCumulativeRotation; + [self convertCocoaMouseEvent:anEvent toGoannaEvent:&goannaEvent]; + goannaEvent.delta = -mCumulativeRotation; if (mCumulativeRotation > 0.0) { - geckoEvent.direction = nsIDOMSimpleGestureEvent::ROTATION_COUNTERCLOCKWISE; + goannaEvent.direction = nsIDOMSimpleGestureEvent::ROTATION_COUNTERCLOCKWISE; } else { - geckoEvent.direction = nsIDOMSimpleGestureEvent::ROTATION_CLOCKWISE; + goannaEvent.direction = nsIDOMSimpleGestureEvent::ROTATION_CLOCKWISE; } // Send the event. - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); } break; @@ -4154,13 +4154,13 @@ NSEvent* gLastDragMouseDownEvent = nil; if (!mGoannaChild) return false; - WidgetSimpleGestureEvent geckoEvent(true, aMsg, mGoannaChild); - geckoEvent.direction = aDirection; - geckoEvent.delta = aDelta; - geckoEvent.allowedDirections = *aAllowedDirections; - [self convertCocoaMouseEvent:aEvent toGoannaEvent:&geckoEvent]; - bool eventCancelled = mGoannaChild->DispatchWindowEvent(geckoEvent); - *aAllowedDirections = geckoEvent.allowedDirections; + WidgetSimpleGestureEvent goannaEvent(true, aMsg, mGoannaChild); + goannaEvent.direction = aDirection; + goannaEvent.delta = aDelta; + goannaEvent.allowedDirections = *aAllowedDirections; + [self convertCocoaMouseEvent:aEvent toGoannaEvent:&goannaEvent]; + bool eventCancelled = mGoannaChild->DispatchWindowEvent(goannaEvent); + *aAllowedDirections = goannaEvent.allowedDirections; return eventCancelled; // event cancelled == swipe should start } @@ -4317,7 +4317,7 @@ NSEvent* gLastDragMouseDownEvent = nil; } __block BOOL animationCanceled = NO; - __block BOOL geckoSwipeEventSent = NO; + __block BOOL goannaSwipeEventSent = NO; // At this point, anEvent is the first scroll wheel event in a two-finger // horizontal gesture that we've decided to treat as a swipe. When we call // [NSEvent trackSwipeEventWithOptions:...], the OS interprets all @@ -4371,7 +4371,7 @@ NSEvent* gLastDragMouseDownEvent = nil; direction:0.0 delta:gestureAmount]; - if (phase == NSEventPhaseEnded && !geckoSwipeEventSent) { + if (phase == NSEventPhaseEnded && !goannaSwipeEventSent) { // The result of the swipe is now known, so the main event can be sent. // The animation might continue even after this event was sent, so // don't tear down the animation overlay yet. @@ -4384,7 +4384,7 @@ NSEvent* gLastDragMouseDownEvent = nil; // gestureAmount is negative when it will be '-1' at isComplete, and // positive when it will be '1'. And phase is never equal to // NSEventPhaseEnded when gestureAmount will be '0' at isComplete. - geckoSwipeEventSent = YES; + goannaSwipeEventSent = YES; [self sendSwipeEvent:anEvent withKind:NS_SIMPLE_GESTURE_SWIPE allowedDirections:&allowedDirectionsCopy @@ -4466,15 +4466,15 @@ NSEvent* gLastDragMouseDownEvent = nil; [self performSelector:@selector(clickHoldCallback:) withObject:theEvent afterDelay:2.0]; #endif - // in order to send gecko events we'll need a gecko widget + // in order to send goanna events we'll need a goanna widget if (!mGoannaChild) return; NSUInteger modifierFlags = [theEvent modifierFlags]; - WidgetMouseEvent geckoEvent(true, NS_MOUSE_BUTTON_DOWN, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_MOUSE_BUTTON_DOWN, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; NSInteger clickCount = [theEvent clickCount]; if (mBlockedLastMouseDown && clickCount > 1) { @@ -4482,14 +4482,14 @@ NSEvent* gLastDragMouseDownEvent = nil; // blocked. clickCount--; } - geckoEvent.clickCount = clickCount; + goannaEvent.clickCount = clickCount; if (modifierFlags & NSControlKeyMask) - geckoEvent.button = WidgetMouseEvent::eRightButton; + goannaEvent.button = WidgetMouseEvent::eRightButton; else - geckoEvent.button = WidgetMouseEvent::eLeftButton; + goannaEvent.button = WidgetMouseEvent::eLeftButton; - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); mBlockedLastMouseDown = NO; // XXX maybe call markedTextSelectionChanged:client: here? @@ -4506,20 +4506,20 @@ NSEvent* gLastDragMouseDownEvent = nil; nsAutoRetainCocoaObject kungFuDeathGrip(self); - WidgetMouseEvent geckoEvent(true, NS_MOUSE_BUTTON_UP, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_MOUSE_BUTTON_UP, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; if ([theEvent modifierFlags] & NSControlKeyMask) - geckoEvent.button = WidgetMouseEvent::eRightButton; + goannaEvent.button = WidgetMouseEvent::eRightButton; else - geckoEvent.button = WidgetMouseEvent::eLeftButton; + goannaEvent.button = WidgetMouseEvent::eLeftButton; // This might destroy our widget (and null out mGoannaChild). - bool defaultPrevented = mGoannaChild->DispatchWindowEvent(geckoEvent); + bool defaultPrevented = mGoannaChild->DispatchWindowEvent(goannaEvent); // Check to see if we are double-clicking in the titlebar. CGFloat locationInTitlebar = [[self window] frame].size.height - [theEvent locationInWindow].y; - LayoutDeviceIntPoint pos = geckoEvent.refPoint; + LayoutDeviceIntPoint pos = goannaEvent.refPoint; if (!defaultPrevented && [theEvent clickCount] == 2 && mGoannaChild->GetDraggableRegion().Contains(pos.x, pos.y) && [[self window] isKindOfClass:[ToolbarWindow class]] && @@ -4637,11 +4637,11 @@ NewCGSRegionFromRegion(const nsIntRegion& aRegion, if (!mGoannaChild) return; - WidgetMouseEvent geckoEvent(true, NS_MOUSE_MOVE, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_MOUSE_MOVE, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); NS_OBJC_END_TRY_ABORT_BLOCK; } @@ -4655,11 +4655,11 @@ NewCGSRegionFromRegion(const nsIntRegion& aRegion, gLastDragView = self; - WidgetMouseEvent geckoEvent(true, NS_MOUSE_MOVE, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_MOUSE_MOVE, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); // Note, sending the above event might have destroyed our widget since we didn't retain. // Fine so long as we don't access any local variables from here on. @@ -4680,14 +4680,14 @@ NewCGSRegionFromRegion(const nsIntRegion& aRegion, if (!mGoannaChild) return; - // The right mouse went down, fire off a right mouse down event to gecko - WidgetMouseEvent geckoEvent(true, NS_MOUSE_BUTTON_DOWN, mGoannaChild, + // The right mouse went down, fire off a right mouse down event to goanna + WidgetMouseEvent goannaEvent(true, NS_MOUSE_BUTTON_DOWN, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; - geckoEvent.button = WidgetMouseEvent::eRightButton; - geckoEvent.clickCount = [theEvent clickCount]; + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; + goannaEvent.button = WidgetMouseEvent::eRightButton; + goannaEvent.clickCount = [theEvent clickCount]; - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); if (!mGoannaChild) return; @@ -4704,14 +4704,14 @@ NewCGSRegionFromRegion(const nsIntRegion& aRegion, if (!mGoannaChild) return; - WidgetMouseEvent geckoEvent(true, NS_MOUSE_BUTTON_UP, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_MOUSE_BUTTON_UP, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; - geckoEvent.button = WidgetMouseEvent::eRightButton; - geckoEvent.clickCount = [theEvent clickCount]; + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; + goannaEvent.button = WidgetMouseEvent::eRightButton; + goannaEvent.clickCount = [theEvent clickCount]; nsAutoRetainCocoaObject kungFuDeathGrip(self); - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); NS_OBJC_END_TRY_ABORT_BLOCK; } @@ -4721,14 +4721,14 @@ NewCGSRegionFromRegion(const nsIntRegion& aRegion, if (!mGoannaChild) return; - WidgetMouseEvent geckoEvent(true, NS_MOUSE_MOVE, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_MOUSE_MOVE, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; - geckoEvent.button = WidgetMouseEvent::eRightButton; + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; + goannaEvent.button = WidgetMouseEvent::eRightButton; // send event into Goanna by going directly to the // the widget. - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); } - (void)otherMouseDown:(NSEvent *)theEvent @@ -4744,13 +4744,13 @@ NewCGSRegionFromRegion(const nsIntRegion& aRegion, if (!mGoannaChild) return; - WidgetMouseEvent geckoEvent(true, NS_MOUSE_BUTTON_DOWN, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_MOUSE_BUTTON_DOWN, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; - geckoEvent.button = WidgetMouseEvent::eMiddleButton; - geckoEvent.clickCount = [theEvent clickCount]; + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; + goannaEvent.button = WidgetMouseEvent::eMiddleButton; + goannaEvent.clickCount = [theEvent clickCount]; - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); NS_OBJC_END_TRY_ABORT_BLOCK; } @@ -4760,13 +4760,13 @@ NewCGSRegionFromRegion(const nsIntRegion& aRegion, if (!mGoannaChild) return; - WidgetMouseEvent geckoEvent(true, NS_MOUSE_BUTTON_UP, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_MOUSE_BUTTON_UP, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; - geckoEvent.button = WidgetMouseEvent::eMiddleButton; + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; + goannaEvent.button = WidgetMouseEvent::eMiddleButton; nsAutoRetainCocoaObject kungFuDeathGrip(self); - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); } - (void)otherMouseDragged:(NSEvent*)theEvent @@ -4774,14 +4774,14 @@ NewCGSRegionFromRegion(const nsIntRegion& aRegion, if (!mGoannaChild) return; - WidgetMouseEvent geckoEvent(true, NS_MOUSE_MOVE, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_MOUSE_MOVE, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; - geckoEvent.button = WidgetMouseEvent::eMiddleButton; + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; + goannaEvent.button = WidgetMouseEvent::eMiddleButton; // send event into Goanna by going directly to the // the widget. - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); } static int32_t RoundUp(double aDouble) @@ -5005,11 +5005,11 @@ static int32_t RoundUp(double aDouble) return nil; } - WidgetMouseEvent geckoEvent(true, NS_CONTEXTMENU, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_CONTEXTMENU, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:theEvent toGoannaEvent:&geckoEvent]; - geckoEvent.button = WidgetMouseEvent::eRightButton; - mGoannaChild->DispatchWindowEvent(geckoEvent); + [self convertCocoaMouseEvent:theEvent toGoannaEvent:&goannaEvent]; + goannaEvent.button = WidgetMouseEvent::eRightButton; + mGoannaChild->DispatchWindowEvent(goannaEvent); if (!mGoannaChild) return nil; @@ -5471,10 +5471,10 @@ static int32_t RoundUp(double aDouble) if (!mGoannaChild) return YES; - WidgetMouseEvent geckoEvent(true, NS_MOUSE_ACTIVATE, mGoannaChild, + WidgetMouseEvent goannaEvent(true, NS_MOUSE_ACTIVATE, mGoannaChild, WidgetMouseEvent::eReal); - [self convertCocoaMouseEvent:aEvent toGoannaEvent:&geckoEvent]; - return !mGoannaChild->DispatchWindowEvent(geckoEvent); + [self convertCocoaMouseEvent:aEvent toGoannaEvent:&goannaEvent]; + return !mGoannaChild->DispatchWindowEvent(goannaEvent); } // We must always call through to our superclass, even when mGoannaChild is @@ -5638,19 +5638,19 @@ static int32_t RoundUp(double aDouble) dragSession->SetDragAction(action); } - // set up gecko event - WidgetDragEvent geckoEvent(true, aMessage, mGoannaChild); - nsCocoaUtils::InitInputEvent(geckoEvent, [NSApp currentEvent]); + // set up goanna event + WidgetDragEvent goannaEvent(true, aMessage, mGoannaChild); + nsCocoaUtils::InitInputEvent(goannaEvent, [NSApp currentEvent]); - // Use our own coordinates in the gecko event. - // Convert event from gecko global coords to gecko view coords. + // Use our own coordinates in the goanna event. + // Convert event from goanna global coords to goanna view coords. NSPoint draggingLoc = [aSender draggingLocation]; - geckoEvent.refPoint = LayoutDeviceIntPoint::FromUntyped( + goannaEvent.refPoint = LayoutDeviceIntPoint::FromUntyped( [self convertWindowCoordinates:draggingLoc]); nsAutoRetainCocoaObject kungFuDeathGrip(self); - mGoannaChild->DispatchWindowEvent(geckoEvent); + mGoannaChild->DispatchWindowEvent(goannaEvent); if (!mGoannaChild) return NSDragOperationNone; @@ -6287,7 +6287,7 @@ ChildViewMouseTracker::WindowAcceptsEvent(NSWindow* aWindow, NSEvent* aEvent, if (!delegate || ![delegate isKindOfClass:[WindowDelegate class]]) return YES; - nsIWidget *windowWidget = [(WindowDelegate *)delegate geckoWidget]; + nsIWidget *windowWidget = [(WindowDelegate *)delegate goannaWidget]; if (!windowWidget) return YES; diff --git a/widget/cocoa/nsCocoaUtils.h b/widget/cocoa/nsCocoaUtils.h index 2b933dd385..48fe03f756 100644 --- a/widget/cocoa/nsCocoaUtils.h +++ b/widget/cocoa/nsCocoaUtils.h @@ -208,13 +208,13 @@ public: // contain width/height info, with no difference in their use. // This function does no scaling, so the Goanna coordinates are // expected to be CSS pixels, which we treat as equal to Cocoa points. - static NSRect GoannaRectToCocoaRect(const nsIntRect &geckoRect); + static NSRect GoannaRectToCocoaRect(const nsIntRect &goannaRect); // Converts aGoannaRect in dev pixels to points in Cocoa coordinates static NSRect GoannaRectToCocoaRectDevPix(const nsIntRect &aGoannaRect, CGFloat aBackingScale); - // See explanation for geckoRectToCocoaRect, guess what this does... + // See explanation for goannaRectToCocoaRect, guess what this does... static nsIntRect CocoaRectToGoannaRect(const NSRect &cocoaRect); static nsIntRect CocoaRectToGoannaRectDevPix(const NSRect &aCocoaRect, diff --git a/widget/cocoa/nsCocoaUtils.mm b/widget/cocoa/nsCocoaUtils.mm index 8c8582ee8c..147fb3584d 100644 --- a/widget/cocoa/nsCocoaUtils.mm +++ b/widget/cocoa/nsCocoaUtils.mm @@ -64,14 +64,14 @@ nsCocoaUtils::FlippedScreenY(float y) return MenuBarScreenHeight() - y; } -NSRect nsCocoaUtils::GoannaRectToCocoaRect(const nsIntRect &geckoRect) +NSRect nsCocoaUtils::GoannaRectToCocoaRect(const nsIntRect &goannaRect) { // We only need to change the Y coordinate by starting with the primary screen - // height and subtracting the gecko Y coordinate of the bottom of the rect. - return NSMakeRect(geckoRect.x, - MenuBarScreenHeight() - geckoRect.YMost(), - geckoRect.width, - geckoRect.height); + // height and subtracting the goanna Y coordinate of the bottom of the rect. + return NSMakeRect(goannaRect.x, + MenuBarScreenHeight() - goannaRect.YMost(), + goannaRect.width, + goannaRect.height); } NSRect nsCocoaUtils::GoannaRectToCocoaRectDevPix(const nsIntRect &aGoannaRect, @@ -810,7 +810,7 @@ struct KeyConversionData { const char* str; size_t strLength; - uint32_t geckoKeyCode; + uint32_t goannaKeyCode; uint32_t charCode; }; @@ -974,7 +974,7 @@ nsCocoaUtils::ConvertGoannaKeyCodeToMacCharCode(uint32_t aKeyCode) } for (uint16_t i = 0; i < ArrayLength(gKeyConversions); ++i) { - if (gKeyConversions[i].geckoKeyCode == aKeyCode) { + if (gKeyConversions[i].goannaKeyCode == aKeyCode) { return gKeyConversions[i].charCode; } } diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h index 5111eee2bc..fa28027092 100644 --- a/widget/cocoa/nsCocoaWindow.h +++ b/widget/cocoa/nsCocoaWindow.h @@ -196,9 +196,9 @@ typedef struct _nsCocoaWindowList { BOOL mHasEverBeenZoomed; } + (void)paintMenubarForWindow:(NSWindow*)aWindow; -- (id)initWithGoannaWindow:(nsCocoaWindow*)geckoWind; +- (id)initWithGoannaWindow:(nsCocoaWindow*)goannaWind; - (void)windowDidResize:(NSNotification*)aNotification; -- (nsCocoaWindow*)geckoWidget; +- (nsCocoaWindow*)goannaWidget; - (bool)toplevelActiveState; - (void)sendToplevelActivateEvents; - (void)sendToplevelDeactivateEvents; diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm index fa76f99c77..ec88fb0dbd 100644 --- a/widget/cocoa/nsCocoaWindow.mm +++ b/widget/cocoa/nsCocoaWindow.mm @@ -81,7 +81,7 @@ extern "C" { NS_IMPL_ISUPPORTS_INHERITED(nsCocoaWindow, Inherited, nsPIWidgetCocoa) // A note on testing to see if your object is a sheet... -// |mWindowType == eWindowType_sheet| is true if your gecko nsIWidget is a sheet +// |mWindowType == eWindowType_sheet| is true if your goanna nsIWidget is a sheet // widget - whether or not the sheet is showing. |[mWindow isSheet]| will return // true *only when the sheet is actually showing*. Choose your test wisely. @@ -392,12 +392,12 @@ nsresult nsCocoaWindow::CreateNativeWindow(const NSRect &aRect, } else { /* * We pass a content area rect to initialize the native Cocoa window. The - * content rect we give is the same size as the size we're given by gecko. + * content rect we give is the same size as the size we're given by goanna. * The origin we're given for non-popup windows is moved down by the height - * of the menu bar so that an origin of (0,100) from gecko puts the window + * of the menu bar so that an origin of (0,100) from goanna puts the window * 100 pixels below the top of the available desktop area. We also move the * origin down by the height of a title bar if it exists. This is so the - * origin that gecko gives us for the top-left of the window turns out to + * origin that goanna gives us for the top-left of the window turns out to * be the top-left of the window we create. This is how it was done in * Carbon. If it ought to be different we'll probably need to look at all * the callers. @@ -770,7 +770,7 @@ NS_IMETHODIMP nsCocoaWindow::Show(bool bState) [(PopupWindow*) mWindow isContextMenu]) { [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.beginMenuTrackingNotification" - object:@"org.mozilla.gecko.PopupWindow"]; + object:@"org.mozilla.goanna.PopupWindow"]; } // If a parent window was supplied and this is a popup at the parent @@ -900,7 +900,7 @@ NS_IMETHODIMP nsCocoaWindow::Show(bool bState) [(PopupWindow*) mWindow isContextMenu]) { [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" - object:@"org.mozilla.gecko.PopupWindow"]; + object:@"org.mozilla.goanna.PopupWindow"]; } } } @@ -2166,7 +2166,7 @@ nsCocoaWindow::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, @implementation WindowDelegate -// We try to find a gecko menu bar to paint. If one does not exist, just paint +// We try to find a goanna menu bar to paint. If one does not exist, just paint // the application menu by itself so that a window doesn't have some other // window's menu bar. + (void)paintMenubarForWindow:(NSWindow*)aWindow @@ -2179,12 +2179,12 @@ nsCocoaWindow::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, if ([windowDelegate class] != [self class]) return; - nsCocoaWindow* geckoWidget = [windowDelegate geckoWidget]; - NS_ASSERTION(geckoWidget, "Window delegate not returning a gecko widget!"); + nsCocoaWindow* goannaWidget = [windowDelegate goannaWidget]; + NS_ASSERTION(goannaWidget, "Window delegate not returning a goanna widget!"); - nsMenuBarX* geckoMenuBar = geckoWidget->GetMenuBar(); - if (geckoMenuBar) { - geckoMenuBar->Paint(); + nsMenuBarX* goannaMenuBar = goannaWidget->GetMenuBar(); + if (goannaMenuBar) { + goannaMenuBar->Paint(); } else { // sometimes we don't have a native application menu early in launching @@ -2213,12 +2213,12 @@ nsCocoaWindow::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, NS_OBJC_END_TRY_ABORT_BLOCK; } -- (id)initWithGoannaWindow:(nsCocoaWindow*)geckoWind +- (id)initWithGoannaWindow:(nsCocoaWindow*)goannaWind { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; [super init]; - mGoannaWindow = geckoWind; + mGoannaWindow = goannaWind; mToplevelActiveState = false; mHasEverBeenZoomed = false; return self; @@ -2420,7 +2420,7 @@ nsCocoaWindow::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, nsIWidgetListener* listener = mGoannaWindow ? mGoannaWindow->GetWidgetListener() : nullptr; if (listener) listener->RequestWindowClose(mGoannaWindow); - return NO; // gecko will do it + return NO; // goanna will do it } - (void)windowWillClose:(NSNotification *)aNotification @@ -2491,7 +2491,7 @@ nsCocoaWindow::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, NS_OBJC_END_TRY_ABORT_BLOCK; } -- (nsCocoaWindow*)geckoWidget +- (nsCocoaWindow*)goannaWidget { return mGoannaWindow; } @@ -3293,10 +3293,10 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton"; // by nsCocoaWindow::GetClientBounds. GetClientBounds bases its return // value on what we return from drawsContentsIntoWindowFrame. WindowDelegate *windowDelegate = (WindowDelegate *)[self delegate]; - nsCocoaWindow *geckoWindow = [windowDelegate geckoWidget]; - if (geckoWindow) { + nsCocoaWindow *goannaWindow = [windowDelegate goannaWidget]; + if (goannaWindow) { // Re-layout our contents. - geckoWindow->ReportSizeEvent(); + goannaWindow->ReportSizeEvent(); } // Resizing the content area causes a reflow which would send a synthesized @@ -3370,11 +3370,11 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton"; if ([[self delegate] isKindOfClass:[WindowDelegate class]]) { WindowDelegate *windowDelegate = (WindowDelegate *)[self delegate]; - nsCocoaWindow *geckoWindow = [windowDelegate geckoWidget]; - if (!geckoWindow) + nsCocoaWindow *goannaWindow = [windowDelegate goannaWidget]; + if (!goannaWindow) return; - nsIWidgetListener* listener = geckoWindow->GetWidgetListener(); + nsIWidgetListener* listener = goannaWindow->GetWidgetListener(); if (listener) listener->OSToolbarButtonPressed(); } @@ -3420,7 +3420,7 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton"; // event loop. id delegate = [self delegate]; if (delegate && [delegate isKindOfClass:[WindowDelegate class]]) { - nsCocoaWindow *widget = [(WindowDelegate *)delegate geckoWidget]; + nsCocoaWindow *widget = [(WindowDelegate *)delegate goannaWidget]; if (widget) { if (gGoannaAppModalWindowList && (widget != gGoannaAppModalWindowList->window)) return; @@ -3590,7 +3590,7 @@ TitlebarDrawCallback(void* aInfo, CGContextRef aContext) // event loop. id delegate = [self delegate]; if (delegate && [delegate isKindOfClass:[WindowDelegate class]]) { - nsCocoaWindow *widget = [(WindowDelegate *)delegate geckoWidget]; + nsCocoaWindow *widget = [(WindowDelegate *)delegate goannaWidget]; if (widget) { if (gGoannaAppModalWindowList && (widget != gGoannaAppModalWindowList->window)) return; diff --git a/widget/cocoa/nsDragService.h b/widget/cocoa/nsDragService.h index e090d749a2..29bf71b4ab 100644 --- a/widget/cocoa/nsDragService.h +++ b/widget/cocoa/nsDragService.h @@ -39,7 +39,7 @@ private: nsIntRect* aDragRect, nsIScriptableRegion* aRegion); - nsCOMPtr mDataItems; // only valid for a drag started within gecko + nsCOMPtr mDataItems; // only valid for a drag started within goanna NSView* mNativeDragView; NSEvent* mNativeDragEvent; }; diff --git a/widget/cocoa/nsMacCursor.h b/widget/cocoa/nsMacCursor.h index 1b067a975c..d660417f22 100644 --- a/widget/cocoa/nsMacCursor.h +++ b/widget/cocoa/nsMacCursor.h @@ -59,7 +59,7 @@ /*! @method cocoaCursorWithImageNamed:hotSpot: @abstract Create a Cocoa NSCursor object with a Goanna image resource name and a hotspot point. @discussion Create a Cocoa NSCursor object with a Goanna image resource name and a hotspot point. - @param imageName the name of the gecko image resource, "tiff" extension is assumed, do not append. + @param imageName the name of the goanna image resource, "tiff" extension is assumed, do not append. @param aPoint the point within the cursor to use as the hotspot @result an autoreleased instance of nsMacCursor that will animate the given cursor frames */ diff --git a/widget/cocoa/nsMenuBarX.mm b/widget/cocoa/nsMenuBarX.mm index 28bcc0a3c5..4d973f8d58 100644 --- a/widget/cocoa/nsMenuBarX.mm +++ b/widget/cocoa/nsMenuBarX.mm @@ -561,7 +561,7 @@ NSMenuItem* nsMenuBarX::CreateNativeAppMenuItem(nsMenuX* inMenu, const nsAString if (!domdoc) return nil; - // Get information from the gecko menu item + // Get information from the goanna menu item nsAutoString label; nsAutoString modifiers; nsAutoString key; @@ -595,8 +595,8 @@ NSMenuItem* nsMenuBarX::CreateNativeAppMenuItem(nsMenuX* inMenu, const nsAString // now grab the key equivalent modifiers nsAutoString modifiersStr; keyContent->GetAttr(kNameSpaceID_None, nsGkAtoms::modifiers, modifiersStr); - uint8_t geckoModifiers = nsMenuUtilsX::GoannaModifiersForNodeAttribute(modifiersStr); - macKeyModifiers = nsMenuUtilsX::MacModifiersForGoannaModifiers(geckoModifiers); + uint8_t goannaModifiers = nsMenuUtilsX::GoannaModifiersForNodeAttribute(modifiersStr); + macKeyModifiers = nsMenuUtilsX::MacModifiersForGoannaModifiers(goannaModifiers); } } // get the label into NSString-form diff --git a/widget/cocoa/nsMenuUtilsX.h b/widget/cocoa/nsMenuUtilsX.h index 7791c9a5d5..2a99af4858 100644 --- a/widget/cocoa/nsMenuUtilsX.h +++ b/widget/cocoa/nsMenuUtilsX.h @@ -21,7 +21,7 @@ namespace nsMenuUtilsX void DispatchCommandTo(nsIContent* aTargetContent); NSString* GetTruncatedCocoaLabel(const nsString& itemLabel); uint8_t GoannaModifiersForNodeAttribute(const nsString& modifiersAttribute); - unsigned int MacModifiersForGoannaModifiers(uint8_t geckoModifiers); + unsigned int MacModifiersForGoannaModifiers(uint8_t goannaModifiers); nsMenuBarX* GetHiddenWindowMenuBar(); // returned object is not retained NSMenuItem* GetStandardEditMenuItem(); // returned object is not retained bool NodeIsHiddenOrCollapsed(nsIContent* inContent); diff --git a/widget/cocoa/nsMenuUtilsX.mm b/widget/cocoa/nsMenuUtilsX.mm index 47893dc725..6bca08d0a8 100644 --- a/widget/cocoa/nsMenuUtilsX.mm +++ b/widget/cocoa/nsMenuUtilsX.mm @@ -84,17 +84,17 @@ uint8_t nsMenuUtilsX::GoannaModifiersForNodeAttribute(const nsString& modifiersA return modifiers; } -unsigned int nsMenuUtilsX::MacModifiersForGoannaModifiers(uint8_t geckoModifiers) +unsigned int nsMenuUtilsX::MacModifiersForGoannaModifiers(uint8_t goannaModifiers) { unsigned int macModifiers = 0; - if (geckoModifiers & knsMenuItemShiftModifier) + if (goannaModifiers & knsMenuItemShiftModifier) macModifiers |= NSShiftKeyMask; - if (geckoModifiers & knsMenuItemAltModifier) + if (goannaModifiers & knsMenuItemAltModifier) macModifiers |= NSAlternateKeyMask; - if (geckoModifiers & knsMenuItemControlModifier) + if (goannaModifiers & knsMenuItemControlModifier) macModifiers |= NSControlKeyMask; - if (geckoModifiers & knsMenuItemCommandModifier) + if (goannaModifiers & knsMenuItemCommandModifier) macModifiers |= NSCommandKeyMask; return macModifiers; diff --git a/widget/cocoa/nsMenuX.h b/widget/cocoa/nsMenuX.h index e3e240e399..5f94e4fd83 100644 --- a/widget/cocoa/nsMenuX.h +++ b/widget/cocoa/nsMenuX.h @@ -30,7 +30,7 @@ class nsIWidget; { nsMenuX* mGoannaMenu; // weak ref } -- (id)initWithGoannaMenu:(nsMenuX*)geckoMenu; +- (id)initWithGoannaMenu:(nsMenuX*)goannaMenu; @end // Once instantiated, this object lives until its DOM node or its parent window is destroyed. diff --git a/widget/cocoa/nsMenuX.mm b/widget/cocoa/nsMenuX.mm index 2f58c5134b..dcb7bf6704 100644 --- a/widget/cocoa/nsMenuX.mm +++ b/widget/cocoa/nsMenuX.mm @@ -785,13 +785,13 @@ nsresult nsMenuX::SetupIcon() @implementation MenuDelegate -- (id)initWithGoannaMenu:(nsMenuX*)geckoMenu +- (id)initWithGoannaMenu:(nsMenuX*)goannaMenu { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; if ((self = [super init])) { - NS_ASSERTION(geckoMenu, "Cannot initialize native menu delegate with NULL gecko menu! Will crash!"); - mGoannaMenu = geckoMenu; + NS_ASSERTION(goannaMenu, "Cannot initialize native menu delegate with NULL goanna menu! Will crash!"); + mGoannaMenu = goannaMenu; } return self; diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm index 6600c86dec..ff1d2883cb 100644 --- a/widget/cocoa/nsNativeThemeCocoa.mm +++ b/widget/cocoa/nsNativeThemeCocoa.mm @@ -3538,7 +3538,7 @@ nsNativeThemeCocoa::WidgetStateChanged(nsIFrame* aFrame, uint8_t aWidgetType, NS_IMETHODIMP nsNativeThemeCocoa::ThemeChanged() { - // This is unimplemented because we don't care if gecko changes its theme + // This is unimplemented because we don't care if goanna changes its theme // and Mac OS X doesn't have themes. return NS_OK; } diff --git a/widget/cocoa/nsPrintDialogX.mm b/widget/cocoa/nsPrintDialogX.mm index 4320fe19ed..10d6359cae 100644 --- a/widget/cocoa/nsPrintDialogX.mm +++ b/widget/cocoa/nsPrintDialogX.mm @@ -368,9 +368,9 @@ static const char sHeaderFooterTags[][4] = {"", "&T", "&U", "&D", "&P", "&PT"}; mPrintBGColorsCheckbox = [self checkboxWithLabel:"printBGColors" andFrame:NSMakeRect(156, 188, 0, 0)]; - bool geckoBool; - mSettings->GetPrintBGColors(&geckoBool); - [mPrintBGColorsCheckbox setState:(geckoBool ? NSOnState : NSOffState)]; + bool goannaBool; + mSettings->GetPrintBGColors(&goannaBool); + [mPrintBGColorsCheckbox setState:(goannaBool ? NSOnState : NSOffState)]; [self addSubview:mPrintBGColorsCheckbox]; @@ -378,8 +378,8 @@ static const char sHeaderFooterTags[][4] = {"", "&T", "&U", "&D", "&P", "&PT"}; mPrintBGImagesCheckbox = [self checkboxWithLabel:"printBGImages" andFrame:NSMakeRect(156, 166, 0, 0)]; - mSettings->GetPrintBGImages(&geckoBool); - [mPrintBGImagesCheckbox setState:(geckoBool ? NSOnState : NSOffState)]; + mSettings->GetPrintBGImages(&goannaBool); + [mPrintBGImagesCheckbox setState:(goannaBool ? NSOnState : NSOffState)]; [self addSubview:mPrintBGImagesCheckbox]; } diff --git a/widget/gonk/HwcComposer2D.h b/widget/gonk/HwcComposer2D.h index d6be003ea4..96c2380802 100644 --- a/widget/gonk/HwcComposer2D.h +++ b/widget/gonk/HwcComposer2D.h @@ -56,7 +56,7 @@ typedef hwc_layer_t HwcLayer; #endif /* - * HwcComposer2D provides a way for gecko to render frames + * HwcComposer2D provides a way for goanna to render frames * using hwcomposer.h in the AOSP HAL. * * hwcomposer.h defines an interface for display composition @@ -66,7 +66,7 @@ typedef hwc_layer_t HwcLayer; * no 3d transforms, no intermediate surfaces, no special shader effects, * and loss of other goodies depending on the platform. * - * In general, when hwc is enabled gecko tries to compose + * In general, when hwc is enabled goanna tries to compose * its frames using HwcComposer2D first. Then if HwcComposer2D is * unable to compose a frame then it falls back to compose it * using the GPU with OpenGL. diff --git a/widget/gonk/nsWindow.cpp b/widget/gonk/nsWindow.cpp index 350ca149d2..8b3724ffde 100644 --- a/widget/gonk/nsWindow.cpp +++ b/widget/gonk/nsWindow.cpp @@ -322,7 +322,7 @@ nsWindow::DispatchTouchEventForAPZ(const MultiTouchInput& aInput, } } - // If it didn't get captured, dispatch the event into the gecko root process + // If it didn't get captured, dispatch the event into the goanna root process // for "normal" flow. The event might get sent to the child process still, // but if it doesn't we need to notify the APZ of various things. All of // that happens in DispatchEventForAPZ diff --git a/widget/gonk/nsWindow.h b/widget/gonk/nsWindow.h index 6682fe0eec..d733c669b7 100644 --- a/widget/gonk/nsWindow.h +++ b/widget/gonk/nsWindow.h @@ -144,7 +144,7 @@ protected: ANativeWindowBuffer* mFramebuffer; // If we're using a BasicCompositor, this is our window back // buffer. The gralloc framebuffer driver expects us to draw the - // entire framebuffer on every frame, but gecko expects the + // entire framebuffer on every frame, but goanna expects the // windowing system to be tracking buffer updates for invalidated // regions. We get stuck holding that bag. // diff --git a/widget/gtk/nsDeviceContextSpecG.cpp b/widget/gtk/nsDeviceContextSpecG.cpp index b63f0d408a..6dd4e999dd 100644 --- a/widget/gtk/nsDeviceContextSpecG.cpp +++ b/widget/gtk/nsDeviceContextSpecG.cpp @@ -237,17 +237,17 @@ NS_IMETHODIMP nsDeviceContextSpecGTK::Init(nsIWidget *aWidget, // This is a horrible workaround for some printer driver bugs that treat custom page sizes different // to standard ones. If our paper object matches one of a standard one, use a standard paper size // object instead. See bug 414314 for more info. - GtkPaperSize* geckosHackishPaperSize = gtk_page_setup_get_paper_size(mGtkPageSetup); - GtkPaperSize* standardGtkPaperSize = gtk_paper_size_new(gtk_paper_size_get_name(geckosHackishPaperSize)); + GtkPaperSize* goannasHackishPaperSize = gtk_page_setup_get_paper_size(mGtkPageSetup); + GtkPaperSize* standardGtkPaperSize = gtk_paper_size_new(gtk_paper_size_get_name(goannasHackishPaperSize)); mGtkPageSetup = gtk_page_setup_copy(mGtkPageSetup); mGtkPrintSettings = gtk_print_settings_copy(mGtkPrintSettings); GtkPaperSize* properPaperSize; - if (gtk_paper_size_is_equal(geckosHackishPaperSize, standardGtkPaperSize)) { + if (gtk_paper_size_is_equal(goannasHackishPaperSize, standardGtkPaperSize)) { properPaperSize = standardGtkPaperSize; } else { - properPaperSize = geckosHackishPaperSize; + properPaperSize = goannasHackishPaperSize; } gtk_print_settings_set_paper_size(mGtkPrintSettings, properPaperSize); gtk_page_setup_set_paper_size_and_default_margins(mGtkPageSetup, properPaperSize); diff --git a/widget/gtk/nsGtkIMModule.h b/widget/gtk/nsGtkIMModule.h index 0960cf9fdc..e62ba85f01 100644 --- a/widget/gtk/nsGtkIMModule.h +++ b/widget/gtk/nsGtkIMModule.h @@ -312,7 +312,7 @@ protected: /** * WARNING: - * Following methods dispatch gecko events. Then, the focused widget + * Following methods dispatch goanna events. Then, the focused widget * can be destroyed, and also it can be stolen focus. If they returns * FALSE, callers cannot continue the composition. * - DispatchCompositionStart diff --git a/widget/gtk/nsPrintDialogGTK.cpp b/widget/gtk/nsPrintDialogGTK.cpp index 9c2aa83c83..4458b22266 100644 --- a/widget/gtk/nsPrintDialogGTK.cpp +++ b/widget/gtk/nsPrintDialogGTK.cpp @@ -401,15 +401,15 @@ nsPrintDialogWidgetGTK::ImportSettings(nsIPrintSettings *aNSSettings) GtkPrintSettings* settings = aNSSettingsGTK->GetGtkPrintSettings(); GtkPageSetup* setup = aNSSettingsGTK->GetGtkPageSetup(); - bool geckoBool; - aNSSettings->GetShrinkToFit(&geckoBool); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(shrink_to_fit_toggle), geckoBool); + bool goannaBool; + aNSSettings->GetShrinkToFit(&goannaBool); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(shrink_to_fit_toggle), goannaBool); - aNSSettings->GetPrintBGColors(&geckoBool); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(print_bg_colors_toggle), geckoBool); + aNSSettings->GetPrintBGColors(&goannaBool); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(print_bg_colors_toggle), goannaBool); - aNSSettings->GetPrintBGImages(&geckoBool); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(print_bg_images_toggle), geckoBool); + aNSSettings->GetPrintBGImages(&goannaBool); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(print_bg_images_toggle), goannaBool); gtk_print_unix_dialog_set_settings(GTK_PRINT_UNIX_DIALOG(dialog), settings); gtk_print_unix_dialog_set_page_setup(GTK_PRINT_UNIX_DIALOG(dialog), setup); diff --git a/widget/gtk/nsPrintSettingsGTK.cpp b/widget/gtk/nsPrintSettingsGTK.cpp index fe947d4806..456a52e172 100644 --- a/widget/gtk/nsPrintSettingsGTK.cpp +++ b/widget/gtk/nsPrintSettingsGTK.cpp @@ -250,7 +250,7 @@ nsPrintSettingsGTK::GetStartPageRange(int32_t *aStartPageRange) if (ctRanges < 1) { *aStartPageRange = 1; } else { - // GTK supports multiple page ranges; gecko only supports 1. So find + // GTK supports multiple page ranges; goanna only supports 1. So find // the lowest start page. int32_t start(lstRanges[0].start); for (gint ii = 1; ii < ctRanges; ii++) { diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp index 01620579eb..5d0663eb39 100644 --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp @@ -6151,43 +6151,43 @@ nsWindow::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, DispatchEvent(&query, status); if (query.mSucceeded && query.mReply.mWritingMode.IsVertical()) { - uint32_t geckoCode = 0; + uint32_t goannaCode = 0; uint32_t gdkCode = 0; switch (aEvent.keyCode) { case nsIDOMKeyEvent::DOM_VK_LEFT: if (query.mReply.mWritingMode.IsVerticalLR()) { - geckoCode = nsIDOMKeyEvent::DOM_VK_UP; + goannaCode = nsIDOMKeyEvent::DOM_VK_UP; gdkCode = GDK_Up; } else { - geckoCode = nsIDOMKeyEvent::DOM_VK_DOWN; + goannaCode = nsIDOMKeyEvent::DOM_VK_DOWN; gdkCode = GDK_Down; } break; case nsIDOMKeyEvent::DOM_VK_RIGHT: if (query.mReply.mWritingMode.IsVerticalLR()) { - geckoCode = nsIDOMKeyEvent::DOM_VK_DOWN; + goannaCode = nsIDOMKeyEvent::DOM_VK_DOWN; gdkCode = GDK_Down; } else { - geckoCode = nsIDOMKeyEvent::DOM_VK_UP; + goannaCode = nsIDOMKeyEvent::DOM_VK_UP; gdkCode = GDK_Up; } break; case nsIDOMKeyEvent::DOM_VK_UP: - geckoCode = nsIDOMKeyEvent::DOM_VK_LEFT; + goannaCode = nsIDOMKeyEvent::DOM_VK_LEFT; gdkCode = GDK_Left; break; case nsIDOMKeyEvent::DOM_VK_DOWN: - geckoCode = nsIDOMKeyEvent::DOM_VK_RIGHT; + goannaCode = nsIDOMKeyEvent::DOM_VK_RIGHT; gdkCode = GDK_Right; break; } return ExecuteNativeKeyBindingRemapped(aType, aEvent, aCallback, aCallbackData, - geckoCode, gdkCode); + goannaCode, gdkCode); } } diff --git a/widget/nsBaseAppShell.cpp b/widget/nsBaseAppShell.cpp index 768d68eca8..b16a2e282e 100644 --- a/widget/nsBaseAppShell.cpp +++ b/widget/nsBaseAppShell.cpp @@ -79,14 +79,14 @@ nsBaseAppShell::NativeEventCallback() } // nsBaseAppShell::Run is not being used to pump events, so this may be - // our only opportunity to process pending gecko events. + // our only opportunity to process pending goanna events. nsIThread *thread = NS_GetCurrentThread(); bool prevBlockNativeEvent = mBlockNativeEvent; if (mEventloopNestingState == eEventloopOther) { if (!NS_HasPendingEvents(thread)) return; - // We're in a nested native event loop and have some gecko events to + // We're in a nested native event loop and have some goanna events to // process. While doing that we block processing native events from the // appshell - instead, we want to get back to the nested native event // loop ASAP (bug 420148). @@ -245,7 +245,7 @@ nsBaseAppShell::OnProcessNextEvent(nsIThreadInternal *thr, bool mayWait, if (!mayWait) return NS_OK; // Hmm, we're in a nested native event loop and would like to get - // back to it ASAP, but it seems a gecko event has caused us to + // back to it ASAP, but it seems a goanna event has caused us to // spin up a nested XPCOM event loop (eg. modal window), so we // really must start processing native events here again. mBlockNativeEvent = false; @@ -268,7 +268,7 @@ nsBaseAppShell::OnProcessNextEvent(nsIThreadInternal *thr, bool mayWait, // on its event queue waiting for an event. bool needEvent = mayWait; // Reset prior to invoking DoProcessNextNativeEvent which might cause - // NativeEventCallback to process gecko events. + // NativeEventCallback to process goanna events. mProcessedGoannaEvents = false; if (mFavorPerf <= 0 && start > mSwitchTime + mStarvationDelay) { diff --git a/widget/nsBaseAppShell.h b/widget/nsBaseAppShell.h index 783b0a6683..84536c26c8 100644 --- a/widget/nsBaseAppShell.h +++ b/widget/nsBaseAppShell.h @@ -46,7 +46,7 @@ protected: /** * Make a decision as to whether or not NativeEventCallback will - * trigger gecko event processing when there are pending gecko + * trigger goanna event processing when there are pending goanna * events. */ virtual void DoProcessMoreGoannaEvents(); @@ -139,16 +139,16 @@ private: /** * mBlockNativeEvent blocks the appshell from processing native events. * It is set to true while a nested native event loop (eEventloopOther) - * is processing gecko events in NativeEventCallback(), thus queuing up + * is processing goanna events in NativeEventCallback(), thus queuing up * native events until we return to that loop (bug 420148). - * We force mBlockNativeEvent to false in case handling one of the gecko + * We force mBlockNativeEvent to false in case handling one of the goanna * events spins up a nested XPCOM event loop (eg. modal window) which would * otherwise lead to a "deadlock" where native events aren't processed at all. */ bool mBlockNativeEvent; /** - * Tracks whether we have processed any gecko events in NativeEventCallback so - * that we can avoid erroneously entering a blocking loop waiting for gecko + * Tracks whether we have processed any goanna events in NativeEventCallback so + * that we can avoid erroneously entering a blocking loop waiting for goanna * events to show up during OnProcessNextEvent. This is required because on * OS X ProcessGoannaEvents may be invoked inside the context of * ProcessNextNativeEvent and may result in NativeEventCallback being invoked diff --git a/widget/nsIClipboardDragDropHookList.idl b/widget/nsIClipboardDragDropHookList.idl index 1f6231b827..ec3edf6a24 100644 --- a/widget/nsIClipboardDragDropHookList.idl +++ b/widget/nsIClipboardDragDropHookList.idl @@ -10,11 +10,11 @@ interface nsISimpleEnumerator; /** * Please note that the following api is not intended for embedders; - * it is intended as an internal (to gecko). Embedders can indirectly + * it is intended as an internal (to goanna). Embedders can indirectly * call these by sending commands (see description in * nsIClipboardDragDropHooks.idl). * - * Internal gecko usage is accomplished by calling get_Interface on a + * Internal goanna usage is accomplished by calling get_Interface on a * docshell. */ diff --git a/widget/nsIClipboardDragDropHooks.idl b/widget/nsIClipboardDragDropHooks.idl index 0810ff70fe..5ce0b61c5d 100644 --- a/widget/nsIClipboardDragDropHooks.idl +++ b/widget/nsIClipboardDragDropHooks.idl @@ -55,7 +55,7 @@ interface nsIClipboardDragDropHooks : nsISupports boolean allowStartDrag(in nsIDOMEvent event); /** - * Tells gecko whether a drop is allowed on this content area + * Tells goanna whether a drop is allowed on this content area * * @param event DOM event (drag over) * @param session the drag session from which client can get diff --git a/widget/nsIPrintOptions.idl b/widget/nsIPrintOptions.idl index c056e7bb29..b06ee0052d 100644 --- a/widget/nsIPrintOptions.idl +++ b/widget/nsIPrintOptions.idl @@ -107,7 +107,7 @@ interface nsIPrinterEnumerator : nsISupports { /** * The name of the system default printer. This name should also be - * present in printerNameList below. This is not necessarily gecko's + * present in printerNameList below. This is not necessarily goanna's * default printer; see nsIPrintSettingsService.defaultPrinterName * for that. */ diff --git a/widget/windows/nsAppShell.cpp b/widget/windows/nsAppShell.cpp index 04237d8a56..cfc114012e 100644 --- a/widget/windows/nsAppShell.cpp +++ b/widget/windows/nsAppShell.cpp @@ -194,17 +194,17 @@ void nsAppShell::DoProcessMoreGoannaEvents() { // Called by nsBaseAppShell's NativeEventCallback() after it has finished - // processing pending gecko events and there are still gecko events pending + // processing pending goanna events and there are still goanna events pending // for the thread. (This can happen if NS_ProcessPendingEvents reached it's // starvation timeout limit.) The default behavior in nsBaseAppShell is to // call ScheduleNativeEventCallback to post a follow up native event callback // message. This triggers an additional call to NativeEventCallback for more - // gecko event processing. + // goanna event processing. // There's a deadlock risk here with certain internal Windows modal loops. In // our dispatch code, we prioritize messages so that input is handled first. // However Windows modal dispatch loops often prioritize posted messages. If - // we find ourselves in a tight gecko timer loop where NS_ProcessPendingEvents + // we find ourselves in a tight goanna timer loop where NS_ProcessPendingEvents // takes longer than the timer duration, NS_HasPendingEvents(thread) will // always be true. ScheduleNativeEventCallback will be called on every // NativeEventCallback callback, and in a Windows modal dispatch loop, the @@ -215,7 +215,7 @@ nsAppShell::DoProcessMoreGoannaEvents() // dispatch loop dispatching input messages. Once we drop out of the modal // loop, we use mNativeCallbackPending to fire off a final NativeEventCallback // if we need it, which insures NS_ProcessPendingEvents gets called and all - // gecko events get processed. + // goanna events get processed. if (mEventloopNestingLevel < 2) { OnDispatchedEvent(nullptr); mNativeCallbackPending = false; @@ -241,7 +241,7 @@ nsAppShell::ScheduleNativeEventCallback() bool nsAppShell::ProcessNextNativeEvent(bool mayWait) { - // Notify ipc we are spinning a (possibly nested) gecko event loop. + // Notify ipc we are spinning a (possibly nested) goanna event loop. mozilla::ipc::MessageChannel::NotifyGoannaEventDispatch(); bool gotMessage = false; diff --git a/widget/windows/nsNativeDragTarget.cpp b/widget/windows/nsNativeDragTarget.cpp index b3a6e29fc8..2bc22a5dd2 100644 --- a/widget/windows/nsNativeDragTarget.cpp +++ b/widget/windows/nsNativeDragTarget.cpp @@ -188,8 +188,8 @@ nsNativeDragTarget::ProcessDrag(uint32_t aEventType, DWORD* pdwEffect) { // Before dispatching the event make sure we have the correct drop action set - uint32_t geckoAction; - GetGoannaDragAction(grfKeyState, pdwEffect, &geckoAction); + uint32_t goannaAction; + GetGoannaDragAction(grfKeyState, pdwEffect, &goannaAction); // Set the current action into the Goanna specific type nsCOMPtr currSession; @@ -198,7 +198,7 @@ nsNativeDragTarget::ProcessDrag(uint32_t aEventType, return; } - currSession->SetDragAction(geckoAction); + currSession->SetDragAction(goannaAction); // Dispatch the event into Goanna DispatchDragDropEvent(aEventType, ptl); diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp index 3a527f3d66..8e0b76e3fe 100644 --- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -2037,7 +2037,7 @@ void nsWindow::ResetLayout() { // This will trigger a frame changed event, triggering - // nc calc size and a sizemode gecko event. + // nc calc size and a sizemode goanna event. SetWindowPos(mWnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOMOVE| SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); @@ -2046,7 +2046,7 @@ nsWindow::ResetLayout() if (!mIsVisible) return; - // Send a gecko size event to trigger reflow. + // Send a goanna size event to trigger reflow. RECT clientRc = {0}; GetClientRect(mWnd, &clientRc); nsIntRect evRect(WinUtils::ToIntRect(clientRc)); @@ -6037,18 +6037,18 @@ void nsWindow::OnWindowPosChanged(WINDOWPOS* wp) // If a maximized window is resized, recalculate the non-client margins. if (mSizeMode == nsSizeMode_Maximized) { if (UpdateNonClientMargins(nsSizeMode_Maximized, true)) { - // gecko resize event already sent by UpdateNonClientMargins. + // goanna resize event already sent by UpdateNonClientMargins. return; } } - // Recalculate the width and height based on the client area for gecko events. + // Recalculate the width and height based on the client area for goanna events. if (::GetClientRect(mWnd, &r)) { rect.width = r.right - r.left; rect.height = r.bottom - r.top; } - // Send a gecko resize event + // Send a goanna resize event OnResize(rect); } } diff --git a/widget/windows/nsWindowBase.h b/widget/windows/nsWindowBase.h index 8f8afc3396..971f0ac3de 100644 --- a/widget/windows/nsWindowBase.h +++ b/widget/windows/nsWindowBase.h @@ -38,7 +38,7 @@ public: virtual bool IsTopLevelWidget() = 0; /* - * Init a standard gecko event for this widget. + * Init a standard goanna event for this widget. * @param aEvent the event to initialize. * @param aPoint message position in physical coordinates. */ @@ -46,21 +46,21 @@ public: nsIntPoint* aPoint = nullptr) = 0; /* - * Dispatch a gecko event for this widget. + * Dispatch a goanna event for this widget. * Returns true if it's consumed. Otherwise, false. */ virtual bool DispatchWindowEvent(mozilla::WidgetGUIEvent* aEvent) = 0; /* - * Dispatch a gecko keyboard event for this widget. This - * is called by KeyboardLayout to dispatch gecko events. + * Dispatch a goanna keyboard event for this widget. This + * is called by KeyboardLayout to dispatch goanna events. * Returns true if it's consumed. Otherwise, false. */ virtual bool DispatchKeyboardEvent(mozilla::WidgetGUIEvent* aEvent) = 0; /* - * Dispatch a gecko scroll event for this widget. This - * is called by ScrollHandler to dispatch gecko events. + * Dispatch a goanna scroll event for this widget. This + * is called by ScrollHandler to dispatch goanna events. * Returns true if it's consumed. Otherwise, false. */ virtual bool DispatchScrollEvent(mozilla::WidgetGUIEvent* aEvent) = 0; diff --git a/widget/windows/winrt/APZController.cpp b/widget/windows/winrt/APZController.cpp index d82203eca7..a196f472c8 100644 --- a/widget/windows/winrt/APZController.cpp +++ b/widget/windows/winrt/APZController.cpp @@ -136,7 +136,7 @@ APZController::RequestContentRepaint(const FrameMetrics& aFrameMetrics) aFrameMetrics.GetScrollId()); #endif - // This must be on the gecko thread since we access the dom + // This must be on the goanna thread since we access the dom MOZ_ASSERT(NS_IsMainThread()); #ifdef DEBUG_CONTROLLER diff --git a/widget/windows/winrt/MetroApp.cpp b/widget/windows/winrt/MetroApp.cpp index 5af58d3e02..6b445d4847 100644 --- a/widget/windows/winrt/MetroApp.cpp +++ b/widget/windows/winrt/MetroApp.cpp @@ -57,7 +57,7 @@ MetroApp::CreateView(ABI::Windows::ApplicationModel::Core::IFrameworkView **aVie // gone through startup at this point. // Note that we create the view which creates our native window for us. The - // gecko widget gets created by gecko, and the two get hooked up later in + // goanna widget gets created by goanna, and the two get hooked up later in // MetroWidget::Create(). LogFunction(); @@ -77,7 +77,7 @@ MetroApp::Run() LogThread(); // Name this thread for debugging and register it with the profiler - // and IOInterposer as the main gecko thread. + // and IOInterposer as the main goanna thread. char aLocal; PR_SetCurrentThreadName(gGoannaThreadName); profiler_register_thread(gGoannaThreadName, &aLocal); @@ -151,7 +151,7 @@ MetroApp::ActivateBaseView() /* * TBD: when we support multiple widgets, we'll need a way to sync up the view - * created in CreateView with the widget gecko creates. Currently we only have + * created in CreateView with the widget goanna creates. Currently we only have * one view (sFrameworkView) and one main widget. */ void diff --git a/widget/windows/winrt/MetroApp.h b/widget/windows/winrt/MetroApp.h index 1e196e0d47..c9748dd53d 100644 --- a/widget/windows/winrt/MetroApp.h +++ b/widget/windows/winrt/MetroApp.h @@ -45,7 +45,7 @@ public: void Shutdown(); void ActivateBaseView(); - // Set when gecko enters xpcom shutdown. + // Set when goanna enters xpcom shutdown. static bool sGoannaShuttingDown; // Shared pointers between framework and widget diff --git a/widget/windows/winrt/MetroAppShell.cpp b/widget/windows/winrt/MetroAppShell.cpp index 305660ec23..9aa94e69f3 100644 --- a/widget/windows/winrt/MetroAppShell.cpp +++ b/widget/windows/winrt/MetroAppShell.cpp @@ -260,7 +260,7 @@ MetroAppShell::Run(void) restartingInDesktop = false; } - // This calls XRE_metroShutdown() in xre. Shuts down gecko, including + // This calls XRE_metroShutdown() in xre. Shuts down goanna, including // releasing the profile, and destroys MessagePump. sMetroApp->Shutdown(); diff --git a/widget/windows/winrt/MetroInput.cpp b/widget/windows/winrt/MetroInput.cpp index 139be5aced..6b93d078e5 100644 --- a/widget/windows/winrt/MetroInput.cpp +++ b/widget/windows/winrt/MetroInput.cpp @@ -215,7 +215,7 @@ namespace { * NOTE: This function will set the `mChanged` member of each * element it encounters to `false`, since this function is only * used to populate a touchlist that is about to be dispatched - * in a gecko touch event. + * in a goanna touch event. * * @param aKey the key of the current element being enumerated * @param aData the value of the current element being enumerated @@ -367,16 +367,16 @@ MetroInput::OnEdgeGestureStarted(UI::Input::IEdgeGesture* sender, #ifdef DEBUG_INPUT LogFunction(); #endif - WidgetSimpleGestureEvent geckoEvent(true, + WidgetSimpleGestureEvent goannaEvent(true, NS_SIMPLE_GESTURE_EDGE_STARTED, mWidget.Get()); mModifierKeyState.Update(); - mModifierKeyState.InitInputEvent(geckoEvent); - geckoEvent.time = ::GetMessageTime(); - geckoEvent.inputSource = ProcessInputTypeForGesture(aArgs); + mModifierKeyState.InitInputEvent(goannaEvent); + goannaEvent.time = ::GetMessageTime(); + goannaEvent.inputSource = ProcessInputTypeForGesture(aArgs); // Safe - DispatchEventIgnoreStatus(&geckoEvent); + DispatchEventIgnoreStatus(&goannaEvent); return S_OK; } @@ -396,16 +396,16 @@ MetroInput::OnEdgeGestureCanceled(UI::Input::IEdgeGesture* sender, #ifdef DEBUG_INPUT LogFunction(); #endif - WidgetSimpleGestureEvent geckoEvent(true, + WidgetSimpleGestureEvent goannaEvent(true, NS_SIMPLE_GESTURE_EDGE_CANCELED, mWidget.Get()); mModifierKeyState.Update(); - mModifierKeyState.InitInputEvent(geckoEvent); - geckoEvent.time = ::GetMessageTime(); - geckoEvent.inputSource = ProcessInputTypeForGesture(aArgs); + mModifierKeyState.InitInputEvent(goannaEvent); + goannaEvent.time = ::GetMessageTime(); + goannaEvent.inputSource = ProcessInputTypeForGesture(aArgs); // Safe - DispatchEventIgnoreStatus(&geckoEvent); + DispatchEventIgnoreStatus(&goannaEvent); return S_OK; } @@ -424,23 +424,23 @@ MetroInput::OnEdgeGestureCompleted(UI::Input::IEdgeGesture* sender, #ifdef DEBUG_INPUT LogFunction(); #endif - WidgetSimpleGestureEvent geckoEvent(true, + WidgetSimpleGestureEvent goannaEvent(true, NS_SIMPLE_GESTURE_EDGE_COMPLETED, mWidget.Get()); mModifierKeyState.Update(); - mModifierKeyState.InitInputEvent(geckoEvent); - geckoEvent.time = ::GetMessageTime(); - geckoEvent.inputSource = ProcessInputTypeForGesture(aArgs); + mModifierKeyState.InitInputEvent(goannaEvent); + goannaEvent.time = ::GetMessageTime(); + goannaEvent.inputSource = ProcessInputTypeForGesture(aArgs); // Safe - DispatchEventIgnoreStatus(&geckoEvent); + DispatchEventIgnoreStatus(&goannaEvent); return S_OK; } /** * This helper function is used by our processing of PointerPressed, * PointerReleased, and PointerMoved events. - * It dispatches a gecko event in response to the input received. This + * It dispatches a goanna event in response to the input received. This * function should only be called for non-touch (i.e. pen or mouse) input * events. * @@ -1051,7 +1051,7 @@ MetroInput::HandleTap(const Foundation::Point& aPoint, unsigned int aTapCount) mouseEvent->button = WidgetMouseEvent::buttonType::eLeftButton; DispatchAsyncEventIgnoreStatus(mouseEvent); - // Make sure all gecko events are dispatched and the dom is up to date + // Make sure all goanna events are dispatched and the dom is up to date // so that when ui automation comes in looking for focus info it gets // the right information. MetroAppShell::MarkEventQueueForPurge(); diff --git a/widget/windows/winrt/MetroInput.h b/widget/windows/winrt/MetroInput.h index 1b98d2a46d..580e5b38cc 100644 --- a/widget/windows/winrt/MetroInput.h +++ b/widget/windows/winrt/MetroInput.h @@ -115,7 +115,7 @@ public: // These input events are received from our window. These are basic // pointer and keyboard press events. MetroInput responds to them - // by sending gecko events and forwarding these input events to its + // by sending goanna events and forwarding these input events to its // GestureRecognizer to be processed into more complex input events // (tap, rightTap, rotate, etc) HRESULT OnPointerPressed(ICoreWindow* aSender, @@ -220,10 +220,10 @@ private: // PointerPressed/PointerMoved/PointerReleased event for each touchpoint // that has changed. // - // When we learn of touch input, we dispatch gecko events in response. + // When we learn of touch input, we dispatch goanna events in response. // With the new WinRT way of doing things, we would end up sending many - // more gecko events than we would using the Win32 mechanism. E.g., - // for 5 active touchpoints, we would be sending 5 times as many gecko + // more goanna events than we would using the Win32 mechanism. E.g., + // for 5 active touchpoints, we would be sending 5 times as many goanna // events. This caused performance to visibly degrade on modestly-powered // machines. In response, we no longer send touch events immediately // upon receiving PointerPressed or PointerMoved. Instead, we store @@ -262,7 +262,7 @@ private: // Due to a limitation added in 8.1 the ui thread can't re-enter the main // native event dispatcher in MetroAppShell. So all events delivered to us // on the ui thread via a native event dispatch call get bounced through - // the gecko thread event queue using runnables. Most events can be sent + // the goanna thread event queue using runnables. Most events can be sent // async without the need to see the status result. Those that do have // specialty callbacks. Note any event that arrives to us on the ui thread // that originates from another thread is safe to send sync. diff --git a/widget/windows/winrt/MetroWidget.cpp b/widget/windows/winrt/MetroWidget.cpp index 43831eb203..0a76d4cffe 100644 --- a/widget/windows/winrt/MetroWidget.cpp +++ b/widget/windows/winrt/MetroWidget.cpp @@ -813,7 +813,7 @@ MetroWidget::WindowProcedure(HWND aWnd, UINT aMsg, WPARAM aWParam, LPARAM aLPara break; } - // Keyboard handling is passed to KeyboardLayout, which delivers gecko events + // Keyboard handling is passed to KeyboardLayout, which delivers goanna events // via DispatchKeyboardEvent. case WM_KEYDOWN: diff --git a/widget/windows/winrt/MetroWidget.h b/widget/windows/winrt/MetroWidget.h index 16319e3ad8..8532d8918e 100644 --- a/widget/windows/winrt/MetroWidget.h +++ b/widget/windows/winrt/MetroWidget.h @@ -209,7 +209,7 @@ public: // Hit test a point to see if an apzc would consume input there bool ApzHitTest(mozilla::ScreenIntPoint& pt); - // Transforms a coord so that it properly targets gecko content based + // Transforms a coord so that it properly targets goanna content based // on apzc transforms currently applied. void ApzTransformGoannaCoordinate(const mozilla::ScreenIntPoint& pt, mozilla::LayoutDeviceIntPoint* aRefPointOut); diff --git a/xpcom/build/IOInterposer.cpp b/xpcom/build/IOInterposer.cpp index aa1e3aae03..e7feba2e67 100644 --- a/xpcom/build/IOInterposer.cpp +++ b/xpcom/build/IOInterposer.cpp @@ -64,7 +64,7 @@ public: { } // Lists of observers for I/O events. - // These are implemented as vectors since they are allowed to survive gecko, + // These are implemented as vectors since they are allowed to survive goanna, // without reporting leaks. This is necessary for the IOInterposer to be used // for late-write checks. std::vector mCreateObservers; diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h index 1dbb027460..ee7e5f9fcd 100644 --- a/xpcom/build/nsXULAppAPI.h +++ b/xpcom/build/nsXULAppAPI.h @@ -369,7 +369,7 @@ static const char* const kGoannaProcessTypeString[] = { "plugin", "tab", "ipdlunittest", - "geckomediaplugin" + "goannamediaplugin" }; static_assert(MOZ_ARRAY_LENGTH(kGoannaProcessTypeString) == diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp index 5e2d57a4d2..95f9ea30d3 100644 --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp @@ -507,7 +507,7 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, nsAutoString appID; nsAutoString appVersion; - nsAutoString geckoVersion; + nsAutoString goannaVersion; nsAutoString osTarget; nsAutoString abi; nsAutoString process; @@ -532,7 +532,7 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, rv = xapp->GetPlatformVersion(s); if (NS_SUCCEEDED(rv)) { - CopyUTF8toUTF16(s, geckoVersion); + CopyUTF8toUTF16(s, goannaVersion); } nsCOMPtr xruntime(do_QueryInterface(xapp)); @@ -698,7 +698,7 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, CheckStringFlag(kProcess, wtoken, process, stProcess) || CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) || CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) || - CheckVersionFlag(kGoannaVersion, wtoken, geckoVersion, stGoannaVersion)) { + CheckVersionFlag(kGoannaVersion, wtoken, goannaVersion, stGoannaVersion)) { continue; } diff --git a/xpcom/io/nsBinaryStream.cpp b/xpcom/io/nsBinaryStream.cpp index 289730f076..30708ec5af 100644 --- a/xpcom/io/nsBinaryStream.cpp +++ b/xpcom/io/nsBinaryStream.cpp @@ -896,9 +896,9 @@ nsBinaryInputStream::ReadObject(bool aIsStrongRef, nsISupports** aObject) return rv; } - // HACK: Intercept old (pre-gecko6) nsIURI IID, and replace with + // HACK: Intercept old (pre-goanna6) nsIURI IID, and replace with // the updated IID, so that we're QI'ing to an actual interface. - // (As soon as we drop support for upgrading from pre-gecko6, we can + // (As soon as we drop support for upgrading from pre-goanna6, we can // remove this chunk.) static const nsIID oldURIiid = { 0x7a22cc0, 0xce5, 0x11d3, diff --git a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp index f606c620f0..97640fd1dc 100644 --- a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp +++ b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp @@ -293,13 +293,13 @@ using namespace mozilla; struct ComponentsInterfaceShimEntry { - const char *geckoName; + const char *goannaName; nsIID iid; const mozilla::dom::NativePropertyHooks* nativePropHooks; }; -#define DEFINE_SHIM_WITH_CUSTOM_INTERFACE(geckoName, domName) \ - { #geckoName, NS_GET_IID(geckoName), \ +#define DEFINE_SHIM_WITH_CUSTOM_INTERFACE(goannaName, domName) \ + { #goannaName, NS_GET_IID(goannaName), \ mozilla::dom::domName ## Binding::sNativePropertyHooks } #define DEFINE_SHIM(name) \ DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOM ## name, name) @@ -493,11 +493,11 @@ ShimInterfaceInfo::MaybeConstruct(const char* aName, JSContext* cx) { nsRefPtr info; for (uint32_t i = 0; i < ArrayLength(kComponentsInterfaceShimMap); ++i) { - if (!strcmp(aName, kComponentsInterfaceShimMap[i].geckoName)) { + if (!strcmp(aName, kComponentsInterfaceShimMap[i].goannaName)) { const ComponentsInterfaceShimEntry& shimEntry = kComponentsInterfaceShimMap[i]; info = new ShimInterfaceInfo(shimEntry.iid, - shimEntry.geckoName, + shimEntry.goannaName, shimEntry.nativePropHooks); break; } diff --git a/xpcom/sample/nsSampleModule.cpp b/xpcom/sample/nsSampleModule.cpp index dc3e5e732a..d23a8d7490 100644 --- a/xpcom/sample/nsSampleModule.cpp +++ b/xpcom/sample/nsSampleModule.cpp @@ -41,7 +41,7 @@ static const mozilla::Module::CIDEntry kSampleCIDs[] = { // Build a table which maps contract IDs to CIDs. // A contract is a string which identifies a particular set of functionality. In some -// cases an extension component may override the contract ID of a builtin gecko component +// cases an extension component may override the contract ID of a builtin goanna component // to modify or extend functionality. static const mozilla::Module::ContractIDEntry kSampleContracts[] = { { NS_SAMPLE_CONTRACTID, &kNS_SAMPLE_CID }, diff --git a/xpcom/system/nsIXULAppInfo.idl b/xpcom/system/nsIXULAppInfo.idl index b5c1c3d64b..65320986fa 100644 --- a/xpcom/system/nsIXULAppInfo.idl +++ b/xpcom/system/nsIXULAppInfo.idl @@ -51,7 +51,7 @@ interface nsIXULAppInfo : nsISupports readonly attribute ACString platformVersion; /** - * The build ID/date of gecko and the XULRunner platform. + * The build ID/date of goanna and the XULRunner platform. */ readonly attribute ACString platformBuildID; diff --git a/xpcom/tests/gtest/TestStrings.cpp b/xpcom/tests/gtest/TestStrings.cpp index dc5fd6fbfb..9a3ec9cbb1 100644 --- a/xpcom/tests/gtest/TestStrings.cpp +++ b/xpcom/tests/gtest/TestStrings.cpp @@ -157,7 +157,7 @@ TEST(Strings, findinreadable) nsMemory::Free(r); // Should not find a match - EXPECT_FALSE(FindInReadable(NS_LITERAL_CSTRING("gecko"), delim_begin, delim_end)); + EXPECT_FALSE(FindInReadable(NS_LITERAL_CSTRING("goanna"), delim_begin, delim_end)); // When no match is found, range should be empty EXPECT_EQ(delim_begin, delim_end); @@ -224,7 +224,7 @@ TEST(Strings, rfindinreadable) // Should not find a match delim_begin = begin; delim_end = end; - EXPECT_FALSE(RFindInReadable(NS_LITERAL_CSTRING("gecko"), delim_begin, delim_end)); + EXPECT_FALSE(RFindInReadable(NS_LITERAL_CSTRING("goanna"), delim_begin, delim_end)); // When no match is found, range should be empty EXPECT_EQ(delim_begin, delim_end); diff --git a/xulrunner/README.xulrunner b/xulrunner/README.xulrunner index 424b7a6150..cda78b3d34 100644 --- a/xulrunner/README.xulrunner +++ b/xulrunner/README.xulrunner @@ -1,5 +1,5 @@ XULRunner is a package which can be used to run applications written in HTML -or XUL. It can also be used to embed the gecko rendering engine into +or XUL. It can also be used to embed the goanna rendering engine into binary applications. XULRunner is not a product; it is a tool which can be used to create products.