Mercurial > hg > release > thermostat-1.2
changeset 620:cb5aa245e81f
Consolidate palette: add common palette class
review-tread: http://icedtea.classpath.org/pipermail/thermostat/2012-September/003259.html
reviewed-by: jerboaa
author | Mario Torre <neugens.limasoftware@gmail.com> |
---|---|
date | Tue, 18 Sep 2012 16:24:54 +0200 |
parents | 8172d6f0f918 |
children | 210694fa00fe |
files | client/core/src/main/java/com/redhat/thermostat/client/ui/ChartColors.java client/swing-components/src/main/java/com/redhat/thermostat/swing/Palette.java |
diffstat | 2 files changed, 89 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/ChartColors.java Tue Sep 18 14:35:21 2012 +0200 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/ChartColors.java Tue Sep 18 16:24:54 2012 +0200 @@ -38,15 +38,17 @@ import java.awt.Color; +import com.redhat.thermostat.swing.Palette; + public class ChartColors { - private static final Color[] SERIES_COLORS = { - new Color(192,80,77), - new Color(79,129,189), - new Color(155,187,89), - new Color(128,100,162), - new Color(75,172,198), - new Color(128,128,128), - new Color(247,150,70), + private static final Palette[] SERIES_COLORS = { + Palette.PALE_RED, + Palette.SKY_BLUE, + Palette.TUNDRA_GREEN, + Palette.POMP_AND_POWER_VIOLET, + Palette.DIRTY_CYAN, + Palette.EARL_GRAY, + Palette.GRANITA_ORANGE, }; private ChartColors() { @@ -54,6 +56,6 @@ } public static Color getColor(int index) { - return SERIES_COLORS[index % SERIES_COLORS.length]; + return SERIES_COLORS[index % SERIES_COLORS.length].getColor(); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/swing-components/src/main/java/com/redhat/thermostat/swing/Palette.java Tue Sep 18 16:24:54 2012 +0200 @@ -0,0 +1,78 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.swing; + +import java.awt.Color; + +public enum Palette { + + RED(new Color(192, 0, 0)), + PALE_RED(new Color(192, 80, 77)), + + SKY_BLUE(new Color(79, 129, 189)), + AZUREUS(new Color(0, 176, 190)), + EGYPTIAN_BLUE(new Color(74, 144, 217)), + DIRTY_CYAN(new Color(75, 172, 198)), + PRUSSIAN_BLUE(new Color(0, 49, 83)), + + GREEN(new Color(146, 208, 80)), + TUNDRA_GREEN(new Color(155, 187, 89)), + + POMP_AND_POWER_VIOLET(new Color(128, 100, 162)), + VIOLET(new Color(112, 48, 160)), + + EARL_GRAY(new Color(128, 128, 128)), + LIGHT_GRAY(new Color(242, 242, 242)), + GRAY(new Color(216, 216, 216)), + DARK_GRAY(new Color(168, 172, 168)), + + GRANITA_ORANGE(new Color(247,150,70)), + + BLACK(Color.BLACK), + WHITE(Color.WHITE), + + /* END */ ; + + private Color color; + Palette(Color color) { + this.color = color; + } + + public Color getColor() { + return color; + } +}