hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use dedicated methods for adding/removing doc materials

Browse Source
This commit is contained in:
SiboVG 2024-08-08 19:24:17 +02:00
parent de61ffe174
commit 09d6137ac0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/info/openrocket/core/preferences/DocumentPreferences.java
View File

@ -136,6 +136,10 @@ public class DocumentPreferences implements ChangeSource, ORPreferences {
getDatabase(material.getType()).add(material); getDatabase(material.getType()).add(material);
} }
public void removeMaterial(Material material) {
getDatabase(material.getType()).remove(material);
}
public int getMaterialCount(Material.Type type) { public int getMaterialCount(Material.Type type) {
return getDatabase(type).size(); return getDatabase(type).size();
} }

8
swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/MaterialEditPanel.java
View File

@ -161,7 +161,7 @@ public class MaterialEditPanel extends JPanel {
Databases.getDatabase(mat.getType()).add(mat); Databases.getDatabase(mat.getType()).add(mat);
} else { } else {
mat.setDocumentMaterial(true); mat.setDocumentMaterial(true);
document.getDocumentPreferences().getDatabase(mat.getType()).add(mat); document.getDocumentPreferences().addMaterial(mat);
} }
model.fireTableDataChanged(); model.fireTableDataChanged();
setButtonStates(); setButtonStates();
@ -205,7 +205,7 @@ public class MaterialEditPanel extends JPanel {
} }
if (m.isUserDefined()) { if (m.isUserDefined()) {
if (isDocumentMaterialPrior) { if (isDocumentMaterialPrior) {
document.getDocumentPreferences().getDatabase(m.getType()).remove(m); document.getDocumentPreferences().removeMaterial(m);
} else { } else {
Databases.getDatabase(m.getType()).remove(m); Databases.getDatabase(m.getType()).remove(m);
} }
@ -215,7 +215,7 @@ public class MaterialEditPanel extends JPanel {
Databases.getDatabase(mat.getType()).add(mat); Databases.getDatabase(mat.getType()).add(mat);
} else { } else {
mat.setDocumentMaterial(true); mat.setDocumentMaterial(true);
document.getDocumentPreferences().getDatabase(mat.getType()).add(mat); document.getDocumentPreferences().addMaterial(mat);
} }
model.fireTableDataChanged(); model.fireTableDataChanged();
setButtonStates(); setButtonStates();
@ -238,7 +238,7 @@ public class MaterialEditPanel extends JPanel {
if (!m.isUserDefined()) if (!m.isUserDefined())
return; return;
if (m.isDocumentMaterial()) { if (m.isDocumentMaterial()) {
document.getDocumentPreferences().getDatabase(m.getType()).remove(m); document.getDocumentPreferences().removeMaterial(m);
} else { } else {
Databases.getDatabase(m.getType()).remove(m); Databases.getDatabase(m.getType()).remove(m);
} }