Variable Renaming

stream_cell.go

@@ -23,7 +23,7 @@ func NewStreamCell(cellData string, cellStyle StreamStyle, cellType CellType) St
 
 // NewStringStreamCell creates a new cell that holds string data, is of type string and uses general formatting
 func NewStringStreamCell(cellData string) StreamCell {
-	return NewStreamCell(cellData, Strings, CellTypeString)
+	return NewStreamCell(cellData, StreamStyleDefaultString, CellTypeString)
 }
 
 // NewStyledStringStreamCell creates a new cell that holds a string and is styled according to the given style
@@ -34,7 +34,7 @@ func NewStyledStringStreamCell(cellData string, cellStyle StreamStyle) StreamCel
 // NewIntegerStreamCell creates a new cell that holds an integer value (represented as string),
 // is formatted as a standard integer and is of type numeric.
 func NewIntegerStreamCell(cellData int) StreamCell {
-	return NewStreamCell(strconv.Itoa(cellData), Integers, CellTypeNumeric)
+	return NewStreamCell(strconv.Itoa(cellData), StreamStyleDefaultInteger, CellTypeNumeric)
 }
 
 // NewStyledIntegerStreamCell creates a new cell that holds an integer value (represented as string)
@@ -47,5 +47,5 @@ func NewStyledIntegerStreamCell(cellData int, cellStyle StreamStyle) StreamCell
 // and is of type numeric
 func NewDateStreamCell(t time.Time) StreamCell {
 	excelTime := TimeToExcelTime(t, false)
-	return NewStreamCell(strconv.Itoa(int(excelTime)), Dates, CellTypeNumeric)
+	return NewStreamCell(strconv.Itoa(int(excelTime)), StreamStyleDefaultDate, CellTypeNumeric)
 }

stream_style.go

@@ -15,59 +15,61 @@ const (
 	DateTimeFormat_d_m_yy_h_mm = 22
 )
 
-var Strings StreamStyle
-var BoldStrings StreamStyle
-var ItalicStrings StreamStyle
-var UnderlinedStrings StreamStyle
+var StreamStyleFromColumn StreamStyle
 
-var Integers StreamStyle
-var BoldIntegers StreamStyle
-var ItalicIntegers StreamStyle
-var UnderlinedIntegers StreamStyle
+var StreamStyleDefaultString StreamStyle
+var StreamStyleBoldString StreamStyle
+var StreamStyleItalicString StreamStyle
+var StreamStyleUnderlinedString StreamStyle
 
-var Dates StreamStyle
+var StreamStyleDefaultInteger StreamStyle
+var StreamStyleBoldInteger StreamStyle
+var StreamStyleItalicInteger StreamStyle
+var StreamStyleUnderlinedInteger StreamStyle
 
-var Decimals StreamStyle
+var StreamStyleDefaultDate StreamStyle
 
-var Bold *Font
-var Italic *Font
-var Underlined *Font
+var StreamStyleDefaultDecimal StreamStyle
 
-var GreenCell *Fill
-var RedCell *Fill
-var WhiteCel *Fill
+var FontBold *Font
+var FontItalic *Font
+var FontUnderlined *Font
+
+var FillGreen *Fill
+var FillRed *Fill
+var FillWhite *Fill
 
 func init() {
 	// Init Fonts
-	Bold = DefaultFont()
-	Bold.Bold = true
+	FontBold = DefaultFont()
+	FontBold.Bold = true
 
-	Italic = DefaultFont()
-	Italic.Italic = true
+	FontItalic = DefaultFont()
+	FontItalic.Italic = true
 
-	Underlined = DefaultFont()
-	Underlined.Underline = true
+	FontUnderlined = DefaultFont()
+	FontUnderlined.Underline = true
 
 	// Init Fills
-	GreenCell = NewFill(Solid_Cell_Fill, RGB_Light_Green, RGB_White)
-	RedCell = NewFill(Solid_Cell_Fill, RGB_Light_Red, RGB_White)
-	WhiteCel = DefaultFill()
+	FillGreen = NewFill(Solid_Cell_Fill, RGB_Light_Green, RGB_White)
+	FillRed = NewFill(Solid_Cell_Fill, RGB_Light_Red, RGB_White)
+	FillWhite = DefaultFill()
 
 	// Init default string styles
-	Strings = MakeStringStyle(DefaultFont(), DefaultFill(), DefaultAlignment(), DefaultBorder())
-	BoldStrings = MakeStringStyle(Bold, DefaultFill(), DefaultAlignment(), DefaultBorder())
-	ItalicStrings = MakeStringStyle(Italic, DefaultFill(), DefaultAlignment(), DefaultBorder())
-	UnderlinedStrings = MakeStringStyle(Underlined, DefaultFill(), DefaultAlignment(), DefaultBorder())
+	StreamStyleDefaultString = MakeStringStyle(DefaultFont(), DefaultFill(), DefaultAlignment(), DefaultBorder())
+	StreamStyleBoldString = MakeStringStyle(FontBold, DefaultFill(), DefaultAlignment(), DefaultBorder())
+	StreamStyleItalicString = MakeStringStyle(FontItalic, DefaultFill(), DefaultAlignment(), DefaultBorder())
+	StreamStyleUnderlinedString = MakeStringStyle(FontUnderlined, DefaultFill(), DefaultAlignment(), DefaultBorder())
 
 	// Init default Integer styles
-	Integers = MakeIntegerStyle(DefaultFont(), DefaultFill(), DefaultAlignment(), DefaultBorder())
-	BoldIntegers = MakeIntegerStyle(Bold, DefaultFill(), DefaultAlignment(), DefaultBorder())
-	ItalicIntegers = MakeIntegerStyle(Italic, DefaultFill(), DefaultAlignment(), DefaultBorder())
-	UnderlinedIntegers = MakeIntegerStyle(Underlined, DefaultFill(), DefaultAlignment(), DefaultBorder())
+	StreamStyleDefaultInteger = MakeIntegerStyle(DefaultFont(), DefaultFill(), DefaultAlignment(), DefaultBorder())
+	StreamStyleBoldInteger = MakeIntegerStyle(FontBold, DefaultFill(), DefaultAlignment(), DefaultBorder())
+	StreamStyleItalicInteger = MakeIntegerStyle(FontItalic, DefaultFill(), DefaultAlignment(), DefaultBorder())
+	StreamStyleUnderlinedInteger = MakeIntegerStyle(FontUnderlined, DefaultFill(), DefaultAlignment(), DefaultBorder())
 
-	Dates = MakeDateStyle(DefaultFont(), DefaultFill(), DefaultAlignment(), DefaultBorder())
+	StreamStyleDefaultDate = MakeDateStyle(DefaultFont(), DefaultFill(), DefaultAlignment(), DefaultBorder())
 
-	Decimals = MakeDecimalStyle(DefaultFont(), DefaultFill(), DefaultAlignment(), DefaultBorder())
+	StreamStyleDefaultDecimal = MakeDecimalStyle(DefaultFont(), DefaultFill(), DefaultAlignment(), DefaultBorder())
 }
 
 // MakeStyle creates a new StreamStyle and add it to the styles that will be streamed

stream_style_test.go

@@ -43,10 +43,10 @@ func (s *StreamSuite) TestXlsxStreamWriteWithStyle(t *C) {
 			},
 			workbookData: [][][]StreamCell{
 				{
-					{NewStyledStringStreamCell("1", UnderlinedStrings), NewStyledStringStreamCell("25", ItalicStrings),
-						NewStyledStringStreamCell("A", BoldStrings), NewStringStreamCell("B")},
-					{NewIntegerStreamCell(1234), NewStyledIntegerStreamCell(98, BoldIntegers),
-						NewStyledIntegerStreamCell(34, ItalicIntegers), NewStyledIntegerStreamCell(26, UnderlinedIntegers)},
+					{NewStyledStringStreamCell("1", StreamStyleUnderlinedString), NewStyledStringStreamCell("25", StreamStyleItalicString),
+						NewStyledStringStreamCell("A", StreamStyleBoldString), NewStringStreamCell("B")},
+					{NewIntegerStreamCell(1234), NewStyledIntegerStreamCell(98, StreamStyleBoldInteger),
+						NewStyledIntegerStreamCell(34, StreamStyleItalicInteger), NewStyledIntegerStreamCell(26, StreamStyleUnderlinedInteger)},
 				},
 			},
 		},
@@ -329,9 +329,9 @@ func writeStreamFileWithStyle(filePath string, fileBuffer io.Writer, sheetNames
 		file = NewStreamFileBuilder(fileBuffer)
 	}
 
-	defaultStyles := []StreamStyle{Strings, BoldStrings, ItalicStrings, UnderlinedStrings,
-		Integers, BoldIntegers, ItalicIntegers, UnderlinedIntegers,
-		Dates}
+	defaultStyles := []StreamStyle{StreamStyleDefaultString, StreamStyleBoldString, StreamStyleItalicString, StreamStyleUnderlinedString,
+		StreamStyleDefaultInteger, StreamStyleBoldInteger, StreamStyleItalicInteger, StreamStyleUnderlinedInteger,
+		StreamStyleDefaultDate}
 	allStylesToBeAdded := append(defaultStyles, customStyles...)
 	err = file.AddStreamStyleList(allStylesToBeAdded)
 	if err != nil {
@@ -341,7 +341,7 @@ func writeStreamFileWithStyle(filePath string, fileBuffer io.Writer, sheetNames
 	for i, sheetName := range sheetNames {
 		var colStyles []StreamStyle
 		for range workbookData[i][0] {
-			colStyles = append(colStyles, Strings)
+			colStyles = append(colStyles, StreamStyleDefaultString)
 		}
 
 		err := file.AddSheetS(sheetName, colStyles)
@@ -552,9 +552,9 @@ func (s *StreamSuite) TestCloseWithNothingWrittenToSheetsWithStyle(t *C) {
 		{{NewStringStreamCell("Header3"), NewStringStreamCell("Header4")}},
 	}
 
-	defaultStyles := []StreamStyle{Strings, BoldStrings, ItalicIntegers, UnderlinedStrings,
-		Integers, BoldIntegers, ItalicIntegers, UnderlinedIntegers,
-		Dates}
+	defaultStyles := []StreamStyle{StreamStyleDefaultString, StreamStyleBoldString, StreamStyleItalicInteger, StreamStyleUnderlinedString,
+		StreamStyleDefaultInteger, StreamStyleBoldInteger, StreamStyleItalicInteger, StreamStyleUnderlinedInteger,
+		StreamStyleDefaultDate}
 	err := file.AddStreamStyleList(defaultStyles)
 	if err != nil {
 		t.Fatal(err)
@@ -562,12 +562,12 @@ func (s *StreamSuite) TestCloseWithNothingWrittenToSheetsWithStyle(t *C) {
 
 	colStyles0 := []StreamStyle{}
 	for range workbookData[0][0] {
-		colStyles0 = append(colStyles0, Strings)
+		colStyles0 = append(colStyles0, StreamStyleDefaultString)
 	}
 
 	colStyles1 := []StreamStyle{}
 	for range workbookData[1][0] {
-		colStyles1 = append(colStyles1, Strings)
+		colStyles1 = append(colStyles1, StreamStyleDefaultString)
 	}
 
 	err = file.AddSheetS(sheetNames[0], colStyles0)
@@ -607,19 +607,19 @@ func (s *StreamSuite) TestCloseWithNothingWrittenToSheetsWithStyle(t *C) {
 func (s *StreamSuite) TestBuildErrorsAfterBuildWithStyle(t *C) {
 	file := NewStreamFileBuilder(bytes.NewBuffer(nil))
 
-	defaultStyles := []StreamStyle{Strings, BoldStrings, ItalicIntegers, UnderlinedStrings,
-		Integers, BoldIntegers, ItalicIntegers, UnderlinedIntegers,
-		Dates}
+	defaultStyles := []StreamStyle{StreamStyleDefaultString, StreamStyleBoldString, StreamStyleItalicInteger, StreamStyleUnderlinedString,
+		StreamStyleDefaultInteger, StreamStyleBoldInteger, StreamStyleItalicInteger, StreamStyleUnderlinedInteger,
+		StreamStyleDefaultDate}
 	err := file.AddStreamStyleList(defaultStyles)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	err = file.AddSheetS("Sheet1", []StreamStyle{Strings})
+	err = file.AddSheetS("Sheet1", []StreamStyle{StreamStyleDefaultString})
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = file.AddSheetS("Sheet2", []StreamStyle{Strings})
+	err = file.AddSheetS("Sheet2", []StreamStyle{StreamStyleDefaultString})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -637,19 +637,19 @@ func (s *StreamSuite) TestBuildErrorsAfterBuildWithStyle(t *C) {
 func (s *StreamSuite) TestAddSheetWithStyleErrorsAfterBuild(t *C) {
 	file := NewStreamFileBuilder(bytes.NewBuffer(nil))
 
-	defaultStyles := []StreamStyle{Strings, BoldStrings, ItalicIntegers, UnderlinedStrings,
-		Integers, BoldIntegers, ItalicIntegers, UnderlinedIntegers,
-		Dates}
+	defaultStyles := []StreamStyle{StreamStyleDefaultString, StreamStyleBoldString, StreamStyleItalicInteger, StreamStyleUnderlinedString,
+		StreamStyleDefaultInteger, StreamStyleBoldInteger, StreamStyleItalicInteger, StreamStyleUnderlinedInteger,
+		StreamStyleDefaultDate}
 	err := file.AddStreamStyleList(defaultStyles)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	err = file.AddSheetS("Sheet1", []StreamStyle{Strings})
+	err = file.AddSheetS("Sheet1", []StreamStyle{StreamStyleDefaultString})
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = file.AddSheetS("Sheet2", []StreamStyle{Strings})
+	err = file.AddSheetS("Sheet2", []StreamStyle{StreamStyleDefaultString})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -658,7 +658,7 @@ func (s *StreamSuite) TestAddSheetWithStyleErrorsAfterBuild(t *C) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = file.AddSheetS("Sheet3", []StreamStyle{Strings})
+	err = file.AddSheetS("Sheet3", []StreamStyle{StreamStyleDefaultString})
 	if err != BuiltStreamFileBuilderError {
 		t.Fatal(err)
 	}