diff --git a/src/com/plantuml/api/cheerpj/JsonResult.java b/src/com/plantuml/api/cheerpj/JsonResult.java index 94b75f3d3..8153f294c 100644 --- a/src/com/plantuml/api/cheerpj/JsonResult.java +++ b/src/com/plantuml/api/cheerpj/JsonResult.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.error.PSystemError; -//::uncomment when CORE +//::uncomment when __CORE__ //import com.leaningtech.client.Global; //::done @@ -55,10 +55,10 @@ public class JsonResult { private Object done() { sb.append("}"); - // ::comment when CORE + // ::comment when __CORE__ return sb.toString(); // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // return Global.JSString(sb.toString()); // ::done } diff --git a/src/com/plantuml/api/cheerpj/StaticMemory.java b/src/com/plantuml/api/cheerpj/StaticMemory.java index 152aea5eb..b020f76fc 100644 --- a/src/com/plantuml/api/cheerpj/StaticMemory.java +++ b/src/com/plantuml/api/cheerpj/StaticMemory.java @@ -36,6 +36,7 @@ package com.plantuml.api.cheerpj; public class StaticMemory { + // ::remove folder when __HAXE__ public static String cheerpjPath = "/app/"; public static String elementIdDebugJava; diff --git a/src/com/plantuml/api/cheerpj/WasmLog.java b/src/com/plantuml/api/cheerpj/WasmLog.java index d646b9c6a..7cc650a48 100644 --- a/src/com/plantuml/api/cheerpj/WasmLog.java +++ b/src/com/plantuml/api/cheerpj/WasmLog.java @@ -37,7 +37,7 @@ package com.plantuml.api.cheerpj; import net.sourceforge.plantuml.utils.Log; -//::uncomment when CORE +//::uncomment when __CORE__ //import com.leaningtech.client.Document; //import com.leaningtech.client.Element; //import com.leaningtech.client.Global; @@ -48,10 +48,10 @@ public class WasmLog { public static long start; public static void log(String message) { - // ::comment when CORE + // ::comment when __CORE__ Log.info(message); // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // try { // if (start > 0) { // final long duration = System.currentTimeMillis() - start; diff --git a/src/com/plantuml/api/cheerpj/v1/Info.java b/src/com/plantuml/api/cheerpj/v1/Info.java index b73332d08..e15a5d0c5 100644 --- a/src/com/plantuml/api/cheerpj/v1/Info.java +++ b/src/com/plantuml/api/cheerpj/v1/Info.java @@ -55,7 +55,7 @@ import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.preproc.Defines; -//::uncomment when CORE +//::uncomment when __CORE__ //import com.leaningtech.client.Global; //::done @@ -69,10 +69,10 @@ public class Info { e.printStackTrace(); result = ""; } - // ::comment when CORE + // ::comment when __CORE__ return result; // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // return Global.JSString(result); // ::done } @@ -85,10 +85,10 @@ public class Info { e.printStackTrace(); result = ""; } - // ::comment when CORE + // ::comment when __CORE__ return result; // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // return Global.JSString(result); // ::done } diff --git a/src/com/plantuml/api/cheerpj/v1/Png.java b/src/com/plantuml/api/cheerpj/v1/Png.java index 0dd00d73c..f266d82e0 100644 --- a/src/com/plantuml/api/cheerpj/v1/Png.java +++ b/src/com/plantuml/api/cheerpj/v1/Png.java @@ -59,7 +59,7 @@ import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.preproc.Defines; -//::uncomment when CORE +//::uncomment when __CORE__ //import com.leaningtech.client.Global; //::done @@ -142,10 +142,10 @@ public class Png { os64.close(); final String base64 = os64.toString(); - // ::comment when CORE + // ::comment when __CORE__ return base64; // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // return Global.JSString(base64); // ::done diff --git a/src/com/plantuml/api/cheerpj/v1/Svg.java b/src/com/plantuml/api/cheerpj/v1/Svg.java index 6b0e3e7d5..5676ec513 100644 --- a/src/com/plantuml/api/cheerpj/v1/Svg.java +++ b/src/com/plantuml/api/cheerpj/v1/Svg.java @@ -57,11 +57,12 @@ import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.preproc.Defines; -//::uncomment when CORE +//::uncomment when __CORE__ //import com.leaningtech.client.Global; //::done public class Svg { + // ::remove folder when __HAXE__ public static Object convert(String mode, String text) { final long start = System.currentTimeMillis(); @@ -97,10 +98,10 @@ public class Svg { WasmLog.log("Done!"); svgos.close(); final String svg = svgos.toString(); - // ::comment when CORE + // ::comment when __CORE__ return svg; // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // return Global.JSString(svg); // ::done diff --git a/src/ext/plantuml/com/ctreber/acearth/ACearth.java b/src/ext/plantuml/com/ctreber/acearth/ACearth.java index f69cb1eaf..1f4f950f7 100644 --- a/src/ext/plantuml/com/ctreber/acearth/ACearth.java +++ b/src/ext/plantuml/com/ctreber/acearth/ACearth.java @@ -97,7 +97,7 @@ import ext.plantuml.com.ctreber.aclib.sort.QuickSort; * @author Christian Treber, ct@ctreber.com */ public class ACearth { - // :: remove folder when CORE + // :: remove folder when __CORE__ public static final String VERSION = "1.1"; public static final String BUILD = "22.11.2002 004"; diff --git a/src/ext/plantuml/com/ctreber/acearth/Configuration.java b/src/ext/plantuml/com/ctreber/acearth/Configuration.java index 4da1604af..7c84ea5ef 100644 --- a/src/ext/plantuml/com/ctreber/acearth/Configuration.java +++ b/src/ext/plantuml/com/ctreber/acearth/Configuration.java @@ -22,6 +22,7 @@ import ext.plantuml.com.ctreber.aclib.gui.MonitoredObject; * */ public class Configuration { + // ::remove folder when __HAXE__ private Map fValues = new HashMap(); /** diff --git a/src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java b/src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java index 352ac37a7..f751a7030 100644 --- a/src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java +++ b/src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java @@ -15,6 +15,7 @@ import ext.plantuml.com.ctreber.acearth.ACearth; * */ public class CanvasACearth extends PixelCanvas { + // ::remove folder when __HAXE__ public CanvasACearth(ACearth pParent, int pWidth, int pHeight) { super(pWidth, pHeight); } diff --git a/src/ext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java b/src/ext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java index f4757d881..b5e08db2a 100644 --- a/src/ext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java +++ b/src/ext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java @@ -15,6 +15,7 @@ import ext.plantuml.com.ctreber.acearth.plugins.Plugin; * */ public class PluginMarkers extends Plugin { + // ::remove folder when __HAXE__ private List fMarkers; // private String fMarkerFileName = ACearth.getHomeDir() + diff --git a/src/ext/plantuml/com/ctreber/acearth/projection/Projection.java b/src/ext/plantuml/com/ctreber/acearth/projection/Projection.java index 8fd3ebf19..cdb6a2316 100644 --- a/src/ext/plantuml/com/ctreber/acearth/projection/Projection.java +++ b/src/ext/plantuml/com/ctreber/acearth/projection/Projection.java @@ -14,6 +14,7 @@ import ext.plantuml.com.ctreber.acearth.util.Toolkit; */ abstract public class Projection { + // ::remove folder when __HAXE__ // Target information int fImageHeight; int fImageWidth; diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java b/src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java index 1b4881fac..e155cf32e 100644 --- a/src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java +++ b/src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java @@ -12,6 +12,7 @@ import java.awt.Color; * */ public interface RenderTarget { + // ::remove folder when __HAXE__ public void setPixel(int pX, int pY, int pA, int pR, int pG, int pB); diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java b/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java index b8913bfa3..c3e0febe3 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java +++ b/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java @@ -9,6 +9,7 @@ package ext.plantuml.com.ctreber.acearth.scanbit; */ abstract public class ScanBitGenerator { + // ::remove folder when __HAXE__ int fImageHeight; int fImageWidth; protected ScanBit[] fScanBitsArray; diff --git a/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java b/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java index 09a48218d..e598a27a2 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java +++ b/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java @@ -11,6 +11,7 @@ import java.util.Random; */ public class DotGeneratorStars extends ScanDotGenerator { + // ::remove folder when __HAXE__ private final int fImageWidth; private final int fImageHeight; private int fBigStars; diff --git a/src/ext/plantuml/com/ctreber/acearth/shader/Shader.java b/src/ext/plantuml/com/ctreber/acearth/shader/Shader.java index 3882a5cea..e3ba21578 100644 --- a/src/ext/plantuml/com/ctreber/acearth/shader/Shader.java +++ b/src/ext/plantuml/com/ctreber/acearth/shader/Shader.java @@ -17,6 +17,7 @@ import ext.plantuml.com.ctreber.acearth.util.Point3D; */ abstract public class Shader { + // ::remove folder when __HAXE__ private static final Color COLOR_SPACE = Color.black; private static final Color COLOR_STAR = Color.white; private static final Color COLOR_WATER = Color.blue; diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Point3D.java b/src/ext/plantuml/com/ctreber/acearth/util/Point3D.java index 3d38bdca9..8f0a06561 100644 --- a/src/ext/plantuml/com/ctreber/acearth/util/Point3D.java +++ b/src/ext/plantuml/com/ctreber/acearth/util/Point3D.java @@ -9,6 +9,7 @@ package ext.plantuml.com.ctreber.acearth.util; */ public class Point3D { + // ::remove folder when __HAXE__ private double fX; private double fY; private double fZ; diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java b/src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java index 0cff7ce5c..67bc29544 100644 --- a/src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java +++ b/src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java @@ -9,7 +9,7 @@ package ext.plantuml.com.ctreber.aclib.gui; */ public class MOBoolean extends MonitoredObject { - // :: remove folder when CORE + // :: remove folder when __CORE__ private boolean fBoolean; public MOBoolean() diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOString.java b/src/ext/plantuml/com/ctreber/aclib/gui/MOString.java index dc1f92ee8..3f06fedb0 100644 --- a/src/ext/plantuml/com/ctreber/aclib/gui/MOString.java +++ b/src/ext/plantuml/com/ctreber/aclib/gui/MOString.java @@ -11,6 +11,7 @@ package ext.plantuml.com.ctreber.aclib.gui; */ public class MOString extends MonitoredObject { + // ::remove folder when __HAXE__ private String fString; public MOString(String pString) diff --git a/src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java b/src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java index 4f3a83184..584f0ba2d 100644 --- a/src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java +++ b/src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java @@ -11,7 +11,8 @@ import java.util.Comparator; */ abstract public class CTSort { - // :: remove folder when CORE + // ::remove folder when __HAXE__ + // :: remove folder when __CORE__ public void sort(Object[] items) { sort(items, new DefaultComparator()); diff --git a/src/ext/plantuml/com/google/zxing/BarcodeFormat.java b/src/ext/plantuml/com/google/zxing/BarcodeFormat.java index c9eabb753..99ace745a 100644 --- a/src/ext/plantuml/com/google/zxing/BarcodeFormat.java +++ b/src/ext/plantuml/com/google/zxing/BarcodeFormat.java @@ -24,7 +24,8 @@ import java.util.Hashtable; * @author Sean Owen */ public final class BarcodeFormat { - // :: remove folder when CORE + // ::remove folder when __HAXE__ + // :: remove folder when __CORE__ // No, we can't use an enum here. J2ME doesn't support it. diff --git a/src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java b/src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java index 54fa6b965..b6668edad 100644 --- a/src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java +++ b/src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java @@ -28,6 +28,7 @@ import ext.plantuml.com.google.zxing.common.BitMatrix; * @author Sean Owen */ public final class MatrixToImageWriter { + // ::remove folder when __HAXE__ private static final int BLACK = 0xFF000000; private static final int WHITE = 0xFFFFFFFF; diff --git a/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java b/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java index 512c82445..29992842f 100644 --- a/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java +++ b/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java @@ -26,6 +26,7 @@ package ext.plantuml.com.google.zxing.common.reedsolomon; * @author Sean Owen */ final class GF256Poly { + // ::remove folder when __HAXE__ private final GF256 field; private final int[] coefficients; diff --git a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java b/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java index 7e2ba2019..94c9f1783 100644 --- a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java +++ b/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java @@ -25,6 +25,7 @@ import ext.plantuml.com.google.zxing.FormatException; * @author bbrown@google.com (Brian Brown) */ public final class Version { + // ::remove folder when __HAXE__ private static final Version[] VERSIONS = buildVersions(); diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java b/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java index c705a8d2d..85e96e72c 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java +++ b/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java @@ -30,6 +30,7 @@ import ext.plantuml.com.google.zxing.common.BitMatrix; * @author Sean Owen */ abstract class DataMask { + // ::remove folder when __HAXE__ /** * See ISO 18004:2006 6.8.1 diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java b/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java index b142084da..4ccd48b6f 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java +++ b/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java @@ -21,6 +21,7 @@ package ext.plantuml.com.google.zxing.qrcode.encoder; * @author dswitkin@google.com (Daniel Switkin) - ported from C++ */ public final class MaskUtil { + // ::remove folder when __HAXE__ private MaskUtil() { // do nothing diff --git a/src/gen/annotation/Comment.java b/src/gen/annotation/Comment.java index 27a3d0b8b..3d292484c 100644 --- a/src/gen/annotation/Comment.java +++ b/src/gen/annotation/Comment.java @@ -26,6 +26,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.CONSTRUCTOR, ElementType.METHOD }) public @interface Comment { + // ::remove folder when __HAXE__ String comment(); diff --git a/src/gen/lib/cdt/dtopen__c.java b/src/gen/lib/cdt/dtopen__c.java index e574945ce..7f56dad8a 100644 --- a/src/gen/lib/cdt/dtopen__c.java +++ b/src/gen/lib/cdt/dtopen__c.java @@ -60,6 +60,7 @@ import smetana.core.ZType; import smetana.core.size_t; public class dtopen__c { + // ::remove folder when __HAXE__ //1 9k44uhd5foylaeoekf3llonjq // extern Dtmethod_t* Dtset diff --git a/src/gen/lib/cgraph/id__c.java b/src/gen/lib/cgraph/id__c.java index 63bea3ace..7ebcf7689 100644 --- a/src/gen/lib/cgraph/id__c.java +++ b/src/gen/lib/cgraph/id__c.java @@ -73,6 +73,7 @@ import smetana.core.Memory; import smetana.core.__ptr__; public class id__c { + // ::remove folder when __HAXE__ public static CFunction idopen = new CFunctionAbstract("idopen") { diff --git a/src/gen/lib/common/splines__c.java b/src/gen/lib/common/splines__c.java index d9b3cecbb..a869a58ff 100644 --- a/src/gen/lib/common/splines__c.java +++ b/src/gen/lib/common/splines__c.java @@ -111,6 +111,7 @@ import smetana.core.ZType; import smetana.core.__ptr__; public class splines__c { + // ::remove folder when __HAXE__ diff --git a/src/gen/lib/dotgen/class1__c.java b/src/gen/lib/dotgen/class1__c.java index 2d9ffc1ff..2152d5615 100644 --- a/src/gen/lib/dotgen/class1__c.java +++ b/src/gen/lib/dotgen/class1__c.java @@ -80,6 +80,7 @@ import smetana.core.CString; import smetana.core.Globals; public class class1__c { + // ::remove folder when __HAXE__ @Reviewed(when = "13/11/2020") diff --git a/src/gen/lib/gvc/gvc__c.java b/src/gen/lib/gvc/gvc__c.java index d87de7f38..1971d7479 100644 --- a/src/gen/lib/gvc/gvc__c.java +++ b/src/gen/lib/gvc/gvc__c.java @@ -59,6 +59,7 @@ import smetana.core.CString; import smetana.core.Globals; public class gvc__c { + // ::remove folder when __HAXE__ //3 f3vdhir2c7dz3pvmx9d3m4lx1 diff --git a/src/gen/lib/label/index__c.java b/src/gen/lib/label/index__c.java index 996e9d319..c2abe50ee 100644 --- a/src/gen/lib/label/index__c.java +++ b/src/gen/lib/label/index__c.java @@ -67,6 +67,7 @@ import smetana.core.Memory; import smetana.core.__ptr__; public class index__c { + // ::remove folder when __HAXE__ //3 1rfaqe5urty5uyp5xb2r0idce diff --git a/src/gen/lib/pack/pack__c.java b/src/gen/lib/pack/pack__c.java index 26d2c5c45..9e7ca2374 100644 --- a/src/gen/lib/pack/pack__c.java +++ b/src/gen/lib/pack/pack__c.java @@ -58,6 +58,7 @@ import smetana.core.CString; import smetana.core.Globals; public class pack__c { + // ::remove folder when __HAXE__ diff --git a/src/gen/lib/pathplan/shortest__c.java b/src/gen/lib/pathplan/shortest__c.java index b3e03b8fc..f6a300cb2 100644 --- a/src/gen/lib/pathplan/shortest__c.java +++ b/src/gen/lib/pathplan/shortest__c.java @@ -64,6 +64,7 @@ import smetana.core.__ptr__; import smetana.core.jmp_buf; public class shortest__c { + // ::remove folder when __HAXE__ //1 baedz5i9est5csw3epz3cv7z // typedef Ppoly_t Ppolyline_t diff --git a/src/gen/plugin/dot_layout/gvlayout_dot_layout__c.java b/src/gen/plugin/dot_layout/gvlayout_dot_layout__c.java index 31e1e1a90..f30d6f883 100644 --- a/src/gen/plugin/dot_layout/gvlayout_dot_layout__c.java +++ b/src/gen/plugin/dot_layout/gvlayout_dot_layout__c.java @@ -46,6 +46,7 @@ package gen.plugin.dot_layout; public class gvlayout_dot_layout__c { + // ::remove folder when __HAXE__ //1 2digov3edok6d5srhgtlmrycs // extern lt_symlist_t lt_preloaded_symbols[] diff --git a/src/h/ST_Agrec_s.java b/src/h/ST_Agrec_s.java index 74955b1c9..901183463 100644 --- a/src/h/ST_Agrec_s.java +++ b/src/h/ST_Agrec_s.java @@ -50,6 +50,7 @@ import smetana.core.UnsupportedStarStruct; import smetana.core.__ptr__; public class ST_Agrec_s extends UnsupportedStarStruct { + // ::remove folder when __HAXE__ public CString name; public ST_Agrec_s next; @@ -67,4 +68,4 @@ public class ST_Agrec_s extends UnsupportedStarStruct { // char *name; // Agrec_t *next; // /* following this would be any programmer-defined data */ -// }; \ No newline at end of file +// }; diff --git a/src/jcckit/GraphicsPlotCanvas.java b/src/jcckit/GraphicsPlotCanvas.java index 23241e082..f997470cd 100644 --- a/src/jcckit/GraphicsPlotCanvas.java +++ b/src/jcckit/GraphicsPlotCanvas.java @@ -48,7 +48,8 @@ import jcckit.util.Factory; * @author Franz-Josef Elmer */ public class GraphicsPlotCanvas extends PlotCanvas { - // ::remove folder when CORE + // ::remove folder when __CORE__ + // ::remove folder when __HAXE__ /** Key of a configuration parameter. */ public static final String BACKGROUND_KEY = "background"; public static final String FOREGROUND_KEY = "foreground"; diff --git a/src/jcckit/data/DataCurve.java b/src/jcckit/data/DataCurve.java index caf94f3fc..9b9397e56 100644 --- a/src/jcckit/data/DataCurve.java +++ b/src/jcckit/data/DataCurve.java @@ -26,6 +26,7 @@ import jcckit.util.ConfigParameters; * @author Franz-Josef Elmer */ public class DataCurve extends DataContainer implements DataElement { + // ::remove folder when __HAXE__ /** Config parameter key. */ public static final String X_KEY = "x", Y_KEY = "y", diff --git a/src/jcckit/graphic/Oval.java b/src/jcckit/graphic/Oval.java index 9d49621a6..54f7bb9e1 100644 --- a/src/jcckit/graphic/Oval.java +++ b/src/jcckit/graphic/Oval.java @@ -24,6 +24,7 @@ package jcckit.graphic; * @author Franz-Josef Elmer */ public class Oval extends Rectangle { + // ::remove folder when __HAXE__ /** * Creates a new instance. * @param center The position of the center of this element. diff --git a/src/jcckit/plot/SimpleCurve.java b/src/jcckit/plot/SimpleCurve.java index 7477d2c24..efa8fbfc7 100644 --- a/src/jcckit/plot/SimpleCurve.java +++ b/src/jcckit/plot/SimpleCurve.java @@ -36,6 +36,7 @@ import jcckit.util.Factory; * @author Franz-Josef Elmer */ public class SimpleCurve implements Curve { + // ::remove folder when __HAXE__ /** Configuration parameter key. */ public static final String SYMBOL_FACTORY_KEY = "symbolFactory", WITH_LINE_KEY = "withLine", diff --git a/src/jcckit/renderer/Transformation.java b/src/jcckit/renderer/Transformation.java index 1277c2e7e..aa2133fab 100644 --- a/src/jcckit/renderer/Transformation.java +++ b/src/jcckit/renderer/Transformation.java @@ -36,6 +36,7 @@ import jcckit.graphic.GraphPoint; * @author Franz-Josef Elmer */ public class Transformation { + // ::remove folder when __HAXE__ private final double _scale, _x0, _y0; public String toString() { diff --git a/src/jcckit/transformation/CartesianTransformation.java b/src/jcckit/transformation/CartesianTransformation.java index d2c30da49..a8670b046 100644 --- a/src/jcckit/transformation/CartesianTransformation.java +++ b/src/jcckit/transformation/CartesianTransformation.java @@ -31,6 +31,7 @@ import jcckit.util.Util; * @author Franz-Josef Elmer */ public class CartesianTransformation implements Transformation { + // ::remove folder when __HAXE__ private final boolean _xLogScale; private final double _xOffset; private final double _xScale; diff --git a/src/jcckit/util/ConfigParametersBasedConfigData.java b/src/jcckit/util/ConfigParametersBasedConfigData.java index 77138a7ea..ee7b8244c 100644 --- a/src/jcckit/util/ConfigParametersBasedConfigData.java +++ b/src/jcckit/util/ConfigParametersBasedConfigData.java @@ -27,6 +27,7 @@ package jcckit.util; * @author Franz-Josef Elmer */ public class ConfigParametersBasedConfigData implements ConfigData { + // ::remove folder when __HAXE__ private ConfigParameters _config; private ConfigParameters _defaultConfig; diff --git a/src/net/atmp/CucaDiagram.java b/src/net/atmp/CucaDiagram.java index 3ff3729ec..83cec53cb 100644 --- a/src/net/atmp/CucaDiagram.java +++ b/src/net/atmp/CucaDiagram.java @@ -361,7 +361,7 @@ public abstract class CucaDiagram extends UmlDiagram implements GroupHierarchy, return result.toArray(new String[result.size()]); } - // ::comment when CORE + // ::comment when __CORE__ private void createFilesGraphml(OutputStream suggestedFile) throws IOException { final CucaDiagramGraphmlMaker maker = new CucaDiagramGraphmlMaker(this); maker.createFiles(suggestedFile); @@ -399,7 +399,7 @@ public abstract class CucaDiagram extends UmlDiagram implements GroupHierarchy, throws IOException { final FileFormat fileFormat = fileFormatOption.getFileFormat(); - // ::comment when CORE + // ::comment when __CORE__ if (fileFormat == FileFormat.ATXT || fileFormat == FileFormat.UTXT) { try { createFilesTxt(os, index, fileFormat); @@ -431,13 +431,13 @@ public abstract class CucaDiagram extends UmlDiagram implements GroupHierarchy, this.eventuallyBuildPhantomGroups(); final CucaDiagramFileMaker maker; - // ::comment when CORE + // ::comment when __CORE__ if (this.isUseElk()) maker = new CucaDiagramFileMakerElk(this, fileFormatOption.getDefaultStringBounder(getSkinParam())); else if (this.isUseSmetana()) // ::done maker = new CucaDiagramFileMakerSmetana(this, fileFormatOption.getDefaultStringBounder(getSkinParam())); - // ::comment when CORE + // ::comment when __CORE__ else maker = new CucaDiagramFileMakerSvek(this); // ::done diff --git a/src/net/atmp/ImageBuilder.java b/src/net/atmp/ImageBuilder.java index 2113afcde..5d720112f 100644 --- a/src/net/atmp/ImageBuilder.java +++ b/src/net/atmp/ImageBuilder.java @@ -113,7 +113,7 @@ import net.sourceforge.plantuml.url.Url; public class ImageBuilder { - // ::comment when CORE + // ::comment when __CORE__ private Animation animation; // ::done private boolean annotations; @@ -223,7 +223,7 @@ public class ImageBuilder { public ImageBuilder styled(TitledDiagram diagram) { skinParam = diagram.getSkinParam(); stringBounder = fileFormatOption.getDefaultStringBounder(skinParam); - // ::comment when CORE + // ::comment when __CORE__ animation = diagram.getAnimation(); // ::done annotations = true; @@ -246,7 +246,7 @@ public class ImageBuilder { udrawable = annotatedWorker.addAdd((TextBlock) udrawable); } - // ::comment when CORE + // ::comment when __CORE__ switch (fileFormatOption.getFileFormat()) { case MJPEG: return writeImageMjpeg(os); @@ -255,10 +255,10 @@ public class ImageBuilder { default: return writeImageInternal(os, animation); // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // return writeImageInternal(os); // ::done - // ::comment when CORE + // ::comment when __CORE__ } // ::done } @@ -270,16 +270,16 @@ public class ImageBuilder { } } - // ::comment when CORE + // ::comment when __CORE__ private ImageData writeImageInternal(OutputStream os, Animation animationArg) throws IOException { // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // private ImageData writeImageInternal(OutputStream os) throws IOException { // ::done XDimension2D dim = getFinalDimension(); double dx = 0; double dy = 0; - // ::comment when CORE + // ::comment when __CORE__ if (animationArg != null) { final MinMax minmax = animationArg.getMinMax(dim); animationArg.setDimension(dim); @@ -294,11 +294,11 @@ public class ImageBuilder { if (scaleFactor <= 0) throw new IllegalStateException("Bad scaleFactor"); WasmLog.log("...image drawing..."); - // ::comment when CORE + // ::comment when __CORE__ UGraphic ug = createUGraphic(dim, animationArg, dx, dy, scaleFactor, titledDiagram == null ? new Pragma() : titledDiagram.getPragma()); // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // UGraphic ug = createUGraphic(dim, dx, dy, scaleFactor, // titledDiagram == null ? new Pragma() : titledDiagram.getPragma()); // ::done @@ -330,7 +330,7 @@ public class ImageBuilder { UStroke stroke = skinParam.getThickness(LineParam.diagramBorder, null); if (stroke == null && color != null) - stroke = new UStroke(); + stroke = UStroke.simple(); if (stroke == null) return; @@ -368,7 +368,7 @@ public class ImageBuilder { return ug; } - // ::comment when CORE + // ::comment when __CORE__ private ImageData writeImageMjpeg(OutputStream os) throws IOException { final XDimension2D dim = getFinalDimension(); @@ -427,11 +427,11 @@ public class ImageBuilder { } // ::done - // ::comment when CORE + // ::comment when __CORE__ private UGraphic createUGraphic(final XDimension2D dim, Animation animationArg, double dx, double dy, double scaleFactor, Pragma pragma) { // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // private UGraphic createUGraphic(final XDimension2D dim, double dx, double dy, // double scaleFactor, Pragma pragma) { // ::done @@ -439,17 +439,17 @@ public class ImageBuilder { switch (fileFormatOption.getFileFormat()) { case PNG: case RAW: - // ::comment when CORE + // ::comment when __CORE__ return createUGraphicPNG(scaleFactor, dim, animationArg, dx, dy, fileFormatOption.getWatermark(), fileFormatOption.getFileFormat()); // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // return createUGraphicPNG(scaleFactor, dim, dx, dy, // fileFormatOption.getWatermark(), fileFormatOption.getFileFormat()); // ::done case SVG: return createUGraphicSVG(scaleFactor, dim, pragma); - // ::comment when CORE + // ::comment when __CORE__ case EPS: return new UGraphicEps(backcolor, colorMapper, stringBounder, EpsStrategy.getDefault2()); case EPS_TEXT: @@ -498,11 +498,11 @@ public class ImageBuilder { } - // ::uncomment when CORE + // ::uncomment when __CORE__ // private UGraphic createUGraphicPNG(double scaleFactor, final XDimension2D // dim, double dx, double dy, String watermark, FileFormat format) { // ::done - // ::comment when CORE + // ::comment when __CORE__ private UGraphic createUGraphicPNG(double scaleFactor, final XDimension2D dim, Animation affineTransforms, double dx, double dy, String watermark, FileFormat format) { // ::done @@ -519,11 +519,11 @@ public class ImageBuilder { (int) (dim.getHeight() * scaleFactor), pngBackColor, stringBounder); final Graphics2D graphics2D = builder.getGraphics2D(); - // ::comment when CORE + // ::comment when __CORE__ final UGraphicG2d ug = new UGraphicG2d(backcolor, fileFormatOption.getColorMapper(), stringBounder, graphics2D, scaleFactor, affineTransforms == null ? null : affineTransforms.getFirst(), dx, dy, format); // ::done - // ::uncomment when CORE + // ::uncomment when __CORE__ // final UGraphicG2d ug = new UGraphicG2d(backcolor, // fileFormatOption.getColorMapper(), stringBounder, graphics2D, // scaleFactor, dx, dy, format); diff --git a/src/net/atmp/SpecialText.java b/src/net/atmp/SpecialText.java index 98179c964..ae5c2e801 100644 --- a/src/net/atmp/SpecialText.java +++ b/src/net/atmp/SpecialText.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.klimt.shape.UEmpty; public class SpecialText implements UShapeIgnorableForCompression { + // ::remove folder when __HAXE__ private final TextBlock title; @@ -64,4 +65,4 @@ public class SpecialText implements UShapeIgnorableForCompression { return title; } -} \ No newline at end of file +} diff --git a/src/net/sourceforge/plantuml/AbstractPSystem.java b/src/net/sourceforge/plantuml/AbstractPSystem.java index 17732a389..447b56529 100644 --- a/src/net/sourceforge/plantuml/AbstractPSystem.java +++ b/src/net/sourceforge/plantuml/AbstractPSystem.java @@ -68,6 +68,7 @@ import net.sourceforge.plantuml.version.License; import net.sourceforge.plantuml.version.Version; public abstract class AbstractPSystem implements Diagram { + // ::remove file when __HAXE__ private final UmlSource source; private Scale scale; @@ -84,7 +85,7 @@ public abstract class AbstractPSystem implements Diagram { toAppend.append(Version.versionString()); toAppend.append("(" + Version.compileTimeString() + ")\n"); toAppend.append("(" + License.getCurrent() + " source distribution)\n"); - // ::comment when CORE + // ::comment when __CORE__ for (String name : OptionPrint.interestingProperties()) { toAppend.append(name); toAppend.append(BackSlash.CHAR_NEWLINE); @@ -186,7 +187,7 @@ public abstract class AbstractPSystem implements Diagram { // } return exportDiagramNow(os, index, fileFormatOption); } finally { - // ::comment when CORE + // ::comment when __CORE__ if (OptionFlags.getInstance().isEnableStats()) StatsUtilsIncrement.onceMoreGenerate(System.currentTimeMillis() - now, getClass(), fileFormatOption.getFileFormat()); diff --git a/src/net/sourceforge/plantuml/AnimatedGifEncoder.java b/src/net/sourceforge/plantuml/AnimatedGifEncoder.java index cef29063f..2e81c2b35 100644 --- a/src/net/sourceforge/plantuml/AnimatedGifEncoder.java +++ b/src/net/sourceforge/plantuml/AnimatedGifEncoder.java @@ -67,7 +67,8 @@ import java.io.OutputStream; */ public class AnimatedGifEncoder { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ protected int width; // image size diff --git a/src/net/sourceforge/plantuml/Annotated.java b/src/net/sourceforge/plantuml/Annotated.java index 3a4374066..5036420fd 100644 --- a/src/net/sourceforge/plantuml/Annotated.java +++ b/src/net/sourceforge/plantuml/Annotated.java @@ -41,6 +41,7 @@ import net.sourceforge.plantuml.cucadiagram.DisplaySection; import net.sourceforge.plantuml.klimt.creole.Display; public interface Annotated { + // ::remove file when __HAXE__ public DisplayPositionned getTitle(); diff --git a/src/net/sourceforge/plantuml/AnnotatedBuilder.java b/src/net/sourceforge/plantuml/AnnotatedBuilder.java index 05580b57c..5b539e082 100644 --- a/src/net/sourceforge/plantuml/AnnotatedBuilder.java +++ b/src/net/sourceforge/plantuml/AnnotatedBuilder.java @@ -63,6 +63,7 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.DecorateEntityImage; public class AnnotatedBuilder { + // ::remove file when __HAXE__ private final Annotated annotated; private final ISkinParam skinParam; diff --git a/src/net/sourceforge/plantuml/AnnotatedWorker.java b/src/net/sourceforge/plantuml/AnnotatedWorker.java index e229b5774..3dcfdfdec 100644 --- a/src/net/sourceforge/plantuml/AnnotatedWorker.java +++ b/src/net/sourceforge/plantuml/AnnotatedWorker.java @@ -43,6 +43,7 @@ import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.svek.DecorateEntityImage; public class AnnotatedWorker { + // ::remove file when __HAXE__ private final Annotated annotated; private final ISkinParam skinParam; diff --git a/src/net/sourceforge/plantuml/BlockUml.java b/src/net/sourceforge/plantuml/BlockUml.java index 7db1eddfd..204538b64 100644 --- a/src/net/sourceforge/plantuml/BlockUml.java +++ b/src/net/sourceforge/plantuml/BlockUml.java @@ -67,6 +67,7 @@ import net.sourceforge.plantuml.utils.StartUtils; import net.sourceforge.plantuml.version.Version; public class BlockUml { + // ::remove file when __HAXE__ private final List rawSource; private final List data; @@ -85,7 +86,7 @@ public class BlockUml { this(convert(strings), Defines.createEmpty(), null, null, null); } - // ::comment when CORE + // ::comment when __CORE__ public String getEncodedUrl() throws IOException { final Transcoder transcoder = TranscoderUtil.getDefaultTranscoder(); final String source = getDiagram().getSource().getPlainString(); @@ -150,7 +151,7 @@ public class BlockUml { } } - // ::comment when CORE + // ::comment when __CORE__ public String getFileOrDirname() { if (OptionFlags.getInstance().isWord()) return null; @@ -194,7 +195,7 @@ public class BlockUml { return data; } - // ::comment when CORE + // ::comment when __CORE__ private String internalEtag() { try { final AsciiEncoder coder = new AsciiEncoder(); diff --git a/src/net/sourceforge/plantuml/BlockUmlBuilder.java b/src/net/sourceforge/plantuml/BlockUmlBuilder.java index 88aa8d881..73926af59 100644 --- a/src/net/sourceforge/plantuml/BlockUmlBuilder.java +++ b/src/net/sourceforge/plantuml/BlockUmlBuilder.java @@ -62,6 +62,7 @@ import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.StartUtils; public final class BlockUmlBuilder implements DefinitionsContainer { + // ::remove file when __HAXE__ private final List blocks = new ArrayList<>(); private Set usedFiles = new HashSet<>(); diff --git a/src/net/sourceforge/plantuml/DefinitionsContainer.java b/src/net/sourceforge/plantuml/DefinitionsContainer.java index b49b65027..085baadb2 100644 --- a/src/net/sourceforge/plantuml/DefinitionsContainer.java +++ b/src/net/sourceforge/plantuml/DefinitionsContainer.java @@ -40,6 +40,7 @@ import java.util.List; import net.sourceforge.plantuml.preproc2.PreprocessorModeSet; public interface DefinitionsContainer extends PreprocessorModeSet { + // ::remove file when __HAXE__ public List getDefinition(String name); diff --git a/src/net/sourceforge/plantuml/EmbeddedDiagram.java b/src/net/sourceforge/plantuml/EmbeddedDiagram.java index 93b7039f0..34841850f 100644 --- a/src/net/sourceforge/plantuml/EmbeddedDiagram.java +++ b/src/net/sourceforge/plantuml/EmbeddedDiagram.java @@ -64,6 +64,7 @@ import net.sourceforge.plantuml.style.ISkinSimple; import net.sourceforge.plantuml.text.StringLocated; public class EmbeddedDiagram extends AbstractTextBlock implements Line, Atom { + // ::remove file when __HAXE__ public static final String EMBEDDED_START = "{{"; public static final String EMBEDDED_END = "}}"; diff --git a/src/net/sourceforge/plantuml/EmptyImageBuilder.java b/src/net/sourceforge/plantuml/EmptyImageBuilder.java index c76689df0..342c8db09 100644 --- a/src/net/sourceforge/plantuml/EmptyImageBuilder.java +++ b/src/net/sourceforge/plantuml/EmptyImageBuilder.java @@ -51,6 +51,7 @@ import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.utils.Log; public class EmptyImageBuilder { + // ::remove file when __HAXE__ private final BufferedImage im; private final Graphics2D g2d; @@ -70,7 +71,7 @@ public class EmptyImageBuilder { if (width <= 0 || height <= 0) throw new IllegalArgumentException("width and height must be positive"); - // ::comment when CORE + // ::comment when __CORE__ if (width > GraphvizUtils.getenvImageLimit()) { Log.info("Width too large " + width + ". You should set PLANTUML_LIMIT_SIZE"); width = GraphvizUtils.getenvImageLimit(); diff --git a/src/net/sourceforge/plantuml/ErrorStatus.java b/src/net/sourceforge/plantuml/ErrorStatus.java index 9bcd4bcf9..176e39be6 100644 --- a/src/net/sourceforge/plantuml/ErrorStatus.java +++ b/src/net/sourceforge/plantuml/ErrorStatus.java @@ -72,12 +72,12 @@ public class ErrorStatus { } public int getExitCode() { - if (isNoData()) { + if (isNoData()) return 100; - } - if (hasErrors) { + + if (hasErrors) return 200; - } + return 0; } diff --git a/src/net/sourceforge/plantuml/ErrorUml.java b/src/net/sourceforge/plantuml/ErrorUml.java index a117b30f6..8b607dec5 100644 --- a/src/net/sourceforge/plantuml/ErrorUml.java +++ b/src/net/sourceforge/plantuml/ErrorUml.java @@ -40,6 +40,7 @@ import java.util.Objects; import net.sourceforge.plantuml.utils.LineLocation; public class ErrorUml { + // ::remove file when __HAXE__ private final String error; private final ErrorUmlType type; diff --git a/src/net/sourceforge/plantuml/FileFormat.java b/src/net/sourceforge/plantuml/FileFormat.java index 4efb5d8d8..2de98c84e 100644 --- a/src/net/sourceforge/plantuml/FileFormat.java +++ b/src/net/sourceforge/plantuml/FileFormat.java @@ -64,8 +64,8 @@ import net.sourceforge.plantuml.text.SvgCharSizeHack; * */ public enum FileFormat { - - // ::comment when CORE + // ::remove file when __HAXE__ + // ::comment when __CORE__ EPS("application/postscript"), // EPS_TEXT("application/postscript"), // ATXT("text/plain"), // @@ -108,7 +108,7 @@ public enum FileFormat { * @return a string starting by a point. */ public String getFileSuffix() { - // ::comment when CORE + // ::comment when __CORE__ if (name().startsWith("XMI")) return ".xmi"; @@ -143,7 +143,7 @@ public enum FileFormat { } public StringBounder getDefaultStringBounder(TikzFontDistortion tikzFontDistortion, SvgCharSizeHack charSizeHack) { - // ::comment when CORE + // ::comment when __CORE__ if (this == LATEX || this == LATEX_NO_PREAMBLE) return getTikzStringBounder(tikzFontDistortion); @@ -202,7 +202,7 @@ public enum FileFormat { return new XDimension2D(rect.getWidth(), rect.getHeight()); } - // ::comment when CORE + // ::comment when __CORE__ private StringBounder getBrailleStringBounder() { return new StringBounderRaw(FileFormat.gg.getFontRenderContext()) { public String toString() { diff --git a/src/net/sourceforge/plantuml/FileFormatOption.java b/src/net/sourceforge/plantuml/FileFormatOption.java index f11ef1473..5ebe4c4ca 100644 --- a/src/net/sourceforge/plantuml/FileFormatOption.java +++ b/src/net/sourceforge/plantuml/FileFormatOption.java @@ -51,6 +51,7 @@ import net.sourceforge.plantuml.text.SvgCharSizeHack; * */ public final class FileFormatOption implements Serializable { + // ::remove file when __HAXE__ private final FileFormat fileFormat; private boolean withMetadata; diff --git a/src/net/sourceforge/plantuml/FileImageData.java b/src/net/sourceforge/plantuml/FileImageData.java index b3ccb3156..3b92037a1 100644 --- a/src/net/sourceforge/plantuml/FileImageData.java +++ b/src/net/sourceforge/plantuml/FileImageData.java @@ -39,6 +39,7 @@ import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.security.SFile; public class FileImageData { + // ::remove file when __HAXE__ public static final int ERROR = 400; public static final int CRASH = 503; diff --git a/src/net/sourceforge/plantuml/FileSystem.java b/src/net/sourceforge/plantuml/FileSystem.java index e635fa224..05c8c4b36 100644 --- a/src/net/sourceforge/plantuml/FileSystem.java +++ b/src/net/sourceforge/plantuml/FileSystem.java @@ -42,6 +42,7 @@ import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.utils.Log; public class FileSystem { + // ::remove file when __HAXE__ private final static FileSystem singleton = new FileSystem(); @@ -65,7 +66,7 @@ public class FileSystem { } public SFile getCurrentDir() { - // ::comment when CORE + // ::comment when __CORE__ final String path = this.currentDir.get(); if (path != null) return new SFile(path); @@ -75,11 +76,11 @@ public class FileSystem { } public SFile getFile(String nameOrPath) throws IOException { - // ::uncomment when CORE + // ::uncomment when __CORE__ // return null; // ::done - // ::comment when CORE + // ::comment when __CORE__ if (isAbsolute(nameOrPath)) { final SFile result = new SFile(nameOrPath); Log.info("Trying " + result.getAbsolutePath()); @@ -117,7 +118,7 @@ public class FileSystem { // ::done } - // ::comment when CORE + // ::comment when __CORE__ private boolean isAbsolute(String nameOrPath) { final SFile f = new SFile(nameOrPath); return f.isAbsolute(); diff --git a/src/net/sourceforge/plantuml/FileUtils.java b/src/net/sourceforge/plantuml/FileUtils.java index a62d3b42b..a750c368a 100644 --- a/src/net/sourceforge/plantuml/FileUtils.java +++ b/src/net/sourceforge/plantuml/FileUtils.java @@ -53,6 +53,7 @@ import net.sourceforge.plantuml.utils.Log; // Used by the Eclipse Plugin, so do not change package location. public class FileUtils { + // ::remove file when __HAXE__ private static AtomicInteger counter; @@ -105,7 +106,7 @@ public class FileUtils { return readSvg(br, true, true); } - // ::comment when CORE + // ::comment when __CORE__ static public File createTempFileLegacy(String prefix, String suffix) throws IOException { if (suffix.startsWith(".") == false) throw new IllegalArgumentException(); diff --git a/src/net/sourceforge/plantuml/GeneratedImage.java b/src/net/sourceforge/plantuml/GeneratedImage.java index 013051ef2..51a6253f0 100644 --- a/src/net/sourceforge/plantuml/GeneratedImage.java +++ b/src/net/sourceforge/plantuml/GeneratedImage.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml; import java.io.File; public interface GeneratedImage extends Comparable { + // ::remove file when __HAXE__ public File getPngFile(); diff --git a/src/net/sourceforge/plantuml/GeneratedImageImpl.java b/src/net/sourceforge/plantuml/GeneratedImageImpl.java index 55fa952ff..6e0aa522f 100644 --- a/src/net/sourceforge/plantuml/GeneratedImageImpl.java +++ b/src/net/sourceforge/plantuml/GeneratedImageImpl.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; public class GeneratedImageImpl implements GeneratedImage { + // ::remove file when __HAXE__ private final SFile pngFile; private final String description; diff --git a/src/net/sourceforge/plantuml/ISourceFileReader.java b/src/net/sourceforge/plantuml/ISourceFileReader.java index 2f4599d41..434b06fa4 100644 --- a/src/net/sourceforge/plantuml/ISourceFileReader.java +++ b/src/net/sourceforge/plantuml/ISourceFileReader.java @@ -39,7 +39,8 @@ import java.io.IOException; import java.util.List; public interface ISourceFileReader { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ public List getGeneratedImages() throws IOException; diff --git a/src/net/sourceforge/plantuml/NewpagedDiagram.java b/src/net/sourceforge/plantuml/NewpagedDiagram.java index a7058b53d..c8027580b 100644 --- a/src/net/sourceforge/plantuml/NewpagedDiagram.java +++ b/src/net/sourceforge/plantuml/NewpagedDiagram.java @@ -51,6 +51,7 @@ import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; public class NewpagedDiagram extends AbstractPSystem { + // ::remove file when __HAXE__ private final List diagrams = new ArrayList<>(); diff --git a/src/net/sourceforge/plantuml/NullOutputStream.java b/src/net/sourceforge/plantuml/NullOutputStream.java index 2f80a08b5..e631735c8 100644 --- a/src/net/sourceforge/plantuml/NullOutputStream.java +++ b/src/net/sourceforge/plantuml/NullOutputStream.java @@ -40,6 +40,7 @@ import java.io.OutputStream; // Modified by Maxime Sinclair public class NullOutputStream extends OutputStream { + // ::remove file when __HAXE__ /** * Writes to nowhere diff --git a/src/net/sourceforge/plantuml/Option.java b/src/net/sourceforge/plantuml/Option.java index 466facd99..156ba223b 100644 --- a/src/net/sourceforge/plantuml/Option.java +++ b/src/net/sourceforge/plantuml/Option.java @@ -59,14 +59,15 @@ import net.sourceforge.plantuml.stats.StatsUtils; import net.sourceforge.plantuml.utils.Log; public class Option { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ private final List excludes = new ArrayList<>(); private final List config = new ArrayList<>(); private final Map defines = new LinkedHashMap(); private String charset; - // ::comment when CORE + // ::comment when __CORE__ private boolean computeurl = false; private boolean decodeurl = false; private boolean pipe = false; @@ -86,7 +87,7 @@ public class Option { private boolean debugsvek = false; private int nbThreads = 0; - // ::comment when CORE + // ::comment when __CORE__ private boolean splash = false; private boolean textProgressBar = false; private int ftpPort = -1; @@ -121,7 +122,7 @@ public class Option { this.fileFormatOption = newFormat; } - // ::comment when CORE + // ::comment when __CORE__ public Option(String... arg) throws InterruptedException, IOException { if (arg.length == 0) OptionFlags.getInstance().setGui(true); @@ -527,7 +528,7 @@ public class Option { return Collections.unmodifiableList(excludes); } - // ::comment when CORE + // ::comment when __CORE__ public Defines getDefaultDefines(SFile f) { final Defines result = Defines.createWithFileName(f); for (Map.Entry ent : defines.entrySet()) { @@ -583,7 +584,7 @@ public class Option { } - // ::comment when CORE + // ::comment when __CORE__ public final boolean isComputeurl() { return computeurl; } @@ -631,7 +632,7 @@ public class Option { return Runtime.getRuntime().availableProcessors(); } - // ::comment when CORE + // ::comment when __CORE__ public final boolean isCheckOnly() { return checkOnly; } @@ -677,7 +678,7 @@ public class Option { return debugsvek; } - // ::comment when CORE + // ::comment when __CORE__ public final boolean isSplash() { return splash; } diff --git a/src/net/sourceforge/plantuml/OptionFlags.java b/src/net/sourceforge/plantuml/OptionFlags.java index 7658ee62c..90933416a 100644 --- a/src/net/sourceforge/plantuml/OptionFlags.java +++ b/src/net/sourceforge/plantuml/OptionFlags.java @@ -47,6 +47,7 @@ import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.utils.Log; public class OptionFlags { + // ::remove file when __HAXE__ private static final OptionFlags singleton = new OptionFlags(); static public final boolean STRICT_SELFMESSAGE_POSITION = true; @@ -68,7 +69,7 @@ public class OptionFlags { this.replaceWhiteBackgroundByTransparent = replaceWhiteBackgroundByTransparent; } - // ::comment when CORE + // ::comment when __CORE__ // static public final boolean PBBACK = false; // static public boolean GRAPHVIZCACHE = false; // static public final boolean TRACE_DOT = false; diff --git a/src/net/sourceforge/plantuml/OptionPreprocOutputMode.java b/src/net/sourceforge/plantuml/OptionPreprocOutputMode.java index 9c74b52aa..888947241 100644 --- a/src/net/sourceforge/plantuml/OptionPreprocOutputMode.java +++ b/src/net/sourceforge/plantuml/OptionPreprocOutputMode.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml; public enum OptionPreprocOutputMode { + // ::remove file when __HAXE__ NORMAL, CYPHER } diff --git a/src/net/sourceforge/plantuml/OptionPrint.java b/src/net/sourceforge/plantuml/OptionPrint.java index cbdb95ef9..fd2a48b0a 100644 --- a/src/net/sourceforge/plantuml/OptionPrint.java +++ b/src/net/sourceforge/plantuml/OptionPrint.java @@ -56,7 +56,8 @@ import net.sourceforge.plantuml.version.PSystemVersion; import net.sourceforge.plantuml.version.Version; public class OptionPrint { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ static public void printTestDot() throws InterruptedException { final List result = new ArrayList<>(); diff --git a/src/net/sourceforge/plantuml/PSystemBuilder.java b/src/net/sourceforge/plantuml/PSystemBuilder.java index d2cce6425..87cbeeae5 100644 --- a/src/net/sourceforge/plantuml/PSystemBuilder.java +++ b/src/net/sourceforge/plantuml/PSystemBuilder.java @@ -109,6 +109,7 @@ import net.sourceforge.plantuml.wire.WireDiagramFactory; import net.sourceforge.plantuml.yaml.YamlDiagramFactory; public class PSystemBuilder { + // ::remove file when __HAXE__ public static final long startTime = System.currentTimeMillis(); @@ -154,7 +155,7 @@ public class PSystemBuilder { return result; } finally { WasmLog.log("...parsing ok..."); - // ::comment when CORE + // ::comment when __CORE__ if (result != null && OptionFlags.getInstance().isEnableStats()) { StatsUtilsIncrement.onceMoreParse(System.currentTimeMillis() - now, result.getClass()); } @@ -176,14 +177,14 @@ public class PSystemBuilder { factories.add(new StateDiagramFactory()); factories.add(new ActivityDiagramFactory3()); - // ::comment when CORE + // ::comment when __CORE__ factories.add(new BpmDiagramFactory(DiagramType.BPM)); // ::done // factories.add(new PostIdDiagramFactory()); factories.add(new PSystemLicenseFactory()); factories.add(new PSystemVersionFactory()); - // ::comment when CORE + // ::comment when __CORE__ factories.add(new PSystemDonorsFactory()); factories.add(new PSystemSkinparameterListFactory()); factories.add(new PSystemListFontsFactory()); @@ -194,7 +195,7 @@ public class PSystemBuilder { // ::done factories.add(new PSystemSaltFactory(DiagramType.UML)); factories.add(new PSystemSaltFactory(DiagramType.SALT)); - // ::comment when CORE + // ::comment when __CORE__ factories.add(new PSystemDotFactory(DiagramType.DOT)); factories.add(new PSystemDotFactory(DiagramType.UML)); // ::done @@ -202,10 +203,10 @@ public class PSystemBuilder { factories.add(new NwDiagramFactory(DiagramType.NW)); factories.add(new MindMapDiagramFactory()); factories.add(new WBSDiagramFactory()); - // ::uncomment when CORE + // ::uncomment when __CORE__ // factories.add(new PSystemSudokuFactory()); // ::done - // ::comment when CORE + // ::comment when __CORE__ factories.add(new PSystemDitaaFactory()); if (License.getCurrent() == License.GPL || License.getCurrent() == License.GPLV2) { factories.add(new PSystemJcckitFactory()); @@ -228,7 +229,7 @@ public class PSystemBuilder { factories.add(new PSystemOregonFactory()); // ::done factories.add(new PSystemCharlieFactory()); - // ::comment when CORE + // ::comment when __CORE__ if (License.getCurrent() == License.GPL || License.getCurrent() == License.GPLV2) { factories.add(new PSystemXearthFactory()); } @@ -237,17 +238,17 @@ public class PSystemBuilder { factories.add(new FlowDiagramFactory()); // factories.add(new PSystemTreeFactory(DiagramType.JUNGLE)); // factories.add(new PSystemCuteFactory(DiagramType.CUTE)); - // ::comment when CORE + // ::comment when __CORE__ factories.add(new PSystemDedicationFactory()); // ::done factories.add(new TimingDiagramFactory()); - // ::comment when CORE + // ::comment when __CORE__ factories.add(new HelpFactory()); factories.add(new WireDiagramFactory()); // ::done factories.add(new JsonDiagramFactory()); factories.add(new GitDiagramFactory()); - // ::comment when CORE + // ::comment when __CORE__ factories.add(new BoardDiagramFactory()); // ::done factories.add(new YamlDiagramFactory()); diff --git a/src/net/sourceforge/plantuml/PSystemUtils.java b/src/net/sourceforge/plantuml/PSystemUtils.java index 3751f9b64..fc1d81d6e 100644 --- a/src/net/sourceforge/plantuml/PSystemUtils.java +++ b/src/net/sourceforge/plantuml/PSystemUtils.java @@ -58,7 +58,8 @@ import net.sourceforge.plantuml.skin.SplitParam; import net.sourceforge.plantuml.utils.Log; public class PSystemUtils { - // :: remove file when CORE + // :: remove file when __CORE__ + // ::remove file when __HAXE__ public static List exportDiagrams(Diagram system, SuggestedFile suggested, FileFormatOption fileFormatOption) throws IOException { @@ -68,7 +69,7 @@ public class PSystemUtils { public static List exportDiagrams(Diagram system, SuggestedFile suggestedFile, FileFormatOption fileFormatOption, boolean checkMetadata) throws IOException { - // ::comment when CORE + // ::comment when __CORE__ final SFile existingFile = suggestedFile.getFile(0); if (checkMetadata && fileFormatOption.getFileFormat().doesSupportMetadata() && existingFile.exists()) { // && system.getNbImages() == 1) { @@ -87,7 +88,7 @@ public class PSystemUtils { if (system instanceof SequenceDiagram) return exportDiagramsSequence((SequenceDiagram) system, suggestedFile, fileFormatOption); - // ::comment when CORE + // ::comment when __CORE__ if (system instanceof CucaDiagram && fileFormatOption.getFileFormat() == FileFormat.HTML) return createFilesHtml((CucaDiagram) system, suggestedFile); // ::done @@ -153,7 +154,7 @@ public class PSystemUtils { } finally { fos.close(); } - // ::comment when SPAM + // ::comment when __CORE__ if (cmap != null && cmap.containsCMapData()) system.exportCmap(suggestedFile, i, cmap); @@ -209,7 +210,7 @@ public class PSystemUtils { if (imageData == null) return emptyList(); - // ::comment when SPAM + // ::comment when __CORE__ if (imageData.containsCMapData() && system instanceof UmlDiagram) ((UmlDiagram) system).exportCmap(suggestedFile, 0, imageData); // ::done diff --git a/src/net/sourceforge/plantuml/Pipe.java b/src/net/sourceforge/plantuml/Pipe.java index 6ff53f20c..41f59c76b 100644 --- a/src/net/sourceforge/plantuml/Pipe.java +++ b/src/net/sourceforge/plantuml/Pipe.java @@ -55,7 +55,8 @@ import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.security.SFile; public class Pipe { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ private final Option option; private final BufferedReader br; diff --git a/src/net/sourceforge/plantuml/PlainDiagram.java b/src/net/sourceforge/plantuml/PlainDiagram.java index 4d0d60c9f..7945b7feb 100644 --- a/src/net/sourceforge/plantuml/PlainDiagram.java +++ b/src/net/sourceforge/plantuml/PlainDiagram.java @@ -45,6 +45,7 @@ import net.sourceforge.plantuml.klimt.shape.UDrawable; // This class doesnt feel like a wonderful idea, just a stepping stone towards something public abstract class PlainDiagram extends AbstractPSystem { + // ::remove file when __HAXE__ public PlainDiagram(UmlSource source) { super(source); diff --git a/src/net/sourceforge/plantuml/PlainStringsDiagram.java b/src/net/sourceforge/plantuml/PlainStringsDiagram.java index df2bcfec7..b3e89b77b 100644 --- a/src/net/sourceforge/plantuml/PlainStringsDiagram.java +++ b/src/net/sourceforge/plantuml/PlainStringsDiagram.java @@ -45,6 +45,7 @@ import net.sourceforge.plantuml.klimt.geom.GraphicPosition; import net.sourceforge.plantuml.klimt.shape.UDrawable; public abstract class PlainStringsDiagram extends PlainDiagram { + // ::remove file when __HAXE__ protected BufferedImage image = null; protected GraphicPosition imagePosition = null; diff --git a/src/net/sourceforge/plantuml/ProgressBar.java b/src/net/sourceforge/plantuml/ProgressBar.java index e9264d574..9d83150ed 100644 --- a/src/net/sourceforge/plantuml/ProgressBar.java +++ b/src/net/sourceforge/plantuml/ProgressBar.java @@ -41,7 +41,8 @@ import java.util.logging.Level; import java.util.logging.LogRecord; public class ProgressBar { - // :: remove file when CORE + // :: remove file when __CORE__ + // ::remove file when __HAXE__ private static final java.util.logging.Logger logger; diff --git a/src/net/sourceforge/plantuml/Run.java b/src/net/sourceforge/plantuml/Run.java index 899946544..9f9558e5a 100644 --- a/src/net/sourceforge/plantuml/Run.java +++ b/src/net/sourceforge/plantuml/Run.java @@ -78,7 +78,8 @@ import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.version.Version; public class Run { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ private static Cypher cypher; diff --git a/src/net/sourceforge/plantuml/SourceFileReader.java b/src/net/sourceforge/plantuml/SourceFileReader.java index 92af0e05a..5213eae3b 100644 --- a/src/net/sourceforge/plantuml/SourceFileReader.java +++ b/src/net/sourceforge/plantuml/SourceFileReader.java @@ -47,7 +47,8 @@ import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.utils.Log; public class SourceFileReader extends SourceFileReaderAbstract implements ISourceFileReader { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ private File outputDirectory; diff --git a/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java b/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java index b0fe50acd..fa5ce0852 100644 --- a/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java +++ b/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java @@ -66,7 +66,8 @@ import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.utils.Log; public abstract class SourceFileReaderAbstract implements ISourceFileReader { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ final private File file; diff --git a/src/net/sourceforge/plantuml/SourceFileReaderCopyCat.java b/src/net/sourceforge/plantuml/SourceFileReaderCopyCat.java index af8854ab3..1cabae2be 100644 --- a/src/net/sourceforge/plantuml/SourceFileReaderCopyCat.java +++ b/src/net/sourceforge/plantuml/SourceFileReaderCopyCat.java @@ -43,7 +43,8 @@ import net.sourceforge.plantuml.file.SuggestedFile; import net.sourceforge.plantuml.preproc.Defines; public class SourceFileReaderCopyCat extends SourceFileReaderAbstract implements ISourceFileReader { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ private final File outputDirectory; diff --git a/src/net/sourceforge/plantuml/SourceFileReaderHardFile.java b/src/net/sourceforge/plantuml/SourceFileReaderHardFile.java index 2592f3cb0..40d0db46f 100644 --- a/src/net/sourceforge/plantuml/SourceFileReaderHardFile.java +++ b/src/net/sourceforge/plantuml/SourceFileReaderHardFile.java @@ -44,7 +44,8 @@ import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.security.SFile; public class SourceFileReaderHardFile extends SourceFileReaderAbstract implements ISourceFileReader { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ private final File outputFile; diff --git a/src/net/sourceforge/plantuml/SourceStringReader.java b/src/net/sourceforge/plantuml/SourceStringReader.java index aaeae43b9..9ed71af7a 100644 --- a/src/net/sourceforge/plantuml/SourceStringReader.java +++ b/src/net/sourceforge/plantuml/SourceStringReader.java @@ -57,6 +57,7 @@ import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.utils.Log; public class SourceStringReader { + // ::remove file when __HAXE__ final private List blocks; @@ -114,7 +115,7 @@ public class SourceStringReader { return outputImage(os, 0); } - // ::comment when CORE + // ::comment when __CORE__ @Deprecated public String generateImage(SFile f) throws IOException { return outputImage(f).getDescription(); diff --git a/src/net/sourceforge/plantuml/Splash.java b/src/net/sourceforge/plantuml/Splash.java index f6887867d..0f61a1046 100644 --- a/src/net/sourceforge/plantuml/Splash.java +++ b/src/net/sourceforge/plantuml/Splash.java @@ -55,7 +55,8 @@ import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.version.PSystemVersion; public class Splash extends Window implements MouseListener, MouseMotionListener { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ private static final Color LINK_NORMAL = Color.BLUE; private static final Color LINK_HOVER = new Color(127, 0, 127); diff --git a/src/net/sourceforge/plantuml/Stdrpt.java b/src/net/sourceforge/plantuml/Stdrpt.java index 310b300e3..02b550bc4 100644 --- a/src/net/sourceforge/plantuml/Stdrpt.java +++ b/src/net/sourceforge/plantuml/Stdrpt.java @@ -41,7 +41,8 @@ import java.io.PrintStream; import net.sourceforge.plantuml.core.Diagram; public interface Stdrpt { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ public void printInfo(PrintStream output, Diagram sys); diff --git a/src/net/sourceforge/plantuml/StdrptNull.java b/src/net/sourceforge/plantuml/StdrptNull.java index 7434ad5a4..c723d861b 100644 --- a/src/net/sourceforge/plantuml/StdrptNull.java +++ b/src/net/sourceforge/plantuml/StdrptNull.java @@ -42,7 +42,8 @@ import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.utils.Log; public class StdrptNull implements Stdrpt { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ public void printInfo(final PrintStream output, final Diagram sys) { } diff --git a/src/net/sourceforge/plantuml/StdrptPipe0.java b/src/net/sourceforge/plantuml/StdrptPipe0.java index 6fd0c4096..b5d053c5d 100644 --- a/src/net/sourceforge/plantuml/StdrptPipe0.java +++ b/src/net/sourceforge/plantuml/StdrptPipe0.java @@ -43,7 +43,8 @@ import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.utils.Log; public class StdrptPipe0 implements Stdrpt { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ public void printInfo(final PrintStream output, final Diagram sys) { if (sys instanceof PSystemError) { diff --git a/src/net/sourceforge/plantuml/StdrptV1.java b/src/net/sourceforge/plantuml/StdrptV1.java index ad304d0f9..7b1677cbd 100644 --- a/src/net/sourceforge/plantuml/StdrptV1.java +++ b/src/net/sourceforge/plantuml/StdrptV1.java @@ -45,7 +45,8 @@ import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.utils.Log; public class StdrptV1 implements Stdrpt { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ public void printInfo(final PrintStream output, Diagram sys) { if (sys instanceof PSystemWelcome) { diff --git a/src/net/sourceforge/plantuml/StdrptV2.java b/src/net/sourceforge/plantuml/StdrptV2.java index 361a57721..1a4b7f805 100644 --- a/src/net/sourceforge/plantuml/StdrptV2.java +++ b/src/net/sourceforge/plantuml/StdrptV2.java @@ -44,7 +44,8 @@ import net.sourceforge.plantuml.eggs.PSystemWelcome; import net.sourceforge.plantuml.error.PSystemError; public class StdrptV2 implements Stdrpt { - // ::remove file when CORE + // ::remove file when __CORE__ + // ::remove file when __HAXE__ public void finalMessage() { } diff --git a/src/net/sourceforge/plantuml/StringUtils.java b/src/net/sourceforge/plantuml/StringUtils.java index 595730a9a..a5a079759 100644 --- a/src/net/sourceforge/plantuml/StringUtils.java +++ b/src/net/sourceforge/plantuml/StringUtils.java @@ -108,6 +108,7 @@ public class StringUtils { } + // ::comment when __HAXE__ final static public List getSplit(Pattern2 pattern, String line) { final Matcher2 m = pattern.matcher(line); if (m.find() == false) @@ -119,6 +120,7 @@ public class StringUtils { return result; } + // ::done public static boolean isNotEmpty(CharSequence s) { return !isEmpty(s); @@ -173,6 +175,7 @@ public class StringUtils { return result.toString(); } + // ::comment when __HAXE__ public static String unicodeForHtml(Display display) { final StringBuilder result = new StringBuilder(); for (int i = 0; i < display.size(); i++) { @@ -183,6 +186,7 @@ public class StringUtils { } return result.toString(); } + // ::done public static String manageArrowForSequence(String s) { s = s.replace('=', '-').toLowerCase(); @@ -318,11 +322,13 @@ public class StringUtils { return c == '\"' || c == '\u201c' || c == '\u201d' || c == '\u00ab' || c == '\u00bb'; } + // ::comment when __HAXE__ public static boolean isCJK(char c) { final Character.UnicodeBlock block = Character.UnicodeBlock.of(c); Log.println("block=" + block); return false; } + // ::done public static char hiddenLesserThan() { return '\u0005'; @@ -344,16 +350,16 @@ public class StringUtils { return s; } - private static int getWidth(Display stringsToDisplay) { - int result = 1; - for (CharSequence s : stringsToDisplay) - if (s != null && result < s.length()) - result = s.length(); +// private static int getWidth(Display stringsToDisplay) { +// int result = 1; +// for (CharSequence s : stringsToDisplay) +// if (s != null && result < s.length()) +// result = s.length(); +// +// return result; +// } - return result; - } - - // ::comment when CORE + // ::comment when __CORE__ or __HAXE__ public static int getWcWidth(Display stringsToDisplay) { int result = 1; for (CharSequence s : stringsToDisplay) { @@ -373,9 +379,11 @@ public class StringUtils { return stringsToDisplay.size(); } + // ::comment when __HAXE__ public static int getHeight(Display stringsToDisplay) { return stringsToDisplay.size(); } + // ::done public static boolean isDiagramCacheable(String uml) { if (uml.length() < 35) @@ -429,6 +437,7 @@ public class StringUtils { return Integer.parseInt(uml.substring(x1, x2)); } + // ::comment when __HAXE__ public static List splitComma(String s) { s = trin(s); final List result = new ArrayList<>(); @@ -439,6 +448,7 @@ public class StringUtils { return Collections.unmodifiableList(result); } + // ::done public static String getUid(String uid1, int uid2) { return uid1 + String.format("%04d", uid2); diff --git a/src/net/sourceforge/plantuml/TikzFontDistortion.java b/src/net/sourceforge/plantuml/TikzFontDistortion.java index 1497ba9ab..57ef85576 100644 --- a/src/net/sourceforge/plantuml/TikzFontDistortion.java +++ b/src/net/sourceforge/plantuml/TikzFontDistortion.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml; import java.util.StringTokenizer; public class TikzFontDistortion { + // ::remove file when __HAXE__ private final double magnify; private final double distortion; diff --git a/src/net/sourceforge/plantuml/TitledDiagram.java b/src/net/sourceforge/plantuml/TitledDiagram.java index 1789422b1..380bf6f4f 100644 --- a/src/net/sourceforge/plantuml/TitledDiagram.java +++ b/src/net/sourceforge/plantuml/TitledDiagram.java @@ -72,6 +72,7 @@ import net.sourceforge.plantuml.style.StyleLoader; import net.sourceforge.plantuml.style.StyleSignatureBasic; public abstract class TitledDiagram extends AbstractPSystem implements Diagram, Annotated { + // ::remove file when __HAXE__ public static boolean FORCE_SMETANA = false; public static boolean FORCE_ELK = false; @@ -87,7 +88,7 @@ public abstract class TitledDiagram extends AbstractPSystem implements Diagram, private final SkinParam skinParam; - // ::comment when CORE + // ::comment when __CORE__ private Animation animation; // ::done @@ -217,7 +218,7 @@ public abstract class TitledDiagram extends AbstractPSystem implements Diagram, return ClockwiseTopRightBottomLeft.same(10); } - // ::comment when CORE + // ::comment when __CORE__ final public void setAnimation(Iterable animationData) { // try { final AnimationDecoder animationDecoder = new AnimationDecoder(animationData); diff --git a/src/net/sourceforge/plantuml/UmlDiagram.java b/src/net/sourceforge/plantuml/UmlDiagram.java index 8bd0ec10a..c0c0d0e62 100644 --- a/src/net/sourceforge/plantuml/UmlDiagram.java +++ b/src/net/sourceforge/plantuml/UmlDiagram.java @@ -87,6 +87,7 @@ import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.version.Version; public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annotated, WithSprite { + // ::remove file when __HAXE__ private boolean rotation; @@ -132,7 +133,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot fileFormatOption = fileFormatOption.withTikzFontDistortion(getSkinParam().getTikzFontDistortion()); - // ::comment when CORE + // ::comment when __CORE__ if (fileFormatOption.getFileFormat() == FileFormat.PDF) return exportDiagramInternalPdf(os, index); // ::done @@ -163,7 +164,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot public static void exportDiagramError(OutputStream os, Throwable exception, FileFormatOption fileFormat, long seed, String metadata, String flash, List strings) throws IOException { - // ::comment when CORE + // ::comment when __CORE__ if (fileFormat.getFileFormat() == FileFormat.ATXT || fileFormat.getFileFormat() == FileFormat.UTXT) { exportDiagramErrorText(os, exception, strings); return; @@ -173,7 +174,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot strings.addAll(CommandExecutionResult.getStackTrace(exception)); BufferedImage im2 = null; - // ::comment when CORE + // ::comment when __CORE__ if (flash != null) { final FlashCodeUtils utils = FlashCodeFactory.getFlashCodeUtils(); try { @@ -203,7 +204,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot plainImageBuilder(drawable, fileFormat).metadata(metadata).seed(seed).write(os); } - // ::comment when CORE + // ::comment when __CORE__ private static void exportDiagramErrorText(OutputStream os, Throwable exception, List strings) { final PrintWriter pw = SecurityUtils.createPrintWriter(os); exception.printStackTrace(pw); @@ -256,7 +257,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot return strings; } - // ::comment when CORE + // ::comment when __CORE__ private void exportDiagramInternalMjpeg(OutputStream os) throws IOException { final SFile f = new SFile("c:/test.avi"); final int nb = 150; diff --git a/src/net/sourceforge/plantuml/WithSprite.java b/src/net/sourceforge/plantuml/WithSprite.java index f75a1efc0..5cb301c2f 100644 --- a/src/net/sourceforge/plantuml/WithSprite.java +++ b/src/net/sourceforge/plantuml/WithSprite.java @@ -39,6 +39,7 @@ import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.klimt.sprite.Sprite; public interface WithSprite extends Diagram { + // ::remove file when __HAXE__ public void addSprite(String name, Sprite sprite); } diff --git a/src/net/sourceforge/plantuml/abel/Hideable.java b/src/net/sourceforge/plantuml/abel/Hideable.java index 2043aa2ec..7bb0c7a51 100644 --- a/src/net/sourceforge/plantuml/abel/Hideable.java +++ b/src/net/sourceforge/plantuml/abel/Hideable.java @@ -36,7 +36,8 @@ package net.sourceforge.plantuml.abel; public interface Hideable { + // ::remove folder when __HAXE__ public boolean isHidden(); -} \ No newline at end of file +} diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearth.java b/src/net/sourceforge/plantuml/acearth/PSystemXearth.java index 7910768f5..0d16655f9 100644 --- a/src/net/sourceforge/plantuml/acearth/PSystemXearth.java +++ b/src/net/sourceforge/plantuml/acearth/PSystemXearth.java @@ -58,7 +58,7 @@ import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; public class PSystemXearth extends AbstractPSystem { - // :: remove folder when CORE + // :: remove folder when __CORE__ final private int width; final private int height; diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java index c01eddaea..aa19bba56 100644 --- a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java +++ b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java @@ -49,6 +49,7 @@ import net.sourceforge.plantuml.regex.MyPattern; import net.sourceforge.plantuml.regex.Pattern2; public class PSystemXearthFactory extends PSystemBasicFactory { + // ::remove folder when __HAXE__ private final Map config = new LinkedHashMap<>(); private final List markers = new ArrayList<>(); diff --git a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java index d27e6c80c..c5b3b8771 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java @@ -56,6 +56,7 @@ import net.sourceforge.plantuml.command.note.CommandFactoryNoteOnLink; import net.sourceforge.plantuml.core.UmlSource; public class ActivityDiagramFactory extends PSystemCommandFactory { + // ::remove folder when __HAXE__ @Override public ActivityDiagram createEmptyDiagram(UmlSource source, Map skinParam) { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java index 9bfe1c330..91c09b904 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java @@ -45,6 +45,7 @@ import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndif extends SingleLineCommand2 { + // ::remove folder when __HAXE__ public CommandEndif() { super(getRegexConcat()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/AbstractInstruction.java b/src/net/sourceforge/plantuml/activitydiagram3/AbstractInstruction.java index a2088aa5a..7d07fc97a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/AbstractInstruction.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/AbstractInstruction.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.style.ISkinParam; abstract class AbstractInstruction { - // ::comment when CORE + // ::comment when __CORE__ public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { throw new UnsupportedOperationException("" + getClass()); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/Branch.java b/src/net/sourceforge/plantuml/activitydiagram3/Branch.java index c1e0ab915..30db18ac0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/Branch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/Branch.java @@ -78,7 +78,7 @@ public class Branch { private final HColor color; private Ftile ftile; - // ::comment when CORE + // ::comment when __CORE__ private Gtile gtile; // ::done @@ -133,7 +133,7 @@ public class Branch { this.ftile = factory.decorateOut(list.createFtile(factory), inlinkRendering); } - // ::comment when CORE + // ::comment when __CORE__ public void updateGtile(ISkinParam skinParam, StringBounder stringBounder) { this.gtile = list.createGtile(skinParam, stringBounder); } @@ -191,14 +191,14 @@ public class Branch { return ftile; } - // ::comment when CORE + // ::comment when __CORE__ public Gtile getGtile() { return gtile; } // ::done public ISkinParam skinParam() { - // ::comment when CORE + // ::comment when __CORE__ if (gtile != null) return gtile.skinParam(); // ::done diff --git a/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java b/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java index 242ae1429..35069a69b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java @@ -52,7 +52,7 @@ public interface Instruction extends Swimable { public Ftile createFtile(FtileFactory factory); - // ::comment when CORE + // ::comment when __CORE__ public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder); // ::done diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionBreak.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionBreak.java index 051171b7c..16e42392e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionBreak.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionBreak.java @@ -61,7 +61,7 @@ public class InstructionBreak extends MonoSwimable implements Instruction { return new FtileBreak(factory.skinParam(), getSwimlaneIn()); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileBreak(stringBounder, skinParam, getSwimlaneIn()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java index 77393a944..cd0a01eb7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java @@ -57,7 +57,7 @@ public class InstructionEnd extends MonoSwimable implements Instruction { this.inlinkRendering = Objects.requireNonNull(inlinkRendering); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java index 508e8331f..0360e926b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java @@ -98,7 +98,7 @@ public class InstructionFork extends WithNote implements Instruction { return getLastList().add(ins); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { final List all = new ArrayList<>(); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java index c82814f19..3e8243e85 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java @@ -59,7 +59,7 @@ public class InstructionGoto extends MonoSwimable implements Instruction { return new FtileGoto(factory.skinParam(), getSwimlaneIn(), name); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileEmpty(stringBounder, skinParam); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java index 1703f1057..3188e4d43 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java @@ -90,7 +90,7 @@ public class InstructionGroup extends AbstractInstruction implements Instruction return list.add(ins); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { Gtile tmp = list.createGtile(skinParam, stringBounder); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java index f10432643..d3117925b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java @@ -108,7 +108,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC return current.add(ins); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { for (Branch branch : thens) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java index 679e8ecaf..b2cec087d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java @@ -59,7 +59,7 @@ public class InstructionLabel extends MonoSwimable implements Instruction { return new FtileLabel(factory.skinParam(), getSwimlaneIn(), name); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileEmpty(stringBounder, skinParam); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java index 8d63d5e58..ac352672c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java @@ -101,7 +101,7 @@ public class InstructionList extends WithNote implements Instruction, Instructio return CommandExecutionResult.ok(); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { if (all.size() == 0) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java index 601641b0f..8b90f7221 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java @@ -127,7 +127,7 @@ public class InstructionRepeat extends AbstractInstruction implements Instructio return repeatList.add(ins); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java index c587a5b57..901b55ce5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java @@ -82,7 +82,7 @@ public class InstructionSimple extends MonoSwimable implements Instruction { this.colors = Objects.requireNonNull(colors); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { GtileBox result = GtileBox.create(stringBounder, colors.mute(skinParam), label, getSwimlaneIn(), style, diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java index 7bf372a69..c511dbcad 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java @@ -89,7 +89,7 @@ public class InstructionSplit extends AbstractInstruction implements Instruction return getLast().add(ins); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { final List all = new ArrayList<>(); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java index d8f3a6257..5fbb60810 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java @@ -80,7 +80,7 @@ public class InstructionSpot extends MonoSwimable implements Instruction { return result; } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { final UFont font = skinParam.getFont(null, false, FontParam.ACTIVITY); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java index f956382e6..58d538bb9 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java @@ -62,7 +62,7 @@ public class InstructionStart extends MonoSwimable implements Instruction { return false; } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java index 686db0f59..22a9ea0f4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java @@ -62,7 +62,7 @@ public class InstructionStop extends MonoSwimable implements Instruction { return false; } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java index 1f008d02e..7a4064b4e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java @@ -58,6 +58,7 @@ import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.style.ISkinParam; public class InstructionSwitch extends WithNote implements Instruction, InstructionCollection { + // ::remove folder when __HAXE__ private final List switches = new ArrayList<>(); private final ISkinParam skinParam; @@ -97,7 +98,7 @@ public class InstructionSwitch extends WithNote implements Instruction, Instruct return current.add(ins); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { for (Branch branch : switches) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java index a84bbc98b..9c0f7b135 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java @@ -103,7 +103,7 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi return repeatList.add(ins); } - // ::comment when CORE + // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { final Gtile back = null; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java index d91320710..efa0a5c0b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java @@ -47,6 +47,7 @@ import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandElseLegacy1 extends SingleLineCommand2 { + // ::remove folder when __HAXE__ public CommandElseLegacy1() { super(getRegexConcat()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java index 7b81e8815..7db90a055 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java @@ -97,7 +97,7 @@ public class CollisionDetector extends UGraphicNo { minmax.drawGray(ug); final HColor color = HColors.BLACK; - ug = ug.apply(color).apply(new UStroke(5)); + ug = ug.apply(color).apply(UStroke.withThickness(5)); for (Snake snake : snakes) for (XLine2D line : snake.getHorizontalLines()) if (collision(line)) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java index 4caebac83..6be861ce1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java @@ -192,7 +192,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable final ConnectionCross connectionCross = new ConnectionCross(connection); connectionCross.drawU(getUg()); } - // ::comment when CORE + // ::comment when __CORE__ } else if (shape instanceof Gtile) { final Gtile tile = (Gtile) shape; tile.drawU(this); @@ -222,7 +222,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable } public final void drawU(UGraphic ug) { - // ::comment when CORE + // ::comment when __CORE__ if (Gtile.USE_GTILE) { drawGtile(ug); return; @@ -242,7 +242,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable } } - // ::comment when CORE + // ::comment when __CORE__ private void drawGtile(UGraphic ug) { TextBlock full = root.createGtile(skinParam, ug.getStringBounder()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java index b3e75b73a..b593081fc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java @@ -61,7 +61,7 @@ public class UGraphicInterceptorUDrawable2 extends UGraphicDelegator { } public void draw(UShape shape) { - // :: comment when CORE + // :: comment when __CORE__ if (shape instanceof Gtile) { final Gtile gtile = (Gtile) shape; // System.err.println("gtile=" + gtile); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java index acc1ce253..ba797bcfc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java @@ -126,20 +126,20 @@ public class Worm implements Iterable { ug = ug.apply(arrowHeadColor.bg()); if (startDecoration != null) { - ug = ug.apply(new UStroke(1.5)); + ug = ug.apply(UStroke.withThickness(1.5)); final XPoint2D start = points.get(0); if (ignoreForCompression) startDecoration.setCompressionMode(CompressionMode.ON_X); - ug.apply(new UTranslate(start)).apply(new UStroke()).draw(startDecoration); + ug.apply(new UTranslate(start)).apply(UStroke.simple()).draw(startDecoration); } if (endDecoration != null) { - ug = ug.apply(new UStroke(1.5)); + ug = ug.apply(UStroke.withThickness(1.5)); final XPoint2D end = points.get(points.size() - 1); if (ignoreForCompression) endDecoration.setCompressionMode(CompressionMode.ON_X); - ug.apply(new UTranslate(end)).apply(new UStroke()).draw(endDecoration); + ug.apply(new UTranslate(end)).apply(UStroke.simple()).draw(endDecoration); } } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java index 21034b2ee..4b4c21261 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java @@ -51,6 +51,7 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.utils.Direction; public class WormTexted implements Iterable { + // ::remove folder when __HAXE__ private final Worm worm; private TextBlock textBlock; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java index dbe382fba..47f410351 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java @@ -65,6 +65,7 @@ import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.svek.ConditionStyle; class FtileSwitch extends AbstractFtile { + // ::remove folder when __HAXE__ private final double xSeparation = 20; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java index a70bfbb68..a4587937e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java @@ -129,7 +129,7 @@ public class FtileWithNotes extends AbstractFtile { public double getEndingX(StringBounder stringBounder, double y) { return sheet1.getEndingX(stringBounder, y) + 15; } - }, new UStroke()); + }, UStroke.simple()); final Opale opale = new Opale(shadowing, borderColor, noteBackgroundColor, sheet2, false, stroke); final TextBlock opaleMarged = TextBlockUtils.withMargin(opale, 10, 10); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java index 1206cb3a8..66cc5713b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java @@ -73,7 +73,7 @@ public class UGraphicInterceptorOneSwimlane extends UGraphicDelegator { tile.drawU(this); // drawGoto(); } - // ::comment when CORE + // ::comment when __CORE__ } else if (shape instanceof Gtile) { final Gtile tile = (Gtile) shape; final Set swinlanes = tile.getSwimlanes(); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java index 5f1904930..b41942e54 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java @@ -41,6 +41,7 @@ import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.ISkinParam; public abstract class FtileDimensionMemoize extends AbstractFtile { + // ::remove folder when __HAXE__ public FtileDimensionMemoize(ISkinParam skinParam) { super(skinParam); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java index 567af7533..d12cbcfe4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java @@ -172,7 +172,7 @@ public class FtileBox extends AbstractFtile { final Sheet sheet = skinParam.sheet(fc, skinParam.getDefaultTextAlignment(horizontalAlignment), CreoleMode.FULL) .createSheet(label); this.tb = new SheetBlock2(new SheetBlock1(sheet, wrapWidth, skinParam.getPadding()), new MyStencil(), - new UStroke(1)); + UStroke.withThickness(1)); this.print = label.toString(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java index c6f25bbb8..0522c061e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java @@ -173,7 +173,7 @@ public class FtileBox2 extends AbstractFtile { final Sheet sheet = skinParam.sheet(fc, skinParam.getDefaultTextAlignment(horizontalAlignment), CreoleMode.FULL) .createSheet(label); this.tb = new SheetBlock2(new SheetBlock1(sheet, wrapWidth, skinParam.getPadding()), new MyStencil(), - new UStroke(1)); + UStroke.withThickness(1)); this.print = label.toString(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java index cb7d63bf6..4c4eb206d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java @@ -166,7 +166,7 @@ public class FtileBoxOld extends AbstractFtile { final Sheet sheet = skinParam.sheet(fc, horizontalAlignment, CreoleMode.FULL).createSheet(label); - this.tb = new SheetBlock2(new SheetBlock1(sheet, wrapWidth, style), new MyStencil(), new UStroke(1)); + this.tb = new SheetBlock2(new SheetBlock1(sheet, wrapWidth, style), new MyStencil(), UStroke.withThickness(1)); this.print = label.toString(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java index 05b899e18..ed12e029a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java @@ -104,12 +104,12 @@ public class FtileCircleEnd extends AbstractFtile { circle.setDeltaShadow(shadowing); ug = ug.apply(borderColor); final double thickness = 2.5; - ug.apply(backColor.bg()).apply(new UStroke(1.5)).apply(new UTranslate(xTheoricalPosition, yTheoricalPosition)) + ug.apply(backColor.bg()).apply(UStroke.withThickness(1.5)).apply(new UTranslate(xTheoricalPosition, yTheoricalPosition)) .draw(circle); final double size2 = (SIZE - thickness) / Math.sqrt(2); final double delta = (SIZE - size2) / 2; - ug = ug.apply(new UStroke(thickness)); + ug = ug.apply(UStroke.withThickness(thickness)); ug.apply(new UTranslate(delta, delta)).draw(new ULine(size2, size2)); ug.apply(new UTranslate(delta, SIZE - delta)).draw(new ULine(size2, -size2)); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java index b9f8f0262..82a637b08 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java @@ -40,6 +40,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.klimt.font.StringBounder; public class FtileDecoratePointOut extends FtileDecorate { + // ::remove folder when __HAXE__ final private double dx; final private double dy; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java index 85ba51670..caff4f6dc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java @@ -92,7 +92,7 @@ public class FtileThinSplit extends AbstractFtile { } else { ug = ug.apply(colorBar); } - ug.apply(new UStroke(1.5)).draw(rect); + ug.apply(UStroke.withThickness(1.5)).draw(rect); } public Set getSwimlanes() { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java index ccadddd0e..29ed8d42d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java @@ -116,7 +116,7 @@ public abstract class AbstractGtile extends AbstractGtileRoot implements Gtile { public final UStroke getThickness() { UStroke thickness = skinParam().getThickness(LineParam.activityBorder, null); if (thickness == null) { - thickness = new UStroke(1.5); + thickness = UStroke.withThickness(1.5); } return thickness; } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtile.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtile.java index ccb4f3cad..470ed39ad 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtile.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.style.ISkinParam; public interface Gtile extends Swimable2, TextBlock { - // ::remove folder when CORE + // ::remove folder when __CORE__ public static final boolean USE_GTILE = false; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java index d357aca73..fd590eceb 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java @@ -147,7 +147,7 @@ public class GtileBox extends AbstractGtile { final Sheet sheet = skinParam.sheet(fc, skinParam.getDefaultTextAlignment(horizontalAlignment), CreoleMode.FULL) .createSheet(label); this.tb = new SheetBlock2(new SheetBlock1(sheet, wrapWidth, skinParam.getPadding()), new MyStencil(), - new UStroke(1)); + UStroke.withThickness(1)); this.print = label.toString(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java index 1824fcb12..2a654d51c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java @@ -49,6 +49,7 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; public class GtileCircleStart extends AbstractGtile { + // ::remove folder when __HAXE__ private static final int SIZE = 20; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java index 4f2b8e216..9fd2d8759 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java @@ -80,7 +80,7 @@ public class GtileSplit extends GtileColumns { final double xLast = gtiles.get(last).getCoord(GPoint.NORTH_HOOK).compose(getPosition(last)).getDx(); final ULine hline = ULine.hline(xLast - x0); - ug = ug.apply(lineColor).apply(new UStroke(1.5)); + ug = ug.apply(lineColor).apply(UStroke.withThickness(1.5)); ug.apply(UTranslate.dx(x0)).draw(hline); final double y = getCoord(GPoint.SOUTH_BORDER).getDy(); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java index 55dff682d..be58bc65f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java @@ -118,7 +118,7 @@ public class GtileWithNoteOpale extends AbstractGtile implements Stencil, Stylea false, null); final Sheet sheet = skinParam.sheet(fc, align, CreoleMode.FULL).createSheet(note.getDisplay()); final TextBlock text = new SheetBlock2(new SheetBlock1(sheet, wrapWidth, skinParam.getPadding()), this, - new UStroke(1)); + UStroke.withThickness(1)); this.opale = new Opale(shadowing, borderColor, noteBackgroundColor, text, withLink, stroke); this.dimNote = opale.calculateDimension(stringBounder); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java index 6a814730f..ead76dcca 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java @@ -71,7 +71,7 @@ public class Gtiles { .sheet(fcTest, skinParam.getDefaultTextAlignment(HorizontalAlignment.LEFT), CreoleMode.FULL) .createSheet(label); final SheetBlock1 sheetBlock1 = new SheetBlock1(sheet, LineBreakStrategy.NONE, skinParam.getPadding()); - final TextBlock tbTest = new SheetBlock2(sheetBlock1, Hexagon.asStencil(sheetBlock1), new UStroke()); + final TextBlock tbTest = new SheetBlock2(sheetBlock1, Hexagon.asStencil(sheetBlock1), UStroke.simple()); return new GtileHexagonInside(stringBounder, tbTest, skinParam, backColor, borderColor, swimlane); } diff --git a/src/net/sourceforge/plantuml/anim/AffineTransformation.java b/src/net/sourceforge/plantuml/anim/AffineTransformation.java index 526d5bf23..beda401ea 100644 --- a/src/net/sourceforge/plantuml/anim/AffineTransformation.java +++ b/src/net/sourceforge/plantuml/anim/AffineTransformation.java @@ -47,7 +47,8 @@ import net.sourceforge.plantuml.klimt.geom.XDimension2D; import net.sourceforge.plantuml.klimt.geom.XPoint2D; public class AffineTransformation { - // ::remove folder when CORE + // ::remove folder when __HAXE__ + // ::remove folder when __CORE__ static private final Pattern rotate = Pattern.compile("rotate\\s+(-?\\d+\\.?\\d*)"); static private final Pattern shear = Pattern.compile("shear\\s+(-?\\d+\\.?\\d*)\\s+(-?\\d+\\.?\\d*)"); diff --git a/src/net/sourceforge/plantuml/annotation/Foo.java b/src/net/sourceforge/plantuml/annotation/Foo.java index 5cea7a901..8652e6507 100644 --- a/src/net/sourceforge/plantuml/annotation/Foo.java +++ b/src/net/sourceforge/plantuml/annotation/Foo.java @@ -8,4 +8,5 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.SOURCE) @Target({ ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.TYPE }) public @interface Foo { + // ::remove folder when __HAXE__ } diff --git a/src/net/sourceforge/plantuml/ant/CheckZipTask.java b/src/net/sourceforge/plantuml/ant/CheckZipTask.java index 426ab8bef..f42a3238e 100644 --- a/src/net/sourceforge/plantuml/ant/CheckZipTask.java +++ b/src/net/sourceforge/plantuml/ant/CheckZipTask.java @@ -54,7 +54,7 @@ import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityUtils; public class CheckZipTask extends Task { - // ::remove folder when CORE + // ::remove folder when __CORE__ private String zipfile = null; private List filesets = new ArrayList<>(); diff --git a/src/net/sourceforge/plantuml/ant/PlantUmlTask.java b/src/net/sourceforge/plantuml/ant/PlantUmlTask.java index c6d7bb186..31d40c564 100644 --- a/src/net/sourceforge/plantuml/ant/PlantUmlTask.java +++ b/src/net/sourceforge/plantuml/ant/PlantUmlTask.java @@ -77,6 +77,7 @@ import net.sourceforge.plantuml.stats.StatsUtils; // Carriage Return in UTF-8 XML: // Line Feed in UTF-8 XML: public class PlantUmlTask extends Task { + // ::remove folder when __HAXE__ private String dir = null; private final Option option = new Option(); diff --git a/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java b/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java index d46f4c3d0..512fc3ddd 100644 --- a/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java +++ b/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java @@ -36,6 +36,7 @@ import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.utils.Log; public class NumberAnalyzed2 implements INumberAnalyzed { + // ::remove folder when __HAXE__ private static final int SLIDING_WINDOW = 512; diff --git a/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java b/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java index cadb416ab..a96bf57a6 100644 --- a/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java +++ b/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.api.mda.option2; import java.util.Collection; public interface MDADiagram { - // ::remove folder when CORE + // ::remove folder when __HAXE__ + // ::remove folder when __CORE__ public Collection getPackages(); } diff --git a/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java b/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java index 9472c73e4..0e9b956a7 100644 --- a/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java +++ b/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java @@ -36,5 +36,6 @@ package net.sourceforge.plantuml.api.mda.option3; public interface MDAVisitor { - // ::remove folder when CORE + // ::remove folder when __HAXE__ + // ::remove folder when __CORE__ } diff --git a/src/net/sourceforge/plantuml/argon2/Argon2.java b/src/net/sourceforge/plantuml/argon2/Argon2.java index ebc06f900..fd4262f1f 100644 --- a/src/net/sourceforge/plantuml/argon2/Argon2.java +++ b/src/net/sourceforge/plantuml/argon2/Argon2.java @@ -25,7 +25,8 @@ import net.sourceforge.plantuml.argon2.model.Argon2Type; import net.sourceforge.plantuml.argon2.model.Instance; public class Argon2 { - // ::remove folder when CORE + // ::remove folder when __CORE__ + // ::remove folder when __HAXE__ private byte[] output; private int outputLength; // -l N diff --git a/src/net/sourceforge/plantuml/argon2/algorithm/Initialize.java b/src/net/sourceforge/plantuml/argon2/algorithm/Initialize.java index 138a1f412..ec48f24ed 100644 --- a/src/net/sourceforge/plantuml/argon2/algorithm/Initialize.java +++ b/src/net/sourceforge/plantuml/argon2/algorithm/Initialize.java @@ -14,6 +14,7 @@ import net.sourceforge.plantuml.argon2.Util; import net.sourceforge.plantuml.argon2.model.Instance; public class Initialize { + // ::remove folder when __HAXE__ public static void initialize(Instance instance, Argon2 argon2) { byte[] initialHash = Functions.initialHash(Util.intToLittleEndianBytes(argon2.getLanes()), diff --git a/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java b/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java index dd895bdbc..413b816ca 100644 --- a/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java +++ b/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java @@ -40,6 +40,7 @@ import java.util.Arrays; /** */ public interface Blake2b { + // ::remove folder when __HAXE__ /** */ void update(byte[] input); diff --git a/src/net/sourceforge/plantuml/argon2/exception/Argon2Exception.java b/src/net/sourceforge/plantuml/argon2/exception/Argon2Exception.java index 0e2e2a3d8..193afe474 100644 --- a/src/net/sourceforge/plantuml/argon2/exception/Argon2Exception.java +++ b/src/net/sourceforge/plantuml/argon2/exception/Argon2Exception.java @@ -7,6 +7,7 @@ package net.sourceforge.plantuml.argon2.exception; /* dislike checked exceptions */ class Argon2Exception extends RuntimeException { + // ::remove folder when __HAXE__ Argon2Exception(String message) { super(message); } diff --git a/src/net/sourceforge/plantuml/argon2/model/Block.java b/src/net/sourceforge/plantuml/argon2/model/Block.java index b256ad400..266f2541a 100644 --- a/src/net/sourceforge/plantuml/argon2/model/Block.java +++ b/src/net/sourceforge/plantuml/argon2/model/Block.java @@ -13,6 +13,7 @@ import java.util.Arrays; import net.sourceforge.plantuml.argon2.Util; public class Block { + // ::remove folder when __HAXE__ /* 128 * 8 Byte QWords */ public long[] v; diff --git a/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java b/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java index 9e45cb115..557ac2270 100644 --- a/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java +++ b/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; public abstract class AbstractComponentText implements Component { - // ::remove folder when CORE + // ::remove folder when __CORE__ public final XDimension2D getPreferredDimension(StringBounder stringBounder) { final double w = getPreferredWidth(stringBounder); diff --git a/src/net/sourceforge/plantuml/asciiart/TranslatedCharArea.java b/src/net/sourceforge/plantuml/asciiart/TranslatedCharArea.java index e4d860b03..858522ee6 100644 --- a/src/net/sourceforge/plantuml/asciiart/TranslatedCharArea.java +++ b/src/net/sourceforge/plantuml/asciiart/TranslatedCharArea.java @@ -40,6 +40,7 @@ import java.util.Collection; import java.util.List; public class TranslatedCharArea implements UmlCharArea { + // ::remove folder when __HAXE__ private final int dx; private final int dy; diff --git a/src/net/sourceforge/plantuml/board/BNode.java b/src/net/sourceforge/plantuml/board/BNode.java index 02ec3d4e8..8b7ae8de5 100644 --- a/src/net/sourceforge/plantuml/board/BNode.java +++ b/src/net/sourceforge/plantuml/board/BNode.java @@ -40,6 +40,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; public class BNode { + // ::remove folder when __HAXE__ private final String name; private final int stage; diff --git a/src/net/sourceforge/plantuml/board/BoardDiagramFactory.java b/src/net/sourceforge/plantuml/board/BoardDiagramFactory.java index dc6586597..a34f6c539 100644 --- a/src/net/sourceforge/plantuml/board/BoardDiagramFactory.java +++ b/src/net/sourceforge/plantuml/board/BoardDiagramFactory.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; public class BoardDiagramFactory extends PSystemCommandFactory { - // ::remove folder when CORE + // ::remove folder when __CORE__ public BoardDiagramFactory() { super(DiagramType.BOARD); diff --git a/src/net/sourceforge/plantuml/bpm/AbstractConnectorPuzzle.java b/src/net/sourceforge/plantuml/bpm/AbstractConnectorPuzzle.java index 6b246f3ca..04917dfb8 100644 --- a/src/net/sourceforge/plantuml/bpm/AbstractConnectorPuzzle.java +++ b/src/net/sourceforge/plantuml/bpm/AbstractConnectorPuzzle.java @@ -39,6 +39,7 @@ import java.util.EnumSet; import java.util.Set; abstract class AbstractConnectorPuzzle implements ConnectorPuzzle { + // ::remove folder when __HAXE__ private final EnumSet connections = EnumSet.noneOf(Where.class); diff --git a/src/net/sourceforge/plantuml/bpm/BpmDiagram.java b/src/net/sourceforge/plantuml/bpm/BpmDiagram.java index ed671e74a..2cbc3663e 100644 --- a/src/net/sourceforge/plantuml/bpm/BpmDiagram.java +++ b/src/net/sourceforge/plantuml/bpm/BpmDiagram.java @@ -54,7 +54,7 @@ import net.sourceforge.plantuml.skin.SkinParam; import net.sourceforge.plantuml.skin.UmlDiagramType; public class BpmDiagram extends UmlDiagram { - // ::remove folder when CORE + // ::remove folder when __CORE__ private void cleanGrid(Grid grid) { while (true) { diff --git a/src/net/sourceforge/plantuml/braille/BrailleChar.java b/src/net/sourceforge/plantuml/braille/BrailleChar.java index 44a38ae7b..5c589d343 100644 --- a/src/net/sourceforge/plantuml/braille/BrailleChar.java +++ b/src/net/sourceforge/plantuml/braille/BrailleChar.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.braille; public class BrailleChar { - // ::remove folder when CORE + // ::remove folder when __CORE__ private final int id; diff --git a/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java b/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java index 1d76bbda9..995cf8229 100644 --- a/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java +++ b/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java @@ -41,6 +41,7 @@ import net.sourceforge.plantuml.klimt.drawing.UDriver; import net.sourceforge.plantuml.klimt.shape.DotPath; public class DriverDotPathBraille implements UDriver { + // ::remove folder when __HAXE__ public void draw(DotPath shape, double x, double y, ColorMapper mapper, UParam param, BrailleGrid grid) { if (param.getColor().isTransparent() == false) diff --git a/src/net/sourceforge/plantuml/brotli/BitReader.java b/src/net/sourceforge/plantuml/brotli/BitReader.java index 9a859fd7f..44331e3a1 100644 --- a/src/net/sourceforge/plantuml/brotli/BitReader.java +++ b/src/net/sourceforge/plantuml/brotli/BitReader.java @@ -12,7 +12,7 @@ package net.sourceforge.plantuml.brotli; * Bit reading helpers. */ final class BitReader { - // ::remove folder when CORE + // ::remove folder when __CORE__ // Added by Arnaud... not very beautifull private static final boolean CHECK_UNUSED_BYTES_AFTER_END = false; diff --git a/src/net/sourceforge/plantuml/brotli/DictionaryData.java b/src/net/sourceforge/plantuml/brotli/DictionaryData.java index d8e743358..533913efa 100644 --- a/src/net/sourceforge/plantuml/brotli/DictionaryData.java +++ b/src/net/sourceforge/plantuml/brotli/DictionaryData.java @@ -17,6 +17,7 @@ import java.nio.ByteBuffer; * {@link Dictionary#setData(ByteBuffer)}. */ final class DictionaryData { + // ::remove folder when __HAXE__ private static final String DATA0 = "timedownlifeleftbackcodedatashowonlysitecityopenjustlikefreeworktextyearoverbodyloveformbookplaylivelinehelphomesidemorewordlongthemviewfindpagedaysfullheadtermeachareafromtruemarkableuponhighdatelandnewsevennextcasebothpostusedmadehandherewhatnameLinkblogsizebaseheldmakemainuser') +holdendswithNewsreadweresigntakehavegameseencallpathwellplusmenufilmpartjointhislistgoodneedwayswestjobsmindalsologorichuseslastteamarmyfoodkingwilleastwardbestfirePageknowaway.pngmovethanloadgiveselfnotemuchfeedmanyrockicononcelookhidediedHomerulehostajaxinfoclublawslesshalfsomesuchzone100%onescareTimeracebluefourweekfacehopegavehardlostwhenparkkeptpassshiproomHTMLplanTypedonesavekeepflaglinksoldfivetookratetownjumpthusdarkcardfilefearstaykillthatfallautoever.comtalkshopvotedeepmoderestturnbornbandfellroseurl(skinrolecomeactsagesmeetgold.jpgitemvaryfeltthensenddropViewcopy1.0\"stopelseliestourpack.gifpastcss?graymean>rideshotlatesaidroadvar feeljohnrickportfast'UA-deadpoorbilltypeU.S.woodmust2px;Inforankwidewantwalllead[0];paulwavesure$('#waitmassarmsgoesgainlangpaid!-- lockunitrootwalkfirmwifexml\"songtest20pxkindrowstoolfontmailsafestarmapscorerainflowbabyspansays4px;6px;artsfootrealwikiheatsteptriporg/lakeweaktoldFormcastfansbankveryrunsjulytask1px;goalgrewslowedgeid=\"sets5px;.js?40pxif (soonseatnonetubezerosentreedfactintogiftharm18pxcamehillboldzoomvoideasyringfillpeakinitcost3px;jacktagsbitsrolleditknewnearironfreddiskwentsoilputs/js/holyT22:ISBNT20:adamsees

json', 'contT21: RSSloopasiamoon

soulLINEfortcartT14:

80px!--<9px;T04:mike:46ZniceinchYorkricezh:d'));puremageparatonebond:37Z_of_']);000,zh:gtankyardbowlbush:56ZJava30px\n|}\n%C3%:34ZjeffEXPIcashvisagolfsnowzh:iquer.csssickmeatmin.binddellhirepicsrent:36ZHTTP-201fotowolfEND xbox:54ZBODYdick;\n}\nexit:35Zvarsbeat'});diet999;anne}}sonyguysfuckpipe|-\n!002)ndow[1];[];\nLog salt\r\n\t\tbangtrimbath){\r\n00px\n});ko:lfeesad>\rs:// [];tollplug(){\n{\r\n .js'200pdualboat.JPG);\n}quot);\n\n');\n\r\n}\r201420152016201720182019202020212022202320242025202620272028202920302031203220332034203520362037201320122011201020092008200720062005200420032002200120001999199819971996199519941993199219911990198919881987198619851984198319821981198019791978197719761975197419731972197119701969196819671966196519641963196219611960195919581957195619551954195319521951195010001024139400009999comomC!sesteestaperotodohacecadaaC1obiendC-aasC-vidacasootroforosolootracualdijosidograntipotemadebealgoquC)estonadatrespococasabajotodasinoaguapuesunosantediceluisellamayozonaamorpisoobraclicellodioshoracasiP7P0P=P0P>PP>Q\u0002P8P7P=P>P4P>Q\u0002P>P6P5P>P=P8Q\u0005P\u001DP0P5P5P1Q\u000BPP2Q\u000BP2P>P\u001DP>P>P1P\u001FP>P;P8P=P8P P$P\u001DP5P\u001CQ\u000BQ\u0002Q\u000BP\u001EP=P8Pthing.org/multiheardPowerstandtokensolid(thisbringshipsstafftriedcallsfullyfactsagentThis //-->adminegyptEvent15px;Emailtrue\"crossspentblogsbox\">notedleavechinasizesguest

robotheavytrue,sevengrandcrimesignsawaredancephase>\n\n\r\nname=diegopage swiss-->\n\n#fff;\">Log.com\"treatsheet) && 14px;sleepntentfiledja:c\u0003id=\"cName\"worseshots-box-delta\n<bears:48Z spendbakershops= \"\";php\">ction13px;brianhellosize=o=%2F joinmaybe, fjsimg\" \")[0]MTopBType\"newlyDanskczechtrailknowsfaq\">zh-cn10);\n-1\");type=bluestrulydavis.js';>\r\n\r\nform jesus100% menu.\r\n\t\r\nwalesrisksumentddingb-likteachgif\" vegasdanskeestishqipsuomisobredesdeentretodospuedeaC1osestC!tienehastaotrospartedondenuevohacerformamismomejormundoaquC-dC-assC3loayudafechatodastantomenosdatosotrassitiomuchoahoralugarmayorestoshorastenerantesfotosestaspaC-snuevasaludforosmedioquienmesespoderchileserC!vecesdecirjosC)estarventagrupohechoellostengoamigocosasnivelgentemismaairesjuliotemashaciafavorjuniolibrepuntobuenoautorabrilbuenatextomarzosaberlistaluegocC3moenerojuegoperC:haberestoynuncamujervalorfueralibrogustaigualvotoscasosguC-apuedosomosavisousteddebennochebuscafaltaeurosseriedichocursoclavecasasleC3nplazolargoobrasvistaapoyojuntotratavistocrearcampohemoscincocargopisosordenhacenC!readiscopedrocercapuedapapelmenorC:tilclarojorgecalleponertardenadiemarcasigueellassiglocochemotosmadreclaserestoniC1oquedapasarbancohijosviajepabloC)stevienereinodejarfondocanalnorteletracausatomarmanoslunesautosvillavendopesartipostengamarcollevapadreunidovamoszonasambosbandamariaabusomuchasubirriojavivirgradochicaallC-jovendichaestantalessalirsuelopesosfinesllamabuscoC)stalleganegroplazahumorpagarjuntadobleislasbolsabaC1ohablaluchaC\u0001readicenjugarnotasvalleallC!cargadolorabajoestC)gustomentemariofirmacostofichaplatahogarartesleyesaquelmuseobasespocosmitadcielochicomiedoganarsantoetapadebesplayaredessietecortecoreadudasdeseoviejodeseaaguas"domaincommonstatuseventsmastersystemactionbannerremovescrollupdateglobalmediumfilternumberchangeresultpublicscreenchoosenormaltravelissuessourcetargetspringmodulemobileswitchphotosborderregionitselfsocialactivecolumnrecordfollowtitle>eitherlengthfamilyfriendlayoutauthorcreatereviewsummerserverplayedplayerexpandpolicyformatdoublepointsseriespersonlivingdesignmonthsforcesuniqueweightpeopleenergynaturesearchfigurehavingcustomoffsetletterwindowsubmitrendergroupsuploadhealthmethodvideosschoolfutureshadowdebatevaluesObjectothersrightsleaguechromesimplenoticesharedendingseasonreportonlinesquarebuttonimagesenablemovinglatestwinterFranceperiodstrongrepeatLondondetailformeddemandsecurepassedtoggleplacesdevicestaticcitiesstreamyellowattackstreetflighthiddeninfo\">openedusefulvalleycausesleadersecretseconddamagesportsexceptratingsignedthingseffectfieldsstatesofficevisualeditorvolumeReportmuseummoviesparentaccessmostlymother\" id=\"marketgroundchancesurveybeforesymbolmomentspeechmotioninsidematterCenterobjectexistsmiddleEuropegrowthlegacymannerenoughcareeransweroriginportalclientselectrandomclosedtopicscomingfatheroptionsimplyraisedescapechosenchurchdefinereasoncorneroutputmemoryiframepolicemodelsNumberduringoffersstyleskilledlistedcalledsilvermargindeletebetterbrowselimitsGlobalsinglewidgetcenterbudgetnowrapcreditclaimsenginesafetychoicespirit-stylespreadmakingneededrussiapleaseextentScriptbrokenallowschargedividefactormember-basedtheoryconfigaroundworkedhelpedChurchimpactshouldalwayslogo\" bottomlist\">){var prefixorangeHeader.push(couplegardenbridgelaunchReviewtakingvisionlittledatingButtonbeautythemesforgotSearchanchoralmostloadedChangereturnstringreloadMobileincomesupplySourceordersviewed courseAbout island: The dialoghousesBEGIN MexicostartscentreheightaddingIslandassetsEmpireSchooleffortdirectnearlymanualSelect.\n\nOnejoinedmenu\">PhilipawardshandleimportOfficeregardskillsnationSportsdegreeweekly (e.g.behinddoctorloggedunitedbeyond-scaleacceptservedmarineFootercamera\n_form\"leavesstress\" />\r\n.gif\" onloadloaderOxfordsistersurvivlistenfemaleDesignsize=\"appealtext\">levelsthankshigherforcedanimalanyoneAfricaagreedrecentPeople
wonderpricesturned|| {};main\">inlinesundaywrap\">failedcensusminutebeaconquotes150px|estateremoteemail\"linkedright;signalformal1.htmlsignupprincefloat:.png\" forum.AccesspaperssoundsextendHeightsliderUTF-8\"& Before. WithstudioownersmanageprofitjQueryannualparamsboughtfamousgooglelongeri++) {israelsayingdecidehome\">headerensurebranchpiecesblock;statedtop\">boston.test(avatartested_countforumsschemaindex,filledsharesreaderalert(appearSubmitline\">body\">\n* TheThoughseeingjerseyNews\nSystem DavidcancertablesprovedApril reallydriveritem\">more\">boardscolorscampusfirst || [];media.guitarfinishwidth:showedOther .php\" assumelayerswilsonstoresreliefswedenCustomeasily your String\n\nWhiltaylorclear:resortfrenchthough\") + \"buyingbrandsMembername\">oppingsector5px;\">vspacepostermajor coffeemartinmaturehappenkansaslink\">Images=falsewhile hspace0& \n\nIn powerPolski-colorjordanBottomStart -count2.htmlnews\">01.jpgOnline-rightmillerseniorISBN 00,000 guidesvalue)ectionrepair.xml\" rights.html-blockregExp:hoverwithinvirginphones\rusing \n\tvar >');\n\t\n\nbahasabrasilgalegomagyarpolskisrpskiX1X/Y\u0008d8-f\u0016\u0007g.\u0000d=\u0013g9\u0001i+\u0014d?!f\u0001/d8-e\u001B=f\u0008\u0011d;,d8\u0000d8*e\u0005,e\u000F8g.!g\u0010\u0006h.:e\u001D\u001Be\u000F/d;%f\u001C\re\n!f\u00176i\u00174d8*d::d:'e\u0013\u0001h\u0007*e71d<\u0001d8\u001Af\u001F%g\u001C\u000Be7%d=\u001Ch\u0001\u0014g3;f2!f\u001C\tg=\u0011g+\u0019f\t\u0000f\u001C\th/\u0004h.:d8-e?\u0003f\u0016\u0007g+ g\u0014(f\u00087i&\u0016i!5d=\u001Ch\u0000\u0005f\n\u0000f\u001C/i\u0017.i\"\u0018g\u001B8e\u00053d8\u000Bh==f\u0010\u001Cg4\"d=?g\u0014(h=/d;6e\u001C(g:?d8;i\"\u0018h5\u0004f\u0016\u0019h'\u0006i\"\u0011e\u001B\u001Ee$\rf3(e\u0006\u000Cg=\u0011g;\u001Cf\u00146h\u0017\u000Fe\u0006\u0005e.9f\u000E(h\r\u0010e8\u0002e\u001C:f6\u0008f\u0001/g):i\u00174e\u000F\u0011e8\u0003d;\u0000d9\u0008e%=e\u000F\u000Bg\u0014\u001Ff4;e\u001B>g\t\u0007e\u000F\u0011e1\u0015e&\u0002f\u001E\u001Cf\t\u000Bf\u001C:f\u00160i\u0017;f\u001C\u0000f\u00160f\u00169e<\u000Fe\u000C\u0017d:,f\u000F\u0010d>\u001Be\u00053d:\u000Ef\u001B4e$\u001Ah?\u0019d8*g3;g;\u001Fg\u001F%i\u0001\u0013f88f\u0008\u000Fe9?e\u0011\ne\u00056d;\u0016e\u000F\u0011h!(e.\te\u0005(g,,d8\u0000d<\u001Ae\u0011\u0018h?\u001Bh!\u000Cg\u00029e\u0007;g\t\u0008f\u001D\u0003g\u00145e-\u0010d8\u0016g\u0015\u000Ch.>h.!e\u0005\rh49f\u0015\u0019h\u00022e\n e\u0005%f4;e\n(d;\u0016d;,e\u0015\u0006e\u0013\u0001e\r\u001Ae.\"g\u000E0e\u001C(d8\nf57e&\u0002d=\u0015e72g;\u000Fg\u0015\u0019h(\u0000h/&g;\u0006g$>e\u000C:g\u0019;e=\u0015f\u001C,g+\u0019i\u001C\u0000h&\u0001d;7f f\u000E%e\u001B=e.6e;:h.>f\u001C\u000Be\u000F\u000Bi\u0018\u0005h/;f3\u0015e>\u000Bd=\rg=.g;\u000Ff5\u000Ei\u0000\tf\u000B)h?\u0019f 7e=\u0013e\t\re\u0008\u0006g1;f\u000E\u0012h!\u000Ce\u001B d8:d:$f\u0018\u0013f\u001C\u0000e\u0010\u000Ei\u001F3d9\u0010d8\rh\u0003=i\u0000\u001Ah?\u0007h!\u000Cd8\u001Ag'\u0011f\n\u0000e\u000F/h\u0003=h.>e$\u0007e\u0010\u0008d=\u001Ce$'e.6g$>d<\u001Ag \u0014g)6d8\u0013d8\u001Ae\u0005(i\u0003(i!9g\u001B.h?\u0019i\u0007\u000Ch?\u0018f\u0018/e<\u0000e'\u000Bf\u0003\u0005e\u00065g\u00145h\u0004\u0011f\u0016\u0007d;6e\u0013\u0001g\t\u000Ce8.e\n)f\u0016\u0007e\u000C\u0016h5\u0004f:\u0010e$'e-&e-&d9 e\u001C0e\u001D\u0000f5\u000Fh'\u0008f\n\u0015h5\u0004e7%g(\u000Bh&\u0001f1\u0002f\u0000\u000Ed9\u0008f\u00176e\u0000\u0019e\n\u001Fh\u0003=d8;h&\u0001g\u001B.e\t\rh5\u0004h./e\u001F\u000Ee8\u0002f\u00169f3\u0015g\u00145e=1f\u000B\u001Bh\u0001\u0018e#0f\u0018\u000Ed;;d=\u0015e\u0001%e:7f\u00150f\r.g>\u000Ee\u001B=f1=h=&d;\u000Bg;\rd=\u0006f\u0018/d:$f5\u0001g\u0014\u001Fd:'f\t\u0000d;%g\u00145h/\u001Df\u0018>g$:d8\u0000d:\u001Be\r\u0015d=\rd::e\u0011\u0018e\u0008\u0006f\u001E\u0010e\u001C0e\u001B>f\u0017\u0005f88e7%e\u00057e-&g\u0014\u001Fg3;e\u0008\u0017g=\u0011e\u000F\u000Be8\u0016e-\u0010e/\u0006g \u0001i\"\u0011i\u0001\u0013f\u000E'e\u00086e\u001C0e\u000C:e\u001F:f\u001C,e\u0005(e\u001B=g=\u0011d8\ni\u0007\rh&\u0001g,,d:\u000Ce\u0016\u001Cf,\"h?\u001Be\u0005%e\u000F\u000Bf\u0003\u0005h?\u0019d:\u001Bh\u0000\u0003h/\u0015e\u000F\u0011g\u000E0e\u001F9h.-d;%d8\nf\u0014?e:\u001Cf\u0008\u0010d8:g\u000E/e\"\u0003i&\u0019f8/e\u0010\u000Cf\u00176e(1d9\u0010e\u000F\u0011i\u0000\u0001d8\u0000e.\u001Ae<\u0000e\u000F\u0011d=\u001Ce\u0013\u0001f \u0007e\u0007\u0006f,\"h?\u000Eh'#e\u00063e\u001C0f\u00169d8\u0000d8\u000Bd;%e\u000F\nh4#d;;f\u0008\u0016h\u0000\u0005e.\"f\u00087d;#h!(g'/e\u0008\u0006e%3d::f\u00150g \u0001i\u0014\u0000e\u0014.e\u0007:g\u000E0g&;g:?e:\u0014g\u0014(e\u0008\u0017h!(d8\re\u0010\u000Cg<\u0016h>\u0011g;\u001Fh.!f\u001F%h/\"d8\rh&\u0001f\u001C\te\u00053f\u001C:f\u001E\u0004e>\u0008e$\u001Af\u0012-f\u0014>g;\u0004g;\u0007f\u0014?g-\u0016g\u001B4f\u000E%h\u0003=e\n\u001Bf\u001D%f:\u0010f\u0019\u0002i\u0016\u0013g\u001C\u000Be\u00080g\u0003-i\u0017(e\u00053i\u0014.d8\u0013e\u000C:i\u001D\u001Ee88h\u000B1h/-g\u0019>e:&e8\u000Cf\u001C\u001Bg>\u000Ee%3f/\u0014h>\u0003g\u001F%h/\u0006h'\u0004e.\u001Ae;:h..i\u0003(i\u0017(f\u0004\u000Fh'\u0001g2>e=)f\u0017%f\u001C,f\u000F\u0010i+\u0018e\u000F\u0011h(\u0000f\u00169i\u001D\"e\u001F:i\u0007\u0011e$\u0004g\u0010\u0006f\u001D\u0003i\u0019\u0010e=1g\t\u0007i\u00136h!\u000Ch?\u0018f\u001C\te\u0008\u0006d:+g\t)e\u0013\u0001g;\u000Fh\u0010%f7;e\n d8\u0013e.6h?\u0019g'\rh/\u001Di\"\u0018h57f\u001D%d8\u001Ae\n!e\u0005,e\u0011\nh.0e=\u0015g.\u0000d;\u000Bh4(i\u0007\u000Fg\u00147d::e=1e\u0013\re<\u0015g\u0014(f\n%e\u0011\ni\u0003(e\u0008\u0006e?+i\u0000\u001Fe\u0012(h/\"f\u00176e0\u001Af3(f\u0004\u000Fg\u00143h/7e-&f !e:\u0014h/%e\u000E\u0006e\u000F2e\u000F*f\u0018/h?\u0014e\u001B\u001Eh4-d90e\u0010\rg'0d8:d:\u0006f\u0008\u0010e\n\u001Fh/4f\u0018\u000Ed>\u001Be:\u0014e-)e-\u0010d8\u0013i\"\u0018g(\u000Be:\u000Fd8\u0000h\u0008,f\u001C\u0003e\u0013!e\u000F*f\u001C\te\u00056e.\u0003d?\u001Df\n$h\u0000\u000Cd8\u0014d;\ne$)g*\u0017e\u000F#e\n(f\u0000\u0001g\n6f\u0000\u0001g\t9e\u0008+h.$d8:e?\u0005i!;f\u001B4f\u00160e0\u000Fh/4f\u0008\u0011e\u0000\u0011d=\u001Cd8:e*\u0012d=\u0013e\u000C\u0005f\u000B,i\u0002#d9\u0008d8\u0000f 7e\u001B=e\u0006\u0005f\u0018/e\u0010&f 9f\r.g\u00145h'\u0006e-&i\u0019\"e\u00057f\u001C\th?\u0007g(\u000Bg\u00141d:\u000Ed::f\t\re\u0007:f\u001D%d8\rh?\u0007f-#e\u001C(f\u0018\u000Ef\u0018\u001Ff\u0015\u0005d:\u000Be\u00053g3;f \u0007i\"\u0018e\u0015\u0006e\n!h>\u0013e\u0005%d8\u0000g\u001B4e\u001F:g!\u0000f\u0015\u0019e-&d:\u0006h'#e;:g-\u0011g;\u0013f\u001E\u001Ce\u0005(g\u0010\u0003i\u0000\u001Ag\u001F%h.!e\u0008\u0012e/9d:\u000Eh\t:f\u001C/g\u001B8e\u0006\u000Ce\u000F\u0011g\u0014\u001Fg\u001C\u001Fg\u001A\u0004e;:g+\u000Bg-\tg:'g1;e\u001E\u000Bg;\u000Fi*\u000Ce.\u001Eg\u000E0e\u00086d=\u001Cf\u001D%h\u0007*f \u0007g->d;%d8\u000Be\u000E\u001Fe\u0008\u001Bf\u0017 f3\u0015e\u00056d8-e\u0000\u000Bd::d8\u0000e\u0008\u0007f\u000C\u0007e\r\u0017e\u00053i\u0017-i\u001B\u0006e\u001B\"g,,d8\te\u00053f3(e\u001B f-$g\u0005'g\t\u0007f71e\u001C3e\u0015\u0006d8\u001Ae9?e7\u001Ef\u0017%f\u001C\u001Fi+\u0018g:'f\u001C\u0000h?\u0011g;\u0011h!\u000Cd8:d:$i\u0000\u001Ah/\u0004d;7h'\te>\u0017g2>e\r\u000Ee.6e:-e.\u000Cf\u0008\u0010f\u0004\u001Fh'\te.\th#\u0005e>\u0017e\u00080i\u0002.d;6e\u00086e:&i#\u001Fe\u0013\u0001h\u0019=g\u00046h=,h==f\n%d;7h.0h\u0000\u0005f\u00169f!\u0008h!\u000Cf\u0014?d::f0\u0011g\u0014(e\u0013\u0001d8\u001Ch%?f\u000F\u0010e\u0007:i\u0005\u0012e:\u0017g\u00046e\u0010\u000Ed;\u0018f,>g\u0003-g\u00029d;%e\t\re.\u000Ce\u0005(e\u000F\u0011e8\u0016h.>g=.i\"\u0006e/g%\u001Eh\u000E7e>\u0017e\u0008)g\u0014(g;'g;-d= d;,h?\u0019d9\u0008f(!e<\u000Fh/-h(\u0000h\u0003=e$\u001Fi\u001B\u0005h\u0019\u000Ef\u0013\rd=\u001Ci#\u000Ef d9&f\u001C\tf\u0015\u0008f5\u000Bh/\u0015g';e\n(f\t\rh\u0003=e\u00063e.\u001Ah\u0002!g%(d8\rf\u0016-i\u001C\u0000f1\u0002d8\re>\u0017e\n\u001Ef3\u0015d9\u000Bi\u00174i\u0007\u0007g\u0014(h\u0010%i\u0014\u0000f\n\u0015h/\tg\u001B.f \u0007g\u00081f\u0003\u0005f\u0011\u0004e=1f\u001C\td:\u001Bh$\u0007h#=f\u0016\u0007e-&f\u001C:d<\u001Af\u00150e-\u0017h#\u0005d?.h4-g\t)e\u0006\u001Cf\u001D\u0011e\u0005(i\u001D\"g2>e\u0013\u0001e\u00056e.\u001Ed:\u000Bf\u0003\u0005f04e93f\u000F\u0010g$:d8\ne8\u0002h0\"h0\"f\u0019.i\u0000\u001Af\u0015\u0019e8\u0008d8\nd< g1;e\u0008+f-\u000Cf\u001B2f\u000B%f\u001C\te\u0008\u001Bf\u00160i\u0005\rd;6e\u000F*h&\u0001f\u00176d;#h3\u0007h(\nh>>e\u00080d::g\u0014\u001Fh.\"i\u0018\u0005h\u0000\u0001e8\u0008e1\u0015g$:e?\u0003g\u0010\u0006h44e-\u0010g62g+\u0019d8;i!\u000Ch\u0007*g\u00046g:'e\u0008+g.\u0000e\r\u0015f\u00149i\u001D)i\u0002#d:\u001Bf\u001D%h/4f\t\u0013e<\u0000d;#g \u0001e\u0008 i\u0019$h/\u0001e\u00088h\n\u0002g\u001B.i\u0007\rg\u00029f,!f\u00158e$\u001Ae0\u0011h'\u0004e\u0008\u0012h5\u0004i\u0007\u0011f\t>e\u00080d;%e\u0010\u000Ee$'e\u0005(d8;i!5f\u001C\u0000d=3e\u001B\u001Eg-\u0014e$)d8\u000Bd?\u001Di\u001A\u001Cg\u000E0d;#f#\u0000f\u001F%f\n\u0015g%(e0\u000Ff\u00176f2\u0012f\u001C\tf-#e88g\u0014\u001Ah\u00073d;#g\u0010\u0006g\u001B.e=\u0015e\u0005,e<\u0000e$\re\u00086i\u0007\u0011h\u001E\re98g&\u000Fg\t\u0008f\u001C,e=\"f\u0008\u0010e\u0007\u0006e$\u0007h!\u000Cf\u0003\u0005e\u001B\u001Ee\u00080f\u0000\u001Df\u00033f\u0000\u000Ef 7e\r\u000Fh..h.$h/\u0001f\u001C\u0000e%=d:'g\u0014\u001Ff\u000C\tg\u0005'f\u001C\rh#\u0005e9?d8\u001Ce\n(f<+i\u0007\u0007h4-f\u00160f\t\u000Bg;\u0004e\u001B>i\u001D\"f\u001D?e\u000F\u0002h\u0000\u0003f\u0014?f2;e.9f\u0018\u0013e$)e\u001C0e\n*e\n\u001Bd::d;,e\r\u0007g:'i\u0000\u001Fe:&d::g\t)h0\u0003f\u00154f5\u0001h!\u000Ci\u0000 f\u0008\u0010f\u0016\u0007e-\u0017i\u001F)e\u001B=h48f\u0018\u0013e<\u0000e1\u0015g\u001B8i\u0017\u001Ch!(g\u000E0e=1h'\u0006e&\u0002f-$g>\u000Ee.9e$'e0\u000Ff\n%i\u0001\u0013f\u001D!f,>e?\u0003f\u0003\u0005h.8e$\u001Af3\u0015h'\u0004e.6e1\u0005d9&e:\u0017h?\u001Ef\u000E%g+\u000Be\r3d8>f\n%f\n\u0000e7'e%%h?\u0010g\u0019;e\u0005%d;%f\u001D%g\u0010\u0006h.:d:\u000Bd;6h\u0007*g\u00141d8-e\r\u000Ee\n\u001Ee\u0005,e&\u0008e&\u0008g\u001C\u001Ff-#d8\ri\u0014\u0019e\u0005(f\u0016\u0007e\u0010\u0008e\u0010\u000Cd;7e\u0000e7&e\u000F3h\u0002!d;=g-\u0014f!\u0008e.\u001Ei\u0019\u0005g\u00145d?!g;\u000Fg\u0010\u0006g\u0014\u001Fe\u0011=e.#d< d;;e\n!f-#e<\u000Fg\t9h\t2d8\u000Bf\u001D%e\r\u000Fd<\u001Ae\u000F*h\u0003=e=\u0013g\u00046i\u0007\rf\u00160e\u0005'e.9f\u000C\u0007e/g(\u000Be\u000C;g\u0016\u0017g;\u000Fh?\u0007h?\u0007e\u000E;d9\u000Be\t\rf\u00146e\u0005%e94e:&f\u001D\u0002e?\u0017g>\u000Ed8=f\u001C\u0000i+\u0018g\u0019;i\u0019\u0006f\u001C*f\u001D%e\n e7%e\u0005\rh4#f\u0015\u0019g(\u000Bg\t\u0008e\u001D\u0017h:+d=\u0013i\u0007\re:\u0006e\u0007:e\u0014.f\u0008\u0010f\u001C,e=\"e<\u000Fe\u001C\u001Fh1\u0006e\u0007:e\u00039d8\u001Cf\u00169i\u0002.g.1e\r\u0017d:,f1\u0002h\u0001\u000Ce\u000F\u0016e>\u0017h\u0001\u000Cd=\rg\u001B8d?!i!5i\u001D\"e\u0008\u0006i\u0012\u001Fg=\u0011i!5g!.e.\u001Ae\u001B>d>\u000Bg=\u0011e\u001D\u0000g'/f\u001E\u0001i\u0014\u0019h//g\u001B.g\u001A\u0004e.\u001Dh4\u001Df\u001C:e\u00053i#\u000Ei\u0019)f\u000E\u0008f\u001D\u0003g\u0017\u0005f/\u0012e. g\t)i\u0019$d:\u0006h)\u0015h+\u0016g\u0016>g\u0017\u0005e\u000F\nf\u00176f1\u0002h4-g+\u0019g\u00029e\u0004?g+%f/\u000Fe$)d8-e$.h.$h/\u0006f/\u000Fd8*e$)f4%e-\u0017d=\u0013e\u000F0g\u0001#g;4f\n$f\u001C,i!5d8*f\u0000'e.\u0018f\u00169e88h'\u0001g\u001B8f\u001C:f\u0008\u0018g\u0015%e:\u0014e=\u0013e>\u000Be8\u0008f\u00169d>?f !e\u001B-h\u0002!e8\u0002f\u0008?e1\u000Bf \u000Fg\u001B.e\u0011\u0018e7%e/\u000Ee\u0005\u0003e<\u0015h57f\u00149e\u000F\u0018g,,e\u001B\u001Bd<\u001Ah.!h**f\u0018\u000Ei\u001A\u0010g'\u0001e.\u001De.\u001Dh'\u0004h\u000C\u0003f6\u0008h49e\u00051e\u0010\u000Ce?\u0018h.0d=\u0013g3;e8&f\u001D%e\u0010\re-\u0017g\u0019e\n g\u001B\u001Fe\u000F\u0017e\u00080d:\u000Cf\t\u000Be$'i\u0007\u000Ff\u0008\u0010d::f\u00150i\u0007\u000Fe\u00051d:+e\u000C:e\u001F\u001Fe%3e-)e\u000E\u001Fe\u0008\u0019f\t\u0000e\u001C(g;\u0013f\u001D\u001Fi\u0000\u001Ad?!h6\u0005g:'i\u0005\rg=.e=\u0013f\u00176d<\u0018g'\u0000f\u0000'f\u0004\u001Ff\u0008?d:'i\u0001\nf\u00082e\u0007:e\u000F#f\u000F\u0010d:$e01d8\u001Ad?\u001De\u0001%g(\u000Be:&e\u000F\u0002f\u00150d:\u000Bd8\u001Af\u00154d8*e11d8\u001Cf\u0003\u0005f\u0004\u001Fg\t9f.\ne\u0008\u0006i!\u001Ef\u0010\u001Ce0\u000Be1\u001Ed:\u000Ei\u0017(f\u00087h4\"e\n!e#0i\u001F3e\u000F\ne\u00056h4\"g;\u000Fe\u001D\u001Af\u000C\u0001e92i\u0003(f\u0008\u0010g+\u000Be\u0008)g\u001B\nh\u0000\u0003h\u0019\u0011f\u0008\u0010i\u0003=e\u000C\u0005h#\u0005g\u0014(f\u00086f/\u0014h5\u001Bf\u0016\u0007f\u0018\u000Ef\u000B\u001Be\u0015\u0006e.\u000Cf\u00154g\u001C\u001Ff\u0018/g\u001Ce/\u0006g\"\u000Ei#\u001Fg;?h\t2g(3e.\u001Ag;\u0008d:\u000Eg\u0014\u001Fg\t)d>\u001Bf1\u0002f\u0010\u001Cg\u000B\u0010e\n\u001Bi\u0007\u000Fd8%i\u0007\rf08h?\u001Ce\u0006\u0019g\u001C\u001Ff\u001C\ti\u0019\u0010g+\u001Ed:\te/9h1!h49g\u0014(d8\re%=g;\u001De/9e\r\u0001e\u0008\u0006d?\u0003h?\u001Bg\u00029h/\u0004e=1i\u001F3d<\u0018e\n?d8\re0\u0011f,#h5\u000Fe96d8\u0014f\u001C\tg\u00029f\u00169e\u0010\u0011e\u0005(f\u00160d?!g\u0014(h.>f\u0016=e=\"h1!h5\u0004f \u000Ee\u0015\u0006e\u001F\u000Eg;\u001Fd8\u0000e\u0007:g\t\u0008f\t\u0013i\u0000 g\u0014\"e\u0013\u0001f&\u0002e\u00065g\u0014(d:\u000Ed?\u001Dg\u0015\u0019e\u001B g4 d8-e\u001C\u000Be-\u0018e\u0002(h44e\u001B>f\u001C\u0000f\u0004\u001Bi\u0015?f\u001C\u001Fe\u000F#d;7g\u0010\u0006h4\"e\u001F:e\u001C0e.\tf\u000E\u0012f-&f1\ti\u0007\u000Ci\u001D\"e\u0008\u001Be;:e$)g):i&\u0016e\u0005\u0008e.\u000Ce\u0016\u0004i)1e\n(d8\u000Bi\u001D\"d8\re\u0006\rh/\u001Ad?!f\u0004\u000Fd9\ti\u00183e\u0005\th\u000B1e\u001B=f<\u0002d:.e\u0006\u001Bd:\u000Bg\u000E)e.6g>$d<\u0017e\u0006\u001Cf0\u0011e\r3e\u000F/e\u0010\rg(1e.6e\u00057e\n(g\u0014;f\u00033e\u00080f3(f\u0018\u000Ee0\u000Fe-&f\u0000'h\u0003=h\u0000\u0003g \u0014g!,d;6h'\u0002g\u001C\u000Bf8\u0005f%\u001Af\u0010\u001Eg,\u0011i&\u0016i \u0001i;\u0004i\u0007\u0011i\u0000\u0002g\u0014(f1\u001Fh\u000B\u000Fg\u001C\u001Fe.\u001Ed8;g.!i\u00186f.5h(;e\u0006\ng?;h/\u0011f\u001D\u0003e\u0008)e\u0001\u001Ae%=d<P:P0P:P8P;P8Q\rQ\u0002P>P2Q\u0001P5P5P3P>P?Q\u0000P8Q\u0002P0P:P5Q\tP5Q\u0003P6P5P\u001AP0P:P1P5P7P1Q\u000BP;P>P=P8P\u0012Q\u0001P5P?P>P4P-Q\u0002P>Q\u0002P>PP=P0P3P4P5PP3P>P4P2P>Q\u0002Q\u0002P0PP2P0Q\u0001P2P0PQ\u0002Q\u0003Q\u0002P=P0P4P4P=Q\u000FP\u0012P>Q\u0002Q\u0002Q\u0000P8P=P5P9P\u0012P0Q\u0001P=P8PQ\u0002Q\u0000Q\u0003P1P\u001EP=P8PPP9P4P2P5P>P=P>Q\u0001Q\u0003P4`$\u0015`%\u0007`$9`%\u0008`$\u0015`%\u0000`$8`%\u0007`$\u0015`$>`$\u0015`%\u000B`$\u0014`$0`$*`$0`$(`%\u0007`$\u000F`$\u0015`$\u0015`$?`$-`%\u0000`$\u0007`$8`$\u0015`$0`$$`%\u000B`$9`%\u000B`$\u0006`$*`$9`%\u0000`$/`$9`$/`$>`$$`$\u0015`$%`$>jagran`$\u0006`$\u001C`$\u001C`%\u000B`$\u0005`$,`$&`%\u000B`$\u0017`$\u0008`$\u001C`$>`$\u0017`$\u000F`$9`$.`$\u0007`$(`$5`$9`$/`%\u0007`$%`%\u0007`$%`%\u0000`$\u0018`$0`$\u001C`$,`$&`%\u0000`$\u0015`$\u0008`$\u001C`%\u0000`$5`%\u0007`$(`$\u0008`$(`$\u000F`$9`$0`$\t`$8`$.`%\u0007`$\u0015`$.`$5`%\u000B`$2`%\u0007`$8`$,`$.`$\u0008`$&`%\u0007`$\u0013`$0`$\u0006`$.`$,`$8`$-`$0`$,`$(`$\u001A`$2`$.`$(`$\u0006`$\u0017`$8`%\u0000`$2`%\u0000X9Y\u0004Y\tX%Y\u0004Y\tY\u0007X0X'X\"X.X1X9X/X/X'Y\u0004Y\tY\u0007X0Y\u0007X5Y\u0008X1X:Y\nX1Y\u0003X'Y\u0006Y\u0008Y\u0004X'X(Y\nY\u0006X9X1X6X0Y\u0004Y\u0003Y\u0007Y\u0006X'Y\nY\u0008Y\u0005Y\u0002X'Y\u0004X9Y\u0004Y\nX'Y\u0006X'Y\u0004Y\u0003Y\u0006X-X*Y\tY\u0002X(Y\u0004Y\u0008X-X)X'X.X1Y\u0001Y\u0002X7X9X(X/X1Y\u0003Y\u0006X%X0X'Y\u0003Y\u0005X'X'X-X/X%Y\u0004X'Y\u0001Y\nY\u0007X(X9X6Y\u0003Y\nY\u0001X(X-X+Y\u0008Y\u0005Y\u0006Y\u0008Y\u0007Y\u0008X#Y\u0006X'X,X/X'Y\u0004Y\u0007X'X3Y\u0004Y\u0005X9Y\u0006X/Y\u0004Y\nX3X9X(X1X5Y\u0004Y\tY\u0005Y\u0006X0X(Y\u0007X'X#Y\u0006Y\u0007Y\u0005X+Y\u0004Y\u0003Y\u0006X*X'Y\u0004X'X-Y\nX+Y\u0005X5X1X4X1X-X-Y\u0008Y\u0004Y\u0008Y\u0001Y\nX'X0X'Y\u0004Y\u0003Y\u0004Y\u0005X1X)X'Y\u0006X*X'Y\u0004Y\u0001X#X(Y\u0008X.X'X5X#Y\u0006X*X'Y\u0006Y\u0007X'Y\u0004Y\nX9X6Y\u0008Y\u0008Y\u0002X/X'X(Y\u0006X.Y\nX1X(Y\u0006X*Y\u0004Y\u0003Y\u0005X4X'X!Y\u0008Y\u0007Y\nX'X(Y\u0008Y\u0002X5X5Y\u0008Y\u0005X'X1Y\u0002Y\u0005X#X-X/Y\u0006X-Y\u0006X9X/Y\u0005X1X#Y\nX'X-X)Y\u0003X*X(X/Y\u0008Y\u0006Y\nX,X(Y\u0005Y\u0006Y\u0007X*X-X*X,Y\u0007X)X3Y\u0006X)Y\nX*Y\u0005Y\u0003X1X)X:X2X)Y\u0006Y\u0001X3X(Y\nX*Y\u0004Y\u0004Y\u0007Y\u0004Y\u0006X'X*Y\u0004Y\u0003Y\u0002Y\u0004X(Y\u0004Y\u0005X'X9Y\u0006Y\u0007X#Y\u0008Y\u0004X4Y\nX!Y\u0006Y\u0008X1X#Y\u0005X'Y\u0001Y\nY\u0003X(Y\u0003Y\u0004X0X'X*X1X*X(X(X#Y\u0006Y\u0007Y\u0005X3X'Y\u0006Y\u0003X(Y\nX9Y\u0001Y\u0002X/X-X3Y\u0006Y\u0004Y\u0007Y\u0005X4X9X1X#Y\u0007Y\u0004X4Y\u0007X1Y\u0002X7X1X7Y\u0004X(profileservicedefaulthimselfdetailscontentsupportstartedmessagesuccessfashioncountryaccountcreatedstoriesresultsrunningprocesswritingobjectsvisiblewelcomearticleunknownnetworkcompanydynamicbrowserprivacyproblemServicerespectdisplayrequestreservewebsitehistoryfriendsoptionsworkingversionmillionchannelwindow.addressvisitedweathercorrectproductedirectforwardyou canremovedsubjectcontrolarchivecurrentreadinglibrarylimitedmanagerfurthersummarymachineminutesprivatecontextprogramsocietynumberswrittenenabledtriggersourcesloadingelementpartnerfinallyperfectmeaningsystemskeepingculture",journalprojectsurfaces"expiresreviewsbalanceEnglishContentthroughPlease opinioncontactaverageprimaryvillageSpanishgallerydeclinemeetingmissionpopularqualitymeasuregeneralspeciessessionsectionwriterscounterinitialreportsfiguresmembersholdingdisputeearlierexpressdigitalpictureAnothermarriedtrafficleadingchangedcentralvictoryimages/reasonsstudiesfeaturelistingmust beschoolsVersionusuallyepisodeplayinggrowingobviousoverlaypresentactions</ul>\r\nwrapperalreadycertainrealitystorageanotherdesktopofferedpatternunusualDigitalcapitalWebsitefailureconnectreducedAndroiddecadesregular & animalsreleaseAutomatgettingmethodsnothingPopularcaptionletterscapturesciencelicensechangesEngland=1&History = new CentralupdatedSpecialNetworkrequirecommentwarningCollegetoolbarremainsbecauseelectedDeutschfinanceworkersquicklybetweenexactlysettingdiseaseSocietyweaponsexhibit<!--Controlclassescoveredoutlineattacksdevices(windowpurposetitle=\"Mobile killingshowingItaliandroppedheavilyeffects-1']);\nconfirmCurrentadvancesharingopeningdrawingbillionorderedGermanyrelated</form>includewhetherdefinedSciencecatalogArticlebuttonslargestuniformjourneysidebarChicagoholidayGeneralpassage,"animatefeelingarrivedpassingnaturalroughly.\n\nThe but notdensityBritainChineselack oftributeIreland\" data-factorsreceivethat isLibraryhusbandin factaffairsCharlesradicalbroughtfindinglanding:lang=\"return leadersplannedpremiumpackageAmericaEdition]"Messageneed tovalue=\"complexlookingstationbelievesmaller-mobilerecordswant tokind ofFirefoxyou aresimilarstudiedmaximumheadingrapidlyclimatekingdomemergedamountsfoundedpioneerformuladynastyhow to SupportrevenueeconomyResultsbrothersoldierlargelycalling."AccountEdward segmentRobert effortsPacificlearnedup withheight:we haveAngelesnations_searchappliedacquiremassivegranted: falsetreatedbiggestbenefitdrivingStudiesminimumperhapsmorningsellingis usedreversevariant role=\"missingachievepromotestudentsomeoneextremerestorebottom:evolvedall thesitemapenglishway to AugustsymbolsCompanymattersmusicalagainstserving})();\r\npaymenttroubleconceptcompareparentsplayersregionsmonitor ''The winningexploreadaptedGalleryproduceabilityenhancecareers). The collectSearch ancientexistedfooter handlerprintedconsoleEasternexportswindowsChannelillegalneutralsuggest_headersigning.html\">settledwesterncausing-webkitclaimedJusticechaptervictimsThomas mozillapromisepartieseditionoutside:false,hundredOlympic_buttonauthorsreachedchronicdemandssecondsprotectadoptedprepareneithergreatlygreateroverallimprovecommandspecialsearch.worshipfundingthoughthighestinsteadutilityquarterCulturetestingclearlyexposedBrowserliberal} catchProjectexamplehide();FloridaanswersallowedEmperordefenseseriousfreedomSeveral-buttonFurtherout of != nulltrainedDenmarkvoid(0)/all.jspreventRequestStephen\n\nWhen observe</h2>\r\nModern provide\" alt=\"borders.\n\nFor \n\nMany artistspoweredperformfictiontype ofmedicalticketsopposedCouncilwitnessjusticeGeorge Belgium...</a>twitternotablywaitingwarfare Other rankingphrasesmentionsurvivescholar</p>\r\n Countryignoredloss ofjust asGeorgiastrange<head><stopped1']);\r\nislandsnotableborder:list ofcarried100,000</h3>\n severalbecomesselect wedding00.htmlmonarchoff theteacherhighly biologylife ofor evenrise of»plusonehunting(thoughDouglasjoiningcirclesFor theAncientVietnamvehiclesuch ascrystalvalue =Windowsenjoyeda smallassumed<a id=\"foreign All rihow theDisplayretiredhoweverhidden;battlesseekingcabinetwas notlook atconductget theJanuaryhappensturninga:hoverOnline French lackingtypicalextractenemieseven ifgeneratdecidedare not/searchbeliefs-image:locatedstatic.login\">convertviolententeredfirst\">circuitFinlandchemistshe was10px;\">as suchdivided</span>will beline ofa greatmystery/index.fallingdue to railwaycollegemonsterdescentit withnuclearJewish protestBritishflowerspredictreformsbutton who waslectureinstantsuicidegenericperiodsmarketsSocial fishingcombinegraphicwinners<br /><by the NaturalPrivacycookiesoutcomeresolveSwedishbrieflyPersianso muchCenturydepictscolumnshousingscriptsnext tobearingmappingrevisedjQuery(-width:title\">tooltipSectiondesignsTurkishyounger.match(})();\n\nburningoperatedegreessource=Richardcloselyplasticentries</tr>\r\ncolor:#ul id=\"possessrollingphysicsfailingexecutecontestlink toDefault<br />\n: true,chartertourismclassicproceedexplain</h1>\r\nonline.?xml vehelpingdiamonduse theairlineend -->).attr(readershosting#ffffffrealizeVincentsignals src=\"/ProductdespitediversetellingPublic held inJoseph theatreaffects<style>a largedoesn'tlater, ElementfaviconcreatorHungaryAirportsee theso thatMichaelSystemsPrograms, and width=e"tradingleft\">\npersonsGolden Affairsgrammarformingdestroyidea ofcase ofoldest this is.src = cartoonregistrCommonsMuslimsWhat isin manymarkingrevealsIndeed,equally/show_aoutdoorescape(Austriageneticsystem,In the sittingHe alsoIslandsAcademy\n\t\t<!--Daniel bindingblock\">imposedutilizeAbraham(except{width:putting).html(|| [];\nDATA[ *kitchenmountedactual dialectmainly _blank'installexpertsif(typeIt also© \">Termsborn inOptionseasterntalkingconcerngained ongoingjustifycriticsfactoryits ownassaultinvitedlastinghis ownhref=\"/\" rel=\"developconcertdiagramdollarsclusterphp?id=alcohol);})();using a><span>vesselsrevivalAddressamateurandroidallegedillnesswalkingcentersqualifymatchesunifiedextinctDefensedied in\n\t<!-- customslinkingLittle Book ofeveningmin.js?are thekontakttoday's.html\" target=wearingAll Rig;\n})();raising Also, crucialabout\">declare-->\n<scfirefoxas muchappliesindex, s, but type = \n\r\n<!--towardsRecordsPrivateForeignPremierchoicesVirtualreturnsCommentPoweredinline;povertychamberLiving volumesAnthonylogin\" RelatedEconomyreachescuttinggravitylife inChapter-shadowNotable</td>\r\n returnstadiumwidgetsvaryingtravelsheld bywho arework infacultyangularwho hadairporttown of\n\nSome 'click'chargeskeywordit willcity of(this);Andrew unique checkedor more300px; return;rsion=\"pluginswithin herselfStationFederalventurepublishsent totensionactresscome tofingersDuke ofpeople,exploitwhat isharmonya major\":\"httpin his menu\">\nmonthlyofficercouncilgainingeven inSummarydate ofloyaltyfitnessand wasemperorsupremeSecond hearingRussianlongestAlbertalateralset of small\">.appenddo withfederalbank ofbeneathDespiteCapitalgrounds), and percentit fromclosingcontainInsteadfifteenas well.yahoo.respondfighterobscurereflectorganic= Math.editingonline paddinga wholeonerroryear ofend of barrierwhen itheader home ofresumedrenamedstrong>heatingretainscloudfrway of March 1knowingin partBetweenlessonsclosestvirtuallinks\">crossedEND -->famous awardedLicenseHealth fairly wealthyminimalAfricancompetelabel\">singingfarmersBrasil)discussreplaceGregoryfont copursuedappearsmake uproundedboth ofblockedsaw theofficescoloursif(docuwhen heenforcepush(fuAugust UTF-8\">Fantasyin mostinjuredUsuallyfarmingclosureobject defenceuse of Medical<body>\nevidentbe usedkeyCodesixteenIslamic#000000entire widely active (typeofone cancolor =speakerextendsPhysicsterrain<tbody>funeralviewingmiddle cricketprophetshifteddoctorsRussell targetcompactalgebrasocial-bulk ofman and</td>\n he left).val()false);logicalbankinghome tonaming Arizonacredits);\n});\nfounderin turnCollinsbefore But thechargedTitle\">CaptainspelledgoddessTag -->Adding:but wasRecent patientback in=false&Lincolnwe knowCounterJudaismscript altered']);\n has theunclearEvent',both innot all\n\n<!-- placinghard to centersort ofclientsstreetsBernardassertstend tofantasydown inharbourFreedomjewelry/about..searchlegendsis mademodern only ononly toimage\" linear painterand notrarely acronymdelivershorter00&as manywidth=\"/* <![Ctitle =of the lowest picked escapeduses ofpeoples PublicMatthewtacticsdamagedway forlaws ofeasy to windowstrong simple}catch(seventhinfoboxwent topaintedcitizenI don'tretreat. Some ww.\");\nbombingmailto:made in. Many carries||{};wiwork ofsynonymdefeatsfavoredopticalpageTraunless sendingleft\"><comScorAll thejQuery.touristClassicfalse\" Wilhelmsuburbsgenuinebishops.split(global followsbody ofnominalContactsecularleft tochiefly-hidden-banner</li>\n\n. When in bothdismissExplorealways via thespaC1olwelfareruling arrangecaptainhis sonrule ofhe tookitself,=0&(calledsamplesto makecom/pagMartin Kennedyacceptsfull ofhandledBesides//--></able totargetsessencehim to its by common.mineralto takeways tos.org/ladvisedpenaltysimple:if theyLettersa shortHerbertstrikes groups.lengthflightsoverlapslowly lesser social </p>\n\t\tit intoranked rate oful>\r\n attemptpair ofmake itKontaktAntoniohaving ratings activestreamstrapped\").css(hostilelead tolittle groups,Picture-->\r\n\r\n rows=\" objectinverse<footerCustomV><\\/scrsolvingChamberslaverywoundedwhereas!= 'undfor allpartly -right:Arabianbacked centuryunit ofmobile-Europe,is homerisk ofdesiredClintoncost ofage of become none ofp"Middle ead')[0Criticsstudios>©group\">assemblmaking pressedwidget.ps:\" ? rebuiltby someFormer editorsdelayedCanonichad thepushingclass=\"but arepartialBabylonbottom carrierCommandits useAs withcoursesa thirddenotesalso inHouston20px;\">accuseddouble goal ofFamous ).bind(priests Onlinein Julyst + \"gconsultdecimalhelpfulrevivedis veryr'+'iptlosing femalesis alsostringsdays ofarrivalfuture <objectforcingString(\" />\n\t\there isencoded. The balloondone by/commonbgcolorlaw of Indianaavoidedbut the2px 3pxjquery.after apolicy.men andfooter-= true;for usescreen.Indian image =family,http://  driverseternalsame asnoticedviewers})();\n is moreseasonsformer the newis justconsent Searchwas thewhy theshippedbr><br>width: height=made ofcuisineis thata very Admiral fixed;normal MissionPress, ontariocharsettry to invaded=\"true\"spacingis mosta more totallyfall of});\r\n immensetime inset outsatisfyto finddown tolot of Playersin Junequantumnot thetime todistantFinnishsrc = (single help ofGerman law andlabeledforestscookingspace\">header-well asStanleybridges/globalCroatia About [0];\n it, andgroupedbeing a){throwhe madelighterethicalFFFFFF\"bottom\"like a employslive inas seenprintermost ofub-linkrejectsand useimage\">succeedfeedingNuclearinformato helpWomen'sNeitherMexicanprotein<table by manyhealthylawsuitdevised.push({sellerssimply Through.cookie Image(older\">us.js\"> Since universlarger open to!-- endlies in']);\r\n marketwho is (\"DOMComanagedone fortypeof Kingdomprofitsproposeto showcenter;made itdressedwere inmixtureprecisearisingsrc = 'make a securedBaptistvoting \n\t\tvar March 2grew upClimate.removeskilledway the</head>face ofacting right\">to workreduceshas haderectedshow();action=book ofan area== \"htt<header\n<html>conformfacing cookie.rely onhosted .customhe wentbut forspread Family a meansout theforums.footage\">MobilClements\" id=\"as highintense--><!--female is seenimpliedset thea stateand hisfastestbesidesbutton_bounded\"><img Infoboxevents,a youngand areNative cheaperTimeoutand hasengineswon the(mostlyright: find a -bottomPrince area ofmore ofsearch_nature,legallyperiod,land ofor withinducedprovingmissilelocallyAgainstthe wayk"px;\">\r\npushed abandonnumeralCertainIn thismore inor somename isand, incrownedISBN 0-createsOctobermay notcenter late inDefenceenactedwish tobroadlycoolingonload=it. TherecoverMembersheight assumes<html>\npeople.in one =windowfooter_a good reklamaothers,to this_cookiepanel\">London,definescrushedbaptismcoastalstatus title\" move tolost inbetter impliesrivalryservers SystemPerhapses and contendflowinglasted rise inGenesisview ofrising seem tobut in backinghe willgiven agiving cities.flow of Later all butHighwayonly bysign ofhe doesdiffersbattery&lasinglesthreatsintegertake onrefusedcalled =US&See thenativesby thissystem.head of:hover,lesbiansurnameand allcommon/header__paramsHarvard/pixel.removalso longrole ofjointlyskyscraUnicodebr />\r\nAtlantanucleusCounty,purely count\">easily build aonclicka givenpointerh"events else {\nditionsnow the, with man whoorg/Webone andcavalryHe diedseattle00,000 {windowhave toif(windand itssolely m"renewedDetroitamongsteither them inSenatorUs</a><King ofFrancis-produche usedart andhim andused byscoringat hometo haverelatesibilityfactionBuffalolink\"><what hefree toCity ofcome insectorscountedone daynervoussquare };if(goin whatimg\" alis onlysearch/tuesdaylooselySolomonsexual - <a hrmedium\"DO NOT France,with a war andsecond take a >\r\n\r\n\r\nmarket.highwaydone inctivity\"last\">obligedrise to\"undefimade to Early praisedin its for hisathleteJupiterYahoo! termed so manyreally s. The a woman?value=direct right\" bicycleacing=\"day andstatingRather,higher Office are nowtimes, when a pay foron this-link\">;borderaround annual the Newput the.com\" takin toa brief(in thegroups.; widthenzymessimple in late{returntherapya pointbanninginks\">\n();\" rea place\\u003Caabout atr>\r\n\t\tccount gives a<SCRIPTRailwaythemes/toolboxById(\"xhumans,watchesin some if (wicoming formats Under but hashanded made bythan infear ofdenoted/iframeleft involtagein eacha"base ofIn manyundergoregimesaction </p>\r\n<ustomVa;></importsor thatmostly &re size=\"</a></ha classpassiveHost = WhetherfertileVarious=[];(fucameras/></td>acts asIn some>\r\n\r\n<!organis <br />BeijingcatalC deutscheuropeueuskaragaeilgesvenskaespaC1amensajeusuariotrabajomC)xicopC!ginasiempresistemaoctubreduranteaC1adirempresamomentonuestroprimeratravC)sgraciasnuestraprocesoestadoscalidadpersonanC:meroacuerdomC:sicamiembroofertasalgunospaC-sesejemploderechoademC!sprivadoagregarenlacesposiblehotelessevillaprimeroC:ltimoeventosarchivoculturamujeresentradaanuncioembargomercadograndesestudiomejoresfebrerodiseC1oturismocC3digoportadaespaciofamiliaantoniopermiteguardaralgunaspreciosalguiensentidovisitastC-tuloconocersegundoconsejofranciaminutossegundatenemosefectosmC!lagasesiC3nrevistagranadacompraringresogarcC-aacciC3necuadorquienesinclusodeberC!materiahombresmuestrapodrC-amaC1anaC:ltimaestamosoficialtambienningC:nsaludospodemosmejorarpositionbusinesshomepagesecuritylanguagestandardcampaignfeaturescategoryexternalchildrenreservedresearchexchangefavoritetemplatemilitaryindustryservicesmaterialproductsz-index:commentssoftwarecompletecalendarplatformarticlesrequiredmovementquestionbuildingpoliticspossiblereligionphysicalfeedbackregisterpicturesdisabledprotocolaudiencesettingsactivityelementslearninganythingabstractprogressoverviewmagazineeconomictrainingpressurevarious <strong>propertyshoppingtogetheradvancedbehaviordownloadfeaturedfootballselectedLanguagedistanceremembertrackingpasswordmodifiedstudentsdirectlyfightingnortherndatabasefestivalbreakinglocationinternetdropdownpracticeevidencefunctionmarriageresponseproblemsnegativeprogramsanalysisreleasedbanner\">purchasepoliciesregionalcreativeargumentbookmarkreferrerchemicaldivisioncallbackseparateprojectsconflicthardwareinterestdeliverymountainobtained= false;for(var acceptedcapacitycomputeridentityaircraftemployedproposeddomesticincludesprovidedhospitalverticalcollapseapproachpartnerslogo\"><adaughterauthor\" culturalfamilies/images/assemblypowerfulteachingfinisheddistrictcriticalcgi-bin/purposesrequireselectionbecomingprovidesacademicexerciseactuallymedicineconstantaccidentMagazinedocumentstartingbottom\">observed: "extendedpreviousSoftwarecustomerdecisionstrengthdetailedslightlyplanningtextareacurrencyeveryonestraighttransferpositiveproducedheritageshippingabsolutereceivedrelevantbutton\" violenceanywherebenefitslaunchedrecentlyalliancefollowedmultiplebulletinincludedoccurredinternal$(this).republic><tr><tdcongressrecordedultimatesolution<ul id=\"discoverHome</a>websitesnetworksalthoughentirelymemorialmessagescontinueactive\">somewhatvictoriaWestern title=\"LocationcontractvisitorsDownloadwithout right\">\nmeasureswidth = variableinvolvedvirginianormallyhappenedaccountsstandingnationalRegisterpreparedcontrolsaccuratebirthdaystrategyofficialgraphicscriminalpossiblyconsumerPersonalspeakingvalidateachieved.jpg\" />machines</h2>\n keywordsfriendlybrotherscombinedoriginalcomposedexpectedadequatepakistanfollow\" valuable</label>relativebringingincreasegovernorplugins/List of Header\">\" name=\" ("graduate</head>\ncommercemalaysiadirectormaintain;height:schedulechangingback to catholicpatternscolor: #greatestsuppliesreliable</ul>\n\t\t<select citizensclothingwatching<li id=\"specificcarryingsentence<center>contrastthinkingcatch(e)southernMichael merchantcarouselpadding:interior.split(\"lizationOctober ){returnimproved-->\n\ncoveragechairman.png\" />subjectsRichard whateverprobablyrecoverybaseballjudgmentconnect..css\" /> websitereporteddefault\"/></a>\r\nelectricscotlandcreationquantity. ISBN 0did not instance-search-\" lang=\"speakersComputercontainsarchivesministerreactiondiscountItalianocriteriastrongly: 'http:'script'coveringofferingappearedBritish identifyFacebooknumerousvehiclesconcernsAmericanhandlingdiv id=\"William provider_contentaccuracysection andersonflexibleCategorylawrence<script>layout=\"approved maximumheader\"></table>Serviceshamiltoncurrent canadianchannels/themes//articleoptionalportugalvalue=\"\"intervalwirelessentitledagenciesSearch\" measuredthousandspending…new Date\" size=\"pageNamemiddle\" \" /></a>hidden\">sequencepersonaloverflowopinionsillinoislinks\">\n\t<title>versionssaturdayterminalitempropengineersectionsdesignerproposal=\"false\"EspaC1olreleasessubmit\" er"additionsymptomsorientedresourceright\"><pleasurestationshistory.leaving border=contentscenter\">.\n\nSome directedsuitablebulgaria.show();designedGeneral conceptsExampleswilliamsOriginal\"><span>search\">operatorrequestsa "allowingDocumentrevision. \n\nThe yourselfContact michiganEnglish columbiapriorityprintingdrinkingfacilityreturnedContent officersRussian generate-8859-1\"indicatefamiliar qualitymargin:0 contentviewportcontacts-title\">portable.length eligibleinvolvesatlanticonload=\"default.suppliedpaymentsglossary\n\nAfter guidance</td><tdencodingmiddle\">came to displaysscottishjonathanmajoritywidgets.clinicalthailandteachers<head>\n\taffectedsupportspointer;toString</small>oklahomawill be investor0\" alt=\"holidaysResourcelicensed (which . After considervisitingexplorerprimary search\" android\"quickly meetingsestimate;return ;color:# height=approval, " checked.min.js\"magnetic></a></hforecast. While thursdaydvertiseéhasClassevaluateorderingexistingpatients Online coloradoOptions\"campbell<!-- end</span><<br />\r\n_popups|sciences," quality Windows assignedheight: <b classle" value=\" Companyexamples<iframe believespresentsmarshallpart of properly).\n\nThe taxonomymuch of </span>\n\" data-srtuguC*sscrollTo project<head>\r\nattorneyemphasissponsorsfancyboxworld's wildlifechecked=sessionsprogrammpx;font- Projectjournalsbelievedvacationthompsonlightingand the special border=0checking</tbody><button Completeclearfix\n<head>\narticle <sectionfindingsrole in popular Octoberwebsite exposureused to changesoperatedclickingenteringcommandsinformed numbers </div>creatingonSubmitmarylandcollegesanalyticlistingscontact.loggedInadvisorysiblingscontent\"s")s. This packagescheckboxsuggestspregnanttomorrowspacing=icon.pngjapanesecodebasebutton\">gamblingsuch as , while </span> missourisportingtop:1px .</span>tensionswidth=\"2lazyloadnovemberused in height=\"cript\">\n </<tr><td height:2/productcountry include footer\" <!-- title\"></jquery.</form>\n(g.\u0000d=\u0013)(g9\u0001i+\u0014)hrvatskiitalianoromC\"nD\u0003tC<rkC'eX'X1X/Y\u0008tambiC)nnoticiasmensajespersonasderechosnacionalserviciocontactousuariosprogramagobiernoempresasanunciosvalenciacolombiadespuC)sdeportesproyectoproductopC:bliconosotroshistoriapresentemillonesmediantepreguntaanteriorrecursosproblemasantiagonuestrosopiniC3nimprimirmientrasamC)ricavendedorsociedadrespectorealizarregistropalabrasinterC)sentoncesespecialmiembrosrealidadcC3rdobazaragozapC!ginassocialesbloqueargestiC3nalquilersistemascienciascompletoversiC3ncompletaestudiospC:blicaobjetivoalicantebuscadorcantidadentradasaccionesarchivossuperiormayorC-aalemaniafunciC3nC:ltimoshaciendoaquellosediciC3nfernandoambientefacebooknuestrasclientesprocesosbastantepresentareportarcongresopublicarcomerciocontratojC3venesdistritotC)cnicaconjuntoenergC-atrabajarasturiasrecienteutilizarboletC-nsalvadorcorrectatrabajosprimerosnegocioslibertaddetallespantallaprC3ximoalmerC-aanimalesquiC)nescorazC3nsecciC3nbuscandoopcionesexteriorconceptotodavC-agalerC-aescribirmedicinalicenciaconsultaaspectoscrC-ticadC3laresjusticiadeberC!nperC-odonecesitamantenerpequeC1orecibidatribunaltenerifecanciC3ncanariasdescargadiversosmallorcarequieretC)cnicodeberC-aviviendafinanzasadelantefuncionaconsejosdifC-cilciudadesantiguasavanzadatC)rminounidadessC!nchezcampaC1asoftonicrevistascontienesectoresmomentosfacultadcrC)ditodiversassupuestofactoressegundospequeC1aP3P>P4P0P5Q\u0001P;P8P5Q\u0001Q\u0002Q\u000CP1Q\u000BP;P>P1Q\u000BQ\u0002Q\u000CQ\rQ\u0002P>P<P\u0015Q\u0001P;P8Q\u0002P>P3P>P<P5P=Q\u000FP2Q\u0001P5Q\u0005Q\rQ\u0002P>P9P4P0P6P5P1Q\u000BP;P8P3P>P4Q\u0003P4P5P=Q\u000CQ\rQ\u0002P>Q\u0002P1Q\u000BP;P0Q\u0001P5P1Q\u000FP>P4P8P=Q\u0001P5P1P5P=P0P4P>Q\u0001P0P9Q\u0002Q\u0004P>Q\u0002P>P=P5P3P>Q\u0001P2P>P8Q\u0001P2P>P9P8P3Q\u0000Q\u000BQ\u0002P>P6P5P2Q\u0001P5P<Q\u0001P2P>Q\u000EP;P8Q\u0008Q\u000CQ\rQ\u0002P8Q\u0005P?P>P:P0P4P=P5P9P4P>P<P0P<P8Q\u0000P0P;P8P1P>Q\u0002P5P<Q\u0003Q\u0005P>Q\u0002Q\u000FP4P2Q\u0003Q\u0005Q\u0001P5Q\u0002P8P;Q\u000EP4P8P4P5P;P>P<P8Q\u0000P5Q\u0002P5P1Q\u000FQ\u0001P2P>P5P2P8P4P5Q\u0007P5P3P>Q\rQ\u0002P8P<Q\u0001Q\u0007P5Q\u0002Q\u0002P5P<Q\u000BQ\u0006P5P=Q\u000BQ\u0001Q\u0002P0P;P2P5P4Q\u000CQ\u0002P5P<P5P2P>P4Q\u000BQ\u0002P5P1P5P2Q\u000BQ\u0008P5P=P0P<P8Q\u0002P8P?P0Q\u0002P>P<Q\u0003P?Q\u0000P0P2P;P8Q\u0006P0P>P4P=P0P3P>P4Q\u000BP7P=P0Q\u000EP<P>P3Q\u0003P4Q\u0000Q\u0003P3P2Q\u0001P5P9P8P4P5Q\u0002P:P8P=P>P>P4P=P>P4P5P;P0P4P5P;P5Q\u0001Q\u0000P>P:P8Q\u000EP=Q\u000FP2P5Q\u0001Q\u000CP\u0015Q\u0001Q\u0002Q\u000CQ\u0000P0P7P0P=P0Q\u0008P8X'Y\u0004Y\u0004Y\u0007X'Y\u0004X*Y\nX,Y\u0005Y\nX9X.X'X5X)X'Y\u0004X0Y\nX9Y\u0004Y\nY\u0007X,X/Y\nX/X'Y\u0004X\"Y\u0006X'Y\u0004X1X/X*X-Y\u0003Y\u0005X5Y\u0001X-X)Y\u0003X'Y\u0006X*X'Y\u0004Y\u0004Y\nY\nY\u0003Y\u0008Y\u0006X4X(Y\u0003X)Y\u0001Y\nY\u0007X'X(Y\u0006X'X*X-Y\u0008X'X!X#Y\u0003X+X1X.Y\u0004X'Y\u0004X'Y\u0004X-X(X/Y\u0004Y\nY\u0004X/X1Y\u0008X3X'X6X:X7X*Y\u0003Y\u0008Y\u0006Y\u0007Y\u0006X'Y\u0003X3X'X-X)Y\u0006X'X/Y\nX'Y\u0004X7X(X9Y\u0004Y\nY\u0003X4Y\u0003X1X'Y\nY\u0005Y\u0003Y\u0006Y\u0005Y\u0006Y\u0007X'X4X1Y\u0003X)X1X&Y\nX3Y\u0006X4Y\nX7Y\u0005X'X0X'X'Y\u0004Y\u0001Y\u0006X4X(X'X(X*X9X(X1X1X-Y\u0005X)Y\u0003X'Y\u0001X)Y\nY\u0002Y\u0008Y\u0004Y\u0005X1Y\u0003X2Y\u0003Y\u0004Y\u0005X)X#X-Y\u0005X/Y\u0002Y\u0004X(Y\nY\nX9Y\u0006Y\nX5Y\u0008X1X)X7X1Y\nY\u0002X4X'X1Y\u0003X,Y\u0008X'Y\u0004X#X.X1Y\tY\u0005X9Y\u0006X'X'X(X-X+X9X1Y\u0008X6X(X4Y\u0003Y\u0004Y\u0005X3X,Y\u0004X(Y\u0006X'Y\u0006X.X'Y\u0004X/Y\u0003X*X'X(Y\u0003Y\u0004Y\nX)X(X/Y\u0008Y\u0006X#Y\nX6X'Y\nY\u0008X,X/Y\u0001X1Y\nY\u0002Y\u0003X*X(X*X#Y\u0001X6Y\u0004Y\u0005X7X(X.X'Y\u0003X+X1X(X'X1Y\u0003X'Y\u0001X6Y\u0004X'X-Y\u0004Y\tY\u0006Y\u0001X3Y\u0007X#Y\nX'Y\u0005X1X/Y\u0008X/X#Y\u0006Y\u0007X'X/Y\nY\u0006X'X'Y\u0004X'Y\u0006Y\u0005X9X1X6X*X9Y\u0004Y\u0005X/X'X.Y\u0004Y\u0005Y\u0005Y\u0003Y\u0006\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0002\u0000\u0002\u0000\u0002\u0000\u0002\u0000\u0004\u0000\u0004\u0000\u0004\u0000\u0004\u0000\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0007\u0006\u0005\u0004\u0003\u0002\u0001\u0000\u0008\t\n\u000B\u000C\r\u000E\u000F\u000F\u000E\r\u000C\u000B\n\t\u0008\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0017\u0016\u0015\u0014\u0013\u0012\u0011\u0010\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F\u001F\u001E\u001D\u001C\u001B\u001A\u0019\u0018\u007F\u007F\u007F\u007F\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u007F\u007F\u007F\u007F\u0001\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u007F\u007F\u0000\u0001\u0000\u0000\u0000\u0001\u0000\u0000\u007F\u007F\u0000\u0001\u0000\u0000\u0000\u0008\u0000\u0008\u0000\u0008\u0000\u0008\u0000\u0000\u0000\u0001\u0000\u0002\u0000\u0003\u0000\u0004\u0000\u0005\u0000\u0006\u0000\u0007resourcescountriesquestionsequipmentcommunityavailablehighlightDTD/xhtmlmarketingknowledgesomethingcontainerdirectionsubscribeadvertisecharacter\" value=\"</select>Australia\" class=\"situationauthorityfollowingprimarilyoperationchallengedevelopedanonymousfunction functionscompaniesstructureagreement\" title=\"potentialeducationargumentssecondarycopyrightlanguagesexclusivecondition</form>\r\nstatementattentionBiography} else {\nsolutionswhen the Analyticstemplatesdangeroussatellitedocumentspublisherimportantprototypeinfluence»</effectivegenerallytransformbeautifultransportorganizedpublishedprominentuntil thethumbnailNational .focus();over the migrationannouncedfooter\">\nexceptionless thanexpensiveformationframeworkterritoryndicationcurrentlyclassNamecriticismtraditionelsewhereAlexanderappointedmaterialsbroadcastmentionedaffiliate</option>treatmentdifferent/default.Presidentonclick=\"biographyotherwisepermanentFranC'aisHollywoodexpansionstandards</style>\nreductionDecember preferredCambridgeopponentsBusiness confusion>\n<title>presentedexplaineddoes not worldwideinterfacepositionsnewspaper</table>\nmountainslike the essentialfinancialselectionaction=\"/abandonedEducationparseInt(stabilityunable to\nrelationsNote thatefficientperformedtwo yearsSince thethereforewrapper\">alternateincreasedBattle ofperceivedtrying tonecessaryportrayedelectionsElizabethdiscoveryinsurances.length;legendaryGeographycandidatecorporatesometimesservices.inheritedCommunityreligiouslocationsCommitteebuildingsthe worldno longerbeginningreferencecannot befrequencytypicallyinto the relative;recordingpresidentinitiallytechniquethe otherit can beexistenceunderlinethis timetelephoneitemscopepracticesadvantage);return For otherprovidingdemocracyboth the extensivesufferingsupportedcomputers functionpracticalsaid thatit may beEnglish\nsuspectedmargin: 0spiritual\n\nmicrosoftgraduallydiscussedhe becameexecutivejquery.jshouseholdconfirmedpurchasedliterallydestroyedup to thevariationremainingit is notcenturiesJapanese among thecompletedalgorithminterestsrebellionundefinedencourageresizableinvolvingsensitiveuniversalprovision(althoughfeaturingconducted), which continued-header\">February numerous overflow:componentfragmentsexcellentcolspan=\"technicalnear the Advanced source ofexpressedHong Kong Facebookmultiple mechanismelevationoffensive\n\tsponsoreddocument.or "there arethose whomovementsprocessesdifficultsubmittedrecommendconvincedpromoting\" width=\".replace(classicalcoalitionhis firstdecisionsassistantindicatedevolution-wrapper\"enough toalong thedelivered-->\r\n\n\r\n
Archbishop class=\"nobeing usedapproachesprivilegesnoscript>\nresults inmay be theEaster eggmechanismsreasonablePopulationCollectionselected\">noscript>\r/index.phparrival of-jssdk'));managed toincompletecasualtiescompletionChristiansSeptember arithmeticproceduresmight haveProductionit appearsPhilosophyfriendshipleading togiving thetoward theguaranteeddocumentedcolor:#000video gamecommissionreflectingchange theassociatedsans-serifonkeypress; padding:He was theunderlyingtypically , and the srcElementsuccessivesince the should be networkingaccountinguse of thelower thanshows that\n\t\tcomplaintscontinuousquantitiesastronomerhe did notdue to itsapplied toan averageefforts tothe futureattempt toTherefore,capabilityRepublicanwas formedElectronickilometerschallengespublishingthe formerindigenousdirectionssubsidiaryconspiracydetails ofand in theaffordablesubstancesreason forconventionitemtype=\"absolutelysupposedlyremained aattractivetravellingseparatelyfocuses onelementaryapplicablefound thatstylesheetmanuscriptstands for no-repeat(sometimesCommercialin Americaundertakenquarter ofan examplepersonallyindex.php?\npercentagebest-knowncreating a\" dir=\"ltrLieutenant\n
is said tostructuralreferendummost oftena separate->\n
soundtracksearchFormtend to beinput id=\"opening ofrestrictedadopted byaddressingtheologianmethods ofvariant ofChristian very largeautomotiveby far therange frompursuit offollow thebrought toin Englandagree thataccused ofcomes frompreventingdiv style=his or hertremendousfreedom ofconcerning0 1em 1em;Basketball/style.cssan earliereven after/\" title=\".com/indextaking thepittsburghcontent\">\rimplementedcan be seenthere was ademonstratecontainer\">connectionsthe Britishwas written!important;px; margin-followed byability to complicatedduring the immigrationalso called

\n

acquisitioncalled the persecutiondesignation{font-size:appeared ininvestigateexperiencedmost likelywidely useddiscussionspresence of (document.extensivelyIt has beenit does notcontrary toinhabitantsimprovementscholarshipconsumptioninstructionfor exampleone or morepx; paddingthe currenta series ofare usuallyrole in thepreviously derivativesevidence ofexperiencescolorschemestated thatcertificate
\n selected=\"high schoolresponse tocomfortableadoption ofthree yearsthe countryin Februaryso that thepeople who provided by\nhaving been\r\n\r\n< "The compilationhe had beenproduced byphilosopherconstructedintended toamong othercompared toto say thatEngineeringa differentreferred todifferencesbelief thatphotographsidentifyingHistory of Republic ofnecessarilyprobabilitytechnicallyleaving thespectacularfraction ofelectricityhead of therestaurantspartnershipemphasis onmost recentshare with saying thatfilled withdesigned toit is often\">as follows:merged withthrough thecommercial pointed outopportunityview of therequirementdivision ofprogramminghe receivedsetInterval\">maintainingChristopherMuch of thewritings of\" height=\"2size of theversion of mixture of between theExamples ofeducationalcompetitive onsubmit=\"director ofdistinctive/DTD XHTML relating totendency toprovince ofwhich woulddespite thescientific legislature.innerHTML allegationsAgriculturewas used inapproach tointelligentyears later,sans-serifdeterminingPerformanceappearances, which is foundationsabbreviatedhigher thans from the individual composed ofsupposed toclaims thatattributionfont-size:1elements ofHistorical his brotherat the timeanniversarygoverned byrelated to ultimately innovationsit is stillcan only bedefinitionstoGMTStringA number ofimg class=\"Eventually,was changedoccurred inneighboringdistinguishwhen he wasintroducingterrestrialMany of theargues thatan Americanconquest ofwidespread were killedscreen and In order toexpected todescendantsare locatedlegislativegenerations backgroundmost peopleyears afterthere is nothe highestfrequently they do notargued thatshowed thatpredominanttheologicalby the timeconsideringshort-livedcan be usedvery littleone of the had alreadyinterpretedcommunicatefeatures ofgovernment,entered the\" height=\"3Independentpopulationslarge-scale. Although used in thedestructionpossibilitystarting intwo or moreexpressionssubordinatelarger thanhistory and\r\nContinentaleliminatingwill not bepractice ofin front ofsite of theensure thatto create amississippipotentiallyoutstandingbetter thanwhat is nowsituated inmeta name=\"TraditionalsuggestionsTranslationthe form ofatmosphericideologicalenterprisescalculatingeast of theremnants ofpluginspage/index.php?remained intransformedHe was alsowas alreadystatisticalin favor ofMinistry ofmovement offormulationis required\nquestion ofwas electedto become abecause of some peopleinspired bysuccessful a time whenmore commonamongst thean officialwidth:100%;technology,was adoptedto keep thesettlementslive birthsindex.html\"Connecticutassigned to&times;account foralign=rightthe companyalways beenreturned toinvolvementBecause thethis period\" name=\"q\" confined toa result ofvalue=\"\" />is actuallyEnvironment\r\n\r\nConversely,>\n
this is notthe presentif they areand finallya matter of\r\n\t
\r\n\r\nfaster thanmajority ofafter whichcomparativeto maintainimprove theawarded theer\" class=\"frameborderrestorationin the sameanalysis oftheir firstDuring the continentalsequence offunction(){font-size: work on the\nadopted theproperty ofdirected byeffectivelywas broughtchildren ofProgramminglonger thanmanuscriptswar againstby means ofand most ofsimilar to proprietaryoriginatingprestigiousgrammaticalexperience.to make theIt was alsois found incompetitorsin the U.S.replace thebrought thecalculationfall of thethe generalpracticallyin honor ofreleased inresidentialand some ofking of thereaction to1st Earl ofculture andprincipally\n they can beback to thesome of hisexposure toare similarform of theaddFavoritecitizenshippart in thepeople within practiceto continue&minus;approved by the first allowed theand for thefunctioningplaying thesolution toheight=\"0\" in his bookmore than afollows thecreated thepresence in nationalistthe idea ofa characterwere forced class=\"btndays of thefeatured inshowing theinterest inin place ofturn of thethe head ofLord of thepoliticallyhas its ownEducationalapproval ofsome of theeach other,behavior ofand becauseand anotherappeared onrecorded inblack"may includethe world'scan lead torefers to aborder=\"0\" government winning theresulted in while the Washington,the subjectcity in the>\r\n\t\treflect theto completebecame moreradioactiverejected bywithout anyhis father,which couldcopy of theto indicatea politicalaccounts ofconstitutesworked witherof his lifeaccompaniedclientWidthprevent theLegislativedifferentlytogether inhas severalfor anothertext of thefounded thee with the is used forchanged theusually theplace wherewhereas the> \nHowever thelead to the\tThe currentthe site ofsubstantialexperience,in the Westthey shouldslovenD\rinacomentariosuniversidadcondicionesactividadesexperienciatecnologC-aproducciC3npuntuaciC3naplicaciC3ncontraseC1acategorC-asregistrarseprofesionaltratamientoregC-stratesecretarC-aprincipalesprotecciC3nimportantesimportanciaposibilidadinteresantecrecimientonecesidadessuscribirseasociaciC3ndisponiblesevaluaciC3nestudiantesresponsableresoluciC3nguadalajararegistradosoportunidadcomercialesfotografC-aautoridadesingenierC-atelevisiC3ncompetenciaoperacionesestablecidosimplementeactualmentenavegaciC3nconformidadline-height:font-family:\" : \"http://applicationslink\" href=\"specifically//\n/index.html\"window.open( !important;application/independence//www.googleorganizationautocompleterequirementsconservative
most notably/>notification'undefined')Furthermore,believe thatinnerHTML = prior to thedramaticallyreferring tonegotiationsheadquartersSouth AfricaunsuccessfulPennsylvaniaAs a result,\npadding-top:experimentalgetAttributeinstructionstechnologiespart of the =function(){subscriptionl.dtd\">\r\nEnglish (US)appendChild(transmissions. However, intelligence\" tabindex=\"float:right;Commonwealthranging fromin which theat least onereproductionencyclopedia;font-size:1jurisdictionat that time\">compensationchampionshipmedia=\"all\" violation ofreference toreturn true;Strict//EN\" transactionsinterventionverificationInformation difficultiesChampionshipcapabilities}\n\nChristianityfor example,Professionalrestrictionssuggest thatwas released(such as theremoveClass(unemploymentthe Americanstructure of/index.html published inspan class=\"\">\n\nf (document.border: 1px {font-size:1treatment of0\" height=\"1modificationIndependencedivided intogreater thanachievementsestablishingJavaScript\" neverthelesssignificanceBroadcasting> container\">\nsuch as the influence ofa particularsrc='http://navigation\" half of the substantial  advantage ofdiscovery offundamental metropolitanthe opposite\" xml:lang=\"deliberatelyalign=centerevolution ofpreservationimprovementsbeginning inJesus ChristPublicationsdisagreementtext-align:r, function()similaritiesbody>is currentlyalphabeticalis sometimestype=\"image/many of the flow:hidden;available indescribe theexistence ofall over thethe Internet\t