Collapsed milstd2525.graphics.command.offense into fewer packages. Th…

…is set of graphics packages was becoming getting deep.
cponeill · Dec 14, 2011 · a5cc735 · a5cc735
1 parent b48a9bf
commit a5cc735
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 45 deletions.
diff --git a/WorldWind/src/gov/nasa/worldwind/symbology/milstd2525/MilStd2525GraphicFactory.java b/WorldWind/src/gov/nasa/worldwind/symbology/milstd2525/MilStd2525GraphicFactory.java
@@ -16,8 +16,7 @@
 import gov.nasa.worldwind.symbology.milstd2525.graphics.command.general.areas.*;
 import gov.nasa.worldwind.symbology.milstd2525.graphics.command.general.lines.PhaseLine;
 import gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.*;
-import gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines.axis.*;
-import gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines.axis.ground.*;
+import gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines.*;
 import gov.nasa.worldwind.symbology.milstd2525.graphics.firesupport.areas.*;
 import gov.nasa.worldwind.symbology.milstd2525.graphics.firesupport.areas.command.*;
 import gov.nasa.worldwind.symbology.milstd2525.graphics.firesupport.areas.target.*;

diff --git a/.../offense/lines/axis/AttackRotaryWing.java → ...mmand/offense/lines/AttackRotaryWing.java b/.../offense/lines/axis/AttackRotaryWing.java → ...mmand/offense/lines/AttackRotaryWing.java
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-package gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines.axis;
+package gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines;
 
 import gov.nasa.worldwind.geom.*;
 import gov.nasa.worldwind.globes.Globe;

diff --git a/.../command/offense/lines/axis/Aviation.java → ...phics/command/offense/lines/Aviation.java b/.../command/offense/lines/axis/Aviation.java → ...phics/command/offense/lines/Aviation.java
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-package gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines.axis;
+package gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines;
 
 import gov.nasa.worldwind.geom.Position;
 import gov.nasa.worldwind.globes.Globe;

diff --git a/...cs/command/offense/DirectionOfAttack.java → ...mand/offense/lines/DirectionOfAttack.java b/...cs/command/offense/DirectionOfAttack.java → ...mand/offense/lines/DirectionOfAttack.java
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-package gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense;
+package gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines;
 
 import gov.nasa.worldwind.WorldWind;
 import gov.nasa.worldwind.avlist.AVKey;

diff --git a/...offense/lines/axis/ground/MainAttack.java → ...ics/command/offense/lines/MainAttack.java b/...offense/lines/axis/ground/MainAttack.java → ...ics/command/offense/lines/MainAttack.java
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-package gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines.axis.ground;
+package gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines;
 
 import gov.nasa.worldwind.geom.*;
 import gov.nasa.worldwind.globes.Globe;

diff --git a/...e/lines/axis/ground/SupportingAttack.java → ...mmand/offense/lines/SupportingAttack.java b/...e/lines/axis/ground/SupportingAttack.java → ...mmand/offense/lines/SupportingAttack.java
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-package gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines.axis.ground;
+package gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines;
 
 import gov.nasa.worldwind.symbology.SymbologyConstants;
 import gov.nasa.worldwind.symbology.milstd2525.graphics.command.offense.lines.AbstractOffenseArrow;

diff --git a/...sa/worldwind/symbology/milstd2525/graphics/command/offense/lines/axis/ground/package.html b/...sa/worldwind/symbology/milstd2525/graphics/command/offense/lines/axis/ground/package.html
diff --git a/.../gov/nasa/worldwind/symbology/milstd2525/graphics/command/offense/lines/axis/package.html b/.../gov/nasa/worldwind/symbology/milstd2525/graphics/command/offense/lines/axis/package.html