<property file="nbproject/project.properties"/>\r
</target>\r
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">\r
+ <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>\r
+ <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>\r
+ <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>\r
+ <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>\r
+ <condition property="platform.javac" value="${platform.home}/bin/javac">\r
+ <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>\r
+ </condition>\r
+ <property name="platform.javac" value="${platform.javac.tmp}"/>\r
+ <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>\r
+ <condition property="platform.java" value="${platform.home}/bin/java">\r
+ <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>\r
+ </condition>\r
+ <property name="platform.java" value="${platform.java.tmp}"/>\r
+ <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>\r
+ <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">\r
+ <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>\r
+ </condition>\r
+ <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>\r
+ <condition property="platform.invalid" value="true">\r
+ <or>\r
+ <contains string="${platform.javac}" substring="$${platforms."/>\r
+ <contains string="${platform.java}" substring="$${platforms."/>\r
+ <contains string="${platform.javadoc}" substring="$${platforms."/>\r
+ </or>\r
+ </condition>\r
+ <fail unless="platform.home">Must set platform.home</fail>\r
+ <fail unless="platform.bootcp">Must set platform.bootcp</fail>\r
+ <fail unless="platform.java">Must set platform.java</fail>\r
+ <fail unless="platform.javac">Must set platform.javac</fail>\r
+ <fail if="platform.invalid">\r
+ The J2SE Platform is not correctly set up.\r
+ Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. \r
+ Either open the project in the IDE and setup the Platform with the same name or add it manually.\r
+ For example like this:\r
+ ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file)\r
+ or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used) \r
+ </fail>\r
<available file="${manifest.file}" property="manifest.available"/>\r
<condition property="main.class.available">\r
<and>\r
<condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">\r
<length length="0" string="${endorsed.classpath}" when="greater"/>\r
</condition>\r
- <property name="javac.fork" value="false"/>\r
</target>\r
<target name="-post-init">\r
<!-- Empty placeholder for easier customization. -->\r
<sequential>\r
<property location="${build.dir}/empty" name="empty.dir"/>\r
<mkdir dir="${empty.dir}"/>\r
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
<src>\r
<dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
<include name="*"/>\r
<attribute default="${excludes}" name="excludes"/>\r
<attribute default="**" name="testincludes"/>\r
<sequential>\r
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">\r
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">\r
<batchtest todir="${build.test.results.dir}">\r
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">\r
<filename name="@{testincludes}"/>\r
<classpath>\r
<path path="@{classpath}"/>\r
</classpath>\r
+ <bootclasspath>\r
+ <path path="${platform.bootcp}"/>\r
+ </bootclasspath>\r
</nbjpdastart>\r
</sequential>\r
</macrodef>\r
</macrodef>\r
</target>\r
<target name="-init-debug-args">\r
- <property name="version-output" value="java version "${ant.java.version}"/>\r
+ <exec executable="${platform.java}" outputproperty="version-output">\r
+ <arg value="-version"/>\r
+ </exec>\r
<condition property="have-jdk-older-than-1.4">\r
<or>\r
<contains string="${version-output}" substring="java version "1.0"/>\r
<attribute default="${debug.classpath}" name="classpath"/>\r
<element name="customize" optional="true"/>\r
<sequential>\r
- <java classname="@{classname}" dir="${work.dir}" fork="true">\r
+ <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
<jvmarg line="${debug-args-line}"/>\r
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
<attribute default="${run.classpath}" name="classpath"/>\r
<element name="customize" optional="true"/>\r
<sequential>\r
- <java classname="@{classname}" dir="${work.dir}" fork="true">\r
+ <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>\r
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>\r
<path path="${run.classpath}"/>\r
<map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>\r
</pathconvert>\r
- <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
+ <echo>${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
</target>\r
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">\r
<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>\r
</copylibs>\r
<echo>To run this application from the command line without Ant, try:</echo>\r
<property location="${dist.jar}" name="dist.jar.resolved"/>\r
- <echo>java -jar "${dist.jar.resolved}"</echo>\r
+ <echo>${platform.java} -jar "${dist.jar.resolved}"</echo>\r
</target>\r
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+mkdist.available" name="-do-jar-with-libraries-without-mainclass" unless="main.class.available">\r
<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>\r
-->\r
<target depends="init" name="-javadoc-build">\r
<mkdir dir="${dist.javadoc.dir}"/>\r
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">\r
+ <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">\r
<classpath>\r
<path path="${javac.classpath}"/>\r
</classpath>\r
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
* @param p 新規プロパティ.
* @throws IOException
*/
- public void updateConfigFile(Configuration p) throws IOException {
+ public void updateConfigFile(Configuration p) throws ConfigurationException {
updatePropertyValue(p, P_NICOVIDEO_MAIL);
updatePropertyValue(p, P_NICOVIDEO_PASSWORD);
updatePropertyValue(p, P_FILE_ENCODING);
updatePropertyValueArray(p, P_DOWNLOAD_MYLIST);
- try {
- properties.save();
- } catch (ConfigurationException ex) {
- throw new IOException(ex);
- }
+ properties.save();
}
/**
return properties.getString(P_SAVEFILE_PATTERN, "{title}");
}
- public String getFileNameReplaceFrom(){
+ public String getFileNameReplaceFrom() {
return properties.getString(P_SAVEFILE_REPLACE_FROM, "/\\:*?\"<>|.");
}
- public String getFileNameReplaceTo(){
+ public String getFileNameReplaceTo() {
return properties.getString(P_SAVEFILE_REPLACE_TO, "_");
}
List lines = FileUtils.readLines(FEEDURL_FILE, getEncoding());
for (Object line : lines) {
final String str = line.toString();
- if (str.isEmpty() || str.startsWith("#")) {
+ if (StringUtils.isEmpty(str) || str.startsWith("#")) {
// 空行, コメント行はスキップ.
continue;
}
return getFlvFile(vi, vi.getRealVideoId(), Status.GET_INFO, true, ProgressListener.EMPTY_LISTENER);
}
- public File getCommentFile(VideoInfo vi, String fileName) throws IOException {
+ public File getCommentFile(VideoInfo vi, String fileName) throws Exception {
return downloadComment(vi, fileName, false);
}
- public File getTCommentFile(VideoInfo vi, String fileName) throws IOException {
+ public File getTCommentFile(VideoInfo vi, String fileName) throws Exception {
return downloadComment(vi, fileName, true);
}
- private File downloadComment(VideoInfo vi, String fileName, boolean isTcomm) throws IOException {
+ private File downloadComment(VideoInfo vi, String fileName, boolean isTcomm) throws Exception {
HttpResponse response = null;
BufferedOutputStream bos = null;
return new File(outputFileName);
} catch (Exception e) {
- throw new IOException("コメントダウンロードに失敗しました。", e);
+ throw new Exception("コメントダウンロードに失敗しました。", e);
} finally {
if (response != null) {
response.getEntity().consumeContent();
* これの回避策としてファイル名を固定した.
* 既存のカラム値をこの固定名にアップデートする.
*/
- public void sync_for_4() throws IOException {
+ public void sync_for_4() throws Exception {
try {
Class.forName("org.h2.Driver");
Connection con = DriverManager.getConnection("jdbc:h2:" + Config.getInstance().getDbFile(), "sa", "");
log.info("DBのアップデートが終了しました.");
} catch (Exception ex) {
log.fatal("DBのアップデートに失敗しました.", ex);
- throw new IOException(ex);
+ throw ex;
}
}
- public void sync() throws IOException {
+ public void sync() throws Exception {
sync_for_4();
File updateFile = new File(Config.getAppHome(), UPDATE_FILE);
log.info("DBのアップデートが終了しました.");
} catch (CommandLineParsingException ex) {
log.fatal("DBのアップデートに失敗しました.", ex);
- throw new IOException(ex);
+ throw ex;
}
}
- public void update() throws IOException {
+ public void update() throws Exception {
File updateFile = new File(Config.getAppHome(), UPDATE_FILE);
InputStream resource = ClassLoader.getSystemResourceAsStream("resources/" + UPDATE_FILE);
log.info("DBのアップデートが終了しました.");
} catch (CommandLineParsingException ex) {
log.fatal("DBのアップデートに失敗しました.", ex);
- throw new IOException(ex);
+ throw ex;
}
}
OSDN Git Service
