Skip to content

Commit c1344eb

Browse files
Windchild292Windchild292
authored
Merge pull request #1716 from Windchild292/dev_Windchild_PersonAwardController
Fixing PersonAwardController's Visibility
2 parents e46b798 + 59fae87 commit c1344eb

File tree

7 files changed

+49
-43
lines changed

7 files changed

+49
-43
lines changed

‎MekHQ/src/mekhq/campaign/log/AwardLogger.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ public static Award getAwardFromLogEntry(Person person, String logEntryText){
6161
Award award = null;
6262

6363
if(matcher.matches()){
64-
award = person.awardController.getAward(matcher.group(2), matcher.group(1));
64+
award = person.getAwardController().getAward(matcher.group(2), matcher.group(1));
6565
}
6666
// In a first implementation, the award Set was not included in the log, so it is impossible to distinguish
6767
// awards with same name but in different set. So it assumes it is the first it finds, using the old message format.
6868
else{
6969
pattern = Pattern.compile("Awarded (.*): (.*)");
7070
matcher = pattern.matcher(logEntryText);
7171
if(matcher.matches()){
72-
award = person.awardController.getFirstAwardIgnoringSet(matcher.group(1));
72+
award = person.getAwardController().getFirstAwardIgnoringSet(matcher.group(1));
7373
}
7474
}
7575
return award;

‎MekHQ/src/mekhq/campaign/personnel/Award.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public boolean canBeAwarded(Person person){
203203
// If we wish to force the user to not be able to give awards for some reason (e.g. lack of kill count),
204204
// we need to create classes for each awards and override this method.
205205

206-
return (!person.awardController.hasAward(this) || stackable);
206+
return (!person.getAwardController().hasAward(this) || stackable);
207207
}
208208

209209
/**

‎MekHQ/src/mekhq/campaign/personnel/Person.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public class Person implements Serializable, MekHqXmlSerializable {
122122
private static final Map<Integer, Money> MECHWARRIOR_AERO_RANSOM_VALUES;
123123
private static final Map<Integer, Money> OTHER_RANSOM_VALUES;
124124

125-
public PersonAwardController awardController;
125+
private PersonAwardController awardController;
126126

127127
//region Family Variables
128128
// Lineage
@@ -1953,9 +1953,9 @@ public void writeToXml(PrintWriter pw1, int indent) {
19531953
}
19541954
MekHqXmlUtil.writeSimpleXMLCloseIndentedLine(pw1, indent + 1, "missionLog");
19551955
}
1956-
if (!awardController.getAwards().isEmpty()) {
1956+
if (!getAwardController().getAwards().isEmpty()) {
19571957
MekHqXmlUtil.writeSimpleXMLOpenIndentedLine(pw1, indent + 1, "awards");
1958-
for (Award award : awardController.getAwards()) {
1958+
for (Award award : getAwardController().getAwards()) {
19591959
award.writeToXml(pw1, indent + 2);
19601960
}
19611961
MekHqXmlUtil.writeSimpleXMLCloseIndentedLine(pw1, indent + 1, "awards");
@@ -3146,6 +3146,12 @@ public int getCostToImprove(String skillName) {
31463146
}
31473147
//endregion skill
31483148

3149+
//region Awards
3150+
public PersonAwardController getAwardController() {
3151+
return awardController;
3152+
}
3153+
//endregion Awards
3154+
31493155
public int getHits() {
31503156
return hits;
31513157
}

‎MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -505,16 +505,16 @@ public void actionPerformed(ActionEvent action) {
505505
}
506506
case CMD_ADD_AWARD: {
507507
for (Person person : people) {
508-
person.awardController.addAndLogAward(data[1], data[2], gui.getCampaign().getDate());
508+
person.getAwardController().addAndLogAward(data[1], data[2], gui.getCampaign().getDate());
509509
}
510510
break;
511511
}
512512
case CMD_RMV_AWARD: {
513513
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
514514
for (Person person : people) {
515515
try {
516-
if (person.awardController.hasAward(data[1], data[2])) {
517-
person.awardController.removeAward(data[1], data[2],
516+
if (person.getAwardController().hasAward(data[1], data[2])) {
517+
person.getAwardController().removeAward(data[1], data[2],
518518
(data.length > 3) ? df.parse(data[3]) : null, gui.getCampaign().getDate());
519519
}
520520
} catch (Exception e) {
@@ -2009,7 +2009,7 @@ private void maybeShowPopup(MouseEvent e) {
20092009
JMenu removeAwardMenu = new JMenu(resourceMap.getString("removeAward.text"));
20102010

20112011
if (oneSelected) {
2012-
for (Award award : person.awardController.getAwards()) {
2012+
for (Award award : person.getAwardController().getAwards()) {
20132013
JMenu singleAwardMenu = new JMenu(award.getName());
20142014
for (String date : award.getFormatedDates()) {
20152015
JMenuItem specificAwardMenu = new JMenuItem(date);
@@ -2028,7 +2028,7 @@ private void maybeShowPopup(MouseEvent e) {
20282028
}
20292029
});
20302030
for (Person p : selected) {
2031-
awards.addAll(p.awardController.getAwards());
2031+
awards.addAll(p.getAwardController().getAwards());
20322032
}
20332033

20342034
for (Award award : awards) {

‎MekHQ/src/mekhq/gui/utilities/StaticChecks.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ public static boolean areAllEligible(Person[] people) {
571571
*/
572572
public static boolean doAnyHaveAnAward(Person[] people) {
573573
for (Person person : people) {
574-
if (person.awardController.hasAwards()) {
574+
if (person.getAwardController().hasAwards()) {
575575
return true;
576576
}
577577
}

‎MekHQ/src/mekhq/gui/view/PersonViewPanel.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ private void initComponents() {
154154
gridy++;
155155
}
156156

157-
if (person.awardController.hasAwards()) {
158-
if (person.awardController.hasAwardsWithRibbons()) {
157+
if (person.getAwardController().hasAwards()) {
158+
if (person.getAwardController().hasAwardsWithRibbons()) {
159159
Box boxRibbons = drawRibbons();
160160

161161
GridBagConstraints gbc_pnlAllRibbons = new GridBagConstraints();
@@ -171,21 +171,21 @@ private void initComponents() {
171171
pnlAllAwards.setLayout(new BoxLayout(pnlAllAwards, BoxLayout.PAGE_AXIS));
172172
pnlAllAwards.setBorder(BorderFactory.createTitledBorder(resourceMap.getString("pnlAwards.title")));
173173

174-
if (person.awardController.hasAwardsWithMedals()) {
174+
if (person.getAwardController().hasAwardsWithMedals()) {
175175
JPanel pnlMedals = drawMedals();
176176
pnlMedals.setName("pnlMedals");
177177
pnlMedals.setLayout(new WrapLayout(FlowLayout.LEFT));
178178
pnlAllAwards.add(pnlMedals);
179179
}
180180

181-
if (person.awardController.hasAwardsWithMiscs()) {
181+
if (person.getAwardController().hasAwardsWithMiscs()) {
182182
JPanel pnlMiscAwards = drawMiscAwards();
183183
pnlMiscAwards.setName("pnlMiscAwards");
184184
pnlMiscAwards.setLayout(new WrapLayout(FlowLayout.LEFT));
185185
pnlAllAwards.add(pnlMiscAwards);
186186
}
187187

188-
if (person.awardController.hasAwardsWithMedals() || person.awardController.hasAwardsWithMiscs()) {
188+
if (person.getAwardController().hasAwardsWithMedals() || person.getAwardController().hasAwardsWithMiscs()) {
189189
gridBagConstraints = new GridBagConstraints();
190190
gridBagConstraints.fill = GridBagConstraints.BOTH;
191191
gridBagConstraints.gridwidth = 2;
@@ -288,7 +288,7 @@ private Box drawRibbons() {
288288
Box boxRibbons = Box.createVerticalBox();
289289
boxRibbons.add(Box.createRigidArea(new Dimension(100, 0)));
290290

291-
List<Award> awards = person.awardController.getAwards().stream().filter(a -> a.getNumberOfRibbonFiles() > 0)
291+
List<Award> awards = person.getAwardController().getAwards().stream().filter(a -> a.getNumberOfRibbonFiles() > 0)
292292
.sorted().collect(Collectors.toList());
293293
Collections.reverse(awards);
294294

@@ -305,7 +305,7 @@ private Box drawRibbons() {
305305
rowRibbonsBox.setBackground(Color.RED);
306306
}
307307
try {
308-
int numberOfAwards = person.awardController.getNumberOfAwards(award);
308+
int numberOfAwards = person.getAwardController().getNumberOfAwards(award);
309309
String ribbonFileName = award.getRibbonFileName(numberOfAwards);
310310
ribbon = (Image) awardIcons.getItem(award.getSet() + "/ribbons/", ribbonFileName);
311311
if (ribbon == null)
@@ -341,15 +341,15 @@ private Box drawRibbons() {
341341
private JPanel drawMedals() {
342342
JPanel pnlMedals = new JPanel();
343343

344-
List<Award> awards = person.awardController.getAwards().stream().filter(a -> a.getNumberOfMedalFiles() > 0)
344+
List<Award> awards = person.getAwardController().getAwards().stream().filter(a -> a.getNumberOfMedalFiles() > 0)
345345
.sorted().collect(Collectors.toList());
346346

347347
for (Award award : awards) {
348348
JLabel medalLabel = new JLabel();
349349

350350
Image medal;
351351
try {
352-
int numberOfAwards = person.awardController.getNumberOfAwards(award);
352+
int numberOfAwards = person.getAwardController().getNumberOfAwards(award);
353353
String medalFileName = award.getMedalFileName(numberOfAwards);
354354
medal = (Image) awardIcons.getItem(award.getSet() + "/medals/", medalFileName);
355355
if (medal == null)
@@ -371,15 +371,15 @@ private JPanel drawMedals() {
371371
*/
372372
private JPanel drawMiscAwards() {
373373
JPanel pnlMiscAwards = new JPanel();
374-
ArrayList<Award> awards = person.awardController.getAwards().stream().filter(a -> a.getNumberOfMiscFiles() > 0)
374+
ArrayList<Award> awards = person.getAwardController().getAwards().stream().filter(a -> a.getNumberOfMiscFiles() > 0)
375375
.collect(Collectors.toCollection(ArrayList::new));
376376

377377
for (Award award : awards) {
378378
JLabel miscLabel = new JLabel();
379379

380380
Image miscAward;
381381
try {
382-
int numberOfAwards = person.awardController.getNumberOfAwards(award);
382+
int numberOfAwards = person.getAwardController().getNumberOfAwards(award);
383383
String miscFileName = award.getMiscFileName(numberOfAwards);
384384
Image miscAwardBufferedImage = (Image) awardIcons.getItem(award.getSet() + "/misc/", miscFileName);
385385
if (miscAwardBufferedImage == null)

‎MekHQ/unittests/mekhq/campaign/personnel/PersonTest.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,24 @@ public void testAddAndRemoveAward() throws ParseException {
5353

5454
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
5555

56-
mockPerson.awardController.addAndLogAward("TestSet","Test Award 1", simpleDateFormat.parse("3000-01-01"));
57-
mockPerson.awardController.addAndLogAward("TestSet","Test Award 1", simpleDateFormat.parse("3000-01-02"));
58-
mockPerson.awardController.addAndLogAward("TestSet","Test Award 2", simpleDateFormat.parse("3000-01-01"));
56+
mockPerson.getAwardController().addAndLogAward("TestSet","Test Award 1", simpleDateFormat.parse("3000-01-01"));
57+
mockPerson.getAwardController().addAndLogAward("TestSet","Test Award 1", simpleDateFormat.parse("3000-01-02"));
58+
mockPerson.getAwardController().addAndLogAward("TestSet","Test Award 2", simpleDateFormat.parse("3000-01-01"));
5959

60-
mockPerson.awardController.removeAward("TestSet", "Test Award 1", simpleDateFormat.parse("3000-01-01"), simpleDateFormat.parse("3000-01-02"));
60+
mockPerson.getAwardController().removeAward("TestSet", "Test Award 1", simpleDateFormat.parse("3000-01-01"), simpleDateFormat.parse("3000-01-02"));
6161

62-
assertTrue(mockPerson.awardController.hasAwards());
63-
assertEquals(2, mockPerson.awardController.getAwards().size());
62+
assertTrue(mockPerson.getAwardController().hasAwards());
63+
assertEquals(2, mockPerson.getAwardController().getAwards().size());
6464

65-
mockPerson.awardController.removeAward("TestSet", "Test Award 2", simpleDateFormat.parse("3000-01-01"), simpleDateFormat.parse("3000-01-02"));
65+
mockPerson.getAwardController().removeAward("TestSet", "Test Award 2", simpleDateFormat.parse("3000-01-01"), simpleDateFormat.parse("3000-01-02"));
6666

67-
assertTrue(mockPerson.awardController.hasAwards());
68-
assertEquals(1, mockPerson.awardController.getAwards().size());
67+
assertTrue(mockPerson.getAwardController().hasAwards());
68+
assertEquals(1, mockPerson.getAwardController().getAwards().size());
6969

70-
mockPerson.awardController.removeAward("TestSet", "Test Award 1", simpleDateFormat.parse("3000-01-02"), simpleDateFormat.parse("3000-01-02"));
70+
mockPerson.getAwardController().removeAward("TestSet", "Test Award 1", simpleDateFormat.parse("3000-01-02"), simpleDateFormat.parse("3000-01-02"));
7171

72-
assertFalse(mockPerson.awardController.hasAwards());
73-
assertEquals(0, mockPerson.awardController.getAwards().size());
72+
assertFalse(mockPerson.getAwardController().hasAwards());
73+
assertEquals(0, mockPerson.getAwardController().getAwards().size());
7474
}
7575

7676
@Test
@@ -80,19 +80,19 @@ public void testGetNumberOfAwards() throws ParseException {
8080

8181
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
8282

83-
mockPerson.awardController.addAndLogAward("TestSet","Test Award 1", simpleDateFormat.parse("3000-01-01"));
84-
mockPerson.awardController.addAndLogAward("TestSet","Test Award 1", simpleDateFormat.parse("3000-01-02"));
85-
mockPerson.awardController.addAndLogAward("TestSet","Test Award 2", simpleDateFormat.parse("3000-01-01"));
83+
mockPerson.getAwardController().addAndLogAward("TestSet","Test Award 1", simpleDateFormat.parse("3000-01-01"));
84+
mockPerson.getAwardController().addAndLogAward("TestSet","Test Award 1", simpleDateFormat.parse("3000-01-02"));
85+
mockPerson.getAwardController().addAndLogAward("TestSet","Test Award 2", simpleDateFormat.parse("3000-01-01"));
8686

87-
assertEquals( 2, mockPerson.awardController.getNumberOfAwards(PersonnelTestUtilities.getTestAward1()));
87+
assertEquals( 2, mockPerson.getAwardController().getNumberOfAwards(PersonnelTestUtilities.getTestAward1()));
8888

89-
mockPerson.awardController.removeAward("TestSet", "Test Award 1", simpleDateFormat.parse("3000-01-01"), simpleDateFormat.parse("3000-01-02"));
89+
mockPerson.getAwardController().removeAward("TestSet", "Test Award 1", simpleDateFormat.parse("3000-01-01"), simpleDateFormat.parse("3000-01-02"));
9090

91-
assertEquals(1, mockPerson.awardController.getNumberOfAwards(PersonnelTestUtilities.getTestAward1()));
91+
assertEquals(1, mockPerson.getAwardController().getNumberOfAwards(PersonnelTestUtilities.getTestAward1()));
9292

93-
mockPerson.awardController.removeAward("TestSet", "Test Award 1", simpleDateFormat.parse("3000-01-02"), simpleDateFormat.parse("3000-01-02"));
93+
mockPerson.getAwardController().removeAward("TestSet", "Test Award 1", simpleDateFormat.parse("3000-01-02"), simpleDateFormat.parse("3000-01-02"));
9494

95-
assertEquals(0, mockPerson.awardController.getNumberOfAwards(PersonnelTestUtilities.getTestAward1()));
95+
assertEquals(0, mockPerson.getAwardController().getNumberOfAwards(PersonnelTestUtilities.getTestAward1()));
9696
}
9797

9898
@Test

0 commit comments

Comments
 (0)