diff --git a/src/UMLClassView.java b/src/UMLClassView.java index 770f325..6ee7527 100644 --- a/src/UMLClassView.java +++ b/src/UMLClassView.java @@ -101,7 +101,7 @@ public class UMLClassView { @Override public void keyReleased(KeyEvent e) { - UMLManager.setDefaultEncapsulation(defaultEncapsulationField.getText() + " "); + manager.setDefaultEncapsulation(defaultEncapsulationField.getText() + " "); refreshTextArea(); } }); diff --git a/src/UMLField.java b/src/UMLField.java index f576a88..fae3706 100644 --- a/src/UMLField.java +++ b/src/UMLField.java @@ -32,7 +32,7 @@ public class UMLField { default -> "[undefined] "; }; } else { - this.encapsulation = UMLManager.DEFAULT_ENCAPSULATION; + this.encapsulation = manager.getDefaultEncapsulation(); } this.name = formattedSplit[2]; diff --git a/src/UMLManager.java b/src/UMLManager.java index a49f887..a933e76 100644 --- a/src/UMLManager.java +++ b/src/UMLManager.java @@ -8,7 +8,7 @@ import java.util.ArrayList; */ public class UMLManager { - public static String DEFAULT_ENCAPSULATION = ""; + private String defaultEncapsulation = ""; private UMLClassView view; private boolean showWatermark; private boolean getSetAuto; @@ -87,7 +87,13 @@ public class UMLManager { this.ignoreEcapsulation = ignoreEcapsulation; } - public static void setDefaultEncapsulation(String defaultEncapsulation) { - DEFAULT_ENCAPSULATION = defaultEncapsulation; + public void setDefaultEncapsulation(String defaultEncapsulation) { + this.defaultEncapsulation = defaultEncapsulation; } + + public String getDefaultEncapsulation() { + return defaultEncapsulation; + } + + } diff --git a/src/UMLMethod.java b/src/UMLMethod.java index 450af9c..ffdd628 100644 --- a/src/UMLMethod.java +++ b/src/UMLMethod.java @@ -41,8 +41,8 @@ public class UMLMethod { default -> "[undefined] "; }; } else { - this.encapsulation = UMLManager.DEFAULT_ENCAPSULATION; - System.out.println(UMLManager.DEFAULT_ENCAPSULATION); + this.encapsulation = manager.getDefaultEncapsulation(); + System.out.println(manager.getDefaultEncapsulation()); } this.name = parts[2];