Version 7988

src/com/ctreber/acearth/plugins/markers/Marker.java

@@ -3,10 +3,6 @@
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.util.ArrayList;
 import java.util.List;
 
 import com.ctreber.acearth.gui.PixelCanvas;

src/com/ctreber/acearth/plugins/markers/PluginMarkers.java

@@ -1,10 +1,8 @@
 package com.ctreber.acearth.plugins.markers;
 
-import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 
-import com.ctreber.acearth.ACearth;
 import com.ctreber.acearth.plugins.Plugin;
 
 /**

src/com/ctreber/acearth/projection/Projection.java

@@ -1,6 +1,9 @@
 package com.ctreber.acearth.projection;
 
-import com.ctreber.acearth.util.*;
+import com.ctreber.acearth.util.Coordinate;
+import com.ctreber.acearth.util.Point2D;
+import com.ctreber.acearth.util.Point3D;
+import com.ctreber.acearth.util.Toolkit;
 
 /**
  * <p>A projection for a globe on a flat surface (must be subclassed).

src/com/ctreber/acearth/renderer/Renderer.java

@@ -1,7 +1,8 @@
 package com.ctreber.acearth.renderer;
 
-import java.awt.*;
-import java.util.*;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import com.ctreber.acearth.shader.Shader;

src/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java

@@ -1,7 +1,7 @@
 package com.ctreber.acearth.renderer;
 
-import com.ctreber.acearth.scanbit.ScanBit;
 import com.ctreber.acearth.scanbit.BitGeneratorMap;
+import com.ctreber.acearth.scanbit.ScanBit;
 
 /**
  * <p>Renders a row of ScanBits to pixel types.</p>

src/com/ctreber/acearth/scanbit/BitGeneratorMap.java

@@ -1,9 +1,14 @@
 package com.ctreber.acearth.scanbit;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
 
 import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.util.*;
+import com.ctreber.acearth.util.EdgeCrossing;
+import com.ctreber.acearth.util.Point2D;
+import com.ctreber.acearth.util.Point3D;
+import com.ctreber.acearth.util.Polygon;
 import com.ctreber.aclib.sort.CTSort;
 import com.ctreber.aclib.sort.QuickSort;
 

src/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java

@@ -3,7 +3,9 @@
 import java.util.Comparator;
 
 import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.util.*;
+import com.ctreber.acearth.util.EdgeCrossing;
+import com.ctreber.acearth.util.Point2D;
+import com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Map scanner for mercator and cylindrical projections.

src/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java

@@ -3,7 +3,9 @@
 import java.util.Comparator;
 
 import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.util.*;
+import com.ctreber.acearth.util.EdgeCrossing;
+import com.ctreber.acearth.util.Point2D;
+import com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Map scanner for orthographic projection.

src/com/ctreber/acearth/scandot/DotGeneratorLines.java

@@ -1,7 +1,9 @@
 package com.ctreber.acearth.scandot;
 
 import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.util.*;
+import com.ctreber.acearth.util.Coordinate;
+import com.ctreber.acearth.util.Point2D;
+import com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Generate latitude and longitude grid as dots.

src/com/ctreber/acearth/shader/Shader.java

@@ -1,6 +1,6 @@
 package com.ctreber.acearth.shader;
 
-import java.awt.*;
+import java.awt.Color;
 
 import com.ctreber.acearth.projection.Projection;
 import com.ctreber.acearth.scanbit.BitGeneratorMap;

src/com/ctreber/acearth/shader/ShaderDefault.java

@@ -1,6 +1,6 @@
 package com.ctreber.acearth.shader;
 
-import java.awt.*;
+import java.awt.Color;
 
 /**
  * <p>Shader for projections which display the whole surface.</p>

src/com/ctreber/acearth/shader/ShaderFlat.java

@@ -1,6 +1,6 @@
 package com.ctreber.acearth.shader;
 
-import java.awt.*;
+import java.awt.Color;
 
 /**
  * <p>Flat shader (does not care for Projection).</p>

src/com/ctreber/acearth/shader/ShaderOrtho.java

@@ -1,6 +1,6 @@
 package com.ctreber.acearth.shader;
 
-import java.awt.*;
+import java.awt.Color;
 
 /**
  * <p>Shader for the orthographic projection.</p>

src/com/ctreber/acearth/util/SunPositionCalculator.java

@@ -1,6 +1,8 @@
 package com.ctreber.acearth.util;
 
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
 
 /**
  * <p>Calculates the position of the point on Earth which is directly

src/doc-files/umls.html

@@ -0,0 +1,40 @@
+<!--
+========================================================================
+PlantUML : a free UML diagram generator
+========================================================================
+
+(C) Copyright 2009-2013, Arnaud Roques
+
+Project Info:  http://plantuml.sourceforge.net
+
+This file is part of PlantUML.
+
+PlantUML is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+PlantUML distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+USA.
+
+[Java is a trademark or registered trademark of Sun Microsystems, Inc.
+in the United States and other countries.]
+
+Original Author:  Arnaud Roques
+
+-->
+
+@startuml img1.png
+title foo2
+component PlantUML
+@enduml
+
+
+</body>

src/jcckit/data/DataContainer.java

@@ -18,8 +18,8 @@
  */
 package jcckit.data;
 
-import java.text.*;
-import java.util.*;
+import java.text.MessageFormat;
+import java.util.Vector;
 
 /**
  * Abstract superclass of all data containers. A data container holds an

src/jcckit/data/DataPlot.java

@@ -18,10 +18,10 @@
  */
 package jcckit.data;
 
-import jcckit.util.ConfigParameters;
-
 import java.util.StringTokenizer;
 
+import jcckit.util.ConfigParameters;
+
 /**
  *  A plot is a {@link DataContainer} of {@link DataCurve DataCurves}.
  *

src/jcckit/graphic/BasicGraphicAttributes.java

@@ -18,10 +18,10 @@
  */
 package jcckit.graphic;
 
-import jcckit.util.ConfigParameters;
-
 import java.awt.Color;
 
+import jcckit.util.ConfigParameters;
+
 /**
  * The basic attributes of any {@link BasicGraphicalElement}. This is an
  * extension of {@link ShapeAttributes} implementing {@link TextAttributes}.

src/jcckit/graphic/FontStyle.java

@@ -18,11 +18,11 @@
  */
 package jcckit.graphic;
 
+import java.util.Hashtable;
+
 import jcckit.util.ConfigParameters;
 import jcckit.util.FactoryException;
 
-import java.util.Hashtable;
-
 /**
  *  Font style constants.
  *  This class is based on the typesafe enumeration pattern.

src/jcckit/graphic/ShapeAttributes.java

@@ -18,10 +18,10 @@
  */
 package jcckit.graphic;
 
-import jcckit.util.ConfigParameters;
-
 import java.awt.Color;
 
+import jcckit.util.ConfigParameters;
+
 /**
  *  Basic attributes for shapes.
  *

src/jcckit/plot/BarFactory.java

@@ -18,6 +18,7 @@
  */
 package jcckit.plot;
 
+import jcckit.graphic.ClippingShape;
 import jcckit.graphic.GraphPoint;
 import jcckit.graphic.GraphicAttributes;
 import jcckit.graphic.GraphicalElement;

src/jcckit/plot/CartesianCoordinateSystem.java

@@ -21,10 +21,10 @@
 import jcckit.data.DataPoint;
 import jcckit.graphic.ClippingRectangle;
 import jcckit.graphic.ClippingShape;
+import jcckit.graphic.GraphPoint;
+import jcckit.graphic.GraphicAttributes;
 import jcckit.graphic.GraphicalComposite;
 import jcckit.graphic.GraphicalElement;
-import jcckit.graphic.GraphicAttributes;
-import jcckit.graphic.GraphPoint;
 import jcckit.graphic.LineAttributes;
 import jcckit.graphic.Polygon;
 import jcckit.graphic.Text;

src/jcckit/plot/CircleSymbolFactory.java

@@ -18,9 +18,9 @@
  */
 package jcckit.plot;
 
+import jcckit.graphic.GraphPoint;
 import jcckit.graphic.GraphicAttributes;
 import jcckit.graphic.GraphicalElement;
-import jcckit.graphic.GraphPoint;
 import jcckit.graphic.Oval;
 import jcckit.util.ConfigParameters;
 

src/jcckit/plot/CoordinateSystem.java

@@ -18,8 +18,8 @@
  */
 package jcckit.plot;
 
-import jcckit.graphic.GraphicalElement;
 import jcckit.graphic.ClippingShape;
+import jcckit.graphic.GraphicalElement;
 import jcckit.transformation.Transformation;
 
 /**

src/jcckit/plot/Curve.java

@@ -18,8 +18,8 @@
  */
 package jcckit.plot;
 
-import jcckit.graphic.GraphicalElement;
 import jcckit.graphic.GraphPoint;
+import jcckit.graphic.GraphicalElement;
 
 /**
  * A curve is defined by a sequence of points in device-independent

src/jcckit/plot/Legend.java

@@ -18,11 +18,13 @@
  */
 package jcckit.plot;
 
+import java.util.Properties;
+
 import jcckit.graphic.BasicGraphicAttributes;
-import jcckit.graphic.GraphicalElement;
-import jcckit.graphic.GraphicalComposite;
-import jcckit.graphic.GraphicAttributes;
 import jcckit.graphic.GraphPoint;
+import jcckit.graphic.GraphicAttributes;
+import jcckit.graphic.GraphicalComposite;
+import jcckit.graphic.GraphicalElement;
 import jcckit.graphic.Polygon;
 import jcckit.graphic.Rectangle;
 import jcckit.graphic.ShapeAttributes;
@@ -34,8 +36,6 @@
 import jcckit.util.Factory;
 import jcckit.util.PropertiesBasedConfigData;
 
-import java.util.Properties;
-
 
 /**
  * Helper class for creating the legend of a {@link Plot}.

src/jcckit/plot/SquareSymbolFactory.java

@@ -18,9 +18,9 @@
  */
 package jcckit.plot;
 
+import jcckit.graphic.GraphPoint;
 import jcckit.graphic.GraphicAttributes;
 import jcckit.graphic.GraphicalElement;
-import jcckit.graphic.GraphPoint;
 import jcckit.graphic.Rectangle;
 import jcckit.util.ConfigParameters;
 

src/jcckit/plot/SymbolFactory.java

@@ -18,8 +18,8 @@
  */
 package jcckit.plot;
 
-import jcckit.graphic.GraphicalElement;
 import jcckit.graphic.GraphPoint;
+import jcckit.graphic.GraphicalElement;
 
 /**
  * Interface of a symbol factory. A symbol is a {@link GraphicalElement}

src/jcckit/renderer/Transformation.java

@@ -21,8 +21,8 @@
 import java.awt.Graphics2D;
 
 import jcckit.graphic.Anchor;
-import jcckit.graphic.GraphPoint;
 import jcckit.graphic.ClippingRectangle;
+import jcckit.graphic.GraphPoint;
 
 /**
  *  Transformation between device-independent coordinates

src/jcckit/util/ConfigParameters.java

@@ -22,6 +22,7 @@
 import java.util.StringTokenizer;
 
 import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.graphic.HtmlColorUtils;
 import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity;
 
 /**
@@ -300,8 +301,8 @@ private Color parseColor(String value, String key) {
   }
 
 private Color decodeInternal(String value) {
-	if (HtmlColor.isValid(value)) {
-		  return new ColorMapperIdentity().getMappedColor(HtmlColor.getColorIfValid(value));
+	if (HtmlColorUtils.getColorIfValid(value)!=null) {
+		  return new ColorMapperIdentity().getMappedColor(HtmlColorUtils.getColorIfValid(value));
 	}
 	return Color.decode(value);
 }

src/jcckit/util/Factory.java

@@ -18,7 +18,7 @@
  */
 package jcckit.util;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
 
 /**
  *  General purpose factory method based on {@link ConfigParameters}

src/jcckit/util/FactoryException.java

@@ -18,7 +18,7 @@
  */
 package jcckit.util;
 
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationTargetException;
 
 /**
  *  Exception thrown in the case of an error during creation of a new