Skip to content
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

Jump to bottom

Remove wordWrap Method from RandomMarriageMethod, RandomProcreationMethod, RandomDivorceMethod Classes #4964

Merged
merged 3 commits into from
Oct 4, 2024
Merged

Remove wordWrap Method from RandomMarriageMethod, RandomProcreationMethod, RandomDivorceMethod Classes #4964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a8b1b9
Remove wordWrap method from enumeration classes
IllianiCBT Oct 2, 2024
14d4ef8
Added Turning Points Dialog to `DateChooser`
IllianiCBT Oct 3, 2024
415ecaf
Rolled back merge to wrong branch
IllianiCBT Oct 3, 2024
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
4 changes: 1 addition & 3 deletions MekHQ/src/mekhq/campaign/personnel/enums/RandomDivorceMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

import java.util.ResourceBundle;

import static megamek.client.ui.WrapLayout.wordWrap;

/**
* An enumeration representing the available random divorce methods.
* <p>
Expand Down Expand Up @@ -60,7 +58,7 @@ public enum RandomDivorceMethod {
final ResourceBundle resources = ResourceBundle.getBundle("mekhq.resources.Personnel",
MekHQ.getMHQOptions().getLocale());
this.name = resources.getString(name);
this.toolTipText = wordWrap(resources.getString(toolTipText));
this.toolTipText = resources.getString(toolTipText);
}
//endregion Constructors

Expand Down
4 changes: 1 addition & 3 deletions MekHQ/src/mekhq/campaign/personnel/enums/RandomProcreationMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

import java.util.ResourceBundle;

import static megamek.client.ui.WrapLayout.wordWrap;

/**
* The {@link RandomProcreationMethod} enum represents different methods of getting random procreation.
* <p>
Expand Down Expand Up @@ -58,7 +56,7 @@ public enum RandomProcreationMethod {
final ResourceBundle resources = ResourceBundle.getBundle("mekhq.resources.Personnel",
MekHQ.getMHQOptions().getLocale());
this.name = resources.getString(name);
this.toolTipText = wordWrap(resources.getString(toolTipText));
this.toolTipText = resources.getString(toolTipText);
}
//endregion Constructors

Expand Down
5 changes: 2 additions & 3 deletions MekHQ/unittests/mekhq/campaign/personnel/enums/RandomDivorceMethodTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

import java.util.ResourceBundle;

import static megamek.client.ui.WrapLayout.wordWrap;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
Expand All @@ -45,8 +44,8 @@ public class RandomDivorceMethodTest {
//region Getters
@Test
public void testGetToolTipText() {
String expected = wordWrap(resources.getString("RandomDivorceMethod.NONE.toolTipText")).replaceAll("\\s", "");
String actual = wordWrap(RandomDivorceMethod.NONE.getToolTipText().trim()).replaceAll("\\s", "");
String expected = resources.getString("RandomDivorceMethod.NONE.toolTipText").replaceAll("\\s", "");
String actual = RandomDivorceMethod.NONE.getToolTipText().trim().replaceAll("\\s", "");

assertEquals(expected, actual);
}
Expand Down
4 changes: 2 additions & 2 deletions MekHQ/unittests/mekhq/campaign/personnel/enums/RandomMarriageMethodTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ public void testGetMethod() {

@Test
public void testToStringOverride() {
assertEquals(wordWrap(resources.getString("RandomMarriageMethod.NONE.text")).trim(),
assertEquals(resources.getString("RandomMarriageMethod.NONE.text").trim(),
RandomMarriageMethod.NONE.toString().trim());
assertEquals(wordWrap(resources.getString("RandomMarriageMethod.DICE_ROLL.text")).trim(),
assertEquals(resources.getString("RandomMarriageMethod.DICE_ROLL.text").trim(),
RandomMarriageMethod.DICE_ROLL.toString().trim());
}
}
8 changes: 4 additions & 4 deletions MekHQ/unittests/mekhq/campaign/personnel/enums/RandomProcreationMethodTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ public class RandomProcreationMethodTest {
//region Getters
@Test
public void testGetToolTipText() {
assertEquals(resources.getString("RandomProcreationMethod.NONE.toolTipText").trim(),
RandomProcreationMethod.NONE.getToolTipText().trim());
assertEquals(resources.getString("RandomProcreationMethod.DICE_ROLL.toolTipText").trim(),
RandomProcreationMethod.DICE_ROLL.getToolTipText().trim());
assertEquals(resources.getString("RandomProcreationMethod.NONE.toolTipText"),
RandomProcreationMethod.NONE.getToolTipText());
assertEquals(resources.getString("RandomProcreationMethod.DICE_ROLL.toolTipText"),
RandomProcreationMethod.DICE_ROLL.getToolTipText());
}
//endregion Getters

Expand Down