Skip to content

Commit

Permalink
Merge branch 'atcoder-pull-request-shanto86'
Browse files Browse the repository at this point in the history
  • Loading branch information
dj3500 committed Feb 26, 2017
2 parents 296dd83 + 37d22b4 commit f53e225
Show file tree
Hide file tree
Showing 35 changed files with 743 additions and 264 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Hightail/build
Hightail/dist
Hightail/nbproject/private
hightail.config
21 changes: 21 additions & 0 deletions Hightail/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,27 @@
<zipfileset src="lib/junit.jar" excludes="META-INF/*" />
<zipfileset src="lib/sax2.jar" excludes="META-INF/*" />
<zipfileset src="lib/thumbelina.jar" excludes="META-INF/*" />
<zipfileset src="lib/commons-codec-1.10.jar" excludes="META-INF/*" />
<zipfileset src="lib/commons-io-2.5.jar" excludes="META-INF/*" />
<zipfileset src="lib/commons-lang3-3.5.jar" excludes="META-INF/*" />
<zipfileset src="lib/commons-logging-1.2.jar" excludes="META-INF/*" />
<zipfileset src="lib/cssparser-0.9.21.jar" excludes="META-INF/*" />
<zipfileset src="lib/htmlunit-2.24.jar" excludes="META-INF/*" />
<zipfileset src="lib/htmlunit-core-js-2.23.jar" excludes="META-INF/*" />
<zipfileset src="lib/httpclient-4.5.2.jar" excludes="META-INF/*" />
<zipfileset src="lib/httpcore-4.4.4.jar" excludes="META-INF/*" />
<zipfileset src="lib/httpmime-4.5.2.jar" excludes="META-INF/*" />
<zipfileset src="lib/jetty-io-9.2.20.v20161216.jar" excludes="META-INF/*" />
<zipfileset src="lib/jetty-util-9.2.20.v20161216.jar" excludes="META-INF/*" />
<zipfileset src="lib/neko-htmlunit-2.24.jar" excludes="META-INF/*" />
<zipfileset src="lib/sac-1.3.jar" excludes="META-INF/*" />
<zipfileset src="lib/serializer-2.7.2.jar" excludes="META-INF/*" />
<zipfileset src="lib/websocket-api-9.2.20.v20161216.jar" excludes="META-INF/*" />
<zipfileset src="lib/websocket-client-9.2.20.v20161216.jar" excludes="META-INF/*" />
<zipfileset src="lib/websocket-common-9.2.20.v20161216.jar" excludes="META-INF/*" />
<zipfileset src="lib/xalan-2.7.2.jar" excludes="META-INF/*" />
<zipfileset src="lib/xercesImpl-2.11.0.jar" excludes="META-INF/*" />
<zipfileset src="lib/xml-apis-1.4.01.jar" excludes="META-INF/*" />
<manifest>
<attribute name="Main-Class" value="org.hightail.ui.MainJFrame" />
</manifest>
Expand Down
Binary file added Hightail/lib/commons-codec-1.10.jar
Binary file not shown.
Binary file added Hightail/lib/commons-io-2.5.jar
Binary file not shown.
Binary file added Hightail/lib/commons-lang3-3.5.jar
Binary file not shown.
Binary file added Hightail/lib/commons-logging-1.2.jar
Binary file not shown.
Binary file added Hightail/lib/cssparser-0.9.21.jar
Binary file not shown.
Binary file added Hightail/lib/htmlunit-2.24.jar
Binary file not shown.
Binary file added Hightail/lib/htmlunit-core-js-2.23.jar
Binary file not shown.
Binary file added Hightail/lib/httpclient-4.5.2.jar
Binary file not shown.
Binary file added Hightail/lib/httpcore-4.4.4.jar
Binary file not shown.
Binary file added Hightail/lib/httpmime-4.5.2.jar
Binary file not shown.
Binary file added Hightail/lib/jetty-io-9.2.20.v20161216.jar
Binary file not shown.
Binary file added Hightail/lib/jetty-util-9.2.20.v20161216.jar
Binary file not shown.
Binary file added Hightail/lib/neko-htmlunit-2.24.jar
Binary file not shown.
Binary file added Hightail/lib/sac-1.3.jar
Binary file not shown.
Binary file added Hightail/lib/serializer-2.7.2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Hightail/lib/xalan-2.7.2.jar
Binary file not shown.
Binary file added Hightail/lib/xercesImpl-2.11.0.jar
Binary file not shown.
Binary file added Hightail/lib/xml-apis-1.4.01.jar
Binary file not shown.
35 changes: 21 additions & 14 deletions Hightail/nbproject/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ is divided into following sections:
<property file="${user.properties.file}"/>
<!-- The two properties below are usually overridden -->
<!-- by the active platform. Just a fallback. -->
<property name="default.javac.source" value="1.4"/>
<property name="default.javac.target" value="1.4"/>
<property name="default.javac.source" value="1.6"/>
<property name="default.javac.target" value="1.6"/>
</target>
<target depends="-pre-init,-init-private,-init-user" name="-init-project">
<property file="nbproject/configs/${config}.properties"/>
Expand Down Expand Up @@ -76,7 +76,7 @@ is divided into following sections:
<and>
<isset property="javac.profile"/>
<length length="0" string="${javac.profile}" when="greater"/>
<matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
<matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
</and>
</condition>
<condition property="do.archive">
Expand Down Expand Up @@ -156,6 +156,7 @@ is divided into following sections:
<property name="application.args" value=""/>
<property name="source.encoding" value="${file.encoding}"/>
<property name="runtime.encoding" value="${source.encoding}"/>
<property name="manifest.encoding" value="${source.encoding}"/>
<condition property="javadoc.encoding.used" value="${javadoc.encoding}">
<and>
<isset property="javadoc.encoding"/>
Expand Down Expand Up @@ -191,7 +192,12 @@ is divided into following sections:
</not>
</and>
</condition>
<property name="javac.fork" value="${jdkBug6558476}"/>
<condition else="false" property="javac.fork">
<or>
<istrue value="${jdkBug6558476}"/>
<istrue value="${javac.external.vm}"/>
</or>
</condition>
<property name="jar.index" value="false"/>
<property name="jar.index.metainf" value="${jar.index}"/>
<property name="copylibs.rebase" value="true"/>
Expand All @@ -217,6 +223,7 @@ is divided into following sections:
<condition else="" property="testng.debug.mode" value="-mixed">
<istrue value="${junit+testng.available}"/>
</condition>
<property name="java.failonerror" value="true"/>
</target>
<target name="-post-init">
<!-- Empty placeholder for easier customization. -->
Expand Down Expand Up @@ -693,7 +700,7 @@ is divided into following sections:
<sequential>
<property environment="env"/>
<resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
<java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
<java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="${profiler.info.jvmargs.agent}"/>
<jvmarg line="${profiler.info.jvmargs}"/>
Expand Down Expand Up @@ -768,7 +775,7 @@ is divided into following sections:
<attribute default="${debug.classpath}" name="classpath"/>
<element name="customize" optional="true"/>
<sequential>
<java classname="@{classname}" dir="${work.dir}" fork="true">
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg line="${debug-args-line}"/>
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
Expand All @@ -795,7 +802,7 @@ is divided into following sections:
<attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/>
<sequential>
<java classname="@{classname}" dir="${work.dir}" fork="true">
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
Expand Down Expand Up @@ -834,7 +841,7 @@ is divided into following sections:
</chainedmapper>
</pathconvert>
<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
<copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
<copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
<fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
<manifest>
<attribute name="Class-Path" value="${jar.classpath}"/>
Expand All @@ -846,7 +853,7 @@ is divided into following sections:
</target>
<target name="-init-presetdef-jar">
<presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
<j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
</jar>
</presetdef>
Expand Down Expand Up @@ -969,23 +976,23 @@ is divided into following sections:
</target>
<target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
<copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
<copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
</target>
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
<manifest file="${tmp.manifest.file}" mode="update">
<manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
<attribute name="Main-Class" value="${main.class}"/>
</manifest>
</target>
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
<manifest file="${tmp.manifest.file}" mode="update">
<manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
<attribute name="Profile" value="${javac.profile}"/>
</manifest>
</target>
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
<basename file="${application.splash}" property="splashscreen.basename"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
<copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
<manifest file="${tmp.manifest.file}" mode="update">
<manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
<attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
</manifest>
</target>
Expand Down Expand Up @@ -1180,7 +1187,7 @@ is divided into following sections:
<target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
<fail unless="run.class">Must select one file in the IDE or set run.class</fail>
<startprofiler/>
<antcal target="run-test-with-main"/>
<antcall target="run-test-with-main"/>
</target>
<target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
<fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
Expand Down
4 changes: 2 additions & 2 deletions Hightail/nbproject/genfiles.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.38.2.45
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=4a0f91a4
nbproject/build-impl.xml.script.CRC32=fd2becde
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
nbproject/build-impl.xml.script.CRC32=d2b3d99d
nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
198 changes: 99 additions & 99 deletions Hightail/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,99 +1,99 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=Hightail
application.vendor=D
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
debug.test.classpath=\
${run.test.classpath}
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/Hightail.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.filterbuilder.jar=lib/filterbuilder.jar
file.reference.htmllexer.jar=lib/htmllexer.jar
file.reference.htmlparser.jar=lib/htmlparser.jar
file.reference.junit.jar=lib/junit.jar
file.reference.sax2.jar=lib/sax2.jar
file.reference.thumbelina.jar=lib/thumbelina.jar
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=false
jar.index=${jnlp.enabled}
javac.classpath=\
${file.reference.filterbuilder.jar}:\
${file.reference.htmllexer.jar}:\
${file.reference.htmlparser.jar}:\
${file.reference.junit.jar}:\
${file.reference.sax2.jar}:\
${file.reference.thumbelina.jar}:\
${libs.beans-binding.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
${libs.junit.classpath}:\
${libs.junit_4.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
jnlp.codebase.type=no.codebase
jnlp.descriptor=application
jnlp.enabled=false
jnlp.mixed.code=default
jnlp.offline-allowed=false
jnlp.signed=false
jnlp.signing=
jnlp.signing.alias=
jnlp.signing.keystore=
main.class=org.hightail.ui.MainJFrame
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
# Space-separated list of JVM arguments used when running the project
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
# or test-sys-prop.name=value to set system properties for unit tests):
run.jvmargs=
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
src.dir=src
test.src.dir=test
#Sat Feb 25 15:43:43 CET 2017
jnlp.offline-allowed=false
file.reference.commons-codec-1.10.jar=lib\\commons-codec-1.10.jar
javadoc.splitindex=true
build.classes.excludes=**/*.java,**/*.form
file.reference.htmllexer.jar=lib/htmllexer.jar
file.reference.thumbelina.jar=lib/thumbelina.jar
javadoc.author=false
build.sysclasspath=ignore
javac.target=1.8
build.generated.dir=${build.dir}/generated
run.classpath=${javac.classpath}\:${build.classes.dir}
file.reference.commons-lang3-3.5.jar=lib\\commons-lang3-3.5.jar
file.reference.httpcore-4.4.4.jar=lib\\httpcore-4.4.4.jar
file.reference.jetty-util-9.2.20.v20161216.jar=lib\\jetty-util-9.2.20.v20161216.jar
debug.test.classpath=${run.test.classpath}
jnlp.descriptor=application
file.reference.websocket-api-9.2.20.v20161216.jar=lib\\websocket-api-9.2.20.v20161216.jar
file.reference.xml-apis-1.4.01.jar=lib\\xml-apis-1.4.01.jar
build.dir=build
javac.deprecation=false
jnlp.signed=false
file.reference.sac-1.3.jar=lib\\sac-1.3.jar
file.reference.neko-htmlunit-2.24.jar=lib\\neko-htmlunit-2.24.jar
test.src.dir=test
junit.selected.version=4
jar.archive.disabled=${jnlp.enabled}
includes=**
application.vendor=D
file.reference.httpclient-4.5.2.jar=lib\\httpclient-4.5.2.jar
mkdist.disabled=false
jnlp.mixed.code=default
jar.compress=true
annotation.processing.processors.list=
javac.external.vm=false
javadoc.version=false
build.classes.dir=${build.dir}/classes
file.reference.junit.jar=lib/junit.jar
dist.dir=dist
file.reference.websocket-client-9.2.20.v20161216.jar=lib\\websocket-client-9.2.20.v20161216.jar
manifest.file=manifest.mf
file.reference.sax2.jar=lib/sax2.jar
javac.source=1.8
run.jvmargs=
javac.test.processorpath=${javac.test.classpath}
run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
build.generated.sources.dir=${build.dir}/generated-sources
jnlp.signing=
javadoc.notree=false
dist.jar=${dist.dir}/Hightail.jar
file.reference.commons-io-2.5.jar=lib\\commons-io-2.5.jar
platform.active=default_platform
annotation.processing.enabled=true
file.reference.xercesImpl-2.11.0.jar=lib\\xercesImpl-2.11.0.jar
main.class=org.hightail.ui.MainJFrame
dist.javadoc.dir=${dist.dir}/javadoc
file.reference.xalan-2.7.2.jar=lib\\xalan-2.7.2.jar
file.reference.jetty-io-9.2.20.v20161216.jar=lib\\jetty-io-9.2.20.v20161216.jar
javadoc.additionalparam=
javac.classpath=${file.reference.filterbuilder.jar}\:${file.reference.htmllexer.jar}\:${file.reference.htmlparser.jar}\:${file.reference.junit.jar}\:${file.reference.sax2.jar}\:${file.reference.thumbelina.jar}\:${libs.beans-binding.classpath}\:${file.reference.commons-codec-1.10.jar}\:${file.reference.commons-io-2.5.jar}\:${file.reference.commons-lang3-3.5.jar}\:${file.reference.commons-logging-1.2.jar}\:${file.reference.cssparser-0.9.21.jar}\:${file.reference.htmlunit-2.24.jar}\:${file.reference.htmlunit-core-js-2.23.jar}\:${file.reference.httpclient-4.5.2.jar}\:${file.reference.httpcore-4.4.4.jar}\:${file.reference.httpmime-4.5.2.jar}\:${file.reference.jetty-io-9.2.20.v20161216.jar}\:${file.reference.jetty-util-9.2.20.v20161216.jar}\:${file.reference.neko-htmlunit-2.24.jar}\:${file.reference.sac-1.3.jar}\:${file.reference.serializer-2.7.2.jar}\:${file.reference.websocket-api-9.2.20.v20161216.jar}\:${file.reference.websocket-client-9.2.20.v20161216.jar}\:${file.reference.websocket-common-9.2.20.v20161216.jar}\:${file.reference.xalan-2.7.2.jar}\:${file.reference.xercesImpl-2.11.0.jar}\:${file.reference.xml-apis-1.4.01.jar}
javadoc.noindex=false
file.reference.serializer-2.7.2.jar=lib\\serializer-2.7.2.jar
annotation.processing.enabled.in.editor=false
javadoc.private=false
javadoc.encoding=${source.encoding}
build.test.classes.dir=${build.dir}/test/classes
file.reference.htmlparser.jar=lib/htmlparser.jar
jar.index=${jnlp.enabled}
javac.compilerargs=
source.encoding=UTF-8
jnlp.signing.keystore=
meta.inf.dir=${src.dir}/META-INF
annotation.processing.run.all.processors=true
excludes=
application.title=Hightail
jnlp.codebase.type=no.codebase
file.reference.websocket-common-9.2.20.v20161216.jar=lib\\websocket-common-9.2.20.v20161216.jar
file.reference.commons-logging-1.2.jar=lib\\commons-logging-1.2.jar
file.reference.htmlunit-core-js-2.23.jar=lib\\htmlunit-core-js-2.23.jar
javac.processorpath=${javac.classpath}
file.reference.htmlunit-2.24.jar=lib\\htmlunit-2.24.jar
file.reference.httpmime-4.5.2.jar=lib\\httpmime-4.5.2.jar
build.test.results.dir=${build.dir}/test/results
endorsed.classpath=
javadoc.use=true
file.reference.filterbuilder.jar=lib/filterbuilder.jar
javadoc.nonavbar=false
jnlp.signing.alias=
javadoc.windowtitle=
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
${libs.junit.classpath}:\
${libs.junit_4.classpath}
src.dir=src
file.reference.cssparser-0.9.21.jar=lib\\cssparser-0.9.21.jar
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
debug.classpath=${run.classpath}
jnlp.enabled=false
Loading

0 comments on commit f53e225

Please sign in to comment.