Skip to content

Commit 7bb081b

Browse files
committed
[O] Rename Plugin to PluginModel to avoid naming conflic
1 parent c87a3db commit 7bb081b

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

src/main/java/org/hydev/mcpm/client/database/DatabaseLoader.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.hydev.mcpm.client.database;
22

3-
import org.hydev.mcpm.client.models.Plugin;
3+
import org.hydev.mcpm.client.models.PluginModel;
44

5-
import javax.xml.crypto.Data;
6-
import java.io.File;
75
import java.util.HashMap;
86
import java.util.List;
97
import java.util.Map;
@@ -17,13 +15,13 @@
1715
public class DatabaseLoader
1816
{
1917
/** Name index: map[lower-cased name] = Plugin of that name */
20-
private final Map<String, Plugin> nameIndex;
18+
private final Map<String, PluginModel> nameIndex;
2119

2220
/** Keyword index: map[lower keyword] = List[plugins that contain the keyword either in name or description] */
23-
private final Map<String, List<Plugin>> keywordIndex;
21+
private final Map<String, List<PluginModel>> keywordIndex;
2422

2523
/** Command index: map[lower command name/alias] = List[plugins that provide the command or alias] */
26-
private final Map<String, List<Plugin>> commandIndex;
24+
private final Map<String, List<PluginModel>> commandIndex;
2725

2826
/**
2927
* Load database, create index for faster searching through the database
@@ -46,7 +44,7 @@ public DatabaseLoader(String path)
4644
* @param name Name of the plugin
4745
* @return Plugin of that name, or null if not found
4846
*/
49-
public Plugin findByName(String name)
47+
public PluginModel findByName(String name)
5048
{
5149
// TODO: Implement this
5250
throw new UnsupportedOperationException("TODO");
@@ -65,7 +63,7 @@ public Plugin findByName(String name)
6563
* @param keyword Keyword
6664
* @return List of packages matching the keyword, or empty list
6765
*/
68-
public List<Plugin> searchByKeyword(String keyword)
66+
public List<PluginModel> searchByKeyword(String keyword)
6967
{
7068
// TODO: Implement this
7169
throw new UnsupportedOperationException("TODO");
@@ -77,7 +75,7 @@ public List<Plugin> searchByKeyword(String keyword)
7775
* @param command Command name
7876
* @return Plugins that provides the command, or empty list
7977
*/
80-
public List<Plugin> searchByCommand(String command)
78+
public List<PluginModel> searchByCommand(String command)
8179
{
8280
// TODO: Implement this
8381
throw new UnsupportedOperationException("TODO");

src/main/java/org/hydev/mcpm/client/database/LocalPluginTracker.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.hydev.mcpm.client.database;
22

3-
import org.hydev.mcpm.client.models.Plugin;
43
import org.hydev.mcpm.client.models.PluginVersion;
54

65
import java.io.File;

src/main/java/org/hydev/mcpm/client/models/Plugin.java renamed to src/main/java/org/hydev/mcpm/client/models/PluginModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @author Azalea (https://github.com/hykilpikonna)
1818
* @since 2022-09-27
1919
*/
20-
public record Plugin(
20+
public record PluginModel(
2121
String name,
2222
String desc,
2323
String url,

0 commit comments

Comments
 (0)