diff --git a/src/main/java/cvbuilder/model/UserGroup.java b/src/main/java/cvbuilder/model/UserGroup.java index 7e2024e..75a18cd 100644 --- a/src/main/java/cvbuilder/model/UserGroup.java +++ b/src/main/java/cvbuilder/model/UserGroup.java @@ -4,14 +4,21 @@ import java.util.ArrayList; public class UserGroup { - private static ArrayList users; + private static UserGroup instance; + private ArrayList users; private UserGroup() { users = new ArrayList<>(); } + public static UserGroup getInstance() { + if (instance == null) { + instance = new UserGroup(); + } + return instance; + } - public static ArrayList getUsers() { + public ArrayList getUsers() { return users; } diff --git a/src/main/java/cvbuilder/view/MainViewer.java b/src/main/java/cvbuilder/view/MainViewer.java index dc0ee14..e80583c 100644 --- a/src/main/java/cvbuilder/view/MainViewer.java +++ b/src/main/java/cvbuilder/view/MainViewer.java @@ -5,10 +5,13 @@ import cvbuilder.model.UserGroup; import javax.swing.*; - public class MainViewer { + private UserGroup userGroup; + public MainViewer() { + userGroup = UserGroup.getInstance(); + JFrame viewer = new JFrame("CV Builder"); viewer.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); viewer.setSize(800, 500); @@ -65,13 +68,14 @@ public class MainViewer { ButtonGroup group = new ButtonGroup(); String panelName = panel.getName(); - for (User user : UserGroup.getUsers()) { + for (User user : userGroup.getUsers()) { JRadioButton radioButton = new JRadioButton(user.getUserAttribute(panelName)); group.add(radioButton); panel.add(radioButton); } } - - -} + public static void main(String[] args) { + SwingUtilities.invokeLater(MainViewer::new); + } +} \ No newline at end of file