build fix

This commit is contained in:
2015-07-14 21:27:37 +02:00
parent ace72938bd
commit 74c78b4b28
3 changed files with 12 additions and 11 deletions
@@ -41,6 +41,7 @@ import com.jpexs.decompiler.flash.helpers.hilight.HighlightData;
import com.jpexs.decompiler.flash.helpers.hilight.HighlightSpecialType;
import com.jpexs.decompiler.flash.helpers.hilight.Highlighting;
import com.jpexs.decompiler.flash.tags.ABCContainerTag;
import com.jpexs.decompiler.graph.DottedChain;
import java.awt.Point;
import java.util.ArrayList;
import java.util.List;
@@ -250,7 +251,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
return getMultinameAtPos(getCaretPosition());
}
public int getLocalDeclarationOfPos(int pos, Reference<String> type) {
public int getLocalDeclarationOfPos(int pos, Reference<DottedChain> type) {
Highlighting sh = Highlighting.searchPos(specialHighlights, pos);
Highlighting h = Highlighting.searchPos(highlights, pos);
@@ -275,7 +276,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
Highlighting ch = Highlighting.searchPos(classHighlights, pos);
int cindex = (int) ch.getProperties().index;
ABC abc = getABC();
type.setVal(abc.instance_info.get(cindex).getName(abc.constants).getNameWithNamespace(abc.constants).toString());
type.setVal(abc.instance_info.get(cindex).getName(abc.constants).getNameWithNamespace(abc.constants));
return ch.startPos;
}
@@ -329,15 +330,15 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
if (t.type != TokenType.IDENTIFIER && t.type != TokenType.KEYWORD || t.type == TokenType.REGEX) {
return false;
}
Reference<String> locTypeRef = new Reference<>("");
Reference<DottedChain> locTypeRef = new Reference<>(DottedChain.EMPTY);
getLocalDeclarationOfPos(t.start, locTypeRef);
String currentType = locTypeRef.getVal();
if (currentType.equals("*")) {
DottedChain currentType = locTypeRef.getVal();
if (currentType.equals(DottedChain.ALL)) {
return false;
}
boolean found;
t = sd.getNextToken(t);
while (t != lastToken && !currentType.equals("*")) {
while (t != lastToken && !currentType.equals(DottedChain.ALL)) {
t = sd.getNextToken(t);
String ident = t.getString(sd);
found = false;
@@ -356,7 +357,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
traitIndex.setVal(j);
classTrait.setVal(false);
multinameIndex.setVal(tr.name_index);
currentType = ii.getName(a.constants).getNameWithNamespace(a.constants).toString();
currentType = ii.getName(a.constants).getNameWithNamespace(a.constants);
found = true;
break loopi;
}
@@ -371,7 +372,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
traitIndex.setVal(j);
classTrait.setVal(true);
multinameIndex.setVal(tr.name_index);
currentType = ii.getName(a.constants).getNameWithNamespace(a.constants).toString();
currentType = ii.getName(a.constants).getNameWithNamespace(a.constants);
found = true;
break loopi;
}