diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/visualization/style/lines')
3 files changed, 14 insertions, 14 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/DashedLineStyleLibrary.java b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/DashedLineStyleLibrary.java index 5dbfe67a..e3abd7c1 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/DashedLineStyleLibrary.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/DashedLineStyleLibrary.java @@ -107,14 +107,14 @@ public class DashedLineStyleLibrary implements LineStyleLibrary { boolean interpolated = false; // process flavoring flags for(Object flag : flags) { - if(flag == LineStyleLibrary.FLAG_STRONG) { + if(LineStyleLibrary.FLAG_STRONG.equals(flag)) { width = width * 1.5; } - else if(flag == LineStyleLibrary.FLAG_WEAK) { + else if(LineStyleLibrary.FLAG_WEAK.equals(flag)) { cls.setStatement(CSSConstants.CSS_STROKE_OPACITY_PROPERTY, ".50"); width = width * 0.75; } - else if(flag == LineStyleLibrary.FLAG_INTERPOLATED) { + else if(LineStyleLibrary.FLAG_INTERPOLATED.equals(flag)) { interpolated = true; } } @@ -125,10 +125,10 @@ public class DashedLineStyleLibrary implements LineStyleLibrary { double[] pat = dashpatterns[styleflav]; assert (pat.length % 2 == 0); if(pat.length > 0) { - StringBuffer pattern = new StringBuffer(); + StringBuilder pattern = new StringBuilder(); for(int i = 0; i < pat.length; i++) { if(i > 0) { - pattern.append(","); + pattern.append(','); } pattern.append(SVGUtil.fmt(pat[i] * width * 30)); // pattern.append("%"); @@ -144,10 +144,10 @@ public class DashedLineStyleLibrary implements LineStyleLibrary { assert (pat.length % 2 == 0); // TODO: add dotting. if(pat.length > 0) { - StringBuffer pattern = new StringBuffer(); + StringBuilder pattern = new StringBuilder(); for(int i = 0; i < pat.length; i++) { if(i > 0) { - pattern.append(","); + pattern.append(','); } pattern.append(SVGUtil.fmt(pat[i] * width)); // pattern.append("%"); diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/LineStyleLibrary.java b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/LineStyleLibrary.java index aff1e0fc..79f3eda0 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/LineStyleLibrary.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/LineStyleLibrary.java @@ -50,17 +50,17 @@ public interface LineStyleLibrary { /** * Meta flag to request a 'stronger' version of the style */ - public final static String FLAG_STRONG = "strong"; + public static final String FLAG_STRONG = "strong"; /** * Meta flag to request a 'weaker' version of the style */ - public final static String FLAG_WEAK = "weak"; + public static final String FLAG_WEAK = "weak"; /** * Meta flag to request an 'interpolated' version of the style */ - public final static String FLAG_INTERPOLATED = "interpolated"; + public static final String FLAG_INTERPOLATED = "interpolated"; /** * Add the formatting statements to the given CSS class. diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/SolidLineStyleLibrary.java b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/SolidLineStyleLibrary.java index 051bff0a..51491db2 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/SolidLineStyleLibrary.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/SolidLineStyleLibrary.java @@ -87,20 +87,20 @@ public class SolidLineStyleLibrary implements LineStyleLibrary { boolean interpolated = false; // process flavoring flags for(Object flag : flags) { - if(flag == LineStyleLibrary.FLAG_STRONG) { + if(LineStyleLibrary.FLAG_STRONG.equals(flag)) { width = width * 1.5; } - else if(flag == LineStyleLibrary.FLAG_WEAK) { + else if(LineStyleLibrary.FLAG_WEAK.equals(flag)) { cls.setStatement(CSSConstants.CSS_STROKE_OPACITY_PROPERTY, ".50"); width = width * 0.75; } - else if(flag == LineStyleLibrary.FLAG_INTERPOLATED) { + else if(LineStyleLibrary.FLAG_INTERPOLATED.equals(flag)) { interpolated = true; } } cls.setStatement(CSSConstants.CSS_STROKE_WIDTH_PROPERTY, SVGUtil.fmt(width)); if(interpolated) { - cls.setStatement(CSSConstants.CSS_STROKE_DASHARRAY_PROPERTY, "" + SVGUtil.fmt(width / StyleLibrary.SCALE * 2) + "," + SVGUtil.fmt(width / StyleLibrary.SCALE * 2)); + cls.setStatement(CSSConstants.CSS_STROKE_DASHARRAY_PROPERTY, "" + SVGUtil.fmt(width / StyleLibrary.SCALE * 2.) + "," + SVGUtil.fmt(width / StyleLibrary.SCALE * 2.)); } } } |