From 688e7ffc27b3905edd82bbcc6421152b5e74d921 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Fri, 7 May 2010 15:52:52 +0400
Subject: [PATCH] encapsulate fields

---
 .../codeInsight/template/zencoding/NumberToken.java    |  6 +++++-
 .../codeInsight/template/zencoding/OperationToken.java |  6 +++++-
 .../codeInsight/template/zencoding/TemplateToken.java  | 10 +++++++++-
 .../template/zencoding/XmlZenCodingInterpreter.java    |  8 ++++----
 .../template/zencoding/XmlZenCodingTemplate.java       |  2 +-
 .../template/zencoding/ZenCodingTemplate.java          |  4 ++--
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/NumberToken.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/NumberToken.java
index 4adf4f763c59..d101c8f4325f 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/NumberToken.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/NumberToken.java
@@ -19,9 +19,13 @@ package com.intellij.codeInsight.template.zencoding;
  * @author Eugene.Kudelevsky
  */
 class NumberToken extends Token {
-  final int myNumber;
+  private final int myNumber;
 
   NumberToken(int number) {
     myNumber = number;
   }
+
+  public int getNumber() {
+    return myNumber;
+  }
 }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/OperationToken.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/OperationToken.java
index 63bb2d343e6c..b33e164eee8e 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/OperationToken.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/OperationToken.java
@@ -19,9 +19,13 @@ package com.intellij.codeInsight.template.zencoding;
  * @author Eugene.Kudelevsky
  */
 class OperationToken extends Token {
-  final char mySign;
+  private final char mySign;
 
   OperationToken(char sign) {
     mySign = sign;
   }
+
+  public char getSign() {
+    return mySign;
+  }
 }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/TemplateToken.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/TemplateToken.java
index 565e8d1114aa..2092f955801c 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/TemplateToken.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/TemplateToken.java
@@ -28,7 +28,7 @@ public class TemplateToken extends Token {
   private final String myKey;
   private final List<Pair<String, String>> myAttribute2Value;
   private TemplateImpl myTemplate;
-  public XmlTag myTag;
+  private XmlTag myTag;
 
   public TemplateToken(String key, List<Pair<String, String>> attribute2value) {
     myKey = key;
@@ -50,4 +50,12 @@ public class TemplateToken extends Token {
   public TemplateImpl getTemplate() {
     return myTemplate;
   }
+
+  public XmlTag getTag() {
+    return myTag;
+  }
+
+  public void setTag(XmlTag tag) {
+    myTag = tag;
+  }
 }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingInterpreter.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingInterpreter.java
index 826b83e747a3..45822cbe0f6f 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingInterpreter.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingInterpreter.java
@@ -118,7 +118,7 @@ class XmlZenCodingInterpreter {
         case OPERATION:
           if (templateToken != null) {
             if (token instanceof MarkerToken || token instanceof OperationToken) {
-              final char sign = token instanceof OperationToken ? ((OperationToken)token).mySign : ZenCodingTemplate.MARKER;
+              final char sign = token instanceof OperationToken ? ((OperationToken)token).getSign() : ZenCodingTemplate.MARKER;
               if (sign == '+' || (mySurroundedText == null && sign == ZenCodingTemplate.MARKER)) {
                 final Object key = new Object();
                 myCallback.fixStartOfTemplate(key);
@@ -156,7 +156,7 @@ class XmlZenCodingInterpreter {
           break;
         case NUMBER:
           if (token instanceof NumberToken) {
-            number = ((NumberToken)token).myNumber;
+            number = ((NumberToken)token).getNumber();
             myState = State.AFTER_NUMBER;
           }
           else {
@@ -165,7 +165,7 @@ class XmlZenCodingInterpreter {
           break;
         case AFTER_NUMBER:
           if (token instanceof MarkerToken || token instanceof OperationToken) {
-            char sign = token instanceof OperationToken ? ((OperationToken)token).mySign : ZenCodingTemplate.MARKER;
+            char sign = token instanceof OperationToken ? ((OperationToken)token).getSign() : ZenCodingTemplate.MARKER;
             if (sign == '+' || (mySurroundedText == null && sign == ZenCodingTemplate.MARKER)) {
               invokeTemplateSeveralTimes(templateToken, 0, number);
               templateToken = null;
@@ -310,7 +310,7 @@ class XmlZenCodingInterpreter {
     if (token.getTemplate() != null) {
       if (attr2value.size() > 0 || XmlZenCodingTemplate.isTrueXml(callback)) {
         TemplateImpl modifiedTemplate = token.getTemplate().copy();
-        XmlTag tag = token.myTag;
+        XmlTag tag = token.getTag();
         if (tag != null) {
           for (Iterator<Pair<String, String>> iterator = attr2value.iterator(); iterator.hasNext();) {
             Pair<String, String> pair = iterator.next();
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingTemplate.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingTemplate.java
index bf34318856a1..9d4613080d16 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingTemplate.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingTemplate.java
@@ -208,7 +208,7 @@ public class XmlZenCodingTemplate extends ZenCodingTemplate {
       if (!XmlZenCodingInterpreter.containsAttrsVar(template) && token.getAttribute2Value().size() > 0) {
         addMissingAttributes(tag, token.getAttribute2Value());
       }
-      token.myTag = tag;
+      token.setTag(tag);
     }
     return token;
   }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java
index 7059e37af21c..cb9a70bc117c 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java
@@ -96,7 +96,7 @@ public abstract class ZenCodingTemplate implements CustomLiveTemplate {
       switch (state) {
         case OPERATION:
           if (token instanceof OperationToken) {
-            state = ((OperationToken)token).mySign == '*' ? State.NUMBER : State.WORD;
+            state = ((OperationToken)token).getSign() == '*' ? State.NUMBER : State.WORD;
           }
           else {
             return false;
@@ -119,7 +119,7 @@ public abstract class ZenCodingTemplate implements CustomLiveTemplate {
           }
           break;
         case AFTER_NUMBER:
-          if (token instanceof OperationToken && ((OperationToken)token).mySign != '*') {
+          if (token instanceof OperationToken && ((OperationToken)token).getSign() != '*') {
             state = State.WORD;
           }
           else {