2021-01-18 9:00 JST 〜 メンテナンスによるサービス全停止予定
  • R/O
  • SSH
  • HTTPS

nine: コミット


コミットメタ情報

リビジョン70 (tree)
日時2010-08-07 16:35:26
作者mshio

ログメッセージ

update files that are forgotten to be committed...

変更サマリ

差分

--- nine-javascript-mode/trunk/src/jp/sourceforge/nine/parser/javascriptmode/JsTokenizer.java (revision 69)
+++ nine-javascript-mode/trunk/src/jp/sourceforge/nine/parser/javascriptmode/JsTokenizer.java (revision 70)
@@ -91,7 +91,7 @@
9191 private void setEndStatus(TokenLine<JsType, JsStatus> line, JsStatus preStatus) {
9292 statusManager.setCurrentStatus(preStatus);
9393 for (Token<JsType> token: line) {
94- statusManager.switchStatus(token.getType());
94+ statusManager.switchStatus(token.type);
9595 }
9696 statusManager.sendLineEnd();
9797 line.setEndStatus(statusManager.getStatus());
@@ -100,7 +100,7 @@
100100 public void setTokenIntoLine(JsType type, int offset, int length) {
101101 if (iterator.hasNext()) {
102102 Token<JsType> t = iterator.next();
103- if (t.getType() != type || t.getOffset() != offset || t.getLength() != length) {
103+ if (t.type != type || t.getOffset() != offset || t.length != length) {
104104 Token<JsType> token = new Token<JsType>(type, offset, length);
105105 iterator.set(token);
106106 }
--- nine-shellscript-mode/trunk/src/jp/sourceforge/nine/parser/shellscript/EasyTokenizer.java (revision 69)
+++ nine-shellscript-mode/trunk/src/jp/sourceforge/nine/parser/shellscript/EasyTokenizer.java (revision 70)
@@ -89,8 +89,8 @@
8989 private void setTokenIntoLine(EasyType type, int offset, int length) {
9090 if (iterator.hasNext()) {
9191 Token<EasyType> t = iterator.next();
92- if (t.getType() != type || t.getOffset() != offset ||
93- t.getLength() != length) {
92+ if (t.type != type || t.getOffset() != offset ||
93+ t.length != length) {
9494 Token<EasyType> token = new Token<EasyType>(type, offset, length);
9595 iterator.set(token);
9696 }
--- nine-xml-mode/trunk/src/jp/sourceforge/nine/xmlmode/HighlightCaretListener.java (revision 69)
+++ nine-xml-mode/trunk/src/jp/sourceforge/nine/xmlmode/HighlightCaretListener.java (revision 70)
@@ -90,9 +90,9 @@
9090 statusManager.setCurrentStatus(prevStatus);
9191 for (Token<XmlType> t : line) {
9292 int offs = t.getOffset();
93- XmlType type = t.getType();
93+ XmlType type = t.type;
9494 statusManager.switchStatus(type);
95- if (offs <= pl && pl <= offs + t.getLength()) {
95+ if (offs <= pl && pl <= offs + t.length) {
9696 XmlStatus status = statusManager.getStatus();
9797 if (status == XmlStatus.ELEMENT &&
9898 type == XmlType.ELEMENT_START) {
@@ -133,7 +133,7 @@
133133 int start = root.getElement(i).getStartOffset();
134134 for (Token<XmlType> t : line) {
135135 int offs = t.getOffset();
136- XmlType type = t.getType();
136+ XmlType type = t.type;
137137 statusManager.switchStatus(type);
138138 int p = offs + start;
139139 if (p > position &&
@@ -159,7 +159,7 @@
159159 int start = root.getElement(i).getStartOffset();
160160 for (Token<XmlType> t : line) {
161161 int offs = t.getOffset();
162- XmlType type = t.getType();
162+ XmlType type = t.type;
163163 statusManager.switchStatus(type);
164164 int p = offs + start;
165165 if (p < position &&
--- nine-xml-mode/trunk/src/jp/sourceforge/nine/parser/xmlmode/XmlTokenizer.java (revision 69)
+++ nine-xml-mode/trunk/src/jp/sourceforge/nine/parser/xmlmode/XmlTokenizer.java (revision 70)
@@ -73,7 +73,7 @@
7373 private void setEndStatus(TokenLine<XmlType, XmlStatus> line, XmlStatus preStatus) {
7474 statusManager.setCurrentStatus(preStatus);
7575 for (Token<XmlType> t : line) {
76- statusManager.switchStatus(t.getType());
76+ statusManager.switchStatus(t.type);
7777 }
7878 statusManager.sendLineEnd();
7979 line.setEndStatus(statusManager.getStatus());
@@ -103,8 +103,7 @@
103103 private void setTokenIntoLine(XmlType type, int startOffs, int length) {
104104 if (iterator.hasNext()) {
105105 Token<XmlType> t = iterator.next();
106- if (t.getType() != type || t.getOffset() != startOffs ||
107- t.getLength() != length) {
106+ if (t.type != type || t.getOffset() != startOffs || t.length != length) {
108107 Token<XmlType> token = new Token<XmlType>(type, startOffs, length);
109108 iterator.set(token);
110109 }
@@ -156,7 +155,7 @@
156155 // check the type of previous token...
157156 // NOTE: Slash in the closing tag is marked as XmlType.ELEMENT.
158157 if (tokenizer.iterator.hasPrevious()) {
159- XmlType prevType = tokenizer.iterator.previous().getType();
158+ XmlType prevType = tokenizer.iterator.previous().type;
160159 XmlType type = (prevType == XmlType.ELEMENT_START ||
161160 prevType == XmlType.ELEMENT) ?
162161 XmlType.ELEMENT : XmlType.NORMAL;
@@ -227,7 +226,7 @@
227226 int n = offset - position;
228227 Token<XmlType> t = tokenizer.iterator.previous();
229228 tokenizer.iterator.next();
230- if (t.getType() == XmlType.ELEMENT) {
229+ if (t.type == XmlType.ELEMENT) {
231230 XmlType type = XmlType.ELEMENT;
232231 for (int i = 0; i < position; i++) {
233232 if (buf[i] != '-') { type = XmlType.MARK; }
--- nine-xml-mode/trunk/src/jp/sourceforge/nine/action/xmlmode/TabulateAction.java (revision 69)
+++ nine-xml-mode/trunk/src/jp/sourceforge/nine/action/xmlmode/TabulateAction.java (revision 70)
@@ -136,13 +136,13 @@
136136 TargetLineInfo.originalIndent = 0;
137137 while (it.hasNext()) {
138138 Token<XmlType> token = it.next();
139- XmlType type = token.getType();
139+ XmlType type = token.type;
140140 if (type != XmlType.WHITE_SPACE) {
141141 TargetLineInfo.originalIndent = token.getOffset();
142142 if (status == XmlStatus.NORMAL &&
143143 type == XmlType.ELEMENT_START &&
144144 it.hasNext() &&
145- (token = it.next()).getType() == XmlType.ELEMENT) {
145+ (token = it.next()).type == XmlType.ELEMENT) {
146146 Element el = doc.getDefaultRootElement().getElement(row);
147147 int s = el.getStartOffset();
148148 TargetLineInfo.closingTag =
@@ -184,7 +184,7 @@
184184 getDocumentChar(doc, x - 1) == '/';
185185 currentIsCloseTag = false;
186186 } else if (startParser.elementStartOffset != -1) {
187- if (it.next().getType() == XmlType.ELEMENT && ret == -1) {
187+ if (it.next().type == XmlType.ELEMENT && ret == -1) {
188188 ret = startParser.elementStartOffset;
189189 }
190190 it.previous();
@@ -191,13 +191,13 @@
191191 }
192192 clearParser();
193193 }
194- XmlType type = token.getType();
194+ XmlType type = token.type;
195195 if (ret == -1 && type != XmlType.WHITE_SPACE) {
196196 if (statusManager.getStatus() == XmlStatus.ELEMENT &&
197197 type == XmlType.MARK) {
198198 int x = token.getOffset() + rowStartOffset;
199199 if (getDocumentChar(doc, x) == '/') {
200- boolean b = (it.next().getType() == XmlType.ELEMENT_END);
200+ boolean b = (it.next().type == XmlType.ELEMENT_END);
201201 if (b) { TargetLineInfo.prevIsCloseTag = true; }
202202 it.previous();
203203 }
@@ -237,7 +237,7 @@
237237 attrPos = token.getOffset();
238238 break;
239239 }
240- statusManager.switchStatus(token.getType());
240+ statusManager.switchStatus(token.type);
241241 }
242242 if (attrPos != -1) {
243243 ret = attrPos;
@@ -322,7 +322,7 @@
322322
323323 public boolean check(Token<XmlType> token) {
324324 boolean b = statusManager.getStatus() == XmlStatus.ELEMENT;
325- b = b && token.getType() == XmlType.ELEMENT_END;
325+ b = b && token.type == XmlType.ELEMENT_END;
326326 if (b) { elementEndOffset = token.getOffset(); }
327327 return b;
328328 }
@@ -337,7 +337,7 @@
337337
338338 public boolean check(Token<XmlType> token) {
339339 boolean b = statusManager.getStatus() == XmlStatus.ELEMENT;
340- b = b && token.getType() == XmlType.NORMAL;
340+ b = b && token.type == XmlType.NORMAL;
341341 if (b) { attributeOffset = token.getOffset(); }
342342 return b;
343343 }
@@ -353,7 +353,7 @@
353353
354354 public boolean check(Token<XmlType> token) {
355355 boolean b = statusManager.getStatus() == XmlStatus.ELEMENT;
356- b = b && token.getType() == XmlType.ELEMENT;
356+ b = b && token.type == XmlType.ELEMENT;
357357 if (b) { nameStartOffset = token.getOffset(); }
358358 return b;
359359 }
@@ -368,7 +368,7 @@
368368
369369 public boolean check(Token<XmlType> token) {
370370 boolean b = statusManager.getStatus() == XmlStatus.NORMAL;
371- b = b && token.getType() == XmlType.ELEMENT_START;
371+ b = b && token.type == XmlType.ELEMENT_START;
372372 if (b) { elementStartOffset = token.getOffset(); }
373373 return b;
374374 }
--- nine-java-mode/trunk/src/jp/sourceforge/nine/javamode/HighlightCaretListener.java (revision 69)
+++ nine-java-mode/trunk/src/jp/sourceforge/nine/javamode/HighlightCaretListener.java (revision 70)
@@ -68,10 +68,10 @@
6868 JavaStatus.NORMAL : tokenlist.get(row - 1).getEndStatus();
6969 statusManager.setCurrentStatus(status);
7070 for (Token<JavaType> token : line) {
71- JavaType type = token.getType();
71+ JavaType type = token.type;
7272 statusManager.switchStatus(type);
7373 if (statusManager.getStatus() == JavaStatus.NORMAL &&
74- token.getOffset() + token.getLength() == col) {
74+ token.getOffset() + token.length == col) {
7575 boolean searchForward = false;
7676 JavaType searchType = null;
7777 switch (type) {
@@ -117,16 +117,16 @@
117117 for (int i = row; i < tokenlist.size(); i++) {
118118 TokenLine<JavaType, JavaStatus> line = tokenlist.get(i);
119119 for (Token<JavaType> t : line) {
120- statusManager.switchStatus(t.getType());
120+ statusManager.switchStatus(t.type);
121121 if (statusManager.getStatus() == JavaStatus.NORMAL &&
122122 ! (i == row && t.getOffset() < col)) {
123- if (t.getType() == search) {
123+ if (t.type == search) {
124124 if (count-- == 0) {
125125 int offs = getRowStartOffset(i) + t.getOffset();
126126 highlight(offs);
127127 return;
128128 }
129- } else if (t.getType() == type) {
129+ } else if (t.type == type) {
130130 count++;
131131 }
132132 }
@@ -141,8 +141,8 @@
141141 TokenLine<JavaType, JavaStatus> line = tokenlist.get(i);
142142 for (int j = line.size() - 1; j >= 0; j--) {
143143 Token<JavaType> token = line.get(j);
144- if (i == row && token.getOffset() + token.getLength() >= col) { continue; }
145- if (token.getType() == search) {
144+ if (i == row && token.getOffset() + token.length >= col) { continue; }
145+ if (token.type == search) {
146146 if (statusIsNormal(i, j)) {
147147 if (count-- == 0) {
148148 int offs = getRowStartOffset(i) + token.getOffset();
@@ -150,7 +150,7 @@
150150 return;
151151 }
152152 }
153- } else if (token.getType() == type) {
153+ } else if (token.type == type) {
154154 if (statusIsNormal(i, j)) { count++; }
155155 }
156156 }
@@ -164,7 +164,7 @@
164164 TokenLine<JavaType, JavaStatus> line = tokenlist.get(row);
165165 for (int i = 0; i < line.size(); i++) {
166166 Token<JavaType> token = line.get(i);
167- statusManager.switchStatus(token.getType());
167+ statusManager.switchStatus(token.type);
168168 if (i == tokenOffset) {
169169 return statusManager.getStatus() == JavaStatus.NORMAL;
170170 }
--- nine-java-mode/trunk/src/jp/sourceforge/nine/action/javamode/JavaTabAction.java (revision 69)
+++ nine-java-mode/trunk/src/jp/sourceforge/nine/action/javamode/JavaTabAction.java (revision 70)
@@ -139,7 +139,7 @@
139139
140140 for (TokenLine<JavaType, JavaStatus> l : list) {
141141 for (Token<JavaType> t : l) {
142- JavaType type = t.getType();
142+ JavaType type = t.type;
143143 statusManager.switchStatus(type);
144144 if (statusManager.getStatus() != JavaStatus.NORMAL) { continue; }
145145 switch (type) {
@@ -174,7 +174,7 @@
174174 if (stack.isEmpty()) { return; }
175175 KeywordInfo b = stack.peek();
176176 if (b != null) {
177- JavaType t = b.token.getType();
177+ JavaType t = b.token.type;
178178 if (t == JavaType.KW_IF || t == JavaType.KW_FOR || t == JavaType.KW_WHILE) {
179179 stack.pop();
180180 }
@@ -190,7 +190,8 @@
190190 return s == e ? "" : t.getText().substring(s, e);
191191 }
192192
193- private String getIndentText(String text, Token<JavaType> token, boolean closed) {
193+ private String getIndentText(String text,
194+ Token<JavaType> token, boolean closed) {
194195 int left = 0;
195196 for (char ch : text.toCharArray()) {
196197 if (ch != ' ' && ch != '\t') break;
@@ -197,7 +198,7 @@
197198 left++;
198199 }
199200 String indent = text.substring(0, left);
200- JavaType t = token.getType();
201+ JavaType t = token.type;
201202 if (t == JavaType.BRACE_BEGIN) {
202203 return closed ? indent : indent + "\t";
203204 } else if (t == JavaType.BRACKET_BEGIN || t == JavaType.PARENTHESIS_BEGIN) {
旧リポジトリブラウザで表示