version 1.2018.1

pom.xml

@@ -35,7 +35,7 @@
 
     <groupId>net.sourceforge.plantuml</groupId>
     <artifactId>plantuml</artifactId>
-    <version>1.2018.1-SNAPSHOT</version>
+    <version>1.2018.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>PlantUML</name>

src/ext/plantuml/com/ctreber/acearth/ACearth.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth;
+package ext.plantuml.com.ctreber.acearth;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -7,33 +7,33 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
-import com.ctreber.acearth.gui.CanvasACearth;
-import com.ctreber.acearth.plugins.Plugin;
-import com.ctreber.acearth.plugins.markers.Marker;
-import com.ctreber.acearth.plugins.markers.PluginMarkers;
-import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.projection.ProjectionCyl;
-import com.ctreber.acearth.projection.ProjectionMerc;
-import com.ctreber.acearth.projection.ProjectionOrtho;
-import com.ctreber.acearth.renderer.Renderer;
-import com.ctreber.acearth.renderer.RowTypeRendererScanBit;
-import com.ctreber.acearth.renderer.RowTypeRendererScanDot;
-import com.ctreber.acearth.scanbit.BitGeneratorMap;
-import com.ctreber.acearth.scanbit.BitGeneratorMapDefault;
-import com.ctreber.acearth.scanbit.BitGeneratorMapOrtho;
-import com.ctreber.acearth.scandot.DotGeneratorLines;
-import com.ctreber.acearth.scandot.DotGeneratorStars;
-import com.ctreber.acearth.scandot.ScanDot;
-import com.ctreber.acearth.scandot.ScanDotGenerator;
-import com.ctreber.acearth.shader.Shader;
-import com.ctreber.acearth.shader.ShaderDefault;
-import com.ctreber.acearth.shader.ShaderFlat;
-import com.ctreber.acearth.shader.ShaderOrtho;
-import com.ctreber.acearth.util.Coordinate;
-import com.ctreber.acearth.util.SunPositionCalculator;
-import com.ctreber.acearth.util.Toolkit;
-import com.ctreber.aclib.sort.CTSort;
-import com.ctreber.aclib.sort.QuickSort;
+import ext.plantuml.com.ctreber.acearth.gui.CanvasACearth;
+import ext.plantuml.com.ctreber.acearth.plugins.Plugin;
+import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
+import ext.plantuml.com.ctreber.acearth.plugins.markers.PluginMarkers;
+import ext.plantuml.com.ctreber.acearth.projection.Projection;
+import ext.plantuml.com.ctreber.acearth.projection.ProjectionCyl;
+import ext.plantuml.com.ctreber.acearth.projection.ProjectionMerc;
+import ext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho;
+import ext.plantuml.com.ctreber.acearth.renderer.Renderer;
+import ext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanBit;
+import ext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanDot;
+import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
+import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapDefault;
+import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapOrtho;
+import ext.plantuml.com.ctreber.acearth.scandot.DotGeneratorLines;
+import ext.plantuml.com.ctreber.acearth.scandot.DotGeneratorStars;
+import ext.plantuml.com.ctreber.acearth.scandot.ScanDot;
+import ext.plantuml.com.ctreber.acearth.scandot.ScanDotGenerator;
+import ext.plantuml.com.ctreber.acearth.shader.Shader;
+import ext.plantuml.com.ctreber.acearth.shader.ShaderDefault;
+import ext.plantuml.com.ctreber.acearth.shader.ShaderFlat;
+import ext.plantuml.com.ctreber.acearth.shader.ShaderOrtho;
+import ext.plantuml.com.ctreber.acearth.util.Coordinate;
+import ext.plantuml.com.ctreber.acearth.util.SunPositionCalculator;
+import ext.plantuml.com.ctreber.acearth.util.Toolkit;
+import ext.plantuml.com.ctreber.aclib.sort.CTSort;
+import ext.plantuml.com.ctreber.aclib.sort.QuickSort;
 
 /**
  * <h1>AC.earth - XEarth for Java

src/ext/plantuml/com/ctreber/acearth/Configuration.java

@@ -1,14 +1,14 @@
-package com.ctreber.acearth;
+package ext.plantuml.com.ctreber.acearth;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.ctreber.aclib.gui.MOBoolean;
-import com.ctreber.aclib.gui.MODouble;
-import com.ctreber.aclib.gui.MOEnum;
-import com.ctreber.aclib.gui.MOInteger;
-import com.ctreber.aclib.gui.MOString;
-import com.ctreber.aclib.gui.MonitoredObject;
+import ext.plantuml.com.ctreber.aclib.gui.MOBoolean;
+import ext.plantuml.com.ctreber.aclib.gui.MODouble;
+import ext.plantuml.com.ctreber.aclib.gui.MOEnum;
+import ext.plantuml.com.ctreber.aclib.gui.MOInteger;
+import ext.plantuml.com.ctreber.aclib.gui.MOString;
+import ext.plantuml.com.ctreber.aclib.gui.MonitoredObject;
 
 /**
  * <p>

src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java

@@ -1,12 +1,12 @@
-package com.ctreber.acearth;
+package ext.plantuml.com.ctreber.acearth;
 
-import com.ctreber.acearth.util.Coordinate;
-import com.ctreber.aclib.gui.MOBoolean;
-import com.ctreber.aclib.gui.MODouble;
-import com.ctreber.aclib.gui.MOEnum;
-import com.ctreber.aclib.gui.MOInteger;
-import com.ctreber.aclib.gui.MOString;
-import com.ctreber.aclib.gui.MonitoredObject;
+import ext.plantuml.com.ctreber.acearth.util.Coordinate;
+import ext.plantuml.com.ctreber.aclib.gui.MOBoolean;
+import ext.plantuml.com.ctreber.aclib.gui.MODouble;
+import ext.plantuml.com.ctreber.aclib.gui.MOEnum;
+import ext.plantuml.com.ctreber.aclib.gui.MOInteger;
+import ext.plantuml.com.ctreber.aclib.gui.MOString;
+import ext.plantuml.com.ctreber.aclib.gui.MonitoredObject;
 
 /**
  * <p>

src/ext/plantuml/com/ctreber/acearth/MapData.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth;
+package ext.plantuml.com.ctreber.acearth;
 
 import java.util.ArrayList;
 import java.util.List;

src/ext/plantuml/com/ctreber/acearth/MapDataReader.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth;
+package ext.plantuml.com.ctreber.acearth;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -6,8 +6,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import com.ctreber.acearth.util.Point3D;
-import com.ctreber.acearth.util.Polygon;
+import ext.plantuml.com.ctreber.acearth.util.Point3D;
+import ext.plantuml.com.ctreber.acearth.util.Polygon;
 
 /**
  * The map data file is a big array of short (16-bit) ints, as follows: - it is

src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java

@@ -1,6 +1,6 @@
-package com.ctreber.acearth.gui;
+package ext.plantuml.com.ctreber.acearth.gui;
 
-import com.ctreber.acearth.ACearth;
+import ext.plantuml.com.ctreber.acearth.ACearth;
 
 /**
  * <p>

src/ext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.gui;
+package ext.plantuml.com.ctreber.acearth.gui;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
@@ -9,7 +9,7 @@ import java.io.OutputStream;
 
 import javax.imageio.ImageIO;
 
-import com.ctreber.acearth.renderer.RenderTarget;
+import ext.plantuml.com.ctreber.acearth.renderer.RenderTarget;
 
 /**
  * <p>

src/ext/plantuml/com/ctreber/acearth/plugins/Plugin.java

@@ -1,11 +1,11 @@
-package com.ctreber.acearth.plugins;
+package ext.plantuml.com.ctreber.acearth.plugins;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import com.ctreber.acearth.ACearth;
-import com.ctreber.acearth.gui.PixelCanvas;
-import com.ctreber.acearth.projection.Projection;
+import ext.plantuml.com.ctreber.acearth.ACearth;
+import ext.plantuml.com.ctreber.acearth.gui.PixelCanvas;
+import ext.plantuml.com.ctreber.acearth.projection.Projection;
 
 /**
  * <p></p>

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

@@ -1,17 +1,17 @@
-package com.ctreber.acearth.plugins.markers;
+package ext.plantuml.com.ctreber.acearth.plugins.markers;
 
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.util.List;
 
-import com.ctreber.acearth.gui.PixelCanvas;
-import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.projection.ProjectionOrtho;
-import com.ctreber.acearth.util.Coordinate;
-import com.ctreber.acearth.util.Point2D;
-import com.ctreber.acearth.util.Point3D;
-import com.ctreber.acearth.util.StringParser;
+import ext.plantuml.com.ctreber.acearth.gui.PixelCanvas;
+import ext.plantuml.com.ctreber.acearth.projection.Projection;
+import ext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho;
+import ext.plantuml.com.ctreber.acearth.util.Coordinate;
+import ext.plantuml.com.ctreber.acearth.util.Point2D;
+import ext.plantuml.com.ctreber.acearth.util.Point3D;
+import ext.plantuml.com.ctreber.acearth.util.StringParser;
 
 /**
  * <p>

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

@@ -1,9 +1,9 @@
-package com.ctreber.acearth.plugins.markers;
+package ext.plantuml.com.ctreber.acearth.plugins.markers;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.ctreber.acearth.plugins.Plugin;
+import ext.plantuml.com.ctreber.acearth.plugins.Plugin;
 
 /**
  * <p>

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

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

src/ext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java

@@ -1,7 +1,7 @@
-package com.ctreber.acearth.projection;
+package ext.plantuml.com.ctreber.acearth.projection;
 
-import com.ctreber.acearth.util.Coordinate;
-import com.ctreber.acearth.util.Point3D;
+import ext.plantuml.com.ctreber.acearth.util.Coordinate;
+import ext.plantuml.com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Cylindrical projection. Show Earth flatly spread out on rectangle.

src/ext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java

@@ -1,7 +1,7 @@
-package com.ctreber.acearth.projection;
+package ext.plantuml.com.ctreber.acearth.projection;
 
-import com.ctreber.acearth.util.Coordinate;
-import com.ctreber.acearth.util.Point3D;
+import ext.plantuml.com.ctreber.acearth.util.Coordinate;
+import ext.plantuml.com.ctreber.acearth.util.Point3D;
 
 
 /**

src/ext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java

@@ -1,7 +1,7 @@
-package com.ctreber.acearth.projection;
+package ext.plantuml.com.ctreber.acearth.projection;
 
-import com.ctreber.acearth.util.Coordinate;
-import com.ctreber.acearth.util.Point3D;
+import ext.plantuml.com.ctreber.acearth.util.Coordinate;
+import ext.plantuml.com.ctreber.acearth.util.Point3D;
 
 
 /**

src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.renderer;
+package ext.plantuml.com.ctreber.acearth.renderer;
 
 import java.awt.Color;
 

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

@@ -1,11 +1,11 @@
-package com.ctreber.acearth.renderer;
+package ext.plantuml.com.ctreber.acearth.renderer;
 
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.ctreber.acearth.shader.Shader;
+import ext.plantuml.com.ctreber.acearth.shader.Shader;
 
 /**
  * <p>

src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.renderer;
+package ext.plantuml.com.ctreber.acearth.renderer;
 
 /**
  * <p>Renders a row of pixel types.</p>

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

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

src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java

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

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

@@ -1,16 +1,16 @@
-package com.ctreber.acearth.scanbit;
+package ext.plantuml.com.ctreber.acearth.scanbit;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-import com.ctreber.acearth.projection.Projection;
-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;
+import ext.plantuml.com.ctreber.acearth.projection.Projection;
+import ext.plantuml.com.ctreber.acearth.util.EdgeCrossing;
+import ext.plantuml.com.ctreber.acearth.util.Point2D;
+import ext.plantuml.com.ctreber.acearth.util.Point3D;
+import ext.plantuml.com.ctreber.acearth.util.Polygon;
+import ext.plantuml.com.ctreber.aclib.sort.CTSort;
+import ext.plantuml.com.ctreber.aclib.sort.QuickSort;
 
 /**
  * <p>

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

@@ -1,11 +1,11 @@
-package com.ctreber.acearth.scanbit;
+package ext.plantuml.com.ctreber.acearth.scanbit;
 
 import java.util.Comparator;
 
-import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.util.EdgeCrossing;
-import com.ctreber.acearth.util.Point2D;
-import com.ctreber.acearth.util.Point3D;
+import ext.plantuml.com.ctreber.acearth.projection.Projection;
+import ext.plantuml.com.ctreber.acearth.util.EdgeCrossing;
+import ext.plantuml.com.ctreber.acearth.util.Point2D;
+import ext.plantuml.com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Map scanner for mercator and cylindrical projections.

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

@@ -1,11 +1,11 @@
-package com.ctreber.acearth.scanbit;
+package ext.plantuml.com.ctreber.acearth.scanbit;
 
 import java.util.Comparator;
 
-import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.util.EdgeCrossing;
-import com.ctreber.acearth.util.Point2D;
-import com.ctreber.acearth.util.Point3D;
+import ext.plantuml.com.ctreber.acearth.projection.Projection;
+import ext.plantuml.com.ctreber.acearth.util.EdgeCrossing;
+import ext.plantuml.com.ctreber.acearth.util.Point2D;
+import ext.plantuml.com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Map scanner for orthographic projection.

src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.scanbit;
+package ext.plantuml.com.ctreber.acearth.scanbit;
 
 /**
  * <p>Instruction to paint points xFrom to xTo on line y.
@@ -53,7 +53,7 @@ public class ScanBit implements Comparable
 
   /**
    * <p>See values for
-   * @see com.ctreber.acearth.util.Polygon
+   * @see ext.plantuml.com.ctreber.acearth.util.Polygon
    */
   public int getType()
   {

src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.scanbit;
+package ext.plantuml.com.ctreber.acearth.scanbit;
 
 /**
  * <p>A ScanBitGenerator produces ScanBits.</p>

src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java

@@ -1,10 +1,10 @@
-package com.ctreber.acearth.scanbit;
+package ext.plantuml.com.ctreber.acearth.scanbit;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.ctreber.aclib.sort.CTSort;
-import com.ctreber.aclib.sort.QuickSort;
+import ext.plantuml.com.ctreber.aclib.sort.CTSort;
+import ext.plantuml.com.ctreber.aclib.sort.QuickSort;
 
 /**
  * <p>For each line, the scanbuffer (= a raster divice) records the points hit

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

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

src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.scandot;
+package ext.plantuml.com.ctreber.acearth.scandot;
 
 import java.util.Random;
 

src/ext/plantuml/com/ctreber/acearth/scandot/ScanDot.java

@@ -1,6 +1,6 @@
-package com.ctreber.acearth.scandot;
+package ext.plantuml.com.ctreber.acearth.scandot;
 
-import com.ctreber.acearth.util.Point2D;
+import ext.plantuml.com.ctreber.acearth.util.Point2D;
 
 /**
  * <p>A single scandot (opposed to a Polygon).

src/ext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.scandot;
+package ext.plantuml.com.ctreber.acearth.scandot;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,11 +1,11 @@
-package com.ctreber.acearth.shader;
+package ext.plantuml.com.ctreber.acearth.shader;
 
 import java.awt.Color;
 
-import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.scanbit.BitGeneratorMap;
-import com.ctreber.acearth.util.Coordinate;
-import com.ctreber.acearth.util.Point3D;
+import ext.plantuml.com.ctreber.acearth.projection.Projection;
+import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
+import ext.plantuml.com.ctreber.acearth.util.Coordinate;
+import ext.plantuml.com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>A shader computes Colors for a row of pixel types, depending

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

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.shader;
+package ext.plantuml.com.ctreber.acearth.shader;
 
 import java.awt.Color;
 

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

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.shader;
+package ext.plantuml.com.ctreber.acearth.shader;
 
 import java.awt.Color;
 

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

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.shader;
+package ext.plantuml.com.ctreber.acearth.shader;
 
 import java.awt.Color;
 

src/ext/plantuml/com/ctreber/acearth/util/Coordinate.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.util;
+package ext.plantuml.com.ctreber.acearth.util;
 
 import java.io.IOException;
 import java.io.Writer;

src/ext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.util;
+package ext.plantuml.com.ctreber.acearth.util;
 
 /**
  * <p>Holds information about a line crossing "the edge of Earth".

src/ext/plantuml/com/ctreber/acearth/util/Point2D.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.util;
+package ext.plantuml.com.ctreber.acearth.util;
 
 /**
  * <p>A point in a 2 axis space.

src/ext/plantuml/com/ctreber/acearth/util/Point3D.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.util;
+package ext.plantuml.com.ctreber.acearth.util;
 
 /**
  * <p>A point in a 2 axis space.

src/ext/plantuml/com/ctreber/acearth/util/Polygon.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.util;
+package ext.plantuml.com.ctreber.acearth.util;
 
 
 /**

src/ext/plantuml/com/ctreber/acearth/util/StringParser.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.util;
+package ext.plantuml.com.ctreber.acearth.util;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.util;
+package ext.plantuml.com.ctreber.acearth.util;
 
 import java.util.Calendar;
 import java.util.Date;

src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java

@@ -1,4 +1,4 @@
-package com.ctreber.acearth.util;
+package ext.plantuml.com.ctreber.acearth.util;
 
 import java.util.HashSet;
 import java.util.StringTokenizer;

src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java

@@ -1,4 +1,4 @@
-package com.ctreber.aclib.gui;
+package ext.plantuml.com.ctreber.aclib.gui;
 
 /**
  * <p></p>

src/ext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java

@@ -1,4 +1,4 @@
-package com.ctreber.aclib.gui;
+package ext.plantuml.com.ctreber.aclib.gui;
 
 /**
  * <p>Implemented by classes interetested in MonitoredObject values changes.</p>

src/ext/plantuml/com/ctreber/aclib/gui/MODouble.java

@@ -1,4 +1,4 @@
-package com.ctreber.aclib.gui;
+package ext.plantuml.com.ctreber.aclib.gui;
 
 /**
  * <p></p>

src/ext/plantuml/com/ctreber/aclib/gui/MOEnum.java

@@ -1,4 +1,4 @@
-package com.ctreber.aclib.gui;
+package ext.plantuml.com.ctreber.aclib.gui;
 
 import java.util.HashSet;
 

src/ext/plantuml/com/ctreber/aclib/gui/MOInteger.java

@@ -1,4 +1,4 @@
-package com.ctreber.aclib.gui;
+package ext.plantuml.com.ctreber.aclib.gui;
 
 /**
  * <p></p>

src/ext/plantuml/com/ctreber/aclib/gui/MOString.java

@@ -1,4 +1,4 @@
-package com.ctreber.aclib.gui;
+package ext.plantuml.com.ctreber.aclib.gui;
 
 
 

src/ext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java

@@ -1,4 +1,4 @@
-package com.ctreber.aclib.gui;
+package ext.plantuml.com.ctreber.aclib.gui;
 
 import java.util.ArrayList;
 import java.util.Iterator;

src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java

@@ -1,4 +1,4 @@
-package com.ctreber.aclib.sort;
+package ext.plantuml.com.ctreber.aclib.sort;
 
 import java.util.Comparator;
 

src/ext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java

@@ -1,4 +1,4 @@
-package com.ctreber.aclib.sort;
+package ext.plantuml.com.ctreber.aclib.sort;
 
 import java.util.Comparator;
 

src/ext/plantuml/com/ctreber/aclib/sort/QuickSort.java

@@ -1,4 +1,4 @@
-package com.ctreber.aclib.sort;
+package ext.plantuml.com.ctreber.aclib.sort;
 
 import java.util.Comparator;
 

src/ext/plantuml/com/google/zxing/BarcodeFormat.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package ext.plantuml.com.google.zxing;
 
 import java.util.Hashtable;
 

src/ext/plantuml/com/google/zxing/ChecksumException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package ext.plantuml.com.google.zxing;
 
 /**
  * Thrown when a barcode was successfully detected and decoded, but

src/ext/plantuml/com/google/zxing/DecodeHintType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package ext.plantuml.com.google.zxing;
 
 import java.io.Reader;
 

src/ext/plantuml/com/google/zxing/EncodeHintType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package ext.plantuml.com.google.zxing;
 
 /**
  * These are a set of hints that you may pass to Writers to specify their behavior.

src/ext/plantuml/com/google/zxing/FormatException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package ext.plantuml.com.google.zxing;
 
 /**
  * Thrown when a barcode was successfully detected, but some aspect of

src/ext/plantuml/com/google/zxing/NotFoundException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package ext.plantuml.com.google.zxing;
 
 /**
  * Thrown when a barcode was not found in the image. It might have been

src/ext/plantuml/com/google/zxing/ReaderException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package ext.plantuml.com.google.zxing;
 
 /**
  * The general exception class throw when something goes wrong during decoding of a barcode.

src/ext/plantuml/com/google/zxing/ResultPoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package ext.plantuml.com.google.zxing;
 
 /**
  * <p>Encapsulates a point of interest in an image containing a barcode. Typically, this

src/ext/plantuml/com/google/zxing/Writer.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package ext.plantuml.com.google.zxing;
 
 import java.util.Hashtable;
 
-import com.google.zxing.common.BitMatrix;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * The base class for all objects which encode/generate a barcode image.

src/ext/plantuml/com/google/zxing/WriterException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package ext.plantuml.com.google.zxing;
 
 /**
  * A base class which covers the range of exceptions which may occur when encoding a barcode using

src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.client.j2se;
+package ext.plantuml.com.google.zxing.client.j2se;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -23,7 +23,7 @@ import java.io.OutputStream;
 
 import javax.imageio.ImageIO;
 
-import com.google.zxing.common.BitMatrix;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * Writes a {@link BitMatrix} to {@link BufferedImage},

src/ext/plantuml/com/google/zxing/common/BitArray.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common;
+package ext.plantuml.com.google.zxing.common;
 
 /**
  * <p>A simple, fast array of bits, represented compactly by an array of ints internally.</p>

src/ext/plantuml/com/google/zxing/common/BitMatrix.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common;
+package ext.plantuml.com.google.zxing.common;
 
 /**
  * <p>Represents a 2D matrix of bits. In function arguments below, and throughout the common

src/ext/plantuml/com/google/zxing/common/BitSource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common;
+package ext.plantuml.com.google.zxing.common;
 
 /**
  * <p>This provides an easy abstraction to read bits at a time from a sequence of bytes, where the

src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common;
+package ext.plantuml.com.google.zxing.common;
 
 import java.util.Hashtable;
 

src/ext/plantuml/com/google/zxing/common/DecoderResult.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common;
+package ext.plantuml.com.google.zxing.common;
 
 import java.util.Vector;
 
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
 /**
  * <p>Encapsulates the result of decoding a matrix of bits. This typically

src/ext/plantuml/com/google/zxing/common/DetectorResult.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common;
+package ext.plantuml.com.google.zxing.common;
 
-import com.google.zxing.ResultPoint;
+import ext.plantuml.com.google.zxing.ResultPoint;
 
 /**
  * <p>Encapsulates the result of detecting a barcode in an image. This includes the raw

src/ext/plantuml/com/google/zxing/common/ECI.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common;
+package ext.plantuml.com.google.zxing.common;
 
 /**
  * Superclass of classes encapsulating types ECIs, according to "Extended Channel Interpretations"

src/ext/plantuml/com/google/zxing/common/StringUtils.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common;
+package ext.plantuml.com.google.zxing.common;
 
 import java.util.Hashtable;
 
-import com.google.zxing.DecodeHintType;
+import ext.plantuml.com.google.zxing.DecodeHintType;
 
 /**
  * Common string-related functions.

src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common.reedsolomon;
+package ext.plantuml.com.google.zxing.common.reedsolomon;
 
 /**
  * <p>This class contains utility methods for performing mathematical operations over

src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common.reedsolomon;
+package ext.plantuml.com.google.zxing.common.reedsolomon;
 
 /**
  * <p>Represents a polynomial whose coefficients are elements of GF(256).

src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common.reedsolomon;
+package ext.plantuml.com.google.zxing.common.reedsolomon;
 
 import java.util.Vector;
 

src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.common.reedsolomon;
+package ext.plantuml.com.google.zxing.common.reedsolomon;
 
 /**
  * <p>Thrown when an exception occurs during Reed-Solomon decoding, such as when

src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.zxing.datamatrix.decoder;
+package ext.plantuml.com.google.zxing.datamatrix.decoder;
 
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
+import ext.plantuml.com.google.zxing.FormatException;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * @author bbrown@google.com (Brian Brown)

src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.datamatrix.decoder;
+package ext.plantuml.com.google.zxing.datamatrix.decoder;
 
 /**
  * <p>Encapsulates a block of data within a Data Matrix Code. Data Matrix Codes may split their data into

src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.zxing.datamatrix.decoder;
+package ext.plantuml.com.google.zxing.datamatrix.decoder;
 
-import com.google.zxing.FormatException;
+import ext.plantuml.com.google.zxing.FormatException;
 
 /**
  * The Version object encapsulates attributes about a particular

src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode;
+package ext.plantuml.com.google.zxing.qrcode;
 
 import java.util.Hashtable;
 
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.Writer;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.google.zxing.qrcode.encoder.ByteMatrix;
-import com.google.zxing.qrcode.encoder.Encoder;
-import com.google.zxing.qrcode.encoder.QRCode;
+import ext.plantuml.com.google.zxing.BarcodeFormat;
+import ext.plantuml.com.google.zxing.EncodeHintType;
+import ext.plantuml.com.google.zxing.Writer;
+import ext.plantuml.com.google.zxing.WriterException;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
+import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import ext.plantuml.com.google.zxing.qrcode.encoder.ByteMatrix;
+import ext.plantuml.com.google.zxing.qrcode.encoder.Encoder;
+import ext.plantuml.com.google.zxing.qrcode.encoder.QRCode;
 
 /**
  * This object renders a QR Code as a BitMatrix 2D array of greyscale values.

src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.decoder;
+package ext.plantuml.com.google.zxing.qrcode.decoder;
 
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
+import ext.plantuml.com.google.zxing.FormatException;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * @author Sean Owen

src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.decoder;
+package ext.plantuml.com.google.zxing.qrcode.decoder;
 
 /**
  * <p>Encapsulates a block of data within a QR Code. QR Codes may split their data into

src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.decoder;
+package ext.plantuml.com.google.zxing.qrcode.decoder;
 
-import com.google.zxing.common.BitMatrix;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * <p>Encapsulates data masks for the data bits in a QR code, per ISO 18004:2006 6.8. Implementations

src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.decoder;
+package ext.plantuml.com.google.zxing.qrcode.decoder;
 
 /**
  * <p>See ISO 18004:2006, 6.5.1. This enum encapsulates the four error correction levels

src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.decoder;
+package ext.plantuml.com.google.zxing.qrcode.decoder;
 
 /**
  * <p>Encapsulates a QR Code's format information, including the data mask used and

src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.decoder;
+package ext.plantuml.com.google.zxing.qrcode.decoder;
 
 /**
  * <p>See ISO 18004:2006, 6.4.1, Tables 2 and 3. This enum encapsulates the various modes in which

src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.decoder;
+package ext.plantuml.com.google.zxing.qrcode.decoder;
 
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
+import ext.plantuml.com.google.zxing.FormatException;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * See ISO 18004:2006 Annex D

src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.encoder;
+package ext.plantuml.com.google.zxing.qrcode.encoder;
 
 final class BlockPair {
 

src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.encoder;
+package ext.plantuml.com.google.zxing.qrcode.encoder;
 
 /**
  * A class which wraps a 2D array of bytes. The default usage is signed. If you want to use it as a

src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java

@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.encoder;
+package ext.plantuml.com.google.zxing.qrcode.encoder;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Hashtable;
 import java.util.Vector;
 
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitArray;
-import com.google.zxing.common.CharacterSetECI;
-import com.google.zxing.common.ECI;
-import com.google.zxing.common.reedsolomon.GF256;
-import com.google.zxing.common.reedsolomon.ReedSolomonEncoder;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.google.zxing.qrcode.decoder.Mode;
-import com.google.zxing.qrcode.decoder.Version;
+import ext.plantuml.com.google.zxing.EncodeHintType;
+import ext.plantuml.com.google.zxing.WriterException;
+import ext.plantuml.com.google.zxing.common.BitArray;
+import ext.plantuml.com.google.zxing.common.CharacterSetECI;
+import ext.plantuml.com.google.zxing.common.ECI;
+import ext.plantuml.com.google.zxing.common.reedsolomon.GF256;
+import ext.plantuml.com.google.zxing.common.reedsolomon.ReedSolomonEncoder;
+import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import ext.plantuml.com.google.zxing.qrcode.decoder.Mode;
+import ext.plantuml.com.google.zxing.qrcode.decoder.Version;
 
 /**
  * @author satorux@google.com (Satoru Takabayashi) - creator

src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.encoder;
+package ext.plantuml.com.google.zxing.qrcode.encoder;
 
 /**
  * @author satorux@google.com (Satoru Takabayashi) - creator

src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.encoder;
+package ext.plantuml.com.google.zxing.qrcode.encoder;
 
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitArray;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import ext.plantuml.com.google.zxing.WriterException;
+import ext.plantuml.com.google.zxing.common.BitArray;
+import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
 /**
  * @author satorux@google.com (Satoru Takabayashi) - creator

src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.encoder;
+package ext.plantuml.com.google.zxing.qrcode.encoder;
 
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.google.zxing.qrcode.decoder.Mode;
+import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import ext.plantuml.com.google.zxing.qrcode.decoder.Mode;
 
 /**
  * @author satorux@google.com (Satoru Takabayashi) - creator

src/net/sourceforge/plantuml/AbstractPSystem.java

@@ -56,6 +56,7 @@ import net.sourceforge.plantuml.version.Version;
 public abstract class AbstractPSystem implements Diagram {
 
 	private UmlSource source;
+	private Scale scale;
 
 	private String getVersion() {
 		final StringBuilder toAppend = new StringBuilder();
@@ -140,6 +141,14 @@ public abstract class AbstractPSystem implements Diagram {
 		}
 	}
 
+	final public void setScale(Scale scale) {
+		this.scale = scale;
+	}
+
+	final public Scale getScale() {
+		return scale;
+	}
+
 	protected abstract ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption,
 			long seed) throws IOException;
 

src/net/sourceforge/plantuml/BlockUmlBuilder.java

@@ -93,6 +93,10 @@ public final class BlockUmlBuilder implements DefinitionsContainer {
 				paused = true;
 				reader2.setPaused(true);
 			}
+			if (StartUtils.isExit(s)) {
+				paused = true;
+				reader2.setPaused(true);
+			}
 			if (current2 != null && paused == false) {
 				current2.add(s);
 			} else if (paused) {
@@ -107,7 +111,9 @@ public final class BlockUmlBuilder implements DefinitionsContainer {
 				reader2.setPaused(false);
 			}
 			if (StartUtils.isArobaseEndDiagram(s) && current2 != null) {
-				// current2.addAll(1, convert(config, new LineLocationImpl(null, null).oneLineRead()));
+				if (paused) {
+					current2.add(s);
+				}
 				blocks.add(new BlockUml(current2, startLine/* - config.size() */, defines.cloneMe()));
 				current2 = null;
 				reader2.setPaused(false);

src/net/sourceforge/plantuml/ISkinParam.java

@@ -99,7 +99,7 @@ public interface ISkinParam extends ISkinSimple {
 
 	public double getRanksep();
 
-	public double getRoundCorner(String param, Stereotype stereotype);
+	public double getRoundCorner(RoundParam param, Stereotype stereotype);
 
 	public LineBreakStrategy maxMessageSize();
 

src/net/sourceforge/plantuml/RoundParam.java

@@ -0,0 +1,48 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * 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.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml;
+
+public enum RoundParam {
+	DEFAULT, diagramBorder, titleBorder, rectangle, component;
+
+	public String getKey() {
+		if (this == DEFAULT) {
+			return "roundcorner";
+		}
+		return name() + "roundcorner";
+	}
+
+}

src/net/sourceforge/plantuml/SkinParam.java

@@ -642,8 +642,23 @@ public class SkinParam implements ISkinParam {
 		return 0;
 	}
 
-	public double getRoundCorner(String param, Stereotype stereotype) {
-		String key = param + "roundcorner";
+	public double getRoundCorner(RoundParam param, Stereotype stereotype) {
+		Double result = getRoundCornerInternal(param, stereotype);
+		if (result != null) {
+			return result;
+		}
+		result = getRoundCornerInternal(param, null);
+		if (result != null) {
+			return result;
+		}
+		if (param == RoundParam.DEFAULT) {
+			return 0;
+		}
+		return getRoundCorner(RoundParam.DEFAULT, stereotype);
+	}
+
+	private Double getRoundCornerInternal(RoundParam param, Stereotype stereotype) {
+		String key = param.getKey();
 		if (stereotype != null) {
 			key += stereotype.getLabel(false);
 		}
@@ -651,7 +666,7 @@ public class SkinParam implements ISkinParam {
 		if (value != null && value.matches("\\d+")) {
 			return Double.parseDouble(value);
 		}
-		return 0;
+		return null;
 	}
 
 	public UStroke getThickness(LineParam param, Stereotype stereotype) {

src/net/sourceforge/plantuml/SkinParamDelegator.java

@@ -147,7 +147,7 @@ public class SkinParamDelegator implements ISkinParam {
 		return skinParam.getRanksep();
 	}
 
-	public double getRoundCorner(String param, Stereotype stereotype) {
+	public double getRoundCorner(RoundParam param, Stereotype stereotype) {
 		return skinParam.getRoundCorner(param, stereotype);
 	}
 

src/net/sourceforge/plantuml/UmlDiagram.java

@@ -98,7 +98,6 @@ public abstract class UmlDiagram extends AbstractPSystem implements Diagram, Ann
 	private DisplayPositionned legend = DisplayPositionned.none(HorizontalAlignment.CENTER, VerticalAlignment.BOTTOM);
 
 	private final Pragma pragma = new Pragma();
-	private Scale scale;
 	private Animation animation;
 
 	private final SkinParam skinParam = SkinParam.create(getUmlDiagramType());
@@ -176,14 +175,6 @@ public abstract class UmlDiagram extends AbstractPSystem implements Diagram, Ann
 		return pragma;
 	}
 
-	final public void setScale(Scale scale) {
-		this.scale = scale;
-	}
-
-	final public Scale getScale() {
-		return scale;
-	}
-
 	final public void setAnimation(Iterable<CharSequence> animationData) {
 		try {
 			final AnimationDecoder animationDecoder = new AnimationDecoder(animationData);

src/net/sourceforge/plantuml/acearth/PSystemXearth.java

@@ -53,9 +53,9 @@ import net.sourceforge.plantuml.api.ImageDataSimple;
 import net.sourceforge.plantuml.core.DiagramDescription;
 import net.sourceforge.plantuml.core.ImageData;
 
-import com.ctreber.acearth.ACearth;
-import com.ctreber.acearth.ConfigurationACearth;
-import com.ctreber.acearth.plugins.markers.Marker;
+import ext.plantuml.com.ctreber.acearth.ACearth;
+import ext.plantuml.com.ctreber.acearth.ConfigurationACearth;
+import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
 
 public class PSystemXearth extends AbstractPSystem {