Fix privacy of members

filiph · May 25, 2016 · a01fa5e · a01fa5e
1 parent 80ee3d9
commit a01fa5e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/lib/html_unescape.dart b/lib/html_unescape.dart
@@ -9,7 +9,7 @@ import 'src/base.dart';
 import 'src/data/named_chars_all.dart' as data;
 
 class HtmlUnescape extends HtmlUnescapeBase {
-  int maxKeyLength = data.maxKeyLength;
-  List<String> keys = data.keys;
-  List<String> values = data.values;
+  int _maxKeyLength = data.maxKeyLength;
+  List<String> _keys = data.keys;
+  List<String> _values = data.values;
 }
diff --git a/lib/html_unescape_small.dart b/lib/html_unescape_small.dart
@@ -10,7 +10,7 @@ import 'src/base.dart';
 import 'src/data/named_chars_basic.dart' as data;
 
 class HtmlUnescape extends HtmlUnescapeBase {
-  int maxKeyLength = data.maxKeyLength;
-  List<String> keys = data.keys;
-  List<String> values = data.values;
+  int _maxKeyLength = data.maxKeyLength;
+  List<String> _keys = data.keys;
+  List<String> _values = data.values;
 }
diff --git a/lib/src/base.dart b/lib/src/base.dart
@@ -10,15 +10,15 @@ abstract class HtmlUnescapeBase extends Converter<String, String> {
   final int _hashCodeUnit = '#'.codeUnitAt(0);
   final int _xCodeUnit = 'x'.codeUnitAt(0);
 
-  List<String> get keys;
-  List<String> get values;
-  int get maxKeyLength;
+  List<String> get _keys;
+  List<String> get _values;
+  int get _maxKeyLength;
 
   HtmlUnescapeBase() {
-    _chunkLength = max(maxKeyLength, _minHexadecimalEscapeLength);
+    _chunkLength = max(_maxKeyLength, _minHexadecimalEscapeLength);
   }
 
-  @override
+  /// Converts from HTML-escaped [data] to unescaped string.
   String convert(String data) {
     // Return early if possible.
     if (data.indexOf('&') == -1) return data;
@@ -57,10 +57,10 @@ abstract class HtmlUnescapeBase extends Converter<String, String> {
 
       // Try &nbsp;
       var replaced = false;
-      for (int i = 0; i < keys.length; i++) {
-        var key = keys[i];
+      for (int i = 0; i < _keys.length; i++) {
+        var key = _keys[i];
         if (chunk.startsWith(key)) {
-          var replacement = values[i];
+          var replacement = _values[i];
           buf.write(replacement);
           offset += key.length;
           replaced = true;