Skip to content

Deprecated Unused Method And Adjusted Formatting #6536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 4, 2025
Merged

Deprecated Unused Method And Adjusted Formatting #6536

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5be5eb8
Deprecated Unused Method And Adjusted Formatting
IllianiBird Apr 2, 2025
e22f158
Merge branch 'refs/heads/master' into deprecateUnusedMethod0
IllianiBird Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions MekHQ/src/mekhq/gui/campaignOptions/contents/PersonnelTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,10 @@ private void initializeGeneralTab() {
* {@code PrisonerStatus.FREE} enumeration.
*
* @return a {@link DefaultComboBoxModel} containing the prisoner status options.
*
* @deprecated unused, no alternative necessary
*/
@Deprecated(since = "0.50.05", forRemoval = true)
private DefaultComboBoxModel<PrisonerStatus> getPrisonerStatusOptions() {
final DefaultComboBoxModel<PrisonerStatus> prisonerStatusModel = new DefaultComboBoxModel<>(PrisonerStatus.values());
// we don't want this as a standard use case for prisoners
Expand Down Expand Up @@ -668,7 +671,8 @@ JPanel createAwardsGeneralOptionsPanel() {
lblAwardBonusStyle = new CampaignOptionsLabel("AwardBonusStyle");
comboAwardBonusStyle.setRenderer(new DefaultListCellRenderer() {
@Override
public Component getListCellRendererComponent(final JList<?> list, final Object value, final int index, final boolean isSelected, final boolean cellHasFocus) {
public Component getListCellRendererComponent(final JList<?> list, final Object value, final int index,
final boolean isSelected, final boolean cellHasFocus) {
super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if (value instanceof AwardBonus) {
list.setToolTipText(((AwardBonus) value).getToolTipText());
Expand Down Expand Up @@ -1048,7 +1052,8 @@ private JPanel createPrisonersPanel() {
lblPrisonerCaptureStyle = new CampaignOptionsLabel("PrisonerCaptureStyle");
comboPrisonerCaptureStyle.setRenderer(new DefaultListCellRenderer() {
@Override
public Component getListCellRendererComponent(final JList<?> list, final Object value, final int index, final boolean isSelected, final boolean cellHasFocus) {
public Component getListCellRendererComponent(final JList<?> list, final Object value, final int index,
final boolean isSelected, final boolean cellHasFocus) {
super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if (value instanceof PrisonerCaptureStyle) {
list.setToolTipText(wordWrap(((PrisonerCaptureStyle) value).getTooltip()));
Expand Down
Loading