Move StringHelper to the format package.

src/main/lombok/org/leumasjaffe/charsheet/model/magic/dimension/Area.java

@@ -1,6 +1,6 @@
 package org.leumasjaffe.charsheet.model.magic.dimension;
 
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;

src/main/lombok/org/leumasjaffe/charsheet/model/magic/dimension/Duration.java

@@ -4,7 +4,7 @@ import static org.leumasjaffe.charsheet.config.Constants.*;
 import static org.leumasjaffe.charsheet.config.Constants.DurationMeasurement.*;
 
 import org.leumasjaffe.charsheet.config.Config;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/lombok/org/leumasjaffe/charsheet/model/magic/dimension/Effect.java

@@ -1,7 +1,7 @@
 package org.leumasjaffe.charsheet.model.magic.dimension;
 
-import org.leumasjaffe.charsheet.util.StringHelper;
 import org.leumasjaffe.format.Named;
+import org.leumasjaffe.format.StringHelper;
 
 import lombok.AccessLevel;
 import lombok.Getter;

src/main/lombok/org/leumasjaffe/charsheet/model/magic/dimension/Range.java

@@ -1,7 +1,7 @@
 package org.leumasjaffe.charsheet.model.magic.dimension;
 
 import org.leumasjaffe.charsheet.config.Config;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

src/main/lombok/org/leumasjaffe/charsheet/model/magic/dimension/Target.java

@@ -1,7 +1,7 @@
 package org.leumasjaffe.charsheet.model.magic.dimension;
 
-import org.leumasjaffe.charsheet.util.StringHelper;
 import org.leumasjaffe.format.Named;
+import org.leumasjaffe.format.StringHelper;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

src/main/lombok/org/leumasjaffe/charsheet/observer/helper/AbilModStringify.java

@@ -5,7 +5,7 @@ import java.util.function.BiConsumer;
 import javax.swing.text.JTextComponent;
 
 import org.leumasjaffe.charsheet.model.Ability;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 public class AbilModStringify implements BiConsumer<JTextComponent, Ability.Scores> {
 

src/main/lombok/org/leumasjaffe/charsheet/observer/helper/IntValueStringify.java

@@ -5,7 +5,7 @@ import java.util.function.BiConsumer;
 import javax.swing.text.JTextComponent;
 
 import org.leumasjaffe.charsheet.model.observable.IntValue;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import lombok.experimental.UtilityClass;
 

src/main/lombok/org/leumasjaffe/charsheet/view/ClassTab.java

@@ -10,8 +10,8 @@ import javax.swing.JTextField;
 import org.leumasjaffe.charsheet.model.DDCharacter;
 import org.leumasjaffe.charsheet.model.DDCharacterClass;
 import org.leumasjaffe.charsheet.model.observable.IntValue;
-import org.leumasjaffe.charsheet.util.StringHelper;
 import org.leumasjaffe.charsheet.view.magic.SpellPanel;
+import org.leumasjaffe.format.StringHelper;
 import org.leumasjaffe.observer.ObservableListener;
 
 import java.awt.GridBagConstraints;

src/main/lombok/org/leumasjaffe/charsheet/view/inventory/ArmorPanel.java

@@ -14,7 +14,7 @@ import javax.swing.SwingConstants;
 
 import org.leumasjaffe.charsheet.model.inventory.DDArmor;
 import org.leumasjaffe.charsheet.model.inventory.DDItem;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import java.awt.Component;
 import javax.swing.Box;

src/main/lombok/org/leumasjaffe/charsheet/view/inventory/ItemInfoPanel.java

@@ -6,7 +6,7 @@ import java.awt.GridBagLayout;
 import javax.swing.JPanel;
 
 import org.leumasjaffe.charsheet.model.inventory.DDItem;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import java.awt.Insets;
 import javax.swing.JLabel;

src/main/lombok/org/leumasjaffe/charsheet/view/inventory/ItemPanel.java

@@ -13,7 +13,7 @@ import java.awt.Color;
 import javax.swing.SwingConstants;
 
 import org.leumasjaffe.charsheet.model.inventory.DDItem;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import java.awt.Component;
 import javax.swing.Box;

src/main/lombok/org/leumasjaffe/charsheet/view/inventory/ShieldPanel.java

@@ -14,7 +14,7 @@ import javax.swing.SwingConstants;
 
 import org.leumasjaffe.charsheet.model.inventory.DDArmor;
 import org.leumasjaffe.charsheet.model.inventory.DDItem;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import java.awt.Component;
 import javax.swing.Box;

src/main/lombok/org/leumasjaffe/charsheet/view/inventory/WeaponPanel.java

@@ -14,7 +14,7 @@ import javax.swing.SwingConstants;
 
 import org.leumasjaffe.charsheet.model.inventory.DDItem;
 import org.leumasjaffe.charsheet.model.inventory.DDWeapon;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import java.awt.Component;
 import javax.swing.Box;

src/main/lombok/org/leumasjaffe/charsheet/view/magic/ChooseSpellsPerDayHeader.java

@@ -10,7 +10,7 @@ import javax.swing.JTextField;
 
 import org.leumasjaffe.charsheet.model.Ability;
 import org.leumasjaffe.charsheet.model.magic.DDSpellbook;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import java.awt.Dimension;
 

src/main/lombok/org/leumasjaffe/charsheet/view/magic/SelectPreparedSpellsPanel.java

@@ -13,8 +13,8 @@ import org.leumasjaffe.charsheet.model.Ability;
 import org.leumasjaffe.charsheet.model.DDCharacterClass;
 import org.leumasjaffe.charsheet.model.magic.DDSpell;
 import org.leumasjaffe.charsheet.model.magic.impl.Prepared;
-import org.leumasjaffe.charsheet.util.StringHelper;
 import org.leumasjaffe.event.SelectTableRowPopupMenuListener;
+import org.leumasjaffe.format.StringHelper;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

src/main/lombok/org/leumasjaffe/charsheet/view/magic/SpellsKnownHeader.java

@@ -10,7 +10,8 @@ import javax.swing.JTextField;
 
 import org.leumasjaffe.charsheet.model.Ability;
 import org.leumasjaffe.charsheet.model.magic.DDSpellbook;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
+
 import java.awt.Dimension;
 
 class SpellsKnownHeader extends JPanel {

src/main/lombok/org/leumasjaffe/charsheet/view/skills/SkillLevelUpLine.java

@@ -8,7 +8,7 @@ import org.leumasjaffe.charsheet.model.DDCharacterClass;
 import org.leumasjaffe.charsheet.model.observable.IntValue;
 import org.leumasjaffe.charsheet.model.skill.DDSkill;
 import org.leumasjaffe.charsheet.util.AbilityHelper;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 import org.leumasjaffe.observer.IndirectObservableListener;
 import org.leumasjaffe.observer.ObserverDispatch;
 

src/main/lombok/org/leumasjaffe/charsheet/view/skills/SkillLine.java

@@ -7,7 +7,7 @@ import org.leumasjaffe.charsheet.model.DDCharacter;
 import org.leumasjaffe.charsheet.model.observable.IntValue;
 import org.leumasjaffe.charsheet.model.skill.DDSkill;
 import org.leumasjaffe.charsheet.util.AbilityHelper;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 import org.leumasjaffe.observer.IndirectObservableListener;
 import org.leumasjaffe.observer.ObservableListener;
 

src/main/lombok/org/leumasjaffe/charsheet/view/summary/AbilityBox.java

@@ -17,7 +17,7 @@ import javax.swing.border.LineBorder;
 import org.leumasjaffe.charsheet.model.observable.IntValue;
 import org.leumasjaffe.charsheet.observer.helper.IntValueHelper;
 import org.leumasjaffe.charsheet.observer.helper.IntValueStringify;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 import org.leumasjaffe.graphics.NumberTextField;
 import org.leumasjaffe.observer.ObservableController;
 import org.leumasjaffe.observer.ObservableListener;

src/main/lombok/org/leumasjaffe/charsheet/view/summary/ArmorLine.java

@@ -12,7 +12,7 @@ import org.leumasjaffe.charsheet.model.DDCharacter;
 import org.leumasjaffe.charsheet.model.inventory.DDInventory;
 import org.leumasjaffe.charsheet.model.inventory.DDItem;
 import org.leumasjaffe.charsheet.model.inventory.EquipmentSlot;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 import org.leumasjaffe.observer.IndirectObservableListener;
 import org.leumasjaffe.observer.ObservableListener;
 

src/main/lombok/org/leumasjaffe/charsheet/view/summary/AttackLine.java

@@ -10,7 +10,7 @@ import javax.swing.border.LineBorder;
 import org.leumasjaffe.charsheet.model.Ability;
 import org.leumasjaffe.charsheet.model.DDCharacter;
 import org.leumasjaffe.charsheet.observer.helper.AbilModStringify;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 import org.leumasjaffe.observer.IndirectObservableListener;
 import org.leumasjaffe.observer.ObservableListener;
 

src/main/lombok/org/leumasjaffe/charsheet/view/summary/DescriptionPanel.java

@@ -8,7 +8,7 @@ import javax.swing.JTextField;
 import javax.swing.border.TitledBorder;
 
 import org.leumasjaffe.charsheet.model.DDCharacter;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;

src/main/lombok/org/leumasjaffe/charsheet/view/summary/InitiativeLine.java

@@ -11,7 +11,7 @@ import javax.swing.border.LineBorder;
 import org.leumasjaffe.charsheet.model.Ability;
 import org.leumasjaffe.charsheet.model.DDCharacter;
 import org.leumasjaffe.charsheet.observer.helper.AbilModStringify;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 import org.leumasjaffe.observer.IndirectObservableListener;
 import org.leumasjaffe.observer.ObservableListener;
 

src/main/lombok/org/leumasjaffe/charsheet/view/summary/ResistanceLine.java

@@ -10,7 +10,7 @@ import javax.swing.border.LineBorder;
 import org.leumasjaffe.charsheet.model.Ability;
 import org.leumasjaffe.charsheet.model.DDCharacter;
 import org.leumasjaffe.charsheet.observer.helper.AbilModStringify;
-import org.leumasjaffe.charsheet.util.StringHelper;
+import org.leumasjaffe.format.StringHelper;
 import org.leumasjaffe.graphics.NumberTextField;
 import org.leumasjaffe.observer.IndirectObservableListener;
 import org.leumasjaffe.observer.ObservableListener;

src/main/lombok/org/leumasjaffe/charsheet/util/StringHelper.java

@@ -1,6 +1,4 @@
-package org.leumasjaffe.charsheet.util;
-
-import org.leumasjaffe.format.StringFormatter;
+package org.leumasjaffe.format;
 
 import lombok.experimental.UtilityClass;
 

src/test/java/org/leumasjaffe/format/StringFormatterTest.java

@@ -3,7 +3,6 @@ package org.leumasjaffe.format;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.leumasjaffe.charsheet.util.StringHelper;
 
 public class StringFormatterTest {