From b2106ae76c6a38a15681bb6dc9e19b4ae8801fbb Mon Sep 17 00:00:00 2001 From: Fabienne Ducroquet Date: Wed, 28 Sep 2016 14:23:16 +0200 Subject: [PATCH] gs-reactor: Rename @GenericBackgroundColor to @GenericValueBackgroundColor --- .../java/org/genericsystem/reactor/annotations/Styles.java | 2 +- .../main/java/org/genericsystem/reactor/az3/GSCellDiv.java | 4 ++-- .../java/org/genericsystem/reactor/az3/GSCompositeDiv.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java index 5a1551af5..85af9f242 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java @@ -69,7 +69,7 @@ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) @Inherited - public @interface GenericBackgroundColor { + public @interface GenericValueBackgroundColor { } @Retention(RetentionPolicy.RUNTIME) diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCellDiv.java b/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCellDiv.java index d7f56c190..4558408b7 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCellDiv.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCellDiv.java @@ -6,7 +6,7 @@ import org.genericsystem.reactor.annotations.Styles.Flex; import org.genericsystem.reactor.annotations.Styles.FlexDirectionStyle; import org.genericsystem.reactor.annotations.Styles.FlexWrap; -import org.genericsystem.reactor.annotations.Styles.GenericBackgroundColor; +import org.genericsystem.reactor.annotations.Styles.GenericValueBackgroundColor; import org.genericsystem.reactor.annotations.Styles.Height; import org.genericsystem.reactor.annotations.Styles.JustifyContent; import org.genericsystem.reactor.annotations.Styles.KeepFlexDirection; @@ -80,7 +80,7 @@ public static class GSComponentEditorDiv extends GSSubcellEditorDiv { } @Color("#000000") - @GenericBackgroundColor + @GenericValueBackgroundColor public static class GSSubcellDiv extends GSComponentEditorDiv { } diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCompositeDiv.java b/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCompositeDiv.java index 74d91e49f..1f5a62230 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCompositeDiv.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCompositeDiv.java @@ -40,7 +40,7 @@ import org.genericsystem.reactor.annotations.Styles.Flex; import org.genericsystem.reactor.annotations.Styles.FlexDirectionStyle; import org.genericsystem.reactor.annotations.Styles.FlexWrap; -import org.genericsystem.reactor.annotations.Styles.GenericBackgroundColor; +import org.genericsystem.reactor.annotations.Styles.GenericValueBackgroundColor; import org.genericsystem.reactor.annotations.Styles.Height; import org.genericsystem.reactor.annotations.Styles.JustifyContent; import org.genericsystem.reactor.annotations.Styles.KeepFlexDirection; @@ -295,7 +295,7 @@ private static void processAnnotations(Class tagClass, Tag re if (backgroundColor != null) result.addStyle("background-color", backgroundColor.value()); - if (tagClass.getAnnotation(GenericBackgroundColor.class) != null) + if (tagClass.getAnnotation(GenericValueBackgroundColor.class) != null) result.addPrefixBinding(modelContext -> result.addStyle(modelContext, "background-color", "Color".equals(StringExtractor.SIMPLE_CLASS_EXTRACTOR.apply(modelContext.getGeneric().getMeta())) ? ((GenericStringDefaults) result).getGenericStringProperty(modelContext).getValue() : "#e5ed00")); FlexWrap flexWrap = tagClass.getAnnotation(FlexWrap.class);