mirror of
https://github.com/processing/processing4.git
synced 2026-02-14 02:45:36 +01:00
Dunno how I wrote such bad code earlier. Lol
This commit is contained in:
@@ -1970,82 +1970,6 @@ public class ASTGenerator {
|
||||
});
|
||||
}
|
||||
|
||||
/*
|
||||
protected void refactorIt(){
|
||||
String newName = txtRenameField.getText().trim();
|
||||
String selText = lastClickedWord == null ? editor.ta.getSelectedText()
|
||||
: lastClickedWord;
|
||||
DefaultMutableTreeNode defCU = findAllOccurrences();
|
||||
if(defCU == null){
|
||||
editor.statusError("Can't locate definition of " + selText);
|
||||
return;
|
||||
}
|
||||
|
||||
if(!newName.matches("([a-zA-Z][a-zA-Z0-9_]*)|([_][a-zA-Z0-9_]+)"))
|
||||
{
|
||||
JOptionPane.showConfirmDialog(new JFrame(), newName
|
||||
+ " isn't a valid name.", "Uh oh..", JOptionPane.PLAIN_MESSAGE);
|
||||
return;
|
||||
}
|
||||
//else log("New name looks K.");
|
||||
|
||||
errorCheckerService.pauseThread();
|
||||
if(treeRename.isVisible()){
|
||||
treeRename.setModel(new DefaultTreeModel(defCU));
|
||||
((DefaultTreeModel) treeRename.getModel()).reload();
|
||||
}
|
||||
frmOccurenceList.setTitle("Usage of " + selText);
|
||||
frmOccurenceList.setLocation(editor.getX() + editor.getWidth(),editor.getY());
|
||||
frmOccurenceList.setVisible(true);
|
||||
int lineOffsetDisplacementConst = newName.length()
|
||||
- selText.length();
|
||||
HashMap<Integer, Integer> lineOffsetDisplacement = new HashMap<Integer, Integer>();
|
||||
|
||||
// I need to store the pde and java offsets beforehand because once
|
||||
// the replace starts, all offsets returned are affected
|
||||
int offsetsMap[][][] = new int[defCU.getChildCount()][2][];
|
||||
for (int i = 0; i < defCU.getChildCount(); i++) {
|
||||
ASTNodeWrapper awrap = (ASTNodeWrapper) ((DefaultMutableTreeNode) (defCU
|
||||
.getChildAt(i))).getUserObject();
|
||||
offsetsMap[i][0] = awrap.getPDECodeOffsets(errorCheckerService);
|
||||
offsetsMap[i][1] = awrap.getJavaCodeOffsets(errorCheckerService);
|
||||
}
|
||||
|
||||
for (int i = 0; i < defCU.getChildCount(); i++) {
|
||||
int pdeoffsets[] = offsetsMap[i][0];
|
||||
int javaoffsets[] = offsetsMap[i][1];
|
||||
// correction for pde enhancements related displacement on a line
|
||||
int off = 0;
|
||||
if (lineOffsetDisplacement.get(javaoffsets[0]) != null) {
|
||||
off = lineOffsetDisplacement.get(javaoffsets[0]);
|
||||
|
||||
lineOffsetDisplacement.put(javaoffsets[0],
|
||||
lineOffsetDisplacementConst + off);
|
||||
} else {
|
||||
lineOffsetDisplacement.put(javaoffsets[0],
|
||||
lineOffsetDisplacementConst);
|
||||
}
|
||||
ErrorCheckerService.scrollToErrorLine(editor, pdeoffsets[0],
|
||||
pdeoffsets[1],
|
||||
javaoffsets[1] + off,
|
||||
javaoffsets[2]);
|
||||
//int k = JOptionPane.showConfirmDialog(new JFrame(), "Rename?","", JOptionPane.INFORMATION_MESSAGE));
|
||||
editor.ta.setSelectedText(newName);
|
||||
}
|
||||
errorCheckerService.resumeThread();
|
||||
// for (Integer lineNum : lineOffsetDisplacement.keySet()) {
|
||||
// log(lineNum + "line, disp"
|
||||
// + lineOffsetDisplacement.get(lineNum));
|
||||
// }
|
||||
editor.getSketch().setModified(true);
|
||||
errorCheckerService.runManualErrorCheck();
|
||||
frmOccurenceList.setVisible(false);
|
||||
frmRename.setVisible(false);
|
||||
lastClickedWord = null;
|
||||
lastClickedWordNode = null;
|
||||
}
|
||||
*/
|
||||
|
||||
protected void refactorIt(){
|
||||
String newName = txtRenameField.getText().trim();
|
||||
String selText = lastClickedWord == null ? editor.ta.getSelectedText()
|
||||
@@ -2086,15 +2010,11 @@ public class ASTGenerator {
|
||||
for (int i = 0; i < defCU.getChildCount(); i++) {
|
||||
ASTNodeWrapper awrap = (ASTNodeWrapper) ((DefaultMutableTreeNode) (defCU
|
||||
.getChildAt(i))).getUserObject();
|
||||
// offsetsMap[i][0] = awrap.getPDECodeOffsets(errorCheckerService);
|
||||
// offsetsMap[i][1] = awrap.getJavaCodeOffsets(errorCheckerService);
|
||||
int ans[] = errorCheckerService.calculateTabIndexAndLineNumber(awrap
|
||||
.getLineNumber());
|
||||
pdeOffsets[i][0] = ans[0];
|
||||
pdeOffsets[i][1] = ans[1];
|
||||
pdeOffsets[i][2] = awrap.getPDECodeOffsetForSN(this);
|
||||
// logE(getNodeAsString(awrap.getNode()) + ", "
|
||||
// + pdeOffsets[i][2]);
|
||||
}
|
||||
|
||||
for (int i = 0; i < defCU.getChildCount(); i++) {
|
||||
@@ -2111,12 +2031,8 @@ public class ASTGenerator {
|
||||
lineOffsetDisplacement.put(awrap.getLineNumber(),
|
||||
lineOffsetDisplacementConst);
|
||||
}
|
||||
logE(getNodeAsString(awrap.getNode()) + ", T:" + pdeOffsets[i][0]
|
||||
+ ", L:" + pdeOffsets[i][1] + ", O:" + pdeOffsets[i][2]);
|
||||
// ErrorCheckerService.scrollToErrorLine(editor, pdeOffsets[i][0],
|
||||
// pdeOffsets[i][1] - 1, pdeOffsets[i][2]
|
||||
// + off, awrap.getNode()
|
||||
// .toString().length());
|
||||
// logE(getNodeAsString(awrap.getNode()) + ", T:" + pdeOffsets[i][0]
|
||||
// + ", L:" + pdeOffsets[i][1] + ", O:" + pdeOffsets[i][2]);
|
||||
highlightPDECode(pdeOffsets[i][0],
|
||||
pdeOffsets[i][1], pdeOffsets[i][2]
|
||||
+ off, awrap.getNode()
|
||||
@@ -2125,10 +2041,6 @@ public class ASTGenerator {
|
||||
editor.ta.setSelectedText(newName);
|
||||
}
|
||||
errorCheckerService.resumeThread();
|
||||
// for (Integer lineNum : lineOffsetDisplacement.keySet()) {
|
||||
// log(lineNum + "line, disp"
|
||||
// + lineOffsetDisplacement.get(lineNum));
|
||||
// }
|
||||
editor.getSketch().setModified(true);
|
||||
errorCheckerService.runManualErrorCheck();
|
||||
frmOccurenceList.setVisible(false);
|
||||
|
||||
Reference in New Issue
Block a user