[Jfreechart-commit] SF.net SVN: jfreechart:[3208] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/urls/TimeSeriesURLGenerator.java

[<mu...@us...>]

Revision: 3208
          http://sourceforge.net/p/jfreechart/code/3208
Author:   mungady
Date:     2014-07-01 10:25:21 +0000 (Tue, 01 Jul 2014)
Log Message:
-----------
Fix SONAR warning.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java	2014-07-01 10:24:14 UTC (rev 3207)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java	2014-07-01 10:25:21 UTC (rev 3208)
@@ -52,10 +52,12 @@
 package org.jfree.chart.urls;
 
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.util.Date;
+
 import org.jfree.chart.util.ParamChecks;
-
 import org.jfree.data.xy.XYDataset;
 
 /**
@@ -165,20 +167,28 @@
     @Override
     public String generateURL(XYDataset dataset, int series, int item) {
         String result = this.prefix;
-        boolean firstParameter = result.indexOf("?") == -1;
+        boolean firstParameter = !result.contains("?");
         Comparable seriesKey = dataset.getSeriesKey(series);
         if (seriesKey != null) {
             result += firstParameter ? "?" : "&";
-            result += this.seriesParameterName + "=" + URLUtilities.encode(
-                    seriesKey.toString(), "UTF-8");
+            try {
+                result += this.seriesParameterName + "=" + URLEncoder.encode(
+                        seriesKey.toString(), "UTF-8");
+            } catch (UnsupportedEncodingException ex) {
+                throw new RuntimeException(ex);
+            }
             firstParameter = false;
         }
 
         long x = (long) dataset.getXValue(series, item);
         String xValue = this.dateFormat.format(new Date(x));
         result += firstParameter ? "?" : "&";
-        result += this.itemParameterName + "=" + URLUtilities.encode(xValue,
-                "UTF-8");
+        try {
+            result += this.itemParameterName + "=" + URLEncoder.encode(xValue,
+                    "UTF-8");
+        } catch (UnsupportedEncodingException ex) {
+            throw new RuntimeException(ex);
+        }
 
         return result;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.