Revision: 9194
http://languagetool.svn.sourceforge.net/languagetool/?rev=9194&view=rev
Author: dnaber
Date: 2013-01-23 22:13:48 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
remove duplicate classes
Modified Paths:
--------------
trunk/languagetool/languagetool-gui-commons/src/main/java/org/languagetool/gui/Tools.java
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/ResultArea.java
Removed Paths:
-------------
trunk/languagetool/languagetool-gui-commons/src/main/java/org/languagetool/gui/ContextTools.java
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/ResourceBundleWithFallback.java
Deleted:
trunk/languagetool/languagetool-gui-commons/src/main/java/org/languagetool/gui/ContextTools.java
===================================================================
---
trunk/languagetool/languagetool-gui-commons/src/main/java/org/languagetool/gui/ContextTools.java
2013-01-23 21:53:44 UTC (rev 9193)
+++
trunk/languagetool/languagetool-gui-commons/src/main/java/org/languagetool/gui/ContextTools.java
2013-01-23 22:13:48 UTC (rev 9194)
@@ -1,104 +0,0 @@
-/* LanguageTool, a natural language style checker
- * Copyright (C) 2012 Daniel Naber (http://www.danielnaber.de)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-package org.languagetool.gui;
-
-import org.languagetool.tools.StringTools;
-
-/**
- * Helper class to mark errors in text.
- */
-public class ContextTools {
-
- private int contextSize = 40;
- private boolean escapeHtml = true;
- private String errorMarkerStart = "<b><font bgcolor=\"#ff8b8b\">";
- private String errorMarkerEnd = "</font></b>";
-
- public ContextTools() {
- }
-
- public String getContext(final int fromPos, final int toPos, String text) {
- text = text.replace('\n', ' ');
- // calculate context region:
- int startContent = fromPos - contextSize;
- String prefix = "...";
- String postfix = "...";
- String markerPrefix = " ";
- if (startContent < 0) {
- prefix = "";
- markerPrefix = "";
- startContent = 0;
- }
- int endContent = toPos + contextSize;
- final int fileLen = text.length();
- if (endContent > fileLen) {
- postfix = "";
- endContent = fileLen;
- }
- // make "^" marker. inefficient but robust implementation:
- final StringBuilder marker = new StringBuilder();
- final int totalLen = fileLen + prefix.length();
- for (int i = 0; i < totalLen; i++) {
- if (i >= fromPos && i < toPos) {
- marker.append('^');
- } else {
- marker.append(' ');
- }
- }
- // now build context string plus marker:
- final StringBuilder sb = new StringBuilder();
- sb.append(prefix);
- sb.append(text.substring(startContent, endContent));
- final String markerStr = markerPrefix
- + marker.substring(startContent, endContent);
- sb.append(postfix);
- final int startMark = markerStr.indexOf('^');
- final int endMark = markerStr.lastIndexOf('^');
- String result = sb.toString();
- if (escapeHtml) {
- final String escapedErrorPart =
StringTools.escapeHTML(result.substring(startMark, endMark + 1))
- .replace(" ", " "); // make sure whitespace errors are
visible
- result = StringTools.escapeHTML(result.substring(0, startMark))
- + errorMarkerStart
- + escapedErrorPart
- + errorMarkerEnd + StringTools.escapeHTML(result.substring(endMark +
1));
- } else {
- result = result.substring(0, startMark) + errorMarkerStart
- + result.substring(startMark, endMark + 1) + errorMarkerEnd
- + result.substring(endMark + 1);
- }
- return result;
- }
-
- public void setErrorMarkerStart(String errorMarkerStart) {
- this.errorMarkerStart = errorMarkerStart;
- }
-
- public void setErrorMarkerEnd(String errorMarkerEnd) {
- this.errorMarkerEnd = errorMarkerEnd;
- }
-
- public void setContextSize(int contextSize) {
- this.contextSize = contextSize;
- }
-
- public void setEscapeHtml(boolean escapeHtml) {
- this.escapeHtml = escapeHtml;
- }
-}
Modified:
trunk/languagetool/languagetool-gui-commons/src/main/java/org/languagetool/gui/Tools.java
===================================================================
---
trunk/languagetool/languagetool-gui-commons/src/main/java/org/languagetool/gui/Tools.java
2013-01-23 21:53:44 UTC (rev 9193)
+++
trunk/languagetool/languagetool-gui-commons/src/main/java/org/languagetool/gui/Tools.java
2013-01-23 22:13:48 UTC (rev 9194)
@@ -18,6 +18,8 @@
*/
package org.languagetool.gui;
+import org.languagetool.tools.ContextTools;
+
import java.awt.Frame;
import java.io.File;
import java.text.MessageFormat;
Deleted:
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/ResourceBundleWithFallback.java
===================================================================
---
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/ResourceBundleWithFallback.java
2013-01-23 21:53:44 UTC (rev 9193)
+++
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/ResourceBundleWithFallback.java
2013-01-23 22:13:48 UTC (rev 9194)
@@ -1,34 +0,0 @@
-package org.languagetool.gui;
-
-import java.util.Enumeration;
-import java.util.ResourceBundle;
-
-/**
- * A resource bundle that uses its fallback resource bundle if the
- * value from the original bundle is null or empty.
- */
-public class ResourceBundleWithFallback extends ResourceBundle {
-
- private final ResourceBundle bundle;
- private final ResourceBundle fallbackBundle;
-
- public ResourceBundleWithFallback(ResourceBundle bundle, ResourceBundle
fallbackBundle) {
- this.bundle = bundle;
- this.fallbackBundle = fallbackBundle;
- }
-
- @Override
- public Object handleGetObject(String key) {
- final String string = bundle.getString(key);
- if (string.trim().isEmpty()) {
- return fallbackBundle.getString(key);
- }
- return string;
- }
-
- @Override
- public Enumeration<String> getKeys() {
- return bundle.getKeys();
- }
-
-}
Modified:
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/ResultArea.java
===================================================================
---
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/ResultArea.java
2013-01-23 21:53:44 UTC (rev 9193)
+++
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/ResultArea.java
2013-01-23 22:13:48 UTC (rev 9194)
@@ -23,6 +23,7 @@
import org.languagetool.rules.Rule;
import org.languagetool.rules.RuleMatch;
import org.languagetool.rules.spelling.SpellingCheckRule;
+import org.languagetool.tools.ContextTools;
import org.languagetool.tools.StringTools;
import javax.swing.*;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
