Replace ChoiceRenderer with StringChoiceRenderer (issue 71)

James Moger

2012-03-05 6fa6abf07be67bba86e9781a4028c4b3863b50f7

 build.xml

@@ -117,7 +117,7 @@


      <delete dir="${project.build.dir}" />

      <mkdir dir="${project.build.dir}" />

      <javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}">

      <javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}" includeantruntime="false">

         <include name="com/gitblit/build/Build.java" />         

         <include name="com/gitblit/Constants.java" />

         <include name="com/gitblit/utils/StringUtils.java" />         

@@ -131,7 +131,7 @@
         </fileset>

         <pathelement path="${project.build.dir}" />            

      </path>

      <javac debug="true" destdir="${project.build.dir}" failonerror="false">

      <javac debug="true" destdir="${project.build.dir}" failonerror="false" includeantruntime="false">

         <src path="${basedir}/src" />

         <classpath refid="master-classpath" />

      </javac>

@@ -227,9 +227,8 @@
         <copy todir="${docs.output.dir}">

            <!-- Copy selected Gitblit resources -->

            <fileset dir="${project.resources.dir}">

               <include name="bootstrap.140.css" />

               <include name="bootstrap.gb.css" />

               <include name="markdown.css" />

               <include name="bootstrap/**/*" />

               <include name="gitblit.css" />

               <include name="gitblt_25_white.png" />

               <include name="gitblt-favicon.png" />

               <include name="lock_go_16x16.png" />

@@ -578,6 +577,7 @@
         <resource file="${basedir}/resources/gitblt-favicon.png" />

         <resource file="${basedir}/resources/gitweb-favicon.png" />

         <resource file="${basedir}/resources/user_16x16.png" />

         <resource file="${basedir}/resources/users_16x16.png" />

         <resource file="${basedir}/resources/settings_16x16.png" />

         <resource file="${basedir}/resources/lock_go_16x16.png" />

         <resource file="${basedir}/resources/lock_pull_16x16.png" />

@@ -709,9 +709,8 @@
      <copy todir="${project.site.dir}">

         <!-- Copy selected Gitblit resources -->

         <fileset dir="${project.resources.dir}">

            <include name="bootstrap.140.css" />

            <include name="bootstrap.gb.css" />

            <include name="markdown.css" />

            <include name="bootstrap/**/*" />

            <include name="gitblit.css" />

            <include name="gitblt_25_white.png" />

            <include name="gitblt-favicon.png" />

            <include name="lock_go_16x16.png" />