Skip to content

Commit b13ae99

Browse files
benfrybenfry
committed
shorten names a little, move Interval out b/c used elsewhere
1 parent b612d57 commit b13ae99

File tree

12 files changed

+96
-110
lines changed

12 files changed

+96
-110
lines changed

‎app/src/processing/app/ui/ChangeDetector.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,8 @@ private void checkFiles() {
238238
editor.rebuildHeader();
239239
sketch.setCurrentCode(sketch.getCurrentCodeIndex());
240240
editor.repaintHeader();
241-
242241
editor.sketchChanged();
243242
}
244-
245243
}
246244

247245

‎java/src/processing/mode/java/ASTViewer.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,15 @@
2121

2222
import processing.app.Messages;
2323
import processing.app.ui.ZoomTreeCellRenderer;
24-
import processing.mode.java.PreprocessedSketch.SketchInterval;
2524

2625

2726
class ASTViewer {
2827
final JDialog window;
2928
final JTree tree;
30-
final Consumer<PreprocessedSketch> updateListener;
29+
final Consumer<PreprocSketch> updateListener;
3130

3231

33-
ASTViewer(JavaEditor editor, PreprocessingService pps) {
32+
ASTViewer(JavaEditor editor, PreprocService pps) {
3433
updateListener = this::buildAndUpdateTree;
3534

3635
window = new JDialog(editor);
@@ -95,7 +94,7 @@ void dispose() {
9594

9695

9796
// Thread: worker
98-
void buildAndUpdateTree(PreprocessedSketch ps) {
97+
void buildAndUpdateTree(PreprocSketch ps) {
9998
CompilationUnit cu = ps.compilationUnit;
10099
if (cu.types().isEmpty()){
101100
Messages.loge("No Type found in CU");

‎java/src/processing/mode/java/CompletionGenerator.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public static ASTNode resolveExpression(ASTNode nearestNode,
195195
* @param astNode
196196
* @return
197197
*/
198-
public static ClassMember resolveExpression3rdParty(PreprocessedSketch ps, ASTNode nearestNode,
198+
public static ClassMember resolveExpression3rdParty(PreprocSketch ps, ASTNode nearestNode,
199199
ASTNode astNode, boolean noCompare) {
200200
log("Resolve 3rdParty expr-- " + getNodeAsString(astNode)
201201
+ " nearest node " + getNodeAsString(nearestNode));
@@ -524,7 +524,7 @@ public static ASTNode getParentExpression(ASTNode expression) {
524524
* @param noCompare
525525
* @return
526526
*/
527-
public static ArrayList<CompletionCandidate> getMembersForType(PreprocessedSketch ps,
527+
public static ArrayList<CompletionCandidate> getMembersForType(PreprocSketch ps,
528528
String typeName,
529529
String child,
530530
boolean noCompare,
@@ -542,7 +542,7 @@ public static ArrayList<CompletionCandidate> getMembersForType(PreprocessedSketc
542542

543543
}
544544

545-
public static ArrayList<CompletionCandidate> getMembersForType(PreprocessedSketch ps,
545+
public static ArrayList<CompletionCandidate> getMembersForType(PreprocSketch ps,
546546
ClassMember tehClass,
547547
String childToLookFor,
548548
boolean noCompare,
@@ -682,7 +682,7 @@ private static boolean isStatic(List<org.eclipse.jdt.core.dom.Modifier> modifier
682682
* @param className
683683
* @return
684684
*/
685-
protected static Class<?> findClassIfExists(PreprocessedSketch ps, String className){
685+
protected static Class<?> findClassIfExists(PreprocSketch ps, String className){
686686
if (className == null){
687687
return null;
688688
}
@@ -766,7 +766,7 @@ protected static Class<?> loadClass(String className, ClassLoader classLoader){
766766
return tehClass;
767767
}
768768

769-
public static ClassMember definedIn3rdPartyClass(PreprocessedSketch ps, String className,String memberName){
769+
public static ClassMember definedIn3rdPartyClass(PreprocSketch ps, String className,String memberName){
770770
Class<?> probableClass = findClassIfExists(ps, className);
771771
if (probableClass == null) {
772772
log("Couldn't load " + className);
@@ -779,7 +779,7 @@ public static ClassMember definedIn3rdPartyClass(PreprocessedSketch ps, String c
779779
}
780780
}
781781

782-
public static ClassMember definedIn3rdPartyClass(PreprocessedSketch ps, ClassMember tehClass,String memberName){
782+
public static ClassMember definedIn3rdPartyClass(PreprocSketch ps, ClassMember tehClass,String memberName){
783783
if(tehClass == null)
784784
return null;
785785
log("definedIn3rdPartyClass-> Looking for " + memberName
@@ -1317,7 +1317,7 @@ protected static ASTNode findDeclaration2(Name findMe, ASTNode alternateParent)
13171317
}
13181318

13191319

1320-
protected static boolean ignorableSuggestionImport(PreprocessedSketch ps, String impName) {
1320+
protected static boolean ignorableSuggestionImport(PreprocSketch ps, String impName) {
13211321

13221322
String impNameLc = impName.toLowerCase();
13231323

@@ -1402,7 +1402,7 @@ public ClassMember(Constructor<?> m) {
14021402
+ m.getDeclaringClass().getName();
14031403
}
14041404

1405-
public ClassMember(PreprocessedSketch ps, ASTNode node){
1405+
public ClassMember(PreprocSketch ps, ASTNode node){
14061406
astNode = node;
14071407
stringVal = getNodeAsString(node);
14081408
if(node instanceof TypeDeclaration){
@@ -1730,7 +1730,7 @@ protected static List<CompletionCandidate> trimCandidates(String newWord, List<C
17301730
* @param line
17311731
* @param lineStartNonWSOffset
17321732
*/
1733-
public List<CompletionCandidate> preparePredictions(final PreprocessedSketch ps,
1733+
public List<CompletionCandidate> preparePredictions(final PreprocSketch ps,
17341734
final String pdePhrase,
17351735
final int lineNumber) {
17361736
Messages.log("* preparePredictions");

‎java/src/processing/mode/java/ErrorChecker.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import processing.app.Language;
2828
import processing.app.Problem;
29-
import processing.mode.java.PreprocessedSketch.SketchInterval;
3029

3130

3231
class ErrorChecker {
@@ -38,13 +37,13 @@ class ErrorChecker {
3837
private volatile long nextUiUpdate = 0;
3938
private volatile boolean enabled = true;
4039

41-
private final Consumer<PreprocessedSketch> errorHandlerListener = this::handleSketchProblems;
40+
private final Consumer<PreprocSketch> errorHandlerListener = this::handleSketchProblems;
4241

4342
private JavaEditor editor;
44-
private PreprocessingService pps;
43+
private PreprocService pps;
4544

4645

47-
public ErrorChecker(JavaEditor editor, PreprocessingService pps) {
46+
public ErrorChecker(JavaEditor editor, PreprocService pps) {
4847
this.editor = editor;
4948
this.pps = pps;
5049
scheduler = Executors.newSingleThreadScheduledExecutor();
@@ -81,7 +80,7 @@ public void dispose() {
8180
}
8281

8382

84-
private void handleSketchProblems(PreprocessedSketch ps) {
83+
private void handleSketchProblems(PreprocSketch ps) {
8584

8685
Map<String, String[]> suggCache =
8786
JavaMode.importSuggestEnabled ? new HashMap<>() : Collections.emptyMap();
@@ -156,7 +155,7 @@ private void handleSketchProblems(PreprocessedSketch ps) {
156155
}
157156

158157

159-
static private JavaProblem convertIProblem(IProblem iproblem, PreprocessedSketch ps) {
158+
static private JavaProblem convertIProblem(IProblem iproblem, PreprocSketch ps) {
160159
SketchInterval in = ps.mapJavaToSketch(iproblem);
161160
if (in != SketchInterval.BEFORE_START) {
162161
String badCode = ps.getPdeCode(in);
@@ -193,7 +192,7 @@ static private boolean isMissingBraceProblem(IProblem iproblem) {
193192
static private final Pattern CURLY_QUOTE_REGEX =
194193
Pattern.compile("([“”‘’])", Pattern.UNICODE_CHARACTER_CLASS);
195194

196-
static private List<JavaProblem> checkForCurlyQuotes(PreprocessedSketch ps) {
195+
static private List<JavaProblem> checkForCurlyQuotes(PreprocSketch ps) {
197196
if (ps.compilationUnit == null) {
198197
return new ArrayList<>();
199198
}
@@ -261,7 +260,7 @@ static private List<JavaProblem> checkForCurlyQuotes(PreprocessedSketch ps) {
261260
}
262261

263262

264-
static private List<JavaProblem> checkForMissingBraces(PreprocessedSketch ps) {
263+
static private List<JavaProblem> checkForMissingBraces(PreprocSketch ps) {
265264
List<JavaProblem> problems = new ArrayList<>(0);
266265
for (int tabIndex = 0; tabIndex < ps.tabStartOffsets.length; tabIndex++) {
267266
int tabStartOffset = ps.tabStartOffsets[tabIndex];

‎java/src/processing/mode/java/InspectMode.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@
2424
import processing.app.Language;
2525
import processing.app.Messages;
2626
import processing.app.Platform;
27-
import processing.mode.java.PreprocessedSketch.SketchInterval;
2827

2928

3029
class InspectMode {
3130
final JavaEditor editor;
32-
final PreprocessingService pps;
31+
final PreprocService pps;
3332
final ShowUsage usage;
3433

3534
boolean inspectModeEnabled;
@@ -45,7 +44,7 @@ class InspectMode {
4544
e -> e.getKeyCode() == KeyEvent.VK_CONTROL;
4645

4746

48-
InspectMode(JavaEditor editor, PreprocessingService pps, ShowUsage usage) {
47+
InspectMode(JavaEditor editor, PreprocService pps, ShowUsage usage) {
4948
this.editor = editor;
5049
this.pps = pps;
5150
this.usage = usage;
@@ -143,7 +142,7 @@ void handleInspect(MouseEvent evt) {
143142

144143

145144
// Thread: worker
146-
private void handleInspect(PreprocessedSketch ps, int tabIndex, int offset) {
145+
private void handleInspect(PreprocSketch ps, int tabIndex, int offset) {
147146
ASTNode root = ps.compilationUnit;
148147
int javaOffset = ps.tabOffsetToJavaOffset(tabIndex, offset);
149148

‎java/src/processing/mode/java/JavaEditor.java‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public class JavaEditor extends Editor {
8787
private boolean hasJavaTabs;
8888
private boolean javaTabWarned;
8989

90-
protected PreprocessingService preprocessingService;
90+
protected PreprocService preprocessingService;
9191

9292
private InspectMode inspect;
9393
private ShowUsage usage;
@@ -136,7 +136,7 @@ protected JavaEditor(Base base, String path, EditorState state,
136136
box.add(textAndError);
137137
*/
138138

139-
preprocessingService = new PreprocessingService(this);
139+
preprocessingService = new PreprocService(this);
140140

141141
pdexEnabled = !hasJavaTabs();
142142

@@ -154,8 +154,7 @@ protected JavaEditor(Base base, String path, EditorState state,
154154
Document document = code.getDocument();
155155
addDocumentListener(document);
156156
}
157-
158-
sketchChangedX();
157+
sketchChanged();
159158

160159
Toolkit.setMenuMnemonics(textarea.getRightClickPopup());
161160

@@ -215,7 +214,7 @@ public void rebuild() {
215214
int currentTabCount = sketch.getCodeCount();
216215
if (currentTabCount != previousTabCount) {
217216
previousTabCount = currentTabCount;
218-
sketchChangedX();
217+
sketchChanged();
219218
}
220219
}
221220
}
@@ -1328,11 +1327,6 @@ public void codeFolderChanged() {
13281327

13291328
@Override
13301329
public void sketchChanged() {
1331-
preprocessingService.notifySketchChanged();
1332-
}
1333-
1334-
1335-
public void sketchChangedX() {
13361330
errorChecker.notifySketchChanged();
13371331
preprocessingService.notifySketchChanged();
13381332
}
@@ -1343,17 +1337,17 @@ public void addDocumentListener(Document doc) {
13431337
doc.addDocumentListener(new DocumentListener() {
13441338
@Override
13451339
public void insertUpdate(DocumentEvent e) {
1346-
sketchChangedX();
1340+
sketchChanged();
13471341
}
13481342

13491343
@Override
13501344
public void removeUpdate(DocumentEvent e) {
1351-
sketchChangedX();
1345+
sketchChanged();
13521346
}
13531347

13541348
@Override
13551349
public void changedUpdate(DocumentEvent e) {
1356-
sketchChangedX();
1350+
sketchChanged();
13571351
}
13581352
});
13591353
}
@@ -1841,7 +1835,7 @@ public JavaTextArea getJavaTextArea() {
18411835
}
18421836

18431837

1844-
public PreprocessingService getPreprocessingService() {
1838+
public PreprocService getPreprocessingService() {
18451839
return preprocessingService;
18461840
}
18471841

@@ -2535,13 +2529,14 @@ private boolean checkForJavaTabs() {
25352529
@Override
25362530
protected void applyPreferences() {
25372531
super.applyPreferences();
2532+
25382533
if (jmode != null) {
25392534
jmode.loadPreferences();
25402535
Messages.log("Applying prefs");
25412536
// trigger it once to refresh UI
25422537
//pdex.preferencesChanged();
25432538
errorChecker.preferencesChanged();
2544-
sketchChangedX();
2539+
sketchChanged();
25452540
}
25462541
}
25472542

0 commit comments

Comments
 (0)