Merge branch 'plantuml:master' into ImproveDoc

.gitattributes

@@ -0,0 +1 @@
+*.java text=auto

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

@@ -47,9 +47,9 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
-import ext.plantuml.com.ctreber.acearth.ACearth;
-import ext.plantuml.com.ctreber.acearth.ConfigurationACearth;
-import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
+import zext.plantuml.com.ctreber.acearth.ACearth;
+import zext.plantuml.com.ctreber.acearth.ConfigurationACearth;
+import zext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
 import net.sourceforge.plantuml.AbstractPSystem;
 import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.api.ImageDataSimple;

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

@@ -40,7 +40,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
+import zext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
 import net.sourceforge.plantuml.command.PSystemBasicFactory;
 import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.log.Logme;

src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java

@@ -61,7 +61,7 @@ public class CommandActivity3 extends SingleLineCommand2<ActivityDiagram3> {
 
 	public static final String endingGroup() {
 		return "(" //
-				+ ";(?:[%s]*(\\<\\<\\w+\\>\\>))?" //
+				+ ";[%s]*(\\<\\<\\w+\\>\\>(?:[%s]*\\<\\<\\w+\\>\\>)*)?" //
 				+ "|" //
 				+ Matcher.quoteReplacement("\\\\") // that is simply \ character
 				+ "|" //
@@ -77,7 +77,7 @@ public class CommandActivity3 extends SingleLineCommand2<ActivityDiagram3> {
 
 	private static final String endingGroupShort() {
 		return "(" //
-				+ ";(?:[%s]*(\\<\\<\\w+\\>\\>))?" //
+				+ ";[%s]*(\\<\\<\\w+\\>\\>(?:[%s]*\\<\\<\\w+\\>\\>)*)?" //
 				+ "|" //
 				+ Matcher.quoteReplacement("\\\\") // that is simply \ character
 				+ "|" //

src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java

@@ -41,12 +41,12 @@ import java.util.Hashtable;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import ext.plantuml.com.google.zxing.BarcodeFormat;
-import ext.plantuml.com.google.zxing.EncodeHintType;
-import ext.plantuml.com.google.zxing.client.j2se.MatrixToImageWriter;
-import ext.plantuml.com.google.zxing.common.BitMatrix;
-import ext.plantuml.com.google.zxing.qrcode.QRCodeWriter;
-import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import zext.plantuml.com.google.zxing.BarcodeFormat;
+import zext.plantuml.com.google.zxing.EncodeHintType;
+import zext.plantuml.com.google.zxing.client.j2se.MatrixToImageWriter;
+import zext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.plantuml.com.google.zxing.qrcode.QRCodeWriter;
+import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import net.sourceforge.plantuml.utils.Log;
 
 public class FlashCodeUtilsZxing implements FlashCodeUtils {

src/net/sourceforge/plantuml/skin/ActorAwesome.java

@@ -55,10 +55,10 @@ public class ActorAwesome extends AbstractTextBlock implements TextBlock {
 	private final double radius = 8;
 	private final double bodyHeight = 28;
 
-	private final Fashion symbolContext;
+	private final Fashion fashion;
 
-	public ActorAwesome(Fashion symbolContext) {
-		this.symbolContext = symbolContext.withStroke(UStroke.withThickness(1.5));
+	public ActorAwesome(Fashion fashion) {
+		this.fashion = fashion;
 	}
 
 	public void drawU(UGraphic ug) {
@@ -81,18 +81,18 @@ public class ActorAwesome extends AbstractTextBlock implements TextBlock {
 		path.cubicTo(-bodyWidth / 2 + shoulder + collar, collar, -collar, collar, 0, collar);
 		path.closePath();
 
-		if (symbolContext.getDeltaShadow() != 0) {
-			head.setDeltaShadow(symbolContext.getDeltaShadow());
-			path.setDeltaShadow(symbolContext.getDeltaShadow());
+		if (fashion.getDeltaShadow() != 0) {
+			head.setDeltaShadow(fashion.getDeltaShadow());
+			path.setDeltaShadow(fashion.getDeltaShadow());
 		}
-		ug = symbolContext.apply(ug);
+		ug = fashion.apply(ug);
 		ug.apply(new UTranslate(centerX - head.getWidth() / 2, thickness())).draw(head);
 		ug.apply(new UTranslate(centerX, head.getHeight() + thickness())).draw(path);
 
 	}
 
 	private double thickness() {
-		return symbolContext.getStroke().getThickness();
+		return fashion.getStroke().getThickness();
 	}
 
 	public double getPreferredWidth() {

src/net/sourceforge/plantuml/skin/ActorHollow.java

@@ -57,10 +57,10 @@ public class ActorHollow extends AbstractTextBlock implements TextBlock {
 	private final double bodyThickness = 6;
 	private final double legThickness = 6;
 
-	private final Fashion symbolContext;
+	private final Fashion fashion;
 
-	public ActorHollow(Fashion symbolContext) {
-		this.symbolContext = symbolContext;
+	public ActorHollow(Fashion fashion) {
+		this.fashion = fashion;
 	}
 
 	public void drawU(UGraphic ug) {
@@ -87,17 +87,17 @@ public class ActorHollow extends AbstractTextBlock implements TextBlock {
 		path.lineTo(-bodyWidth / 2, 0);
 		path.closePath();
 
-		if (symbolContext.getDeltaShadow() != 0) {
-			head.setDeltaShadow(symbolContext.getDeltaShadow());
-			path.setDeltaShadow(symbolContext.getDeltaShadow());
+		if (fashion.getDeltaShadow() != 0) {
+			head.setDeltaShadow(fashion.getDeltaShadow());
+			path.setDeltaShadow(fashion.getDeltaShadow());
 		}
-		ug = symbolContext.apply(ug);
+		ug = fashion.apply(ug);
 		ug.apply(new UTranslate(centerX - head.getWidth() / 2, thickness())).draw(head);
 		ug.apply(new UTranslate(centerX, head.getHeight() + thickness() + neckHeight)).draw(path);
 	}
 
 	private double thickness() {
-		return symbolContext.getStroke().getThickness();
+		return fashion.getStroke().getThickness();
 	}
 
 	public double getPreferredWidth() {
@@ -105,7 +105,7 @@ public class ActorHollow extends AbstractTextBlock implements TextBlock {
 	}
 
 	public double getPreferredHeight() {
-		return headDiam + neckHeight + bodyHeight + thickness() * 2 + symbolContext.getDeltaShadow();
+		return headDiam + neckHeight + bodyHeight + thickness() * 2 + fashion.getDeltaShadow();
 	}
 
 	public XDimension2D calculateDimension(StringBounder stringBounder) {

src/net/sourceforge/plantuml/skin/ActorStickMan.java

@@ -57,11 +57,11 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock {
 	private final double legsY = 15;
 	private final double headDiam = 16;
 
-	private final Fashion symbolContext;
+	private final Fashion fashion;
 	private final boolean actorBusiness;
 
-	ActorStickMan(Fashion symbolContext, boolean actorBusiness) {
-		this.symbolContext = symbolContext;
+	ActorStickMan(Fashion fashion, boolean actorBusiness) {
+		this.fashion = fashion;
 		this.actorBusiness = actorBusiness;
 	}
 
@@ -81,12 +81,12 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock {
 		path.lineTo(-legsX, bodyLenght + legsY);
 		path.moveTo(0, bodyLenght);
 		path.lineTo(legsX, bodyLenght + legsY);
-		if (symbolContext.getDeltaShadow() != 0) {
-			head.setDeltaShadow(symbolContext.getDeltaShadow());
-			path.setDeltaShadow(symbolContext.getDeltaShadow());
+		if (fashion.getDeltaShadow() != 0) {
+			head.setDeltaShadow(fashion.getDeltaShadow());
+			path.setDeltaShadow(fashion.getDeltaShadow());
 		}
 
-		ug = symbolContext.apply(ug);
+		ug = fashion.apply(ug);
 		ug.apply(new UTranslate(startX, thickness())).draw(head);
 		if (actorBusiness) {
 			specialBusiness(ug.apply(new UTranslate(startX + headDiam / 2, thickness() + headDiam / 2)));
@@ -109,7 +109,7 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock {
 	}
 
 	private double thickness() {
-		return symbolContext.getStroke().getThickness();
+		return fashion.getStroke().getThickness();
 	}
 
 	public double getPreferredWidth() {
@@ -117,7 +117,7 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock {
 	}
 
 	public double getPreferredHeight() {
-		return headDiam + bodyLenght + legsY + 2 * thickness() + symbolContext.getDeltaShadow() + 1;
+		return headDiam + bodyLenght + legsY + 2 * thickness() + fashion.getDeltaShadow() + 1;
 	}
 
 	public XDimension2D calculateDimension(StringBounder stringBounder) {

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth;
+package zext.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 ext.plantuml.com.ctreber.acearth.util.Point3D;
-import ext.plantuml.com.ctreber.acearth.util.Polygon;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.util.Polygon;
 
 /**
  * The map data file is a big array of short (16-bit) ints, as follows: - it is

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

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

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

@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.gui;
+package zext.plantuml.com.ctreber.acearth.gui;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
@@ -6,7 +6,7 @@ import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import ext.plantuml.com.ctreber.acearth.renderer.RenderTarget;
+import zext.plantuml.com.ctreber.acearth.renderer.RenderTarget;
 import net.sourceforge.plantuml.security.SImageIO;
 
 /**

src/zext/plantuml/com/ctreber/acearth/package-info.java

@@ -13,4 +13,4 @@
  * @see net.sourceforge.plantuml.acearth
  * 
  */
-package ext.plantuml.com.ctreber.acearth;
+package zext.plantuml.com.ctreber.acearth;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.scanbit;
+package zext.plantuml.com.ctreber.acearth.scanbit;
 
 /**
  * <p>Instruction to paint points xFrom to xTo on line y.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 /**
  * Encapsulates a type of hint that a caller may pass to a barcode reader to help it

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.client.j2se;
+package zext.plantuml.com.google.zxing.client.j2se;
 
 import java.awt.image.BufferedImage;
 
-import ext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * Writes a {@link BitMatrix} to {@link BufferedImage},

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

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

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

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

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common;
+package zext.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/zext/plantuml/com/google/zxing/common/CharacterSetECI.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.datamatrix.decoder;
+package zext.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/zext/plantuml/com/google/zxing/datamatrix/decoder/Version.java

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

src/zext/plantuml/com/google/zxing/package-info.java

@@ -13,4 +13,4 @@
  * @see net.sourceforge.plantuml.flashcode
  * 
  */
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;

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

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

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

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

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

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

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

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.decoder;
+package zext.plantuml.com.google.zxing.qrcode.decoder;
 
-import ext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.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/zext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java

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

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

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

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.decoder;
+package zext.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/zext/plantuml/com/google/zxing/qrcode/decoder/Version.java

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

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

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

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.encoder;
+package zext.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/zext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java

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

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

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