From 15e5efb2a01981080a0a2b6723581217866423d5 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 23 Oct 2014 17:50:12 +0200 Subject: [PATCH] Fix ToolTip not appearing on front sheet panel. We now traverse the superclass hierarchy and search for a field with the matching annotation. --- src/eva2/gui/BeanInspector.java | 9 ++++----- src/eva2/tools/matlab/JMatLink.java | 10 ---------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/eva2/gui/BeanInspector.java b/src/eva2/gui/BeanInspector.java index 787538b7..27ff1cbb 100644 --- a/src/eva2/gui/BeanInspector.java +++ b/src/eva2/gui/BeanInspector.java @@ -1022,16 +1022,15 @@ public class BeanInspector { String tipName = name + "TipText"; // Find by annotation - Parameter[] parameters= target.getClass().getAnnotationsByType(Parameter.class); Parameter parameter = BeanInspector.getAnnotationFromField(name, target.getClass(), Parameter.class); if (parameter != null) { return parameter.description(); } // Find by deprecated TipText method - for (int j = 0; j < methods.length; j++) { - String mname = methods[j].getDisplayName(); - Method meth = methods[j].getMethod(); + for (MethodDescriptor method : methods) { + String mname = method.getDisplayName(); + Method meth = method.getMethod(); if (mname.equals(tipName)) { if (meth.getReturnType().equals(String.class)) { @@ -1046,7 +1045,7 @@ public class BeanInspector { } } } catch (Exception ex) { - + LOGGER.log(Level.FINE, "Error calling TipText method.", ex); } break; } diff --git a/src/eva2/tools/matlab/JMatLink.java b/src/eva2/tools/matlab/JMatLink.java index c0ddc1fb..5b31d748 100644 --- a/src/eva2/tools/matlab/JMatLink.java +++ b/src/eva2/tools/matlab/JMatLink.java @@ -318,16 +318,6 @@ public class JMatLink extends Thread { } - // **** terminate running thread **** - - @Override - public void destroy() { - - destroyJMatLinkB = true; - - notifyAll(); - - } public void kill() {