diff --git a/MekHQ/src/mekhq/campaign/personnel/death/AbstractDeath.java b/MekHQ/src/mekhq/campaign/personnel/death/AbstractDeath.java index 53988dce0b..29ee8487de 100644 --- a/MekHQ/src/mekhq/campaign/personnel/death/AbstractDeath.java +++ b/MekHQ/src/mekhq/campaign/personnel/death/AbstractDeath.java @@ -116,7 +116,7 @@ public Map>> get /** * This is used to determine if a person can die. - * + * * @param person the person to determine for * @param ageGroup the age group of the person in question * @param randomDeath if this is for random death or manual death @@ -144,7 +144,7 @@ public Map>> get // region New Day /** * Processes new day random death for an individual. - * + * * @param campaign the campaign to process * @param today the current day * @param person the person to process diff --git a/MekHQ/src/mekhq/gui/StratconTab.java b/MekHQ/src/mekhq/gui/StratconTab.java index 89b10adb81..0fdaf6da9d 100644 --- a/MekHQ/src/mekhq/gui/StratconTab.java +++ b/MekHQ/src/mekhq/gui/StratconTab.java @@ -1,5 +1,5 @@ /* -* MegaMek - Copyright (C) 2020 - The MegaMek Team +* MegaMek - Copyright (C) 2020-2024 - The MegaMek Team * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software @@ -194,7 +194,7 @@ public void updateCampaignState() { // current support points TrackDropdownItem currentTDI = (TrackDropdownItem) cboCurrentTrack.getSelectedItem(); if (currentTDI == null) { - campaignStatusText.setText("No active contract selected."); + campaignStatusText.setText("No active contract selected, or contract has not started."); expandedObjectivePanel.setVisible(false); return; } @@ -347,7 +347,7 @@ private String buildStrategicObjectiveText(StratconCampaignState campaignState) break; case AnyScenarioVictory: sb.append("Engage and defeat hostile forces in ") - .append(objective.getCurrentObjectiveCount()).append("/") + .append(objective.getCurrentObjectiveCount()).append('/') .append(objective.getDesiredObjectiveCount()) .append(" scenarios on ").append(track.getDisplayableName()); break; @@ -471,10 +471,9 @@ public String toString() { @Override public boolean equals(Object other) { - if (!(other instanceof TrackDropdownItem)) { + if (!(other instanceof TrackDropdownItem otherTDI)) { return false; } else { - TrackDropdownItem otherTDI = (TrackDropdownItem) other; return otherTDI.contract.equals(this.contract) && otherTDI.track.equals(this.track); } }