From eb96870afa2a8d97b568e98bce2f88874b93eaee Mon Sep 17 00:00:00 2001
From: Tobias Ask <tobiaas@stud.ntnu.no>
Date: Thu, 22 Feb 2018 12:51:56 +0100
Subject: [PATCH] Use helper methods where applicable.
---
.../no/tobask/sb4e/examples/GreatFxmlController.java | 4 ++++
sb4e/src/no/tobask/sb4e/JavaProjectGlossary.java | 10 ++--------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/sb4e.examples/src/no/tobask/sb4e/examples/GreatFxmlController.java b/sb4e.examples/src/no/tobask/sb4e/examples/GreatFxmlController.java
index 334fd40..d846dba 100644
--- a/sb4e.examples/src/no/tobask/sb4e/examples/GreatFxmlController.java
+++ b/sb4e.examples/src/no/tobask/sb4e/examples/GreatFxmlController.java
@@ -2,9 +2,13 @@ package no.tobask.sb4e.examples;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
+import javafx.scene.control.Button;
public class GreatFxmlController {
+ @FXML
+ Button button;
+
@FXML
private void onSomething(ActionEvent event) {
diff --git a/sb4e/src/no/tobask/sb4e/JavaProjectGlossary.java b/sb4e/src/no/tobask/sb4e/JavaProjectGlossary.java
index 662fcac..a7fc29d 100644
--- a/sb4e/src/no/tobask/sb4e/JavaProjectGlossary.java
+++ b/sb4e/src/no/tobask/sb4e/JavaProjectGlossary.java
@@ -70,7 +70,7 @@ public class JavaProjectGlossary extends Glossary implements IElementChangedList
ICompilationUnit controller = discoverController(fxmlLocation, controllerClass);
fxIds = controller == null ? new HashMap<>() : getFxIds(controller);
}
- return fxIds.getOrDefault(getClassName(targetType), new ArrayList<>());
+ return fxIds.getOrDefault(Signature.getSimpleName(targetType.getName()), new ArrayList<>());
}
@Override
@@ -196,11 +196,6 @@ public class JavaProjectGlossary extends Glossary implements IElementChangedList
return null;
}
- private String getClassName(Class<?> clas) {
- int classNameStartIdx = clas.getName().lastIndexOf(".") + 1;
- return clas.getName().substring(classNameStartIdx);
- }
-
private List<String> getEventHandlers(ICompilationUnit controller) {
List<String> eventHandlers = new ArrayList<>();
IType type = controller.findPrimaryType();
@@ -265,8 +260,7 @@ public class JavaProjectGlossary extends Glossary implements IElementChangedList
private void addToIds(Map<String, List<String>> ids, IField field) {
try {
- String typeName = field.getTypeSignature();
- typeName = typeName.substring(1, typeName.length()-1);
+ String typeName = Signature.getSignatureSimpleName(field.getTypeSignature());
String fieldName = field.getElementName();
List<String> existingIds = ids.putIfAbsent(typeName,
new ArrayList<>(Arrays.asList(fieldName)));
--
GitLab