MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

encapsulate fields

Browse Source
This commit is contained in:
Eugene Kudelevsky
2010-05-07 15:52:52 +04:00
parent 53fa445efb
commit 688e7ffc27
6 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/template/zencoding/NumberToken.java
+5 -1
View File
@@ -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;
}
}
xml/impl/src/com/intellij/codeInsight/template/zencoding/OperationToken.java
+5 -1
View File
@@ -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;
}
}
xml/impl/src/com/intellij/codeInsight/template/zencoding/TemplateToken.java
+9 -1
View File
@@ -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;
}
}
xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingInterpreter.java
+4 -4
View File
@@ -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();
xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingTemplate.java
+1 -1
View File
@@ -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;
}
xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java
+2 -2
View File
@@ -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 {