James Moger
2014-04-10 e2dfad080a46368950f387c88103561e07c9afa6
Remove remaining GoogleCharts code and update documentation
6 files modified
100 ■■■■ changed files
.classpath 1 ●●●● patch | view | raw | blame | history
NOTICE 29 ●●●●● patch | view | raw | blame | history
build.moxie 1 ●●●● patch | view | raw | blame | history
gitblit.iml 11 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/WicketUtils.java 55 ●●●●● patch | view | raw | blame | history
src/site/design.mkd 3 ●●●● patch | view | raw | blame | history
.classpath
@@ -20,7 +20,6 @@
    <classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" />
    <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" />
    <classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" />
    <classpathentry kind="lib" path="ext/googlecharts-1.4.21.jar" sourcepath="ext/src/googlecharts-1.4.21.jar" />
    <classpathentry kind="lib" path="ext/lucene-core-4.6.0.jar" sourcepath="ext/src/lucene-core-4.6.0.jar" />
    <classpathentry kind="lib" path="ext/lucene-analyzers-common-4.6.0.jar" sourcepath="ext/src/lucene-analyzers-common-4.6.0.jar" />
    <classpathentry kind="lib" path="ext/lucene-highlighter-4.6.0.jar" sourcepath="ext/src/lucene-highlighter-4.6.0.jar" />
NOTICE
@@ -48,14 +48,6 @@
   http://wicket.apache.org
   
---------------------------------------------------------------------------
WicketStuff GoogleCharts
---------------------------------------------------------------------------
   WicketStuff GoogleCharts, released under the
   Apache Software License, Version 2.0.
   https://github.com/wicketstuff/core/wiki/GoogleCharts
---------------------------------------------------------------------------
Jetty
---------------------------------------------------------------------------
   Jetty, released under the
@@ -203,7 +195,7 @@
UnboundID
---------------------------------------------------------------------------
   UnboundID, released under the
   GNU LESSER GENERAL PUBLIC LICENSE. (http://www.unboundid.com/products/ldap-sdk/docs/LICENSE-LGPLv2.1.txt)
   GNU LESSER GENERAL PUBLIC LICENSE.
   http://www.unboundid.com
@@ -211,7 +203,7 @@
JCalendar
---------------------------------------------------------------------------
   JCalendar, released under the
   GNU LESSER GENERAL PUBLIC LICENSE. (http://www.unboundid.com/products/ldap-sdk/docs/LICENSE-LGPLv2.1.txt)
   GNU LESSER GENERAL PUBLIC LICENSE.
   http://www.toedter.com/en/jcalendar
   
@@ -334,3 +326,20 @@
   Apache License 2.0
   
   http://args4j.kohsuke.org
---------------------------------------------------------------------------
jQuery
---------------------------------------------------------------------------
   jQuery, release under the
   MIT License
   https://jquery.org
---------------------------------------------------------------------------
flotr2
---------------------------------------------------------------------------
   flotr2, release under the
   BSD License
   http://humblesoftware.com/flotr2
build.moxie
@@ -138,7 +138,6 @@
- compile 'org.apache.wicket:wicket:${wicket.version}' :war !org.mockito
- compile 'org.apache.wicket:wicket-auth-roles:${wicket.version}' :war !org.mockito
- compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito
- compile 'org.wicketstuff:googlecharts:${wicket.version}' :war
- compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
- compile 'org.apache.lucene:lucene-analyzers-common:${lucene.version}' :war :fedclient
- compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient
gitblit.iml
@@ -179,17 +179,6 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="googlecharts-1.4.21.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/googlecharts-1.4.21.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/googlecharts-1.4.21.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-core-4.6.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-core-4.6.0.jar!/" />
src/main/java/com/gitblit/wicket/WicketUtils.java
@@ -38,8 +38,6 @@
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.resource.ContextRelativeResource;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.wicketstuff.googlecharts.AbstractChartData;
import org.wicketstuff.googlecharts.IChartData;
import com.gitblit.Constants;
import com.gitblit.Constants.AccessPermission;
@@ -632,32 +630,6 @@
        return label;
    }
    public static IChartData getChartData(Collection<Metric> metrics) {
        final double[] commits = new double[metrics.size()];
        final double[] tags = new double[metrics.size()];
        int i = 0;
        double max = 0;
        for (Metric m : metrics) {
            commits[i] = m.count;
            if (m.tag > 0) {
                tags[i] = m.count;
            } else {
                tags[i] = -1d;
            }
            max = Math.max(max, m.count);
            i++;
        }
        IChartData data = new AbstractChartData(max) {
            private static final long serialVersionUID = 1L;
            @Override
            public double[][] getData() {
                return new double[][] { commits, tags };
            }
        };
        return data;
    }
    public static double maxValue(Collection<Metric> metrics) {
        double max = Double.MIN_VALUE;
        for (Metric m : metrics) {
@@ -667,31 +639,4 @@
        }
        return max;
    }
    public static IChartData getScatterData(Collection<Metric> metrics) {
        final double[] y = new double[metrics.size()];
        final double[] x = new double[metrics.size()];
        int i = 0;
        double max = 0;
        for (Metric m : metrics) {
            y[i] = m.count;
            if (m.duration > 0) {
                x[i] = m.duration;
            } else {
                x[i] = -1d;
            }
            max = Math.max(max, m.count);
            i++;
        }
        IChartData data = new AbstractChartData(max) {
            private static final long serialVersionUID = 1L;
            @Override
            public double[][] getData() {
                return new double[][] { x, y };
            }
        };
        return data;
    }
}
src/site/design.mkd
@@ -17,6 +17,8 @@
- [Clippy](https://github.com/mojombo/clippy) (MIT)
- [google-code-prettify](http://code.google.com/p/google-code-prettify) (Apache 2.0)
- [Commons Daemon](http://commons.apache.org/daemon) (Apache 2.0)
- [jQuery](https://jquery.org) (MIT)
- [flotr2](http://humblesoftware.com/flotr2) (BSD)
- magnifying glass search icon courtesy of [Gnome](http://gnome.org) (Creative Commons CC-BY)
- Git logo originally designed by [Jason Long](http://git-scm.com/downloads/logos)
- modified Git logo originally designed by [Henrik Nyh](http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon)
@@ -28,7 +30,6 @@
- [JGit][jgit] (EDL 1.0)
- [Wicket](http://wicket.apache.org) (Apache 2.0)
- [WicketStuff GoogleCharts](https://github.com/wicketstuff/core/wiki/GoogleCharts) (Apache 2.0)
- [Jetty](http://eclipse.org/jetty) (Apache 2.0, EPL 1.0)
- [SLF4J](http://www.slf4j.org) (MIT/X11)
- [Log4j](http://logging.apache.org/log4j) (Apache 2.0)