fix mapping stats filtering

QuiltMC · Sep 13, 2024 · 26dc451 · 26dc451
1 parent 6f1fcf2
commit 26dc451
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/dialog/StatsDialog.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/dialog/StatsDialog.java
@@ -95,10 +95,11 @@ public static void show(Gui gui, ProjectStatsResult result, String packageName)
 		filterButton.addActionListener(action -> {
 			dialog.dispose();
 			ProgressDialog.runOffThread(gui, listener -> {
+				String topLevelPackageSlashes = topLevelPackage.getText().replace('.', '/');
 				Config.main().stats.lastTopLevelPackage.setValue(topLevelPackage.getText(), true);
 
-				ProjectStatsResult projectResult = gui.getController().getStatsGenerator().getResult(EditableType.toStatTypes(gui.getEditableTypes()), syntheticParametersOption.isSelected()).filter(Config.main().stats.lastTopLevelPackage.value());
-				SwingUtilities.invokeLater(() -> show(gui, projectResult, Config.main().stats.lastTopLevelPackage.value()));
+				ProjectStatsResult projectResult = gui.getController().getStatsGenerator().getResult(EditableType.toStatTypes(gui.getEditableTypes()), syntheticParametersOption.isSelected()).filter(topLevelPackageSlashes);
+				SwingUtilities.invokeLater(() -> show(gui, projectResult, topLevelPackageSlashes));
 			});
 		});
 		contentPane.add(filterButton, cb1.pos(0, result.getOverall().getTypes().size() + 3).anchor(GridBagConstraints.EAST).build());

diff --git a/enigma/src/main/java/org/quiltmc/enigma/api/stats/StatsResult.java b/enigma/src/main/java/org/quiltmc/enigma/api/stats/StatsResult.java
@@ -72,11 +72,12 @@ public Set<StatType> getTypes() {
 
 	/**
 	 * Builds a tree representation of this stats result.
-	 * @param topLevelPackageDot the top level package, separated by dots
+	 * @param topLevelPackage the top level package
 	 * @param includedTypes the types to include in the tree
 	 * @return the tree
 	 */
-	public StatsTree<Integer> buildTree(String topLevelPackageDot, Set<StatType> includedTypes) {
+	public StatsTree<Integer> buildTree(String topLevelPackage, Set<StatType> includedTypes) {
+		topLevelPackage = topLevelPackage.replace('/', '.');
 		StatsTree<Integer> tree = new StatsTree<>();
 
 		for (Map.Entry<StatType, Map<String, Integer>> typedEntry : this.unmappedTreeData.entrySet()) {
@@ -85,7 +86,7 @@ public StatsTree<Integer> buildTree(String topLevelPackageDot, Set<StatType> inc
 			}
 
 			for (Map.Entry<String, Integer> entry : typedEntry.getValue().entrySet()) {
-				if (entry.getKey().startsWith(topLevelPackageDot)) {
+				if (entry.getKey().startsWith(topLevelPackage)) {
 					StatsTree.Node<Integer> node = tree.getNode(entry.getKey());
 					int value = node.getValue() == null ? 0 : node.getValue();