Dbrant has submitted this change and it was merged.
Change subject: Refactor: Move PageTitle and PageQueryTask classes to package
org.wikipedia.page
......................................................................
Refactor: Move PageTitle and PageQueryTask classes to package org.wikipedia.page
Change-Id: I5ed9770d7f68283e29fc6c067a2fd58f0db9c09d
---
M wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
M
wikipedia-it/src/main/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/GetDescriptionsTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/PageTitleTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
M wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/SiteTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
M wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
M wikipedia/src/main/java/org/wikipedia/Site.java
M wikipedia/src/main/java/org/wikipedia/analytics/EditFunnel.java
M wikipedia/src/main/java/org/wikipedia/analytics/FunnelManager.java
M wikipedia/src/main/java/org/wikipedia/analytics/GalleryFunnel.java
M wikipedia/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
M wikipedia/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java
M wikipedia/src/main/java/org/wikipedia/analytics/SuggestedPagesFunnel.java
M wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
M wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
M wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java
M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
M wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
M
wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryFragment.java
M
wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
M wikipedia/src/main/java/org/wikipedia/history/HistoryEntry.java
M
wikipedia/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
M wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
M wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
M wikipedia/src/main/java/org/wikipedia/migration/ArticleImporter.java
M wikipedia/src/main/java/org/wikipedia/migration/BookmarksMigrator.java
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M wikipedia/src/main/java/org/wikipedia/page/DisambigResult.java
M wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
M wikipedia/src/main/java/org/wikipedia/page/Page.java
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/page/PageBackStackItem.java
M wikipedia/src/main/java/org/wikipedia/page/PageCache.java
M wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
R wikipedia/src/main/java/org/wikipedia/page/PageQueryTask.java
R wikipedia/src/main/java/org/wikipedia/page/PageTitle.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
M wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandlerOld.java
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentInterface.java
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/MainPageReadMoreTopicTask.java
M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollection.java
M
wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollectionFetchTask.java
M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFetchTask.java
M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M
wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java
M wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
M wikipedia/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java
M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
M wikipedia/src/main/java/org/wikipedia/pagehistory/PageHistoryItem.java
M
wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
M wikipedia/src/main/java/org/wikipedia/pageimages/PageImage.java
M
wikipedia/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
M wikipedia/src/main/java/org/wikipedia/pageimages/PageImagesTask.java
M wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
M wikipedia/src/main/java/org/wikipedia/random/RandomHandler.java
M wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
M wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageUrlMapTask.java
M wikipedia/src/main/java/org/wikipedia/savedpages/SavePageTask.java
M wikipedia/src/main/java/org/wikipedia/savedpages/SavedPage.java
M
wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagePersistenceHelper.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
M wikipedia/src/main/java/org/wikipedia/search/SearchResults.java
M wikipedia/src/main/java/org/wikipedia/search/SearchResultsFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
M wikipedia/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
M wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
80 files changed, 80 insertions(+), 82 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
index 6e77d53..0686e91 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
@@ -4,7 +4,7 @@
import android.test.ActivityUnitTestCase;
import org.mediawiki.api.json.ApiException;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.editing.DoEditTask;
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java
index a51ad2b..78942f8 100644
---
a/wikipedia-it/src/main/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java
+++
b/wikipedia-it/src/main/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java
@@ -3,7 +3,7 @@
import android.content.Intent;
import android.test.ActivityUnitTestCase;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.editing.FetchSectionWikitextTask;
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
index a00b3b2..a6228b3 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -1,6 +1,6 @@
package org.wikipedia.test;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.search.FullSearchArticlesTask;
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/GetDescriptionsTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/GetDescriptionsTaskTests.java
index 1972d11..f0da15b 100644
---
a/wikipedia-it/src/main/java/org/wikipedia/test/GetDescriptionsTaskTests.java
+++
b/wikipedia-it/src/main/java/org/wikipedia/test/GetDescriptionsTaskTests.java
@@ -1,6 +1,6 @@
package org.wikipedia.test;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.wikidata.GetDescriptionsTask;
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java
index 1041968..cc03df0 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java
@@ -3,7 +3,7 @@
import android.content.Context;
import android.content.Intent;
import android.test.ActivityUnitTestCase;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.page.Section;
import org.wikipedia.page.SectionsFetchTask;
diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
index d05e2b0..d5375e3 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.page.Page;
import org.wikipedia.page.PageProperties;
diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/PageTitleTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/PageTitleTests.java
index abf9d0e..f22292b 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/PageTitleTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/PageTitleTests.java
@@ -1,7 +1,7 @@
package org.wikipedia.test;
import junit.framework.TestCase;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.staticdata.MainPageNameData;
diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
b/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
index 4d5e3a3..4fe9e03 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
@@ -4,7 +4,7 @@
import android.os.Parcelable;
import junit.framework.TestCase;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.ParcelableLruCache;
import org.wikipedia.Site;
import org.wikipedia.history.HistoryEntry;
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java
index bb2a034..1bd134f 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java
@@ -1,7 +1,7 @@
package org.wikipedia.test;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.editing.EditPreviewTask;
import android.content.Intent;
diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/SiteTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/SiteTests.java
index fe2bfd8..e5f042c 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/SiteTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/SiteTests.java
@@ -1,7 +1,7 @@
package org.wikipedia.test;
import junit.framework.TestCase;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
public class SiteTests extends TestCase {
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
index 1257d30..28900ed 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
@@ -1,6 +1,6 @@
package org.wikipedia.test;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.SuggestionsTask;
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
index a47c6c4..3383fc5 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
@@ -2,7 +2,7 @@
import android.content.Intent;
import android.test.ActivityUnitTestCase;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.editing.AbuseFilterEditResult;
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
index a047c60..d772304 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
@@ -3,7 +3,7 @@
import android.content.Intent;
import android.test.ActivityUnitTestCase;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.editing.CaptchaResult;
diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
index 1c811bf..8622ffb 100644
--- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
@@ -19,6 +19,7 @@
import org.wikipedia.login.LoginActivity;
import org.wikipedia.nearby.NearbyFragment;
import org.wikipedia.page.PageActivity;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.page.PageViewFragmentInternal;
import org.wikipedia.random.RandomHandler;
import org.wikipedia.savedpages.SavedPagesFragment;
diff --git a/wikipedia/src/main/java/org/wikipedia/Site.java
b/wikipedia/src/main/java/org/wikipedia/Site.java
index 1e61703..44b6296 100644
--- a/wikipedia/src/main/java/org/wikipedia/Site.java
+++ b/wikipedia/src/main/java/org/wikipedia/Site.java
@@ -5,6 +5,8 @@
import android.os.Parcelable;
import android.text.TextUtils;
+import org.wikipedia.page.PageTitle;
+
/**
* Represents a particular wiki.
*/
diff --git a/wikipedia/src/main/java/org/wikipedia/analytics/EditFunnel.java
b/wikipedia/src/main/java/org/wikipedia/analytics/EditFunnel.java
index 5804e11..69ec592 100644
--- a/wikipedia/src/main/java/org/wikipedia/analytics/EditFunnel.java
+++ b/wikipedia/src/main/java/org/wikipedia/analytics/EditFunnel.java
@@ -2,7 +2,7 @@
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
diff --git a/wikipedia/src/main/java/org/wikipedia/analytics/FunnelManager.java
b/wikipedia/src/main/java/org/wikipedia/analytics/FunnelManager.java
index 3d03ae0..c218c98 100644
--- a/wikipedia/src/main/java/org/wikipedia/analytics/FunnelManager.java
+++ b/wikipedia/src/main/java/org/wikipedia/analytics/FunnelManager.java
@@ -1,6 +1,6 @@
package org.wikipedia.analytics;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
diff --git a/wikipedia/src/main/java/org/wikipedia/analytics/GalleryFunnel.java
b/wikipedia/src/main/java/org/wikipedia/analytics/GalleryFunnel.java
index 3b56eee..b8e8a8b 100644
--- a/wikipedia/src/main/java/org/wikipedia/analytics/GalleryFunnel.java
+++ b/wikipedia/src/main/java/org/wikipedia/analytics/GalleryFunnel.java
@@ -2,7 +2,7 @@
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
diff --git
a/wikipedia/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
b/wikipedia/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
index 6ec9b22..30698d6 100644
--- a/wikipedia/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
+++ b/wikipedia/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
@@ -4,7 +4,7 @@
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.linkpreview.LinkPreviewVersion;
diff --git
a/wikipedia/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java
b/wikipedia/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java
index fde5d99..8f1fa7c 100644
--- a/wikipedia/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java
+++ b/wikipedia/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java
@@ -2,7 +2,7 @@
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
diff --git
a/wikipedia/src/main/java/org/wikipedia/analytics/SuggestedPagesFunnel.java
b/wikipedia/src/main/java/org/wikipedia/analytics/SuggestedPagesFunnel.java
index 596569a..c97fc77 100644
--- a/wikipedia/src/main/java/org/wikipedia/analytics/SuggestedPagesFunnel.java
+++ b/wikipedia/src/main/java/org/wikipedia/analytics/SuggestedPagesFunnel.java
@@ -4,7 +4,7 @@
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
diff --git a/wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
b/wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
index df6e841..8cd7821 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
@@ -7,7 +7,7 @@
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
import org.wikipedia.ApiTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
public class DoEditTask extends ApiTask<EditingResult> {
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
b/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
index 3d1cd4e..85608e3 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
@@ -21,6 +21,7 @@
import org.wikipedia.*;
import org.wikipedia.analytics.EditFunnel;
import org.wikipedia.bridge.StyleBundle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.views.ObservableWebView;
import org.wikipedia.bridge.CommunicationBridge;
import org.wikipedia.editing.summaries.EditSummaryTag;
diff --git a/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java
b/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java
index 2eab0e1..38c6b64 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java
@@ -6,7 +6,7 @@
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
import org.wikipedia.ApiTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
index ce6100f..c2174d6 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
@@ -29,7 +29,7 @@
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.ApiException;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.ThemedActionBarActivity;
import org.wikipedia.Utils;
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
b/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
index a5dd191..5a2e21f 100644
---
a/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
@@ -6,7 +6,7 @@
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
import org.wikipedia.ApiTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
public class FetchSectionWikitextTask extends ApiTask<String> {
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryFragment.java
b/wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryFragment.java
index b5ff1f6..8e778e5 100644
---
a/wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryFragment.java
+++
b/wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryFragment.java
@@ -9,7 +9,7 @@
import android.view.inputmethod.EditorInfo;
import android.widget.AutoCompleteTextView;
import android.widget.TextView;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Utils;
import org.wikipedia.ViewAnimations;
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
b/wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
index da2b519..066631a 100644
---
a/wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
@@ -10,7 +10,7 @@
import android.widget.AutoCompleteTextView;
import android.widget.FilterQueryProvider;
import android.widget.TextView;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Utils;
import org.wikipedia.WikipediaApp;
diff --git a/wikipedia/src/main/java/org/wikipedia/history/HistoryEntry.java
b/wikipedia/src/main/java/org/wikipedia/history/HistoryEntry.java
index f4e71c3..4f9453c 100644
--- a/wikipedia/src/main/java/org/wikipedia/history/HistoryEntry.java
+++ b/wikipedia/src/main/java/org/wikipedia/history/HistoryEntry.java
@@ -2,7 +2,7 @@
import android.os.Parcel;
import android.os.Parcelable;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import java.util.Date;
diff --git
a/wikipedia/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
b/wikipedia/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
index 850b442..029b0ac 100644
---
a/wikipedia/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
+++
b/wikipedia/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
@@ -2,7 +2,7 @@
import android.content.ContentValues;
import android.database.Cursor;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.data.PersistenceHelper;
diff --git
a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
index a40fee2..2c5aafc 100644
--- a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
@@ -18,6 +18,7 @@
import org.wikipedia.*;
import org.wikipedia.history.HistoryEntry;
import org.wikipedia.page.PageActivity;
+import org.wikipedia.page.PageTitle;
import java.util.ArrayList;
import java.util.List;
diff --git
a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
index 8a6c94e..10cb362 100644
---
a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
@@ -7,7 +7,7 @@
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
import org.wikipedia.ApiTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
diff --git
a/wikipedia/src/main/java/org/wikipedia/migration/ArticleImporter.java
b/wikipedia/src/main/java/org/wikipedia/migration/ArticleImporter.java
index a0b553a..ff9bf5f 100644
--- a/wikipedia/src/main/java/org/wikipedia/migration/ArticleImporter.java
+++ b/wikipedia/src/main/java/org/wikipedia/migration/ArticleImporter.java
@@ -2,7 +2,7 @@
import android.content.Context;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.analytics.SavedPagesFunnel;
diff --git
a/wikipedia/src/main/java/org/wikipedia/migration/BookmarksMigrator.java
b/wikipedia/src/main/java/org/wikipedia/migration/BookmarksMigrator.java
index 6f50512..dc81eaa 100644
--- a/wikipedia/src/main/java/org/wikipedia/migration/BookmarksMigrator.java
+++ b/wikipedia/src/main/java/org/wikipedia/migration/BookmarksMigrator.java
@@ -4,7 +4,7 @@
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.util.Log;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.savedpages.SavedPage;
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index c169a1f..7acc87c 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -1,6 +1,6 @@
package org.wikipedia.nearby;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Site;
import org.wikipedia.Utils;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
b/wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
index 16963a5..fc4b0b7 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
@@ -1,6 +1,5 @@
package org.wikipedia.page;
-import org.wikipedia.PageTitle;
import org.wikipedia.ParcelableLruCache;
import org.wikipedia.R;
import org.wikipedia.Site;
diff --git a/wikipedia/src/main/java/org/wikipedia/page/DisambigResult.java
b/wikipedia/src/main/java/org/wikipedia/page/DisambigResult.java
index 83d3695..f35e26e 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/DisambigResult.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/DisambigResult.java
@@ -1,7 +1,5 @@
package org.wikipedia.page;
-import org.wikipedia.PageTitle;
-
public class DisambigResult {
private final PageTitle title;
diff --git a/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
index 38368c8..b9eeb41 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
@@ -5,7 +5,6 @@
import android.util.Log;
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.Utils;
import org.wikipedia.WikipediaApp;
diff --git a/wikipedia/src/main/java/org/wikipedia/page/Page.java
b/wikipedia/src/main/java/org/wikipedia/page/Page.java
index c86130b..e56b6e9 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/Page.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/Page.java
@@ -3,7 +3,6 @@
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
import org.wikipedia.page.gallery.GalleryCollection;
import java.util.ArrayList;
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 9fadef0..601e03e 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -3,7 +3,6 @@
import org.acra.ACRA;
import org.wikipedia.BackPressedHandler;
import org.wikipedia.NavDrawerFragment;
-import org.wikipedia.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Site;
import org.wikipedia.ThemedActionBarActivity;
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageBackStackItem.java
b/wikipedia/src/main/java/org/wikipedia/page/PageBackStackItem.java
index 3f2b005..59cf0af 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageBackStackItem.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageBackStackItem.java
@@ -1,6 +1,5 @@
package org.wikipedia.page;
-import org.wikipedia.PageTitle;
import org.wikipedia.history.HistoryEntry;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageCache.java
b/wikipedia/src/main/java/org/wikipedia/page/PageCache.java
index 579cccd..6ba7ab9 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageCache.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageCache.java
@@ -1,6 +1,5 @@
package org.wikipedia.page;
-import org.wikipedia.PageTitle;
import org.wikipedia.Utils;
import org.wikipedia.concurrency.SaneAsyncTask;
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
b/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
index ee93729..2d51e57 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
@@ -1,6 +1,5 @@
package org.wikipedia.page;
-import org.wikipedia.PageTitle;
import org.wikipedia.R;
import org.wikipedia.history.HistoryEntry;
import android.graphics.Typeface;
diff --git a/wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
b/wikipedia/src/main/java/org/wikipedia/page/PageQueryTask.java
similarity index 96%
rename from wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
rename to wikipedia/src/main/java/org/wikipedia/page/PageQueryTask.java
index 7931818..9e31004 100644
--- a/wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageQueryTask.java
@@ -1,10 +1,12 @@
-package org.wikipedia;
+package org.wikipedia.page;
import android.text.TextUtils;
import org.json.JSONObject;
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
+import org.wikipedia.ApiTask;
+import org.wikipedia.Site;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/wikipedia/src/main/java/org/wikipedia/PageTitle.java
b/wikipedia/src/main/java/org/wikipedia/page/PageTitle.java
similarity index 98%
rename from wikipedia/src/main/java/org/wikipedia/PageTitle.java
rename to wikipedia/src/main/java/org/wikipedia/page/PageTitle.java
index 416e5f5..7776464 100644
--- a/wikipedia/src/main/java/org/wikipedia/PageTitle.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageTitle.java
@@ -1,10 +1,13 @@
-package org.wikipedia;
+package org.wikipedia.page;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
import org.json.JSONException;
import org.json.JSONObject;
+import org.wikipedia.Site;
+import org.wikipedia.Utils;
+import org.wikipedia.WikipediaApp;
import org.wikipedia.staticdata.FileAliasData;
import org.wikipedia.staticdata.MainPageNameData;
import org.wikipedia.staticdata.SpecialAliasData;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 54ff603..9497b4e 100755
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -2,7 +2,6 @@
import org.wikipedia.BackPressedHandler;
import org.wikipedia.NightModeHandler;
-import org.wikipedia.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Site;
import org.wikipedia.Utils;
diff --git a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
index cad3305..85a3fc1 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
@@ -9,7 +9,6 @@
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
import org.wikipedia.ApiTask;
-import org.wikipedia.PageTitle;
import org.wikipedia.WikipediaApp;
import java.util.ArrayList;
diff --git a/wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
b/wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
index cf816e8..b2039ca 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
@@ -1,6 +1,5 @@
package org.wikipedia.page;
-import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.search.FullSearchArticlesTask;
import org.mediawiki.api.json.Api;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandlerOld.java
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandlerOld.java
index 111c34c..2a5cb26 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandlerOld.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandlerOld.java
@@ -21,7 +21,7 @@
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Utils;
import org.wikipedia.WikipediaApp;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentInterface.java
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentInterface.java
index a8d99bc..10b33a5 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentInterface.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentInterface.java
@@ -1,6 +1,6 @@
package org.wikipedia.page.bottomcontent;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
public interface BottomContentInterface {
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/MainPageReadMoreTopicTask.java
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/MainPageReadMoreTopicTask.java
index 3b0e828..18cf0f2 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/MainPageReadMoreTopicTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/MainPageReadMoreTopicTask.java
@@ -5,7 +5,7 @@
import android.database.Cursor;
import android.os.RemoteException;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.concurrency.SaneAsyncTask;
import org.wikipedia.history.HistoryEntry;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
index 2e3887e..8c1fdcc 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
@@ -1,6 +1,6 @@
package org.wikipedia.page.gallery;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Site;
import org.wikipedia.ThemedActionBarActivity;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollection.java
b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollection.java
index b1a8a15..4c0fc51 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollection.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollection.java
@@ -1,6 +1,6 @@
package org.wikipedia.page.gallery;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollectionFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollectionFetchTask.java
index 696211c..eaf7c51 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollectionFetchTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollectionFetchTask.java
@@ -3,8 +3,8 @@
import org.json.JSONObject;
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.PageQueryTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageQueryTask;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import java.util.Map;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFetchTask.java
index d5e21a1..a5dc2bd 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFetchTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFetchTask.java
@@ -3,8 +3,8 @@
import org.json.JSONObject;
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.PageQueryTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageQueryTask;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
public class GalleryItemFetchTask extends PageQueryTask<GalleryItem> {
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java
index 53ad376..aeccb3f 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java
@@ -1,6 +1,6 @@
package org.wikipedia.page.gallery;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
import org.wikipedia.concurrency.SaneAsyncTask;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
index 9ad4500..04e9557 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -25,7 +25,7 @@
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Utils;
import org.wikipedia.ViewAnimations;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java
b/wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java
index 23a5e9a..58449f6 100755
---
a/wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java
@@ -2,7 +2,7 @@
import android.text.TextUtils;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.json.JSONException;
import org.json.JSONObject;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
b/wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
index e30e01d..e7509ca 100755
---
a/wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
@@ -1,6 +1,6 @@
package org.wikipedia.page.linkpreview;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Utils;
import org.wikipedia.WikipediaApp;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java
index 7f98e19..b059c4b 100755
---
a/wikipedia/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java
@@ -3,8 +3,8 @@
import org.json.JSONObject;
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.PageQueryTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageQueryTask;
+import org.wikipedia.page.PageTitle;
public class PreviewFetchTask extends PageQueryTask<LinkPreviewContents> {
private final PageTitle title;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
index cabb127..fceb212 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
@@ -6,7 +6,7 @@
import android.view.View;
import android.widget.ImageView;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
import org.wikipedia.analytics.ShareAFactFunnel;
diff --git
a/wikipedia/src/main/java/org/wikipedia/pagehistory/PageHistoryItem.java
b/wikipedia/src/main/java/org/wikipedia/pagehistory/PageHistoryItem.java
index e21a49a..d1c756a 100644
--- a/wikipedia/src/main/java/org/wikipedia/pagehistory/PageHistoryItem.java
+++ b/wikipedia/src/main/java/org/wikipedia/pagehistory/PageHistoryItem.java
@@ -2,7 +2,7 @@
import android.os.Parcel;
import android.os.Parcelable;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import java.util.Date;
diff --git
a/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
b/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
index 9f9854b..61c6541 100644
---
a/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
@@ -7,7 +7,7 @@
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
import org.wikipedia.ApiTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.Utils;
import org.wikipedia.WikipediaApp;
diff --git a/wikipedia/src/main/java/org/wikipedia/pageimages/PageImage.java
b/wikipedia/src/main/java/org/wikipedia/pageimages/PageImage.java
index 1ea7761..d67ab10 100644
--- a/wikipedia/src/main/java/org/wikipedia/pageimages/PageImage.java
+++ b/wikipedia/src/main/java/org/wikipedia/pageimages/PageImage.java
@@ -2,7 +2,7 @@
import android.os.Parcel;
import android.os.Parcelable;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
public class PageImage implements Parcelable {
public static final PageImagePersistenceHelper PERSISTENCE_HELPER = new
PageImagePersistenceHelper();
diff --git
a/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
b/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
index 071927b..5ae856f 100644
---
a/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
+++
b/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
@@ -2,7 +2,7 @@
import android.content.ContentValues;
import android.database.Cursor;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.data.PersistenceHelper;
diff --git
a/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagesTask.java
b/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagesTask.java
index e8f44e7..15ecc5a 100644
--- a/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagesTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagesTask.java
@@ -3,8 +3,8 @@
import org.json.JSONObject;
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.PageQueryTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageQueryTask;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import java.util.List;
diff --git
a/wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
b/wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
index b33f639..db12632 100644
--- a/wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
@@ -7,7 +7,7 @@
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
import org.wikipedia.ApiTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
public class RandomArticleIdTask extends ApiTask<PageTitle> {
diff --git a/wikipedia/src/main/java/org/wikipedia/random/RandomHandler.java
b/wikipedia/src/main/java/org/wikipedia/random/RandomHandler.java
index 3f79c7f..dc1124b 100644
--- a/wikipedia/src/main/java/org/wikipedia/random/RandomHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/random/RandomHandler.java
@@ -5,7 +5,7 @@
import android.util.Log;
import android.view.View;
import android.widget.Toast;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
index aa6a1cc..3320349 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
@@ -1,6 +1,6 @@
package org.wikipedia.savedpages;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.concurrency.SaneAsyncTask;
import org.wikipedia.page.Page;
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageUrlMapTask.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageUrlMapTask.java
index 63b6759..78e93a6 100644
---
a/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageUrlMapTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageUrlMapTask.java
@@ -1,7 +1,7 @@
package org.wikipedia.savedpages;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.concurrency.SaneAsyncTask;
/** To load the file with the image source URL mappings in the background. */
diff --git a/wikipedia/src/main/java/org/wikipedia/savedpages/SavePageTask.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavePageTask.java
index ea5490f..6abcac1 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavePageTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavePageTask.java
@@ -1,7 +1,7 @@
package org.wikipedia.savedpages;
import android.content.Context;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
import org.wikipedia.concurrency.SaneAsyncTask;
import org.wikipedia.page.Page;
diff --git a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPage.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPage.java
index 99ed6f0..0930500 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPage.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPage.java
@@ -4,7 +4,7 @@
import android.os.Parcelable;
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Utils;
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.Page;
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagePersistenceHelper.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagePersistenceHelper.java
index 8dad599..204f7cf 100644
---
a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagePersistenceHelper.java
+++
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagePersistenceHelper.java
@@ -2,7 +2,7 @@
import android.content.ContentValues;
import android.database.Cursor;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.data.PersistenceHelper;
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
index 1a39586..8387cb7 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
@@ -2,7 +2,7 @@
import org.json.JSONArray;
import org.wikipedia.ApiTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.Utils;
import org.wikipedia.WikipediaApp;
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 6f55d9b..0118293 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -1,7 +1,7 @@
package org.wikipedia.search;
import org.wikipedia.BackPressedHandler;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Utils;
import org.wikipedia.WikipediaApp;
diff --git a/wikipedia/src/main/java/org/wikipedia/search/SearchResults.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchResults.java
index cf1bc47..613fdfb 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchResults.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchResults.java
@@ -1,6 +1,6 @@
package org.wikipedia.search;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import java.util.ArrayList;
import java.util.List;
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchResultsFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchResultsFragment.java
index fa06f7a..0a0cb1e 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchResultsFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchResultsFragment.java
@@ -1,6 +1,6 @@
package org.wikipedia.search;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.ParcelableLruCache;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
diff --git a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
index 0bdb3bc..824d049 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
@@ -2,7 +2,7 @@
import org.json.JSONArray;
import org.wikipedia.ApiTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.Utils;
import org.wikipedia.WikipediaApp;
diff --git
a/wikipedia/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
b/wikipedia/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
index 27baa74..84dd82b 100644
---
a/wikipedia/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
+++
b/wikipedia/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
@@ -2,7 +2,7 @@
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.Utils;
import org.wikipedia.WikipediaApp;
diff --git
a/wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
b/wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
index e6c4de6..75bfe01 100644
--- a/wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
@@ -4,8 +4,8 @@
import org.json.JSONObject;
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.PageQueryTask;
-import org.wikipedia.PageTitle;
+import org.wikipedia.page.PageQueryTask;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.Utils;
--
To view, visit https://gerrit.wikimedia.org/r/210700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ed9770d7f68283e29fc6c067a2fd58f0db9c09d
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
