From 16b9603b3b4a9382eeb6e89d386e81195c31132b Mon Sep 17 00:00:00 2001 From: Nils Christian Ehmke <nils@rhocas.de> Date: Mon, 5 Oct 2015 21:31:45 +0200 Subject: [PATCH] #12 --- .../mainview/subview/util/OperationCellValueFactory.java | 6 +++--- .../subview/util/OperationTreeCellValueFactory.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/kieker/diagnosis/mainview/subview/util/OperationCellValueFactory.java b/src/main/java/kieker/diagnosis/mainview/subview/util/OperationCellValueFactory.java index 0e31fa10..9237f65a 100644 --- a/src/main/java/kieker/diagnosis/mainview/subview/util/OperationCellValueFactory.java +++ b/src/main/java/kieker/diagnosis/mainview/subview/util/OperationCellValueFactory.java @@ -29,13 +29,13 @@ public class OperationCellValueFactory implements Callback<CellDataFeatures<?, S public ObservableValue<String> call(final CellDataFeatures<?, String> call) { try { final Method getter = call.getValue().getClass().getMethod("get" + this.property, new Class<?>[0]); - String componentName = (String) getter.invoke(call.getValue(), new Object[0]); + String operationName = (String) getter.invoke(call.getValue(), new Object[0]); if (PropertiesModel.getInstance().getOperationNames() == OperationNames.SHORT) { - componentName = NameConverter.toShortComponentName(componentName); + operationName = NameConverter.toShortOperationName(operationName); } - return new ReadOnlyObjectWrapper<String>(componentName); + return new ReadOnlyObjectWrapper<String>(operationName); } catch (final NullPointerException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) { LOGGER.warn(ex); return null; diff --git a/src/main/java/kieker/diagnosis/mainview/subview/util/OperationTreeCellValueFactory.java b/src/main/java/kieker/diagnosis/mainview/subview/util/OperationTreeCellValueFactory.java index 42e70418..96aedf3b 100644 --- a/src/main/java/kieker/diagnosis/mainview/subview/util/OperationTreeCellValueFactory.java +++ b/src/main/java/kieker/diagnosis/mainview/subview/util/OperationTreeCellValueFactory.java @@ -31,13 +31,13 @@ public class OperationTreeCellValueFactory implements Callback<CellDataFeatures< try { final TreeItem<?> item = (call.getValue()); final Method getter = item.getValue().getClass().getMethod("get" + this.property, new Class<?>[0]); - String componentName = (String) getter.invoke(item.getValue(), new Object[0]); + String operationName = (String) getter.invoke(item.getValue(), new Object[0]); if (PropertiesModel.getInstance().getOperationNames() == OperationNames.SHORT) { - componentName = NameConverter.toShortComponentName(componentName); + operationName = NameConverter.toShortOperationName(operationName); } - return new ReadOnlyObjectWrapper<String>(componentName); + return new ReadOnlyObjectWrapper<String>(operationName); } catch (final NullPointerException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) { LOGGER.warn(ex); return null; -- GitLab