Author: jflesch
Date: 2007-08-06 16:57:43 +0000 (Mon, 06 Aug 2007)
New Revision: 14490
Added:
trunk/apps/Thaw/real.build.xml
Modified:
trunk/apps/Thaw/src/thaw/core/PluginManager.java
trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexRoot.java
Log:
Fix an exception reported by nextgens in the index browser
Added: trunk/apps/Thaw/real.build.xml
===================================================================
--- trunk/apps/Thaw/real.build.xml (rev 0)
+++ trunk/apps/Thaw/real.build.xml 2007-08-06 16:57:43 UTC (rev 14490)
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+
+<project name="Thaw" default="jar">
+
+ <property name="src.dir" value="src" />
+ <property name="bin.dir" value="build" />
+ <property name="images.dir" value="images" />
+ <property name="lib.dir" value="lib" />
+ <property name="javadoc.dir" value="javadoc" />
+ <property name="javac.debug" value="false" />
+ <property name="svn.revision" value="@custom@"/>
+
+ <property name="licenses.dir" value="licenses" />
+
+ <property name="final.dir" value="bin" />
+
+ <!-- JMDNS -->
+ <property name="jmdns.location" value="${lib.dir}/jmdns.jar" />
+ <available file="${jmdns.location}" property="jmdns_available" />
+ <fail unless="jmdns_available" status="1"
+ message="You need to download jmdns.jar from
http://sourceforge.net/projects/jmdns/ and to put it in lib/" />
+
+ <!-- HSQLDB -->
+ <property name="hsqldb.location" value="${lib.dir}/hsqldb.jar" />
+ <available file="${hsqldb.location}" property="hsqldb_available" />
+ <fail unless="hsqldb_available" status="1"
+ message="You need to download hsqldb.jar from
http://sourceforge.net/projects/hsqldb/ and to put it in lib/" />
+
+ <!-- BOUNCYCASTLE -->
+ <property name="bouncycastle.location"
value="${lib.dir}/BouncyCastle.jar" />
+ <available file="${bouncycastle.location}"
property="bouncycastle_available" />
+ <fail unless="bouncycastle_available" status="1"
+ message="You need to download the bouncycastle provider for the JDK 1.4
from http://bouncycastle.org/latest_releases.html and put it in lib/ with the
name BouncyCastle.jar." />
+
+
+ <target name="compile">
+ <mkdir dir="${bin.dir}" />
+
+ <replace file="${src.dir}/thaw/core/Main.java">
+ <replacefilter token="@custom@"
value="${svn.revision}"/>
+ </replace>
+
+
+ <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="true"
optimize="true" encoding="UTF8">
+
+ <!-- <compilerarg value="-Xlint" /> -->
+ <classpath>
+ <pathelement location="${jmdns.location}"/>
+ <pathelement location="${hsqldb.location}"/>
+ <pathelement
location="${bouncycastle.location}" />
+ </classpath>
+ </javac>
+
+ <copy todir="${bin.dir}">
+ <fileset dir="licenses" />
+ <fileset file="readme.txt" />
+ <fileset dir="${images.dir}" />
+
+ <fileset dir="${src.dir}">
+ <include name="**/*.properties" />
+ <include name="**/*.png" /><!-- for the liquid
lnf -->
+ </fileset>
+ </copy>
+ </target>
+
+
+ <target name="run" depends="compile">
+ <java classname="thaw.core.Main"
classpath="${jmdns.location}:${bouncycastle.location}:${hsqldb.location}:${bin.dir}"
dir="${bin.dir}" fork="true" />
+ </target>
+
+
+ <target name="jar" depends="compile" description="Make the Jar" >
+ <mkdir dir="${final.dir}" />
+
+ <jar jarfile="${final.dir}/Thaw.jar" basedir="${bin.dir}">
+ <manifest>
+ <attribute name="Main-Class"
value="thaw.core.Main" />
+ <attribute name="Class-Path" value=". Thaw.jar
jmdns.jar hsqldb.jar BouncyCastle.jar" />
+ </manifest>
+
+ <fileset dir="build">
+ <include name="**/*.class" />
+ </fileset>
+
+ <fileset dir=".">
+ <include name="${lib.dir}/**/*.jar" />
+ <include name="${licenses.dir}/**/*.txt" />
+ <include name="${images.dir}/**/*.png" />
+ </fileset>
+ </jar>
+ </target>
+
+
+ <target name="javadoc">
+ <javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}">
+ <fileset dir="${src.dir}" includes="**/*.java" />
+ </javadoc>
+ </target>
+
+ <target name="clean">
+ <delete dir="${bin.dir}"/>
+ <delete file="${final.dir}/Thaw.jar"/>
+ </target>
+
+</project>
Modified: trunk/apps/Thaw/src/thaw/core/PluginManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginManager.java 2007-08-05 20:04:08 UTC
(rev 14489)
+++ trunk/apps/Thaw/src/thaw/core/PluginManager.java 2007-08-06 16:57:43 UTC
(rev 14490)
@@ -17,6 +17,7 @@
"thaw.plugins.Hsqldb",
"thaw.plugins.IndexBrowser",
"thaw.plugins.IndexExporter",
+ "thaw.plugins.MiniFrost",
"thaw.plugins.TransferLogs"
};
Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-08-05 20:04:08 UTC
(rev 14489)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-08-06 16:57:43 UTC
(rev 14490)
@@ -19,10 +19,11 @@
public class IndexBrowser extends ToolbarModifier implements Plugin,
ChangeListener {
- public static final String DEFAULT_INDEX =
- "USK at p-uFAWUomLm37MCQLu3r67-B8e6yF1kS4q2v0liM1Vk,"+
- "h0MWqM~lF0Bec-AIv445PLn06ams9-RFbnwO6Cm2Snc,AQACAAE"+
- "/Thaw/2/Thaw.frdx";
+ public static final String[] DEFAULT_INDEXES = new String[] {
+ "USK at p-uFAWUomLm37MCQLu3r67-B8e6yF1kS4q2v0liM1Vk,"+
+
"h0MWqM~lF0Bec-AIv445PLn06ams9-RFbnwO6Cm2Snc,AQACAAE"+
+ "/Thaw/2/Thaw.frdx"
+ };
private Core core;
private Hsqldb hsqldb;
@@ -87,13 +88,17 @@
browserPanel.restoreState();
if (newDb) {
- IndexManagementHelper.addIndex(core.getQueueManager(),
browserPanel, null, IndexBrowser.DEFAULT_INDEX);
+ for (int i = 0 ; i < DEFAULT_INDEXES.length ; i++) {
+
IndexManagementHelper.addIndex(core.getQueueManager(), browserPanel, null,
+
DEFAULT_INDEXES[i]);
+ }
}
stateChanged(null);
- configPanel = new IndexConfigTab(core.getConfigWindow(),
core.getConfig(), browserPanel);
+ configPanel = new IndexConfigTab(core.getConfigWindow(),
core.getConfig(),
+ browserPanel);
configPanel.addTab();
autoRefresh = null;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-08-05 20:04:08 UTC (rev 14489)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-08-06 16:57:43 UTC (rev 14490)
@@ -334,17 +334,28 @@
publicKey = dialog.getPublicKey();
privateKey = dialog.getPrivateKey();
- IndexManagementHelper.reuseIndex(getQueueManager(),
getIndexBrowserPanel(), (IndexFolder)getTarget(), publicKey, privateKey);
+ IndexManagementHelper.reuseIndex(getQueueManager(),
getIndexBrowserPanel(),
+
(IndexFolder)getTarget(), publicKey, privateKey);
}
}
- public static Index addIndex(final FCPQueueManager queueManager, final
IndexBrowserPanel indexBrowser, final IndexFolder target, final String
publicKey) {
+ public static Index addIndex(final FCPQueueManager queueManager,
+ final IndexBrowserPanel indexBrowser,
+ final IndexFolder target,
+ final String publicKey) {
+
return IndexManagementHelper.reuseIndex(queueManager,
indexBrowser, target, publicKey, null);
+
}
- public static Index reuseIndex(final FCPQueueManager queueManager,
final IndexBrowserPanel indexBrowser, final IndexFolder target, String
publicKey, String privateKey) {
+ public static Index reuseIndex(final FCPQueueManager queueManager,
+ final IndexBrowserPanel indexBrowser,
+ final IndexFolder target, String
publicKey,
+ String privateKey) {
+
return reuseIndex(queueManager, indexBrowser, target,
publicKey, privateKey, true);
+
}
/**
@@ -438,15 +449,15 @@
}
- if (load)
- download(queueManager, indexBrowser, index);
-
((MutableTreeNode)parent).insert((index), 0);
indexBrowser.getIndexTree().refresh(parent);
indexBrowser.getUnknownIndexList().removeLink(index);
+ if (load)
+ download(queueManager, indexBrowser, index);
+
return index;
}
@@ -573,8 +584,12 @@
- public static boolean download(FCPQueueManager queueManager,
IndexBrowserPanel indexBrowser, IndexTreeNode target) {
- IndexDownloader downloader = new IndexDownloader(queueManager,
indexBrowser, null);
+ public static boolean download(FCPQueueManager queueManager,
+ IndexBrowserPanel indexBrowser,
+ IndexTreeNode target) {
+
+ IndexDownloader downloader = new IndexDownloader(queueManager,
indexBrowser,
+ null);
downloader.setTarget(target);
Thread th = new Thread(downloader);
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexRoot.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexRoot.java 2007-08-05
20:04:08 UTC (rev 14489)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexRoot.java 2007-08-06
16:57:43 UTC (rev 14490)
@@ -95,8 +95,10 @@
DatabaseManager.dropTables(indexBrowser.getDb());
DatabaseManager.createTables(indexBrowser.getDb());
- IndexManagementHelper.addIndex(queueManager, indexBrowser, null,
-
thaw.plugins.IndexBrowser.DEFAULT_INDEX);
+ for (int i = 0 ; i <
thaw.plugins.IndexBrowser.DEFAULT_INDEXES.length ; i++) {
+ IndexManagementHelper.addIndex(queueManager,
indexBrowser, null,
+
thaw.plugins.IndexBrowser.DEFAULT_INDEXES[i]);
+ }
forceReload();
