Skip to content

Commit e369b0c

Browse files
leewyattleewyatt
committed
Change DataRepository2 references to DataRepository
Renamed all instances of DataRepository2 to DataRepository across the project. This change aligns with the recent updates in the jfxcentral-data project, where DataRepository2 was deprecated and renamed to DataRepository. This update ensures consistency with the latest project structure and removes references to the now-obsolete DataRepository2.
1 parent 91c85b7 commit e369b0c

File tree

95 files changed

+254
-254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+254
-254
lines changed

‎app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2App.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.dlsc.jfxcentral2.app;
22

33
import com.dlsc.gemsfx.util.StageManager;
4-
import com.dlsc.jfxcentral.data.DataRepository2;
4+
import com.dlsc.jfxcentral.data.DataRepository;
55
import com.dlsc.jfxcentral.data.model.Blog;
66
import com.dlsc.jfxcentral.data.model.Book;
77
import com.dlsc.jfxcentral.data.model.Company;
@@ -328,7 +328,7 @@ private Response createResponse(Request request, Class<? extends ModelObject> cl
328328
int index = request.getPath().lastIndexOf("/");
329329
if (index > 0) {
330330
String id = request.getPath().substring(index + 1).trim();
331-
if (!DataRepository2.getInstance().isValidId(clazz, id)) {
331+
if (!DataRepository.getInstance().isValidId(clazz, id)) {
332332
return Response.view(new ErrorPage(size, request));
333333
}
334334

@@ -360,7 +360,7 @@ private Route createIconPackOrDetailRoute(String path) {
360360
String ikonliPackId = parts[1];
361361
String iconDescription = parts[2];
362362

363-
return DataRepository2.getInstance().getIkonliPackById(ikonliPackId)
363+
return DataRepository.getInstance().getIkonliPackById(ikonliPackId)
364364
.flatMap(ikonliPack -> IkonliPackUtil.getInstance().getIkon(ikonliPack, iconDescription)
365365
.map(ikon -> {
366366
IconInfo iconInfo = new IconInfoBuilder(ikon, ikonliPack.getName(), ikonliPackId).build();

‎app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2MobileApp.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Blog;
55
import com.dlsc.jfxcentral.data.model.Book;
66
import com.dlsc.jfxcentral.data.model.Company;
@@ -220,7 +220,7 @@ private MobileRoute createCategoryOrDetailRoute(String path, Class<? extends Mod
220220
int index = url.lastIndexOf("/");
221221
if (index > 0 && clazz != null) {
222222
String id = url.substring(index + 1).trim();
223-
if (!DataRepository2.getInstance().isValidId(clazz, id)) {
223+
if (!DataRepository.getInstance().isValidId(clazz, id)) {
224224
return MobileResponse.view(url, new Label("Error: 404"));
225225
}
226226
return MobileResponse.view(url, detailedResponse.call(id));

‎app/src/main/java/com/dlsc/jfxcentral2/app/RepositoryManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral2.utils.LOGGER;
55
import com.dlsc.jfxcentral2.utils.OSUtil;
66
import javafx.application.Platform;
@@ -62,7 +62,7 @@ public static void updateRepository(ProgressMonitor monitor) {
6262
}
6363

6464
private static File getRepositoryDirectory() {
65-
return DataRepository2.getRepositoryDirectory();
65+
return DataRepository.getInstance().getRepositoryDirectory();
6666
}
6767

6868
public static boolean isFirstTimeSetup() {

‎app/src/main/java/com/dlsc/jfxcentral2/app/TrayIconManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Documentation;
55
import com.dlsc.jfxcentral.data.model.ModelObject;
66
import com.dlsc.jfxcentral2.utils.LOGGER;
@@ -76,7 +76,7 @@ public void refresh() {
7676
Menu utilities = new Menu("Utilities");
7777
Menu documentation = new Menu("Documentation");
7878

79-
DataRepository2 repository = DataRepository2.getInstance();
79+
DataRepository repository = DataRepository.getInstance();
8080

8181
repository.getTools().stream().sorted(Comparator.comparing(ModelObject::getName)).forEach(mo -> createMenuItem(tools, mo));
8282
repository.getPeople().stream().sorted(Comparator.comparing(ModelObject::getName)).forEach(mo -> createMenuItem(people, mo));

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/DetailsPageBase.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Blog;
55
import com.dlsc.jfxcentral.data.model.Book;
66
import com.dlsc.jfxcentral.data.model.Company;
@@ -51,7 +51,7 @@ public abstract class DetailsPageBase<T extends ModelObject> extends PageBase {
5151

5252
public DetailsPageBase(ObjectProperty<Size> size, Class<? extends T> clazz, String itemId) {
5353
super(size, Mode.DARK);
54-
setItem(DataRepository2.getInstance().getByID(clazz, itemId));
54+
setItem(DataRepository.getInstance().getByID(clazz, itemId));
5555
}
5656

5757
public T getItem() {
@@ -120,7 +120,7 @@ private <MO extends ModelObject> void maybeAddBox(ModelObject modelObject, Class
120120
return;
121121
}
122122

123-
List<MO> linkedObjects = DataRepository2.getInstance().getLinkedObjects(modelObject, clazz);
123+
List<MO> linkedObjects = DataRepository.getInstance().getLinkedObjects(modelObject, clazz);
124124
if (!linkedObjects.isEmpty()) {
125125
DetailsBoxBase<MO> box = boxSupplier.get();
126126
box.getItems().setAll(linkedObjects);
@@ -130,9 +130,9 @@ private <MO extends ModelObject> void maybeAddBox(ModelObject modelObject, Class
130130
}
131131

132132
private void addLearnBox(ModelObject modelObject, List<DetailsBoxBase<?>> boxList) {
133-
List<LearnJavaFX> fxList = DataRepository2.getInstance().getLinkedObjects(modelObject, LearnJavaFX.class);
134-
List<LearnMobile> mobileList = DataRepository2.getInstance().getLinkedObjects(modelObject, LearnMobile.class);
135-
List<LearnRaspberryPi> learnRaspberryPiList = DataRepository2.getInstance().getLinkedObjects(modelObject, LearnRaspberryPi.class);
133+
List<LearnJavaFX> fxList = DataRepository.getInstance().getLinkedObjects(modelObject, LearnJavaFX.class);
134+
List<LearnMobile> mobileList = DataRepository.getInstance().getLinkedObjects(modelObject, LearnMobile.class);
135+
List<LearnRaspberryPi> learnRaspberryPiList = DataRepository.getInstance().getLinkedObjects(modelObject, LearnRaspberryPi.class);
136136
if (!fxList.isEmpty() || !mobileList.isEmpty() || !learnRaspberryPiList.isEmpty()) {
137137
LearnDetailBox box = new LearnDetailBox();
138138
box.getItems().setAll(fxList);

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/LinksOfTheWeekPage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.LinksOfTheWeek;
55
import com.dlsc.jfxcentral2.components.DetailsContentPane;
66
import com.dlsc.jfxcentral2.components.LinksOfTheWeekView;
@@ -67,7 +67,7 @@ public Node content() {
6767

6868
// links of the week view
6969
LinksOfTheWeekView linksOfTheWeekView = new LinksOfTheWeekView();
70-
linksOfTheWeekView.getLinksOfTheWeeks().setAll(DataRepository2.getInstance().getLinksOfTheWeek());
70+
linksOfTheWeekView.getLinksOfTheWeeks().setAll(DataRepository.getInstance().getLinksOfTheWeek());
7171
linksOfTheWeekView.sizeProperty().bind(sizeProperty());
7272

7373
// this is a category page, but we still need to use the details content pane for layout purposes
@@ -130,7 +130,7 @@ private HBox createPaginationBox(LinksOfTheWeekView linksOfTheWeekView) {
130130

131131
@Override
132132
protected ObservableList<LinksOfTheWeek> getCategoryItems() {
133-
return FXCollections.observableArrayList(DataRepository2.getInstance().getLinksOfTheWeek());
133+
return FXCollections.observableArrayList(DataRepository.getInstance().getLinksOfTheWeek());
134134
}
135135

136136
@Override
@@ -144,7 +144,7 @@ protected SearchFilterView<LinksOfTheWeek> createSearchFilterView() {
144144
}
145145

146146
protected List<MenuView.Item> createMenuItems(LinksOfTheWeekView linksOfTheWeekView) {
147-
List<LinksOfTheWeek> linksOfTheWeek = DataRepository2.getInstance().getLinksOfTheWeek();
147+
List<LinksOfTheWeek> linksOfTheWeek = DataRepository.getInstance().getLinksOfTheWeek();
148148
List<LinksOfTheWeek> weeks = new ArrayList<>(linksOfTheWeek);
149149

150150
return weeks

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/StartPage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.LinksOfTheWeek;
55
import com.dlsc.jfxcentral2.components.HomePageTopView;
66
import com.dlsc.jfxcentral2.components.Mode;
@@ -38,7 +38,7 @@ public Node content() {
3838
homePageTopView.sizeProperty().bind(sizeProperty());
3939

4040
// links of the Week
41-
List<LinksOfTheWeek> linksOfTheWeek = DataRepository2.getInstance().getLinksOfTheWeek();
41+
List<LinksOfTheWeek> linksOfTheWeek = DataRepository.getInstance().getLinksOfTheWeek();
4242

4343
WeekLinksLiteView weekLinksLiteView = new WeekLinksLiteView();
4444
weekLinksLiteView.sizeProperty().bind(sizeProperty());
@@ -56,7 +56,7 @@ public Node content() {
5656
// video gallery
5757
VideoGalleryView videoGallery = new VideoGalleryView();
5858
videoGallery.sizeProperty().bind(sizeProperty());
59-
videoGallery.getVideos().setAll(randomSubList(DataRepository2.getInstance().getVideos(), 12));
59+
videoGallery.getVideos().setAll(randomSubList(DataRepository.getInstance().getVideos(), 12));
6060
videoGallery.blockingProperty().addListener(it -> setBlocking(videoGallery.isBlocking()));
6161
videoGallery.onCloseGlassPaneProperty().addListener(it -> setOnCloseGlassPane(videoGallery.getOnCloseGlassPane()));
6262
return wrapContent(homePageTopView, weekLinksLiteView, websiteChangesView, videoGallery);

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/TeamPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral2.components.FeaturesContainer;
55
import com.dlsc.jfxcentral2.components.Mode;
66
import com.dlsc.jfxcentral2.components.StripView;
@@ -39,7 +39,7 @@ public Node content() {
3939
// team view
4040
TeamView teamView = new TeamView();
4141
teamView.sizeProperty().bind(sizeProperty());
42-
teamView.getMembers().setAll(DataRepository2.getInstance().getMembers());
42+
teamView.getMembers().setAll(DataRepository.getInstance().getMembers());
4343

4444
// features
4545
FeaturesContainer featuresContainer = new FeaturesContainer();

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/BlogsCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Blog;
55
import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
66
import com.dlsc.jfxcentral2.components.filters.BlogsFilterView;
@@ -63,6 +63,6 @@ protected SearchFilterView<Blog> createSearchFilterView() {
6363

6464
@Override
6565
protected ObservableList<Blog> getCategoryItems() {
66-
return FXCollections.observableArrayList(DataRepository2.getInstance().getBlogs());
66+
return FXCollections.observableArrayList(DataRepository.getInstance().getBlogs());
6767
}
6868
}

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/BooksCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Book;
55
import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
66
import com.dlsc.jfxcentral2.components.filters.BooksFilterView;
@@ -61,6 +61,6 @@ protected SearchFilterView<Book> createSearchFilterView() {
6161

6262
@Override
6363
protected ObservableList<Book> getCategoryItems() {
64-
return FXCollections.observableArrayList(DataRepository2.getInstance().getBooks());
64+
return FXCollections.observableArrayList(DataRepository.getInstance().getBooks());
6565
}
6666
}

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/CompaniesCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Company;
55
import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
66
import com.dlsc.jfxcentral2.components.filters.CompaniesFilterView;
@@ -58,6 +58,6 @@ protected SearchFilterView<Company> createSearchFilterView() {
5858

5959
@Override
6060
protected ObservableList<Company> getCategoryItems() {
61-
return FXCollections.observableArrayList(DataRepository2.getInstance().getCompanies());
61+
return FXCollections.observableArrayList(DataRepository.getInstance().getCompanies());
6262
}
6363
}

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/DocumentationCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Documentation;
55
import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
66
import com.dlsc.jfxcentral2.components.filters.DocumentationFilterView;
@@ -63,6 +63,6 @@ protected SearchFilterView<Documentation> createSearchFilterView() {
6363

6464
@Override
6565
protected ObservableList<Documentation> getCategoryItems() {
66-
return FXCollections.observableArrayList(DataRepository2.getInstance().getDocumentation());
66+
return FXCollections.observableArrayList(DataRepository.getInstance().getDocumentation());
6767
}
6868
}

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/DownloadsCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Download;
55
import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
66
import com.dlsc.jfxcentral2.components.DownloadsBox;
@@ -63,7 +63,7 @@ protected SearchFilterView<Download> createSearchFilterView() {
6363

6464
@Override
6565
protected ObservableList<Download> getCategoryItems() {
66-
return FXCollections.observableArrayList(DataRepository2.getInstance().getDownloads());
66+
return FXCollections.observableArrayList(DataRepository.getInstance().getDownloads());
6767
}
6868

6969
@Override

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnJavaFXCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Learn;
55
import com.dlsc.jfxcentral2.model.Size;
66
import javafx.beans.property.ObjectProperty;
@@ -35,7 +35,7 @@ protected String getCategoryDescription() {
3535

3636
@Override
3737
protected ObservableList<Learn> getCategoryItems() {
38-
return FXCollections.observableArrayList(DataRepository2.getInstance().getLearnJavaFX());
38+
return FXCollections.observableArrayList(DataRepository.getInstance().getLearnJavaFX());
3939
}
4040

4141
}

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnMobileCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Learn;
55
import com.dlsc.jfxcentral2.model.Size;
66
import javafx.beans.property.ObjectProperty;
@@ -36,6 +36,6 @@ protected String getCategoryDescription() {
3636

3737
@Override
3838
protected ObservableList<Learn> getCategoryItems() {
39-
return FXCollections.observableArrayList(DataRepository2.getInstance().getLearnMobile());
39+
return FXCollections.observableArrayList(DataRepository.getInstance().getLearnMobile());
4040
}
4141
}

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnRaspberryPiCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Learn;
55
import com.dlsc.jfxcentral2.model.Size;
66
import javafx.beans.property.ObjectProperty;
@@ -36,6 +36,6 @@ protected String getCategoryDescription() {
3636

3737
@Override
3838
protected ObservableList<Learn> getCategoryItems() {
39-
return FXCollections.observableArrayList(DataRepository2.getInstance().getLearnRaspberryPi());
39+
return FXCollections.observableArrayList(DataRepository.getInstance().getLearnRaspberryPi());
4040
}
4141
}

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LibrariesCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Library;
55
import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
66
import com.dlsc.jfxcentral2.components.filters.LibrariesFilterView;
@@ -67,6 +67,6 @@ protected SearchFilterView<Library> createSearchFilterView() {
6767

6868
@Override
6969
protected ObservableList<Library> getCategoryItems() {
70-
return FXCollections.observableArrayList(DataRepository2.getInstance().getLibraries());
70+
return FXCollections.observableArrayList(DataRepository.getInstance().getLibraries());
7171
}
7272
}

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/PeopleCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Person;
55
import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
66
import com.dlsc.jfxcentral2.components.filters.PeopleFilterView;
@@ -77,6 +77,6 @@ protected SearchFilterView<Person> createSearchFilterView() {
7777

7878
@Override
7979
protected ObservableList<Person> getCategoryItems() {
80-
return FXCollections.observableArrayList(DataRepository2.getInstance().getPeople());
80+
return FXCollections.observableArrayList(DataRepository.getInstance().getPeople());
8181
}
8282
}

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/ShowcasesCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.RealWorldApp;
55
import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
66
import com.dlsc.jfxcentral2.components.filters.SearchFilterView;
@@ -58,6 +58,6 @@ protected SearchFilterView<RealWorldApp> createSearchFilterView() {
5858

5959
@Override
6060
protected ObservableList<RealWorldApp> getCategoryItems() {
61-
return FXCollections.observableArrayList(DataRepository2.getInstance().getRealWorldApps());
61+
return FXCollections.observableArrayList(DataRepository.getInstance().getRealWorldApps());
6262
}
6363
}

‎app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/TipCategoryPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dlsc.jfxcentral2.app.pages.category;
22

3-
import com.dlsc.jfxcentral.data.DataRepository2;
3+
import com.dlsc.jfxcentral.data.DataRepository;
44
import com.dlsc.jfxcentral.data.model.Tip;
55
import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
66
import com.dlsc.jfxcentral2.components.filters.SearchFilterView;
@@ -58,6 +58,6 @@ protected SearchFilterView<Tip> createSearchFilterView() {
5858

5959
@Override
6060
protected ObservableList<Tip> getCategoryItems() {
61-
return FXCollections.observableArrayList(DataRepository2.getInstance().getTips());
61+
return FXCollections.observableArrayList(DataRepository.getInstance().getTips());
6262
}
6363
}

0 commit comments

Comments
 (0)