monitor core fixes

src/extension/monitor/core/src/main/java/org/geoserver/monitor/web/ActivityChartBasePanel.java

@@ -1,53 +1,40 @@
-/* (c) 2014 - 2015 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
 package org.geoserver.monitor.web;
 
 import java.awt.Color;
-import java.awt.geom.Rectangle2D;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.wicket.Resource;
-import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
 import org.apache.wicket.extensions.yui.calendar.DateTimeField;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.image.NonCachingImage;
 import org.apache.wicket.markup.html.image.resource.BufferedDynamicImageResource;
 import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.geoserver.monitor.Monitor;
 import org.geoserver.monitor.Query;
 import org.geoserver.monitor.RequestData;
 import org.geoserver.monitor.RequestDataVisitor;
 import org.geoserver.web.GeoServerApplication;
-import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.axis.DateAxis;
 import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.labels.StandardXYToolTipGenerator;
-import org.jfree.chart.labels.XYToolTipGenerator;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
-import org.jfree.chart.title.TextTitle;
-import org.jfree.chart.urls.StandardXYURLGenerator;
-import org.jfree.chart.urls.XYURLGenerator;
 import org.jfree.data.time.RegularTimePeriod;
 import org.jfree.data.time.TimeSeries;
 import org.jfree.data.time.TimeSeriesCollection;
 import org.jfree.data.time.TimeSeriesDataItem;
 import org.jfree.data.xy.XYDataset;
-import org.jfree.ui.HorizontalAlignment;
 
 public abstract class ActivityChartBasePanel extends Panel {
 

src/extension/monitor/core/src/main/java/org/geoserver/monitor/web/LiveActivityPanel.java

@@ -28,17 +28,17 @@ public class LiveActivityPanel extends Panel {
     public LiveActivityPanel(String id) {
         super(id);
 
-        GeoServerTablePanel<RequestData> requests = new GeoServerTablePanel<RequestData>("requests", 
-            new LiveRequestDataProvider()) {
-                @Override
-                protected Component getComponentForProperty(String id, IModel itemModel,
-                        Property<RequestData> property) {
-                    Object prop = ((BeanProperty<RequestData>)property)
-                        .getPropertyValue((RequestData) itemModel.getObject()); 
-                    
-                    String value = prop != null ? prop.toString() : "";
-                    return new Label(id, value); 
-                }
+        GeoServerTablePanel<RequestData> requests = new GeoServerTablePanel<RequestData>("requests",
+                new LiveRequestDataProvider()) {
+            @Override
+            protected Component getComponentForProperty(String id, IModel<RequestData> itemModel,
+                    Property<RequestData> property) {
+                Object prop = ((BeanProperty<RequestData>) property)
+                        .getPropertyValue((RequestData) itemModel.getObject());
+
+                String value = prop != null ? prop.toString() : "";
+                return new Label(id, value);
+            }
         };
         add(requests);
     }