From 4a641a986d93beda5842a85b62dc2d2d465789a4 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Wed, 29 Jan 2020 09:43:21 +0100 Subject: [PATCH] Refactoring --- .../xhtml/PageStyleConverter.java | 25 +++++++++----- .../xhtml/PresentationStyleConverter.java | 12 ++++--- .../xhtml/TextStyleConverter.java | 34 +++++++++++++------ 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/src/main/java/writer2latex/xhtml/PageStyleConverter.java b/src/main/java/writer2latex/xhtml/PageStyleConverter.java index 9b79c7b..40d76a8 100644 --- a/src/main/java/writer2latex/xhtml/PageStyleConverter.java +++ b/src/main/java/writer2latex/xhtml/PageStyleConverter.java @@ -151,10 +151,13 @@ public class PageStyleConverter extends StyleConverterHelper { cssDrawBackground(drawingPage,info.props,true); } // Then export the results - buf.append(sIndent) - .append(".masterpage").append(styleNames.addToExport(sDisplayName)) - .append(" {").append(info.props.toString()).append("}") - .append(config.prettyPrint() ? "\n" : " "); + buf.append(sIndent); + buf.append(".masterpage"); + buf.append(styleNames.addToExport(sDisplayName)); + buf.append(" {"); + buf.append(info.props.toString()); + buf.append("}"); + buf.append(config.prettyPrint() ? "\n" : " "); } if (ofr.isText()) { @@ -171,16 +174,22 @@ public class PageStyleConverter extends StyleConverterHelper { pageInfo.props.addValue("margin", "0"); }*/ if (pageInfo.hasAttributes()) { - buf.append(sIndent).append("body {").append(pageInfo.props.toString()).append("}") - .append(config.prettyPrint() ? "\n" : " "); + buf.append(sIndent); + buf.append("body {"); + buf.append(pageInfo.props.toString()); + buf.append("}"); + buf.append(config.prettyPrint() ? "\n" : " "); } // Footnote rule if (bHasFootnoteRules) { StyleInfo ruleInfo = new StyleInfo(); cssFootnoteRule(pageLayout,ruleInfo.props); - buf.append(sIndent).append("hr.footnoterule {").append(ruleInfo.props.toString()).append("}") - .append(config.prettyPrint() ? "\n" : " "); + buf.append(sIndent); + buf.append("hr.footnoterule {"); + buf.append(ruleInfo.props.toString()); + buf.append("}"); + buf.append(config.prettyPrint() ? "\n" : " "); } } } diff --git a/src/main/java/writer2latex/xhtml/PresentationStyleConverter.java b/src/main/java/writer2latex/xhtml/PresentationStyleConverter.java index 2424aa8..054466b 100644 --- a/src/main/java/writer2latex/xhtml/PresentationStyleConverter.java +++ b/src/main/java/writer2latex/xhtml/PresentationStyleConverter.java @@ -98,11 +98,13 @@ public class PresentationStyleConverter extends FrameStyleConverter { getParSc().cssPar(style,props,true); getTextSc().cssTextCommon(style,props,true); if (!props.isEmpty()) { - buf.append(sIndent) - .append("li.outline") - .append(styleNames.addToExport(sDisplayName)) - .append(" p {").append(props.toString()).append("}") - .append(config.prettyPrint() ? "\n" : " "); + buf.append(sIndent); + buf.append("li.outline"); + buf.append(styleNames.addToExport(sDisplayName)); + buf.append(" p {"); + buf.append(props.toString()); + buf.append("}"); + buf.append(config.prettyPrint() ? "\n" : " "); } } } diff --git a/src/main/java/writer2latex/xhtml/TextStyleConverter.java b/src/main/java/writer2latex/xhtml/TextStyleConverter.java index 9082d4c..8764048 100644 --- a/src/main/java/writer2latex/xhtml/TextStyleConverter.java +++ b/src/main/java/writer2latex/xhtml/TextStyleConverter.java @@ -148,30 +148,34 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper { /**

Convert style information for used styles

* @param sIndent a String of spaces to add before each line */ - public String getStyleDeclarations(String sIndent) { StringBuilder buf = new StringBuilder(); + public String getStyleDeclarations(String sIndent) { buf.append(super.getStyleDeclarations(sIndent)); if (bConvertStyles) { // Export anchor styles // Default is always the styles "Internet link" and "Visited Internet Link"(?) StyleWithProperties defaultLinkStyle = (StyleWithProperties) - getStyles().getStyleByDisplayName(DEFAULT_LINK_STYLE); + getStyles().getStyleByDisplayName(DEFAULT_LINK_STYLE); if (defaultLinkStyle!=null) { CSVList props = new CSVList(";"); cssText(defaultLinkStyle,props,true); cssHyperlink(defaultLinkStyle,props); - buf.append(sIndent) - .append("a:link {").append(props.toString()).append("}\n"); + buf.append(sIndent); + buf.append("a:link {"); + buf.append(props.toString()); + buf.append("}\n"); } defaultLinkStyle = (StyleWithProperties) - getStyles().getStyleByDisplayName(DEFAULT_VISITED_LINK_STYLE); + getStyles().getStyleByDisplayName(DEFAULT_VISITED_LINK_STYLE); if (defaultLinkStyle!=null) { CSVList props = new CSVList(";"); cssText(defaultLinkStyle,props,true); cssHyperlink(defaultLinkStyle,props); - buf.append(sIndent) - .append("a:visited {").append(props.toString()).append("}\n"); + buf.append(sIndent); + buf.append("a:visited {"); + buf.append(props.toString()); + buf.append("}\n"); } // Remaining link styles... @@ -187,8 +191,12 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper { CSVList props = new CSVList(";"); cssText(style,props,true); cssHyperlink(style,props); - buf.append(sIndent).append("a.").append(sExportName) - .append(":link {").append(props.toString()).append("}\n"); + buf.append(sIndent); + buf.append("a."); + buf.append(sExportName); + buf.append(":link {"); + buf.append(props.toString()); + buf.append("}\n"); } style = ofr.getTextStyle(sVisitedStyleName); @@ -196,8 +204,12 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper { CSVList props = new CSVList(";"); cssText(style,props,true); cssHyperlink(style,props); - buf.append(sIndent).append("a.").append(sExportName) - .append(":visited {").append(props.toString()).append("}\n"); + buf.append(sIndent); + buf.append("a."); + buf.append(sExportName); + buf.append(":visited {"); + buf.append(props.toString()); + buf.append("}\n"); } } }