From 9748e704763be89c57cad0a65fe74dce65fbcf84 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 07 Nov 2014 10:44:24 +0000
Subject: [PATCH] Code cleanup for the tools
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
index 6d41cf3..ba72f30 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
@@ -22,43 +22,38 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
-import static org.opends.messages.AdminToolMessages.*;
-
import java.awt.Component;
import java.awt.GridBagConstraints;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.swing.Box;
import javax.swing.JLabel;
import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
-import org.opends.guitools.controlpanel.datamodel.BasicMonitoringAttributes;
import org.opends.guitools.controlpanel.datamodel.MonitoringAttributes;
import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
import org.opends.guitools.controlpanel.util.Utilities;
+
+import static org.opends.guitools.controlpanel.datamodel.BasicMonitoringAttributes.*;
+import static org.opends.guitools.controlpanel.util.Utilities.*;
+import static org.opends.messages.AdminToolMessages.*;
/**
* The panel displaying the entry caches monitor panel.
*/
public class EntryCachesMonitoringPanel extends GeneralMonitoringPanel
{
private static final long serialVersionUID = 9031734563700069830L;
- static List<MonitoringAttributes> ngOperations =
- new ArrayList<MonitoringAttributes>();
- {
- ngOperations.add(BasicMonitoringAttributes.ENTRY_CACHE_TRIES);
- ngOperations.add(BasicMonitoringAttributes.ENTRY_CACHE_HITS);
- ngOperations.add(BasicMonitoringAttributes.ENTRY_CACHE_HIT_RATIO);
- ngOperations.add(BasicMonitoringAttributes.CURRENT_ENTRY_CACHE_SIZE);
- ngOperations.add(BasicMonitoringAttributes.MAX_ENTRY_CACHE_SIZE);
- ngOperations.add(BasicMonitoringAttributes.CURRENT_ENTRY_CACHE_COUNT);
- ngOperations.add(BasicMonitoringAttributes.MAX_ENTRY_CACHE_COUNT);
- }
- private ArrayList<JLabel> monitoringLabels =
- new ArrayList<JLabel>();
+ private static List<MonitoringAttributes> ngOperations = new ArrayList<MonitoringAttributes>(Arrays.asList(
+ ENTRY_CACHE_TRIES, ENTRY_CACHE_HITS, ENTRY_CACHE_HIT_RATIO, CURRENT_ENTRY_CACHE_SIZE, MAX_ENTRY_CACHE_SIZE,
+ CURRENT_ENTRY_CACHE_COUNT, MAX_ENTRY_CACHE_COUNT));
+
+ private ArrayList<JLabel> monitoringLabels = new ArrayList<JLabel>();
{
for (int i=0; i<ngOperations.size(); i++)
{
@@ -85,6 +80,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Component getPreferredFocusComponent()
{
return monitoringLabels.get(0);
@@ -159,8 +155,7 @@
int index = 0;
for (MonitoringAttributes attr : ngOperations)
{
- if (Utilities.getFirstMonitoringValue(csr, attr.getAttributeName())
- == null)
+ if (getFirstValueAsString(csr, attr.getAttributeName()) == null)
{
monitoringLabels.get(index).setVisible(false);
labels.get(index).setVisible(false);
--
Gitblit v1.10.0