Global import ordering

PCGen · Dec 3, 2017 · 0260d8d · 0260d8d
1 parent f6041f2
commit 0260d8d
Show file tree

Hide file tree

Showing 98 changed files with 187 additions and 140 deletions.
diff --git a/code/src/itest/tokencontent/DomainCSkillTest.java b/code/src/itest/tokencontent/DomainCSkillTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.SkillCost;
 import pcgen.cdom.enumeration.Type;
@@ -37,6 +35,8 @@
 import pcgen.util.chooser.ChooserFactory;
 import plugin.lsttokens.choose.SkillToken;
 import plugin.lsttokens.domain.CskillToken;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class DomainCSkillTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/DomainCcSkillTest.java b/code/src/itest/tokencontent/DomainCcSkillTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.SkillCost;
 import pcgen.cdom.enumeration.Type;
@@ -38,6 +36,8 @@
 import plugin.lsttokens.choose.SkillToken;
 import plugin.lsttokens.domain.CcskillToken;
 import plugin.lsttokens.skill.ExclusiveToken;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class DomainCcSkillTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/GlobalCSkillTest.java b/code/src/itest/tokencontent/GlobalCSkillTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.base.CDOMObject;
 import pcgen.cdom.enumeration.SkillCost;
 import pcgen.cdom.facet.FacetLibrary;
@@ -32,6 +30,8 @@
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.CskillLst;
 import plugin.lsttokens.choose.SkillToken;
+
+import org.junit.Test;
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalCSkillTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalCcSkillTest.java b/code/src/itest/tokencontent/GlobalCcSkillTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.base.CDOMObject;
 import pcgen.cdom.enumeration.SkillCost;
 import pcgen.cdom.facet.FacetLibrary;
@@ -33,6 +31,8 @@
 import plugin.lsttokens.CcskillLst;
 import plugin.lsttokens.choose.SkillToken;
 import plugin.lsttokens.skill.ExclusiveToken;
+
+import org.junit.Test;
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalCcSkillTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalChangeProfTest.java b/code/src/itest/tokencontent/GlobalChangeProfTest.java
@@ -27,6 +27,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.ChangeprofLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalChangeProfTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalCompanionListTest.java b/code/src/itest/tokencontent/GlobalCompanionListTest.java
@@ -28,6 +28,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.CompanionListLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalCompanionListTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalDefineUnlockedStatTest.java b/code/src/itest/tokencontent/GlobalDefineUnlockedStatTest.java
@@ -23,6 +23,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.DefineStatLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalDefineUnlockedStatTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalDefineVariableTest.java b/code/src/itest/tokencontent/GlobalDefineVariableTest.java
@@ -24,6 +24,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.DefineLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalDefineVariableTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalDrTest.java b/code/src/itest/tokencontent/GlobalDrTest.java
@@ -26,6 +26,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.DrLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalDrTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalFollowersTest.java b/code/src/itest/tokencontent/GlobalFollowersTest.java
@@ -24,6 +24,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.FollowersLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalFollowersTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalMoveCloneTest.java b/code/src/itest/tokencontent/GlobalMoveCloneTest.java
@@ -24,6 +24,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.MovecloneLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalMoveCloneTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalMoveTest.java b/code/src/itest/tokencontent/GlobalMoveTest.java
@@ -24,6 +24,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.MoveLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalMoveTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalQualifyTest.java b/code/src/itest/tokencontent/GlobalQualifyTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.base.CDOMObject;
 import pcgen.cdom.facet.FacetLibrary;
 import pcgen.cdom.facet.analysis.QualifyFacet;
@@ -33,6 +31,8 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.QualifyToken;
+
+import org.junit.Test;
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalQualifyTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalSABTest.java b/code/src/itest/tokencontent/GlobalSABTest.java
@@ -24,6 +24,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.SabLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalSABTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalSRTest.java b/code/src/itest/tokencontent/GlobalSRTest.java
@@ -24,6 +24,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.SrLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalSRTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalSpellKnownTest.java b/code/src/itest/tokencontent/GlobalSpellKnownTest.java
@@ -40,6 +40,7 @@
 import plugin.lsttokens.testsupport.TokenRegistration;
 import plugin.pretokens.parser.PreVariableParser;
 import plugin.pretokens.test.PreVariableTester;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalSpellKnownTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalUdamTest.java b/code/src/itest/tokencontent/GlobalUdamTest.java
@@ -19,15 +19,15 @@
 
 import java.util.Collections;
 
-import org.junit.Test;
-
 import pcgen.cdom.base.CDOMObject;
 import pcgen.cdom.facet.FacetLibrary;
 import pcgen.cdom.facet.analysis.UnarmedDamageFacet;
 import pcgen.persistence.PersistenceLayerException;
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.UdamLst;
+
+import org.junit.Test;
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalUdamTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalUnencumberedMoveArmorTest.java b/code/src/itest/tokencontent/GlobalUnencumberedMoveArmorTest.java
@@ -24,6 +24,7 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.enumeration.Load;
 import plugin.lsttokens.UnencumberedmoveLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalUnencumberedMoveArmorTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalUnencumberedMoveLoadTest.java b/code/src/itest/tokencontent/GlobalUnencumberedMoveLoadTest.java
@@ -24,6 +24,7 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.enumeration.Load;
 import plugin.lsttokens.UnencumberedmoveLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalUnencumberedMoveLoadTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/GlobalVisionTest.java b/code/src/itest/tokencontent/GlobalVisionTest.java
@@ -25,6 +25,7 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.VisionLst;
+
 import tokencontent.testsupport.AbstractContentTokenTest;
 
 public class GlobalVisionTest extends AbstractContentTokenTest

diff --git a/code/src/itest/tokencontent/PCClassLevelCCSkillTest.java b/code/src/itest/tokencontent/PCClassLevelCCSkillTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.SkillCost;
 import pcgen.cdom.enumeration.Type;
@@ -34,6 +32,8 @@
 import pcgen.util.chooser.ChooserFactory;
 import plugin.lsttokens.pcclass.level.CcskillToken;
 import plugin.lsttokens.skill.ExclusiveToken;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class PCClassLevelCCSkillTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/PCClassLevelCSkillTest.java b/code/src/itest/tokencontent/PCClassLevelCSkillTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.SkillCost;
 import pcgen.cdom.enumeration.Type;
@@ -33,6 +31,8 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.chooser.ChooserFactory;
 import plugin.lsttokens.pcclass.level.CskillToken;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class PCClassLevelCSkillTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/RaceFavClassTest.java b/code/src/itest/tokencontent/RaceFavClassTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.facet.FacetLibrary;
 import pcgen.cdom.facet.analysis.FavoredClassFacet;
 import pcgen.cdom.facet.input.RaceInputFacet;
@@ -32,6 +30,8 @@
 import plugin.lsttokens.choose.ClassToken;
 import plugin.lsttokens.race.FavclassToken;
 import plugin.lsttokens.testsupport.TokenRegistration;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class RaceFavClassTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/RaceMonCCSkillTest.java b/code/src/itest/tokencontent/RaceMonCCSkillTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.ObjectKey;
 import pcgen.cdom.enumeration.SkillCost;
@@ -39,6 +37,8 @@
 import plugin.lsttokens.race.MonccskillToken;
 import plugin.lsttokens.skill.ExclusiveToken;
 import plugin.lsttokens.testsupport.TokenRegistration;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class RaceMonCCSkillTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/RaceMonCSkillTest.java b/code/src/itest/tokencontent/RaceMonCSkillTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.SkillCost;
 import pcgen.cdom.enumeration.Type;
@@ -40,6 +38,8 @@
 import plugin.lsttokens.pcclass.IsmonsterToken;
 import plugin.lsttokens.race.MoncskillToken;
 import plugin.lsttokens.testsupport.TokenRegistration;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class RaceMonCSkillTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/RaceMoveTest.java b/code/src/itest/tokencontent/RaceMoveTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.facet.FacetLibrary;
 import pcgen.cdom.facet.analysis.BaseMovementFacet;
 import pcgen.core.Movement;
@@ -27,6 +25,8 @@
 import pcgen.rules.persistence.token.CDOMToken;
 import pcgen.rules.persistence.token.ParseResult;
 import plugin.lsttokens.race.MoveToken;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class RaceMoveTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/SkillClassesTest.java b/code/src/itest/tokencontent/SkillClassesTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.SkillCost;
 import pcgen.cdom.enumeration.Type;
@@ -32,6 +30,8 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.chooser.ChooserFactory;
 import plugin.lsttokens.skill.ClassesToken;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class SkillClassesTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/SpellClassesTest.java b/code/src/itest/tokencontent/SpellClassesTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.base.util.HashMapToList;
 import pcgen.cdom.base.CDOMList;
 import pcgen.cdom.enumeration.ListKey;
@@ -35,6 +33,8 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.chooser.ChooserFactory;
 import plugin.lsttokens.spell.ClassesToken;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class SpellClassesTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/SpellDomainsTest.java b/code/src/itest/tokencontent/SpellDomainsTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.base.util.HashMapToList;
 import pcgen.cdom.base.CDOMList;
 import pcgen.cdom.enumeration.ListKey;
@@ -37,6 +35,8 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.chooser.ChooserFactory;
 import plugin.lsttokens.spell.DomainsToken;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class SpellDomainsTest extends AbstractTokenModelTest

diff --git a/code/src/itest/tokencontent/TemplateFavoredClassTest.java b/code/src/itest/tokencontent/TemplateFavoredClassTest.java
@@ -17,8 +17,6 @@
  */
 package tokencontent;
 
-import org.junit.Test;
-
 import pcgen.cdom.facet.FacetLibrary;
 import pcgen.cdom.facet.analysis.FavoredClassFacet;
 import pcgen.core.PCClass;
@@ -31,6 +29,8 @@
 import plugin.lsttokens.choose.ClassToken;
 import plugin.lsttokens.template.FavoredclassToken;
 import plugin.lsttokens.testsupport.TokenRegistration;
+
+import org.junit.Test;
 import tokenmodel.testsupport.AbstractTokenModelTest;
 
 public class TemplateFavoredClassTest extends AbstractTokenModelTest