Merge pull request #802 from eclipse-mylyn/575-remove-guava-from-wikitext-part-3

gnl42 · web-flow · commit ed5423682925 · 2025-08-12T19:53:19.000-07:00
Remove last vestiges of guava #575
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/META-INF/MANIFEST.MF b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-Name: Mylyn WikiText AsciiDoc
 Bundle-Vendor: Eclipse Mylyn
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
-Import-Package: com.google.common.base;version="[33.0,34.0)",
- org.apache.commons.lang3;version="[3.14.0,4.0.0)",
+Import-Package: org.apache.commons.lang3;version="[3.14.0,4.0.0)",
  org.eclipse.mylyn.wikitext.parser;version="[4.2,5)",
  org.eclipse.mylyn.wikitext.parser.builder;version="[4.2,5)",
  org.eclipse.mylyn.wikitext.parser.markup;version="[4.2,5)",
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LanguageSupport.java b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LanguageSupport.java
@@ -27,8 +27,6 @@
 import org.eclipse.mylyn.wikitext.asciidoc.internal.AsciiDocContentState;
 import org.eclipse.mylyn.wikitext.parser.TableCellAttributes;
 
-import com.google.common.base.Splitter;
-
 /**
  * Internal class to provide package internal support to the language
  */
@@ -39,6 +37,8 @@ public class LanguageSupport {
 
 	private static Pattern keyValuePattern = Pattern.compile("(.*)=\"(.*)\""); //$NON-NLS-1$
 
+	private static final Pattern SPLIT_PATTERN = Pattern.compile(",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)"); //$NON-NLS-1$
+
 	/**
 	 * Helper method for parsing AsciiDoc format string (
 	 *
@@ -63,9 +63,7 @@ public static Map<String, String> parseFormattingProperties(String rawFormat, Li
 			return properties;
 		}
 
-		// TODO: handle escaped strings and default sequence of parameters
-		// i.e. sunset,100,200,title="test"
-		Iterable<String> valpairs = Splitter.on(Pattern.compile(",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)")).split(rawFormat); //$NON-NLS-1$
+		String[] valpairs = SPLIT_PATTERN.split(rawFormat);
 		for (String pair : valpairs) {
 			Matcher matcher = keyValuePattern.matcher(pair.trim());
 
@@ -153,4 +151,4 @@ public static int computeHeadingLevel(int initialLevel, AsciiDocContentState sta
 		return Math.max(1, Math.min(initialLevel + levelOffset, 6));
 	}
 
-}
+}
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.confluence/META-INF/MANIFEST.MF b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.confluence/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-Name: Mylyn WikiText Confluence
 Bundle-Vendor: Eclipse Mylyn
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
-Import-Package: com.google.common.base;version="[33.0,34.0)",
- org.apache.commons.lang3;version="[3.14.0,4.0.0)",
+Import-Package: org.apache.commons.lang3;version="[3.14.0,4.0.0)",
  org.eclipse.mylyn.wikitext.confluence,
  org.eclipse.mylyn.wikitext.confluence.internal,
  org.eclipse.mylyn.wikitext.confluence.internal.block,
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilder.java b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilder.java
@@ -35,8 +35,6 @@
 import org.eclipse.mylyn.wikitext.parser.builder.AbstractMarkupDocumentBuilder;
 import org.eclipse.mylyn.wikitext.parser.builder.EntityReferences;
 
-import com.google.common.base.CharMatcher;
-
 /**
  * a document builder that emits Confluence markup
  *
@@ -52,7 +50,7 @@ public class ConfluenceDocumentBuilder extends AbstractMarkupDocumentBuilder {
 	private static final Pattern PATTERN_MULTIPLE_NEWLINES = Pattern
 			.compile("(" + NEWLINE_REGEX + "(?:\\s+" + NEWLINE_REGEX + "|" + NEWLINE_REGEX + ")+)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 
-	private static final CharMatcher SPAN_MARKUP_CHARACTERS = CharMatcher.anyOf("*_+-^~{}[]?%@"); //$NON-NLS-1$
+	private static final String SPAN_MARKUP_CHARACTERS = "*_+-^~{}[]?%@"; //$NON-NLS-1$
 
 	private final Map<String, String> entityToLiteral = new HashMap<>();
 
@@ -200,7 +198,7 @@ public final void close() throws IOException {
 
 				emitPrefix();
 				if (trimmingNewlinesAndWhitespace) {
-					content = CharMatcher.whitespace().trimFrom(content);
+					content = content.strip();
 				}
 				if (collapsingConsecutiveNewlines) {
 					content = PATTERN_MULTIPLE_NEWLINES.matcher(content).replaceAll("\n"); //$NON-NLS-1$
@@ -464,7 +462,7 @@ private boolean isEscapeCharacter(int i) {
 	}
 
 	private boolean isSpanMarkup(char character) {
-		return SPAN_MARKUP_CHARACTERS.matches(character);
+		return SPAN_MARKUP_CHARACTERS.indexOf(character) >= 0;
 	}
 
 	@Override
@@ -631,4 +629,4 @@ private void writeImageAttributes(Attributes attributes) throws IOException {
 			}
 		}
 	}
-}
+}
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableBlock.java b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableBlock.java
@@ -22,8 +22,6 @@
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
 import org.eclipse.mylyn.wikitext.parser.markup.Block;
 
-import com.google.common.base.CharMatcher;
-
 /**
  * Table block, matches blocks that start with <code>table. </code> or those that start with a table row.
  *
@@ -161,7 +159,7 @@ private boolean isNestableCellContent(String cellContent) {
 
 	private void emitMarkup(String text, int lineOffset) {
 		getConfluenceLanguage().emitMarkupLine(getParser(), state, lineOffset,
-				CharMatcher.whitespace().trimTrailingFrom(text), 0);
+				text.replaceAll("\\s+$", ""), 0);
 	}
 
 	private ConfluenceLanguage getConfluenceLanguage() {
@@ -240,4 +238,4 @@ private void ensureCellClosed() {
 			multiLineCell = false;
 		}
 	}
-}
+}
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.html/META-INF/MANIFEST.MF b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.html/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Bundle-Name: Mylyn WikiText HTML
 Bundle-Vendor: Eclipse Mylyn
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
-Import-Package: com.google.common.base;version="[33.0,34.0)",
- org.apache.commons.lang3;version="[3.14.0,4.0.0)",
+Import-Package: org.apache.commons.lang3;version="[3.14.0,4.0.0)",
  org.eclipse.mylyn.wikitext.parser;version="[4.2,5)",
  org.eclipse.mylyn.wikitext.parser.builder;version="[4.2,5)",
  org.eclipse.mylyn.wikitext.parser.css;version="[4.2,5)",
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategies.java b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategies.java
@@ -29,9 +29,6 @@
 import org.eclipse.mylyn.wikitext.parser.css.CssParser;
 import org.eclipse.mylyn.wikitext.parser.css.CssRule;
 
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Splitter;
-
 public class SpanStrategies extends ElementStrategies<SpanType, SpanStrategy, SpanHtmlElementStrategy> {
 
 	private static final Map<SpanType, List<SpanType>> spanTypeToAlternatives = createSpanTypeToAlternatives();
@@ -131,8 +128,9 @@ private SpanStrategy calculateAlternateSpanStrategy(Attributes attributes) {
 	}
 
 	private boolean isFontFamilyMonospace(CssRule rule) {
-		for (String value : Splitter.on(',').trimResults(CharMatcher.whitespace()).split(rule.value)) {
-			if ("monospace".equalsIgnoreCase(value)) { //$NON-NLS-1$
+		for (String value : rule.value.split(",")) { //$NON-NLS-1$
+			String trimmed = value.trim();
+			if ("monospace".equalsIgnoreCase(trimmed)) { //$NON-NLS-1$
 				return true;
 			}
 		}
@@ -148,4 +146,4 @@ private SpanStrategy calculateAlternateSpanStrategy(SpanType spanType) {
 		}
 		return null;
 	}
-}
+}
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.maven/pom.xml b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.maven/pom.xml
@@ -65,11 +65,6 @@
 			<version>3.4</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava.version}</version>
-		</dependency>
 		<dependency>
 		    <groupId>org.apache.commons</groupId>
 		    <artifactId>commons-lang3</artifactId>
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.textile.tests/META-INF/MANIFEST.MF b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.textile.tests/META-INF/MANIFEST.MF
@@ -8,8 +8,7 @@ Bundle-Vendor: Eclipse Mylyn
 Fragment-Host: org.eclipse.mylyn.wikitext.textile
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
-Import-Package: com.google.common.base;version="[33.0,34.0)",
- org.eclipse.mylyn.wikitext.parser;version="[4.2,5)",
+Import-Package: org.eclipse.mylyn.wikitext.parser;version="[4.2,5)",
  org.eclipse.mylyn.wikitext.parser.builder;version="[4.2,5)",
  org.eclipse.mylyn.wikitext.parser.markup;version="[4.2,5)",
  org.eclipse.mylyn.wikitext.parser.markup.block;version="[4.2,5)",
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.textile.tests/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/tests/TextileDocumentBuilderEntityReferenceTest.java b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.textile.tests/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/tests/TextileDocumentBuilderEntityReferenceTest.java
@@ -21,8 +21,6 @@
 import org.eclipse.mylyn.wikitext.textile.internal.TextileDocumentBuilder;
 import org.junit.Test;
 
-import com.google.common.base.CharMatcher;
-
 @SuppressWarnings({ "nls", "restriction" })
 public class TextileDocumentBuilderEntityReferenceTest {
 
@@ -80,7 +78,7 @@ private void assertCharacter(String expected, String character) {
 		builder.endDocument();
 
 		String markup = out.toString();
-		String expectedSequence = CharMatcher.whitespace().trimAndCollapseFrom("a " + expected + " test", ' ');
+		String expectedSequence = collapseAndTrimWhitespace("a " + expected + " test");
 		assertEquals(expectedSequence + "\n\n", markup);
 	}
 
@@ -95,4 +93,8 @@ private void assertEntityReference(String expected, String entity) {
 		assertEquals(expected + "\n\n", markup);
 	}
 
-}
+	private static String collapseAndTrimWhitespace(String input) {
+		return input.strip().replaceAll("\\s+", " ");
+	}
+
+}
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.textile/META-INF/MANIFEST.MF b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.textile/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-Name: Mylyn WikiText Textile
 Bundle-Vendor: Eclipse Mylyn
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
-Import-Package: com.google.common.base;version="[33.2.0,34.0.0)",
- org.apache.commons.collections4;version="[4.4.0,5.0.0)",
+Import-Package: org.apache.commons.collections4;version="[4.4.0,5.0.0)",
  org.apache.commons.collections4.multimap;version="[4.4.0,5.0.0)",
  org.eclipse.mylyn.wikitext.parser;version="[4.2,5)",
  org.eclipse.mylyn.wikitext.parser.builder;version="[4.2,5)",
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableBlock.java b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableBlock.java
@@ -22,8 +22,6 @@
 import org.eclipse.mylyn.wikitext.parser.markup.Block;
 import org.eclipse.mylyn.wikitext.textile.internal.Textile;
 
-import com.google.common.base.CharMatcher;
-
 /**
  * Table block, matches blocks that start with <code>table. </code> or those that start with a table row.
  *
@@ -125,7 +123,7 @@ public int processLineContent(String line, int offset) {
 			builder.beginBlock(header ? BlockType.TABLE_CELL_HEADER : BlockType.TABLE_CELL_NORMAL, attributes);
 
 			markupLanguage.emitMarkupLine(getParser(), state, textLineOffset,
-					CharMatcher.whitespace().trimTrailingFrom(text), 0);
+					text.replaceAll("\\s+$", ""), 0);
 
 			builder.endBlock(); // table cell
 		} while (rowMatcher.find());
@@ -155,4 +153,4 @@ public void setClosed(boolean closed) {
 		super.setClosed(closed);
 	}
 
-}
+}
diff --git a/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntities.java b/mylyn.docs/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntities.java
@@ -23,6 +23,7 @@
 import java.nio.charset.StandardCharsets;
 import java.text.Normalizer;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -36,19 +37,23 @@ class HtmlEntities {
 	private static HtmlEntities instance = new HtmlEntities();
 
 	private static Map<String, List<String>> readHtmlEntities() {
-		Map<String, List<String>> builder = new HashMap<>();
+		final Map<String, List<String>> builder = new HashMap<>();
 
 		try (BufferedReader reader = new BufferedReader(
 				new InputStreamReader(HtmlDocumentBuilder.class.getResourceAsStream("html-entity-references.txt"), //$NON-NLS-1$
 						StandardCharsets.UTF_8))) {
 
 			String line;
 			while ((line = reader.readLine()) != null) {
-				String[] lineItems = line.split("\s"); //$NON-NLS-1$
-				checkState(lineItems.length > 1);
-				for (int x = 1; x < lineItems.length; ++x) {
-					List<String> list = builder.computeIfAbsent(lineItems[0], i -> new ArrayList<>());
-					list.add(lineItems[x]);
+				final List<String> lineItems = Arrays.stream(line.split("\\s+")) //$NON-NLS-1$
+						.map(String::trim)
+						.filter(s -> !s.isEmpty())
+						.toList();
+				checkState(lineItems.size() > 1);
+				final String key = lineItems.get(0);
+				final List<String> values = builder.computeIfAbsent(key, k -> new ArrayList<>(lineItems.size()));
+				for (int x = 1; x < lineItems.size(); ++x) {
+					values.add(lineItems.get(x));
 				}
 			}
 		} catch (IOException e) {
@@ -99,4 +104,4 @@ private String numericEntityToString(String s) {
 		checkArgument(s.charAt(0) == '#');
 		return String.valueOf((char) Integer.parseInt(s.substring(1)));
 	}
-}
+}
diff --git a/mylyn.docs/wikitext/core/pom.xml b/mylyn.docs/wikitext/core/pom.xml
@@ -28,9 +28,6 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<guava.osgi>33.0</guava.osgi>
-		<guava.osgi.upper>34.0</guava.osgi.upper>
-		<guava.version>33.4.8-jre</guava.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 	</properties>
@@ -81,8 +78,6 @@
 						<Bundle-RequiredExecutionEnvironment>JavaSE-21</Bundle-RequiredExecutionEnvironment>
 						<Export-Package>
 							${project.artifactId}.internal*;x-internal:=true,${project.artifactId}*</Export-Package>
-						<Import-Package>!java.*, com.google.common*;
-							version="[${guava.osgi},${guava.osgi.upper})", *</Import-Package>
 						<Import-Package>!java.*, org.apache.commons.collections4*;
 							version="[4.4.0,5.0.0)", *</Import-Package>
 						<Import-Package>!java.*, org.apache.commons.lang3*;
diff --git a/mylyn.docs/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/pom.xml b/mylyn.docs/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/pom.xml
@@ -114,11 +114,6 @@
 					</execution>
 				</executions>
 				<dependencies>
-					<dependency>
-						<groupId>com.google.guava</groupId>
-						<artifactId>guava</artifactId>
-						<version>33.4.8-jre</version>
-					</dependency>
 					<dependency>
 					    <groupId>org.apache.commons</groupId>
 					    <artifactId>commons-collections4</artifactId>
diff --git a/org.eclipse.mylyn-site/category.xml b/org.eclipse.mylyn-site/category.xml
@@ -181,7 +181,6 @@
    <bundle id="com.google.gerrit.prettify"/>
    <bundle id="com.google.gerrit.reviewdb"/>
    <bundle id="com.google.gson"/>
-   <bundle id="com.google.guava"/>
    <bundle id="com.google.gwt.servlet"/>
    <bundle id="com.google.gwtjsonrpc"/>
    <bundle id="com.google.gwtorm"/>
diff --git a/org.eclipse.mylyn-target/org.eclipse.mylyn.target.target b/org.eclipse.mylyn-target/org.eclipse.mylyn.target.target
@@ -88,7 +88,6 @@
 			<unit id="org.apache.tika.core" version="0.0.0"/>
 			<unit id="com.github.ben-manes.caffeine" version="0.0.0"/>
 			<unit id="com.google.gson" version="0.0.0"/>
-			<unit id="com.google.guava" version="0.0.0"/>
 			<unit id="org.hamcrest" version="0.0.0"/>
 			<unit id="org.jsoup" version="0.0.0"/>
 			<unit id="org.junit" version="0.0.0"/>

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@`
`35`	`35`	`import org.eclipse.mylyn.wikitext.parser.builder.AbstractMarkupDocumentBuilder;`
`36`	`36`	`import org.eclipse.mylyn.wikitext.parser.builder.EntityReferences;`
`37`	`37`
`38`		`-import com.google.common.base.CharMatcher;`
`39`		`-`
`40`	`38`	`/**`
`41`	`39`	`* a document builder that emits Confluence markup`
`42`	`40`	`*`
`@@ -52,7 +50,7 @@ public class ConfluenceDocumentBuilder extends AbstractMarkupDocumentBuilder {`
`52`	`50`	`private static final Pattern PATTERN_MULTIPLE_NEWLINES = Pattern`
`53`	`51`	`.compile("(" + NEWLINE_REGEX + "(?:\\s+" + NEWLINE_REGEX + "\|" + NEWLINE_REGEX + ")+)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$`
`54`	`52`
`55`		`- private static final CharMatcher SPAN_MARKUP_CHARACTERS = CharMatcher.anyOf("*_+-^~{}[]?%@"); //$NON-NLS-1$`
	`53`	`+ private static final String SPAN_MARKUP_CHARACTERS = "*_+-^~{}[]?%@"; //$NON-NLS-1$`
`56`	`54`
`57`	`55`	`private final Map<String, String> entityToLiteral = new HashMap<>();`
`58`	`56`
`@@ -200,7 +198,7 @@ public final void close() throws IOException {`
`200`	`198`
`201`	`199`	`emitPrefix();`
`202`	`200`	`if (trimmingNewlinesAndWhitespace) {`
`203`		`- content = CharMatcher.whitespace().trimFrom(content);`
	`201`	`+ content = content.strip();`
`204`	`202`	`}`
`205`	`203`	`if (collapsingConsecutiveNewlines) {`
`206`	`204`	`content = PATTERN_MULTIPLE_NEWLINES.matcher(content).replaceAll("\n"); //$NON-NLS-1$`
`@@ -464,7 +462,7 @@ private boolean isEscapeCharacter(int i) {`
`464`	`462`	`}`
`465`	`463`
`466`	`464`	`private boolean isSpanMarkup(char character) {`
`467`		`- return SPAN_MARKUP_CHARACTERS.matches(character);`
	`465`	`+ return SPAN_MARKUP_CHARACTERS.indexOf(character) >= 0;`
`468`	`466`	`}`
`469`	`467`
`470`	`468`	`@Override`
`@@ -631,4 +629,4 @@ private void writeImageAttributes(Attributes attributes) throws IOException {`
`631`	`629`	`}`
`632`	`630`	`}`
`633`	`631`	`}`
`634`		`-}`
	`632`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@`
`22`	`22`	`import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;`
`23`	`23`	`import org.eclipse.mylyn.wikitext.parser.markup.Block;`
`24`	`24`
`25`		`-import com.google.common.base.CharMatcher;`
`26`		`-`
`27`	`25`	`/**`
`28`	`26`	`* Table block, matches blocks that start with <code>table. </code> or those that start with a table row.`
`29`	`27`	`*`
`@@ -161,7 +159,7 @@ private boolean isNestableCellContent(String cellContent) {`
`161`	`159`
`162`	`160`	`private void emitMarkup(String text, int lineOffset) {`
`163`	`161`	`getConfluenceLanguage().emitMarkupLine(getParser(), state, lineOffset,`
`164`		`- CharMatcher.whitespace().trimTrailingFrom(text), 0);`
	`162`	`+ text.replaceAll("\\s+$", ""), 0);`
`165`	`163`	`}`
`166`	`164`
`167`	`165`	`private ConfluenceLanguage getConfluenceLanguage() {`
`@@ -240,4 +238,4 @@ private void ensureCellClosed() {`
`240`	`238`	`multiLineCell = false;`
`241`	`239`	`}`
`242`	`240`	`}`
`243`		`-}`
	`241`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,6 @@`
`29`	`29`	`import org.eclipse.mylyn.wikitext.parser.css.CssParser;`
`30`	`30`	`import org.eclipse.mylyn.wikitext.parser.css.CssRule;`
`31`	`31`
`32`		`-import com.google.common.base.CharMatcher;`
`33`		`-import com.google.common.base.Splitter;`
`34`		`-`
`35`	`32`	`public class SpanStrategies extends ElementStrategies<SpanType, SpanStrategy, SpanHtmlElementStrategy> {`
`36`	`33`
`37`	`34`	`private static final Map<SpanType, List<SpanType>> spanTypeToAlternatives = createSpanTypeToAlternatives();`
`@@ -131,8 +128,9 @@ private SpanStrategy calculateAlternateSpanStrategy(Attributes attributes) {`
`131`	`128`	`}`
`132`	`129`
`133`	`130`	`private boolean isFontFamilyMonospace(CssRule rule) {`
`134`		`- for (String value : Splitter.on(',').trimResults(CharMatcher.whitespace()).split(rule.value)) {`
`135`		`- if ("monospace".equalsIgnoreCase(value)) { //$NON-NLS-1$`
	`131`	`+ for (String value : rule.value.split(",")) { //$NON-NLS-1$`
	`132`	`+ String trimmed = value.trim();`
	`133`	`+ if ("monospace".equalsIgnoreCase(trimmed)) { //$NON-NLS-1$`
`136`	`134`	`return true;`
`137`	`135`	`}`
`138`	`136`	`}`
`@@ -148,4 +146,4 @@ private SpanStrategy calculateAlternateSpanStrategy(SpanType spanType) {`
`148`	`146`	`}`
`149`	`147`	`return null;`
`150`	`148`	`}`
`151`		`-}`
	`149`	`+}`