andrew
/
EntityRelationMappingEditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugs in attribute adding action and saving.

This commit is contained in:
Andrew Lalis 2021-02-08 18:08:10 +01:00
parent 592bbbb769
commit cac3381c54
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/nl/andrewlalis/erme/control/actions/edits/AddAttributeAction.java
View File

@ -56,6 +56,7 @@ public class AddAttributeAction extends AbstractAction {
Stream.iterate(0, n -> n + 1).limit(r.getAttributes().size() + 1).toArray(), Stream.iterate(0, n -> n + 1).limit(r.getAttributes().size() + 1).toArray(),
r.getAttributes().size() r.getAttributes().size()
); );
if (index == null) return;
AttributeType type = (AttributeType) JOptionPane.showInputDialog( AttributeType type = (AttributeType) JOptionPane.showInputDialog(
c, c,
"Select the type this attribute is.", "Select the type this attribute is.",
@ -65,12 +66,16 @@ public class AddAttributeAction extends AbstractAction {
AttributeType.values(), AttributeType.values(),
AttributeType.PLAIN AttributeType.PLAIN
); );
boolean shouldUseForeignKey = JOptionPane.showConfirmDialog( if (type == null) return;
boolean shouldUseForeignKey = ((String) JOptionPane.showInputDialog(
c, c,
"Is this attribute a foreign key?", "Is this attribute a foreign key?",
"Foreign Key", "Foreign Key",
JOptionPane.YES_NO_OPTION JOptionPane.PLAIN_MESSAGE,
) == JOptionPane.YES_OPTION; null,
new String[]{"Yes", "No"},
"No"
)).equalsIgnoreCase("yes");
if (shouldUseForeignKey) { if (shouldUseForeignKey) {
if (this.model.getRelations().size() < 2) { if (this.model.getRelations().size() < 2) {
JOptionPane.showMessageDialog(c, "There should be at least 2 relations present in the model.", "Not Enough Relations", JOptionPane.WARNING_MESSAGE); JOptionPane.showMessageDialog(c, "There should be at least 2 relations present in the model.", "Not Enough Relations", JOptionPane.WARNING_MESSAGE);
@ -85,7 +90,8 @@ public class AddAttributeAction extends AbstractAction {
this.model.getRelations().toArray(new Relation[0]), this.model.getRelations().toArray(new Relation[0]),
this.model.getRelations().stream().findFirst().orElse(null) this.model.getRelations().stream().findFirst().orElse(null)
); );
List<Attribute> eligibleAttributes = fkRelation.getReferencableAttributes(); if (fkRelation == null) return;
List<Attribute> eligibleAttributes = fkRelation.getAttributes();
if (eligibleAttributes.isEmpty()) { if (eligibleAttributes.isEmpty()) {
JOptionPane.showMessageDialog(c, "There are no referencable attributes in the selected relation.", "No Referencable Attributes", JOptionPane.WARNING_MESSAGE); JOptionPane.showMessageDialog(c, "There are no referencable attributes in the selected relation.", "No Referencable Attributes", JOptionPane.WARNING_MESSAGE);
return; return;

2
src/main/java/nl/andrewlalis/erme/model/Attribute.java
View File

@ -15,7 +15,7 @@ public class Attribute implements Serializable {
private AttributeType type; private AttributeType type;
private String name; private String name;
private AttributeViewModel viewModel; private transient AttributeViewModel viewModel;
public Attribute(Relation relation, AttributeType type, String name) { public Attribute(Relation relation, AttributeType type, String name) {
this.relation = relation; this.relation = relation;