From ddbf095afc719ef32e9fe8f5d18c0de8fe28f0ed Mon Sep 17 00:00:00 2001 From: Victor Kirhenshtein Date: Fri, 26 Aug 2016 14:16:16 +0300 Subject: [PATCH] minor refactoring --- .../perfview/widgets/helpers/TableLabelProvider.java | 7 +++---- .../perfview/widgets/helpers/TableLabelProvider.java | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/widgets/helpers/TableLabelProvider.java b/src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/widgets/helpers/TableLabelProvider.java index e8794eb3b..7f8d25121 100644 --- a/src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/widgets/helpers/TableLabelProvider.java +++ b/src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/widgets/helpers/TableLabelProvider.java @@ -39,7 +39,6 @@ import org.netxms.client.datacollection.DataCollectionObject; public class TableLabelProvider extends LabelProvider implements ITableLabelProvider, ITableFontProvider { private TableColumnDefinition[] columns = null; - private TableRow row; private Font keyColumnFont; private boolean useMultipliers = true; @@ -86,12 +85,12 @@ public class TableLabelProvider extends LabelProvider implements ITableLabelProv @Override public String getColumnText(Object element, int columnIndex) { - row = (TableRow)element; + TableRow row = (TableRow)element; if (columnIndex >= row.size()) return null; if (useMultipliers) - return getValueForFormat(columnIndex); + return getValueForFormat(row, columnIndex); return row.get(columnIndex).getValue(); } @@ -128,7 +127,7 @@ public class TableLabelProvider extends LabelProvider implements ITableLabelProv * @param columnIndex * @return value converted to multiplier form */ - private String getValueForFormat(int columnIndex) + private String getValueForFormat(TableRow row, int columnIndex) { String value; String suffix = null; diff --git a/webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/widgets/helpers/TableLabelProvider.java b/webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/widgets/helpers/TableLabelProvider.java index e8794eb3b..7f8d25121 100644 --- a/webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/widgets/helpers/TableLabelProvider.java +++ b/webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/widgets/helpers/TableLabelProvider.java @@ -39,7 +39,6 @@ import org.netxms.client.datacollection.DataCollectionObject; public class TableLabelProvider extends LabelProvider implements ITableLabelProvider, ITableFontProvider { private TableColumnDefinition[] columns = null; - private TableRow row; private Font keyColumnFont; private boolean useMultipliers = true; @@ -86,12 +85,12 @@ public class TableLabelProvider extends LabelProvider implements ITableLabelProv @Override public String getColumnText(Object element, int columnIndex) { - row = (TableRow)element; + TableRow row = (TableRow)element; if (columnIndex >= row.size()) return null; if (useMultipliers) - return getValueForFormat(columnIndex); + return getValueForFormat(row, columnIndex); return row.get(columnIndex).getValue(); } @@ -128,7 +127,7 @@ public class TableLabelProvider extends LabelProvider implements ITableLabelProv * @param columnIndex * @return value converted to multiplier form */ - private String getValueForFormat(int columnIndex) + private String getValueForFormat(TableRow row, int columnIndex) { String value; String suffix = null; -- 2.20.1