From b99172d28b998984ec091b83316128386a87315a Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Mon, 14 Nov 2016 03:27:31 -0800 Subject: [PATCH] rename CSSWrapType to shorter CSSWrap matching java and csharp Summary: Java and csharp already use CSSWrap and not CSSWrapType. Let's consolidate and stick with the shorter of the two. Reviewed By: gkassabli Differential Revision: D4174257 fbshipit-source-id: ba0bfab996ba158b07863d8c72cf2a41262c9592 --- CSSLayout/CSSLayout.c | 6 +++--- CSSLayout/CSSLayout.h | 10 +++++----- CSSLayoutKit/UIView+CSSLayout.h | 2 +- CSSLayoutKit/UIView+CSSLayout.m | 2 +- gentest/gentest-cpp.js | 4 ++-- gentest/gentest-cs.js | 4 ++-- gentest/gentest-java.js | 4 ++-- gentest/gentest.js | 4 ++-- java/jni/CSSJNI.cpp | 2 +- tests/CSSLayoutAlignContentTest.cpp | 8 ++++---- tests/CSSLayoutDefaultValuesTest.cpp | 2 +- tests/CSSLayoutFlexWrapTest.cpp | 8 ++++---- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CSSLayout/CSSLayout.c b/CSSLayout/CSSLayout.c index 5cf642d9..eba66a5b 100644 --- a/CSSLayout/CSSLayout.c +++ b/CSSLayout/CSSLayout.c @@ -69,7 +69,7 @@ typedef struct CSSStyle { CSSAlign alignItems; CSSAlign alignSelf; CSSPositionType positionType; - CSSWrapType flexWrap; + CSSWrap flexWrap; CSSOverflow overflow; float flex; float flexGrow; @@ -423,7 +423,7 @@ CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignContent, alignContent, alignContent) CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignItems, alignItems, alignItems); CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignSelf, alignSelf, alignSelf); CSS_NODE_STYLE_PROPERTY_IMPL(CSSPositionType, PositionType, positionType, positionType); -CSS_NODE_STYLE_PROPERTY_IMPL(CSSWrapType, FlexWrap, flexWrap, flexWrap); +CSS_NODE_STYLE_PROPERTY_IMPL(CSSWrap, FlexWrap, flexWrap, flexWrap); CSS_NODE_STYLE_PROPERTY_IMPL(CSSOverflow, Overflow, overflow, overflow); CSS_NODE_STYLE_PROPERTY_SETTER_IMPL(float, FlexGrow, flexGrow, flexGrow); @@ -1395,7 +1395,7 @@ static void layoutNodeImpl(const CSSNodeRef node, const CSSFlexDirection crossAxis = getCrossFlexDirection(mainAxis, direction); const bool isMainAxisRow = isRowDirection(mainAxis); const CSSJustify justifyContent = node->style.justifyContent; - const bool isNodeFlexWrap = node->style.flexWrap == CSSWrapTypeWrap; + const bool isNodeFlexWrap = node->style.flexWrap == CSSWrapWrap; CSSNodeRef firstAbsoluteChild = NULL; CSSNodeRef currentAbsoluteChild = NULL; diff --git a/CSSLayout/CSSLayout.h b/CSSLayout/CSSLayout.h index fb06d6d4..b860b9c3 100644 --- a/CSSLayout/CSSLayout.h +++ b/CSSLayout/CSSLayout.h @@ -74,10 +74,10 @@ typedef enum CSSPositionType { CSSPositionTypeAbsolute, } CSSPositionType; -typedef enum CSSWrapType { - CSSWrapTypeNoWrap, - CSSWrapTypeWrap, -} CSSWrapType; +typedef enum CSSWrap { + CSSWrapNoWrap, + CSSWrapWrap, +} CSSWrap; typedef enum CSSMeasureMode { CSSMeasureModeUndefined, @@ -207,7 +207,7 @@ CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignContent, alignContent); CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignItems, alignItems); CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignSelf, alignSelf); CSS_NODE_STYLE_PROPERTY(CSSPositionType, PositionType, positionType); -CSS_NODE_STYLE_PROPERTY(CSSWrapType, FlexWrap, flexWrap); +CSS_NODE_STYLE_PROPERTY(CSSWrap, FlexWrap, flexWrap); CSS_NODE_STYLE_PROPERTY(CSSOverflow, Overflow, overflow); WIN_EXPORT void CSSNodeStyleSetFlex(const CSSNodeRef node, const float flex); diff --git a/CSSLayoutKit/UIView+CSSLayout.h b/CSSLayoutKit/UIView+CSSLayout.h index b7951b83..394c58c1 100644 --- a/CSSLayoutKit/UIView+CSSLayout.h +++ b/CSSLayoutKit/UIView+CSSLayout.h @@ -24,7 +24,7 @@ - (void)css_setAlignItems:(CSSAlign)alignItems; - (void)css_setAlignSelf:(CSSAlign)alignSelf; - (void)css_setPositionType:(CSSPositionType)positionType; -- (void)css_setFlexWrap:(CSSWrapType)flexWrap; +- (void)css_setFlexWrap:(CSSWrap)flexWrap; - (void)css_setFlexGrow:(CGFloat)flexGrow; - (void)css_setFlexShrink:(CGFloat)flexShrink; diff --git a/CSSLayoutKit/UIView+CSSLayout.m b/CSSLayoutKit/UIView+CSSLayout.m index 645cdd30..faf3242f 100644 --- a/CSSLayoutKit/UIView+CSSLayout.m +++ b/CSSLayoutKit/UIView+CSSLayout.m @@ -85,7 +85,7 @@ CSSNodeStyleSetPositionType([self cssNode], positionType); } -- (void)css_setFlexWrap:(CSSWrapType)flexWrap +- (void)css_setFlexWrap:(CSSWrap)flexWrap { CSSNodeStyleSetFlexWrap([self cssNode], flexWrap); } diff --git a/gentest/gentest-cpp.js b/gentest/gentest-cpp.js index dc0427b9..9e378816 100644 --- a/gentest/gentest-cpp.js +++ b/gentest/gentest-cpp.js @@ -84,8 +84,8 @@ CPPEmitter.prototype = Object.create(Emitter.prototype, { CSSPositionTypeAbsolute:{value:'CSSPositionTypeAbsolute'}, CSSPositionTypeRelative:{value:'CSSPositionTypeRelative'}, - CSSWrapTypeNoWrap:{value:'CSSWrapTypeNoWrap'}, - CSSWrapTypeWrap:{value:'CSSWrapTypeWrap'}, + CSSWrapNoWrap:{value:'CSSWrapNoWrap'}, + CSSWrapWrap:{value:'CSSWrapWrap'}, CSSUndefined:{value:'CSSUndefined'}, diff --git a/gentest/gentest-cs.js b/gentest/gentest-cs.js index c2046ef0..194b845a 100644 --- a/gentest/gentest-cs.js +++ b/gentest/gentest-cs.js @@ -100,8 +100,8 @@ CSEmitter.prototype = Object.create(Emitter.prototype, { CSSUndefined:{value:'CSSConstants.Undefined'}, - CSSWrapTypeNoWrap:{value:'CSSWrap.NoWrap'}, - CSSWrapTypeWrap:{value:'CSSWrap.Wrap'}, + CSSWrapNoWrap:{value:'CSSWrap.NoWrap'}, + CSSWrapWrap:{value:'CSSWrap.Wrap'}, CSSNodeCalculateLayout:{value:function(node, dir) { this.push(node + '.StyleDirection = ' + dir + ';'); diff --git a/gentest/gentest-java.js b/gentest/gentest-java.js index f1dbb06b..853bf658 100644 --- a/gentest/gentest-java.js +++ b/gentest/gentest-java.js @@ -93,8 +93,8 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, { CSSUndefined:{value:'CSSConstants.UNDEFINED'}, - CSSWrapTypeNoWrap:{value:'CSSWrap.NO_WRAP'}, - CSSWrapTypeWrap:{value:'CSSWrap.WRAP'}, + CSSWrapNoWrap:{value:'CSSWrap.NO_WRAP'}, + CSSWrapWrap:{value:'CSSWrap.WRAP'}, CSSNodeCalculateLayout:{value:function(node, dir) { this.push(node + '.setDirection(' + dir + ');'); diff --git a/gentest/gentest.js b/gentest/gentest.js index 07fef381..26204c35 100755 --- a/gentest/gentest.js +++ b/gentest/gentest.js @@ -354,8 +354,8 @@ function overflowValue(e, value) { function wrapValue(e, value) { switch (value) { - case 'wrap': return e.CSSWrapTypeWrap; - case 'nowrap': return e.CSSWrapTypeNoWrap; + case 'wrap': return e.CSSWrapWrap; + case 'nowrap': return e.CSSWrapNoWrap; } } diff --git a/java/jni/CSSJNI.cpp b/java/jni/CSSJNI.cpp index 1b5d1de9..8460e86a 100644 --- a/java/jni/CSSJNI.cpp +++ b/java/jni/CSSJNI.cpp @@ -203,7 +203,7 @@ CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignItems); CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignSelf); CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignContent); CSS_NODE_JNI_STYLE_PROP(jint, CSSPositionType, PositionType); -CSS_NODE_JNI_STYLE_PROP(jint, CSSWrapType, FlexWrap); +CSS_NODE_JNI_STYLE_PROP(jint, CSSWrap, FlexWrap); CSS_NODE_JNI_STYLE_PROP(jint, CSSOverflow, Overflow); void jni_CSSNodeStyleSetFlex(alias_ref, jlong nativePointer, jfloat value) { diff --git a/tests/CSSLayoutAlignContentTest.cpp b/tests/CSSLayoutAlignContentTest.cpp index 7176801b..9fe462a4 100644 --- a/tests/CSSLayoutAlignContentTest.cpp +++ b/tests/CSSLayoutAlignContentTest.cpp @@ -49,7 +49,7 @@ TEST(CSSLayoutTest, align_content_flex_start) { const CSSNodeRef root = CSSNodeNew(); - CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap); + CSSNodeStyleSetFlexWrap(root, CSSWrapWrap); CSSNodeStyleSetWidth(root, 100); CSSNodeStyleSetHeight(root, 100); @@ -147,7 +147,7 @@ TEST(CSSLayoutTest, align_content_flex_start) { TEST(CSSLayoutTest, align_content_flex_end) { const CSSNodeRef root = CSSNodeNew(); CSSNodeStyleSetAlignContent(root, CSSAlignFlexEnd); - CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap); + CSSNodeStyleSetFlexWrap(root, CSSWrapWrap); CSSNodeStyleSetWidth(root, 100); CSSNodeStyleSetHeight(root, 100); @@ -245,7 +245,7 @@ TEST(CSSLayoutTest, align_content_flex_end) { TEST(CSSLayoutTest, align_content_center) { const CSSNodeRef root = CSSNodeNew(); CSSNodeStyleSetAlignContent(root, CSSAlignCenter); - CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap); + CSSNodeStyleSetFlexWrap(root, CSSWrapWrap); CSSNodeStyleSetWidth(root, 100); CSSNodeStyleSetHeight(root, 100); @@ -343,7 +343,7 @@ TEST(CSSLayoutTest, align_content_center) { TEST(CSSLayoutTest, align_content_stretch) { const CSSNodeRef root = CSSNodeNew(); CSSNodeStyleSetAlignContent(root, CSSAlignStretch); - CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap); + CSSNodeStyleSetFlexWrap(root, CSSWrapWrap); CSSNodeStyleSetWidth(root, 100); CSSNodeStyleSetHeight(root, 100); diff --git a/tests/CSSLayoutDefaultValuesTest.cpp b/tests/CSSLayoutDefaultValuesTest.cpp index 7c647f61..f9e1766e 100644 --- a/tests/CSSLayoutDefaultValuesTest.cpp +++ b/tests/CSSLayoutDefaultValuesTest.cpp @@ -23,7 +23,7 @@ TEST(CSSLayoutTest, assert_default_values) { ASSERT_EQ(CSSAlignStretch, CSSNodeStyleGetAlignItems(root)); ASSERT_EQ(CSSAlignAuto, CSSNodeStyleGetAlignSelf(root)); ASSERT_EQ(CSSPositionTypeRelative, CSSNodeStyleGetPositionType(root)); - ASSERT_EQ(CSSWrapTypeNoWrap, CSSNodeStyleGetFlexWrap(root)); + ASSERT_EQ(CSSWrapNoWrap, CSSNodeStyleGetFlexWrap(root)); ASSERT_EQ(CSSOverflowVisible, CSSNodeStyleGetOverflow(root)); ASSERT_EQ(0, CSSNodeStyleGetFlexGrow(root)); ASSERT_EQ(0, CSSNodeStyleGetFlexShrink(root)); diff --git a/tests/CSSLayoutFlexWrapTest.cpp b/tests/CSSLayoutFlexWrapTest.cpp index 49dcab93..74b23657 100644 --- a/tests/CSSLayoutFlexWrapTest.cpp +++ b/tests/CSSLayoutFlexWrapTest.cpp @@ -45,7 +45,7 @@ TEST(CSSLayoutTest, wrap_column) { const CSSNodeRef root = CSSNodeNew(); - CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap); + CSSNodeStyleSetFlexWrap(root, CSSWrapWrap); CSSNodeStyleSetHeight(root, 100); const CSSNodeRef root_child0 = CSSNodeNew(); @@ -127,7 +127,7 @@ TEST(CSSLayoutTest, wrap_column) { TEST(CSSLayoutTest, wrap_row) { const CSSNodeRef root = CSSNodeNew(); CSSNodeStyleSetFlexDirection(root, CSSFlexDirectionRow); - CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap); + CSSNodeStyleSetFlexWrap(root, CSSWrapWrap); CSSNodeStyleSetWidth(root, 100); const CSSNodeRef root_child0 = CSSNodeNew(); @@ -210,7 +210,7 @@ TEST(CSSLayoutTest, wrap_row_align_items_flex_end) { const CSSNodeRef root = CSSNodeNew(); CSSNodeStyleSetFlexDirection(root, CSSFlexDirectionRow); CSSNodeStyleSetAlignItems(root, CSSAlignFlexEnd); - CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap); + CSSNodeStyleSetFlexWrap(root, CSSWrapWrap); CSSNodeStyleSetWidth(root, 100); const CSSNodeRef root_child0 = CSSNodeNew(); @@ -293,7 +293,7 @@ TEST(CSSLayoutTest, wrap_row_align_items_center) { const CSSNodeRef root = CSSNodeNew(); CSSNodeStyleSetFlexDirection(root, CSSFlexDirectionRow); CSSNodeStyleSetAlignItems(root, CSSAlignCenter); - CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap); + CSSNodeStyleSetFlexWrap(root, CSSWrapWrap); CSSNodeStyleSetWidth(root, 100); const CSSNodeRef root_child0 = CSSNodeNew();