eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 10:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

validate new name before refactor

Browse Source
This commit is contained in:
Manindra Moharana
2013-08-17 21:11:26 +05:30
parent f49066264f
commit a5917514b6
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pdex/src/processing/mode/experimental/ASTGenerator.java
View File

@@ -1806,7 +1806,7 @@ public class ASTGenerator {
}
private void refactorIt(){
String newName = txtRenameField.getText();
String newName = txtRenameField.getText().trim();
String selText = lastClickedWord == null ? editor.ta.getSelectedText()
: lastClickedWord;
DefaultMutableTreeNode defCU = findAllOccurrences();
@@ -1814,6 +1814,14 @@ public class ASTGenerator {
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();
treeRename.setModel(new DefaultTreeModel(defCU));
((DefaultTreeModel) treeRename.getModel()).reload();
@@ -1851,7 +1859,7 @@ public class ASTGenerator {
pdeoffsets[1],
javaoffsets[1] + off,
javaoffsets[2]);
//int k = JOptionPane.showConfirmDialog(new JFrame(), "Rename?","", JOptionPane.OK_OPTION));
//int k = JOptionPane.showConfirmDialog(new JFrame(), "Rename?","", JOptionPane.INFORMATION_MESSAGE));
editor.ta.setSelectedText(newName);
}
errorCheckerService.resumeThread();