Mercurial > dive4elements > river
changeset 3256:17ca0a43027a
Removed trailing whitespace
flys-artifacts/trunk@4890 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sat, 07 Jul 2012 09:23:33 +0000 |
| parents | 4246851312e6 |
| children | 2aca387333d6 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledValueMarker.java flys-artifacts/src/main/java/de/intevation/flys/utils/ThemeUtil.java |
| diffstat | 6 files changed, 23 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Jul 06 14:52:14 2012 +0000 +++ b/flys-artifacts/ChangeLog Sat Jul 07 09:23:33 2012 +0000 @@ -1,3 +1,12 @@ +2012-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java, + src/main/java/de/intevation/flys/jfree/StyledValueMarker.java, + src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java, + src/main/java/de/intevation/flys/utils/ThemeUtil.java, + src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: + Removed trailing whitespace. + 2012-07-06 Christian Lins <christian.lins@intevation.de> * doc/conf/*-themes.xml,
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java Fri Jul 06 14:52:14 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java Sat Jul 07 09:23:33 2012 +0000 @@ -293,7 +293,7 @@ if (groupNum == 0) { logger.warn("There are no theme groups configured!"); } - + logger.info("Found " + groupNum + " theme groups in configuration"); List<ThemeGroup> groups = new ArrayList<ThemeGroup>(); @@ -325,7 +325,7 @@ } String gName = themeGroup.getAttribute("name"); groups.add(new ThemeGroup(gName, theThemes)); - + logger.info( "Initialized " + theThemes.size() + "/" + num + " themes " + "of theme-group '" + gName + "'");
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Fri Jul 06 14:52:14 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Sat Jul 07 09:23:33 2012 +0000 @@ -22,7 +22,7 @@ import org.w3c.dom.Document; /** - * + * * @author <a href="mailto:christian.lins@intevation.de">Christian Lins</a> */ public class FixWQCurveGenerator
--- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java Fri Jul 06 14:52:14 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java Sat Jul 07 09:23:33 2012 +0000 @@ -14,22 +14,22 @@ public class StyledDomainMarker extends IntervalMarker { private static final long serialVersionUID = -4369410661339512342L; - + private final Color fillColor, backgroundColor; - + public StyledDomainMarker(double start, double end, Document theme) { super(start, end); - + backgroundColor = ThemeUtil.parseColor( ThemeUtil.getBackgroundColorString(theme)); fillColor = ThemeUtil.parseColor( ThemeUtil.getFillColorString(theme)); useSecondColor(false); - + int alpha = ThemeUtil.parseInteger(ThemeUtil.getTransparencyAlpha(theme), 128); setAlpha(alpha / 255.0f); } - + /** * To properly differentiate several styled domain markers side by side, * we can use this switch to toggle between two colors.
--- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledValueMarker.java Fri Jul 06 14:52:14 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledValueMarker.java Sat Jul 07 09:23:33 2012 +0000 @@ -18,13 +18,13 @@ public StyledValueMarker(double value, Document theme) { super(value); - + Color color = ThemeUtil.parsePointColor(theme); if(color == null) { color = Color.BLACK; } this.setPaint(color); - + int size = ThemeUtil.parsePointWidth(theme); setStroke(new BasicStroke(size)); }
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/ThemeUtil.java Fri Jul 06 14:52:14 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/ThemeUtil.java Sat Jul 07 09:23:33 2012 +0000 @@ -88,7 +88,7 @@ public final static String XPATH_TRANSPARENCY = "/theme/field[@name='transparent']/@default"; - + public final static String XPATH_TRANSPARENCY_ALPHA = "/theme/field[@name='alpha']/@default"; @@ -559,8 +559,8 @@ public static String getTransparencyString(Document theme) { return XMLUtils.xpathString(theme, XPATH_TRANSPARENCY, null); } - - + + public static String getTransparencyAlpha(Document theme) { return XMLUtils.xpathString(theme, XPATH_TRANSPARENCY_ALPHA, null); } @@ -569,7 +569,7 @@ public static String getShowMinimum(Document theme) { return XMLUtils.xpathString(theme, XPATH_SHOW_MINIMUM, null); } - + public static String getShowMaximum(Document theme) { return XMLUtils.xpathString(theme, XPATH_SHOW_MAXIMUM, null);