[jsword-svn] r1320 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install jsword/src/main/java/org/crosswire/jsword/book/install jsword/src/main/java/org/crosswire/jsword/book/install/sword jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword

dmsmith at www.crosswire.org dmsmith at www.crosswire.org
Sun May 6 18:59:07 MST 2007


Author: dmsmith
Date: 2007-05-06 18:59:06 -0700 (Sun, 06 May 2007)
New Revision: 1320

Modified:
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/Msg.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/Msg.properties
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstallerFactory.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.properties
   trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstallerFactory.java
Log:
Fixed a window size bug in the download sites editor.
Added the ability to download beta modules from Crosswire.

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java	2007-05-07 00:50:49 UTC (rev 1319)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java	2007-05-07 01:59:06 UTC (rev 1320)
@@ -173,6 +173,7 @@
         siteEditorPane = new JPanel();
         siteEditorPane.setLayout(new GridBagLayout());
         JPanel pnlMain = new JPanel();
+        pnlMain.setPreferredSize(new Dimension(300, 300));
         pnlMain.setLayout(new GridBagLayout());
         pnlMain.add(lblMesg, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 10, 10, 10), 0, 0));
         pnlMain.add(lblName, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
@@ -236,7 +237,7 @@
         dlgMain.setResizable(true);
         dlgMain.setModal(true);
 
-        GuiUtil.setSize(dlgMain, new Dimension(480, 320));
+        GuiUtil.setSize(dlgMain, new Dimension(750, 400));
         GuiUtil.centerWindow(dlgMain);
         dlgMain.setVisible(true);
         dlgMain.toFront();

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/Msg.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/Msg.java	2007-05-07 00:50:49 UTC (rev 1319)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/Msg.java	2007-05-07 01:59:06 UTC (rev 1320)
@@ -69,7 +69,8 @@
     static final Msg OPTION_CANCEL = new Msg("IndexResolver.OptionCancel"); //$NON-NLS-1$
 
     static final Msg HOST = new Msg("SwordSiteEditor.Host"); //$NON-NLS-1$
-    static final Msg DIRECTORY = new Msg("SwordSiteEditor.Directory"); //$NON-NLS-1$
+    static final Msg CATALOG_DIR = new Msg("SwordSiteEditor.CatalogDir"); //$NON-NLS-1$
+    static final Msg PACKAGE_DIR = new Msg("SwordSiteEditor.PackageDir"); //$NON-NLS-1$
     static final Msg PROXY_HOST = new Msg("SwordSiteEditor.ProxyHost"); //$NON-NLS-1$
     static final Msg PROXY_PORT = new Msg("SwordSiteEditor.ProxyPort"); //$NON-NLS-1$
 

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/Msg.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/Msg.properties	2007-05-07 00:50:49 UTC (rev 1319)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/Msg.properties	2007-05-07 01:59:06 UTC (rev 1320)
@@ -50,7 +50,8 @@
 IndexResolver.OptionCancel=Cancel
 
 SwordSiteEditor.Host=Host:
-SwordSiteEditor.Directory=Directory:
+SwordSiteEditor.CatalogDir=Catalog Directory:
+SwordSiteEditor.PackageDir=Zip Directory:
 SwordSiteEditor.ProxyHost=Proxy Host:
 SwordSiteEditor.ProxyPort=Proxy Port:
 

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java	2007-05-07 00:50:49 UTC (rev 1319)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java	2007-05-07 01:59:06 UTC (rev 1320)
@@ -48,9 +48,12 @@
         host = new JTextField();
         JLabel hostLabel = getLabelForText(Msg.HOST, host);
 
-        directory = new JTextField();
-        JLabel directoryLabel = getLabelForText(Msg.DIRECTORY, directory);
+        catalogDir = new JTextField();
+        JLabel catalogDirLabel = getLabelForText(Msg.CATALOG_DIR, catalogDir);
 
+        packageDir = new JTextField();
+        JLabel packageDirLabel = getLabelForText(Msg.PACKAGE_DIR, packageDir);
+
         proxyHost = new JTextField();
         JLabel proxyHostLabel = getLabelForText(Msg.PROXY_HOST, proxyHost);
 
@@ -58,14 +61,16 @@
         JLabel proxyPortLabel = getLabelForText(Msg.PROXY_PORT, proxyPort);
 
         setLayout(new GridBagLayout());
-        add(hostLabel,      new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
-        add(host,           new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
-        add(directoryLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
-        add(directory,      new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
-        add(proxyHostLabel, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
-        add(proxyHost,      new GridBagConstraints(1, 2, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
-        add(proxyPortLabel, new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
-        add(proxyPort,      new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
+        add(hostLabel,       new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        add(host,            new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
+        add(catalogDirLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        add(catalogDir,      new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
+        add(packageDirLabel, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        add(packageDir,      new GridBagConstraints(1, 2, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
+        add(proxyHostLabel,  new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        add(proxyHost,       new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
+        add(proxyPortLabel,  new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        add(proxyPort,       new GridBagConstraints(1, 4, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
 
         reset();
     }
@@ -81,7 +86,8 @@
         }
 
         installer.setHost(host.getText());
-        installer.setDirectory(directory.getText());
+        installer.setCatalogDirectory(catalogDir.getText());
+        installer.setPackageDirectory(packageDir.getText());
         installer.setProxyHost(proxyHost.getText());
         Integer pport = null;
         try
@@ -106,7 +112,8 @@
         }
 
         host.setText(installer.getHost());
-        directory.setText(installer.getDirectory());
+        catalogDir.setText(installer.getCatalogDirectory());
+        packageDir.setText(installer.getPackageDirectory());
         proxyHost.setText(installer.getProxyHost());
         Integer port = installer.getProxyPort();
         proxyPort.setText(port == null ? null : port.toString());
@@ -122,11 +129,16 @@
             host.setEditable(editable);
         }
 
-        if (directory != null)
+        if (catalogDir != null)
         {
-            directory.setEditable(editable);
+            catalogDir.setEditable(editable);
         }
 
+        if (packageDir != null)
+        {
+            packageDir.setEditable(editable);
+        }
+
         if (proxyHost != null)
         {
             proxyHost.setEditable(editable);
@@ -188,7 +200,8 @@
 
     private transient AbstractSwordInstaller installer;
     private JTextField host;
-    private JTextField directory;
+    private JTextField catalogDir;
+    private JTextField packageDir;
     private JTextField proxyHost;
     private JTextField proxyPort;
 

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.properties
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.properties	2007-05-07 00:50:49 UTC (rev 1319)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.properties	2007-05-07 01:59:06 UTC (rev 1320)
@@ -1,18 +1,18 @@
 # Format is as follows:
 # Each key is of the form: Installer.n, where n is a unique number.
 # Each value is of the form:
-# driver,label,host,path,proxyHost,proxyPort
+# driver,label,host,catalog path,zip path,index path,proxyHost,proxyPort
 # a value may be empty
 # The drivers are defined in InstallerFactory.properties and in each installer.
 
 # The Crosswire main "production" download site
-Installer.1=sword-http,Crosswire,www.crosswire.org,/ftpmirror/pub/sword,,
+Installer.1=sword-http,Crosswire,www.crosswire.org,/ftpmirror/pub/sword/raw,/ftpmirror/pub/sword/packages/rawzip,,,
 
 #FTP is no longer supported
 #Installer.1=sword-ftp,Crosswire,ftp.crosswire.org,/pub/sword/raw,,
 
 # Install site for NET bible
-Installer.2=sword-http,Bible.org,ftp.bible.org,/sword,,
+Installer.2=sword-http,Bible.org,ftp.bible.org,/sword/raw,/sword/packages/rawzip,,,
 
 # The Crosswire beta area is not set up correctly
-#Installer.3=sword-http,Crosswire Beta,www.crosswire.org,/ftpmirror/pub/sword/betaraw,,
+Installer.3=sword-http,Crosswire Beta,www.crosswire.org,/ftpmirror/pub/sword/betaraw,/ftpmirror/pub/sword/betapackages/rawzip,,,

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java	2007-05-07 00:50:49 UTC (rev 1319)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java	2007-05-07 01:59:06 UTC (rev 1320)
@@ -83,8 +83,12 @@
     {
         StringBuffer buf = new StringBuffer(host);
         buf.append(',');
-        buf.append(directory);
+        buf.append(packageDirectory);
         buf.append(',');
+        buf.append(catalogDirectory);
+        buf.append(',');
+        buf.append(indexDirectory);
+        buf.append(',');
         if (proxyHost != null)
         {
             buf.append(proxyHost);
@@ -191,7 +195,7 @@
 
                     URI temp = NetUtil.getTemporaryURI("swd", ZIP_SUFFIX); //$NON-NLS-1$
 
-                    download(job, directory + '/' + PACKAGE_DIR, sbmd.getInitials() + ZIP_SUFFIX, temp);
+                    download(job, packageDirectory, sbmd.getInitials() + ZIP_SUFFIX, temp);
 
                     // Once the unzipping is started, we need to continue
                     job.setCancelable(false);
@@ -242,7 +246,7 @@
         try
         {
             URI scratchfile = getCachedIndexFile();
-            download(job, directory + '/' + LIST_DIR, FILE_LIST_GZ, scratchfile);
+            download(job, catalogDirectory, FILE_LIST_GZ, scratchfile);
             loaded = false;
         }
         catch (InstallException ex)
@@ -265,7 +269,7 @@
 
         try
         {
-            download(job, directory + '/' + SEARCH_DIR, book.getInitials() + ZIP_SUFFIX, localDest);
+            download(job, packageDirectory + '/' + SEARCH_DIR, book.getInitials() + ZIP_SUFFIX, localDest);
         }
         catch (InstallException ex)
         {
@@ -374,26 +378,58 @@
     }
 
     /**
+     * @return the catologDirectory
+     */
+    public String getCatalogDirectory()
+    {
+        return catalogDirectory;
+    }
+
+    /**
+     * @param catologDirectory the catologDirectory to set
+     */
+    public void setCatalogDirectory(String catologDirectory)
+    {
+        this.catalogDirectory = catologDirectory;
+    }
+
+    /**
      * @return Returns the directory.
      */
-    public String getDirectory()
+    public String getPackageDirectory()
     {
-        return directory;
+        return packageDirectory;
     }
 
     /**
      * @param newDirectory The directory to set.
      */
-    public void setDirectory(String newDirectory)
+    public void setPackageDirectory(String newDirectory)
     {
-        if (directory == null || !directory.equals(newDirectory))
+        if (packageDirectory == null || !packageDirectory.equals(newDirectory))
         {
-            directory = newDirectory;
+            packageDirectory = newDirectory;
             loaded = false;
         }
     }
 
     /**
+     * @return the indexDirectory
+     */
+    public String getIndexDirectory()
+    {
+        return indexDirectory;
+    }
+
+    /**
+     * @param indexDirectory the indexDirectory to set
+     */
+    public void setIndexDirectory(String indexDirectory)
+    {
+        this.indexDirectory = indexDirectory;
+    }
+
+    /**
      * @return Returns the host.
      */
     public String getHost()
@@ -465,7 +501,7 @@
     {
         try
         {
-            URI scratchdir = Project.instance().getTempScratchSpace(getTempFileExtension(host, directory), true);
+            URI scratchdir = Project.instance().getTempScratchSpace(getTempFileExtension(host, catalogDirectory), true);
             return NetUtil.lengthenURI(scratchdir, FILE_LIST_GZ);
         }
         catch (IOException ex)
@@ -477,9 +513,9 @@
     /**
      * What are we using as a temp filename?
      */
-    private static String getTempFileExtension(String host, String directory)
+    private static String getTempFileExtension(String host, String catalogDir)
     {
-        return DOWNLOAD_PREFIX + host + directory.replace('/', '_');
+        return DOWNLOAD_PREFIX + host + catalogDir.replace('/', '_');
     }
 
     /* (non-Javadoc)
@@ -499,7 +535,7 @@
             return false;
         }
 
-        if (!equals(this.directory, that.directory))
+        if (!equals(this.packageDirectory, that.packageDirectory))
         {
             return false;
         }
@@ -517,7 +553,7 @@
         int ret = host.compareTo(myClass.host);
         if (ret != 0)
         {
-            ret = directory.compareTo(myClass.directory);
+            ret = packageDirectory.compareTo(myClass.packageDirectory);
         }
         return ret;
     }
@@ -528,7 +564,7 @@
     /* @Override */
     public int hashCode()
     {
-        return host.hashCode() + directory.hashCode();
+        return host.hashCode() + packageDirectory.hashCode();
     }
 
     /**
@@ -544,16 +580,6 @@
     }
 
     /**
-     * The relative path of the dir holding the zip files
-     */
-    protected static final String PACKAGE_DIR = "packages/rawzip"; //$NON-NLS-1$
-
-    /**
-     * The relative path of the dir holding the index file
-     */
-    private static final String LIST_DIR = "raw"; //$NON-NLS-1$
-
-    /**
      * A map of the entries in this download area
      */
     protected Map entries = new HashMap();
@@ -574,11 +600,21 @@
     protected Integer proxyPort;
 
     /**
-     * The directory containing books on the <code>host</code>.
+     * The directory containing zipped books on the <code>host</code>.
      */
-    protected String directory = "/"; //$NON-NLS-1$
+    protected String packageDirectory = ""; //$NON-NLS-1$
 
     /**
+     * The directory containing the catalog of all books on the <code>host</code>.
+     */
+    protected String catalogDirectory = ""; //$NON-NLS-1$
+
+    /**
+     * The directory containing the catalog of all books on the <code>host</code>.
+     */
+    protected String indexDirectory = ""; //$NON-NLS-1$
+
+    /**
      * Do we need to reload the index file
      */
     protected boolean loaded;
@@ -607,4 +643,5 @@
      * When we cache a download index
      */
     protected static final String DOWNLOAD_PREFIX = "download-"; //$NON-NLS-1$
+
 }

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java	2007-05-07 00:50:49 UTC (rev 1319)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java	2007-05-07 01:59:06 UTC (rev 1320)
@@ -65,7 +65,7 @@
     {
         try
         {
-            return new URI(NetUtil.PROTOCOL_HTTP, host, directory + '/' + PACKAGE_DIR + '/' + book.getInitials() + ZIP_SUFFIX, null);
+            return new URI(NetUtil.PROTOCOL_HTTP, host, packageDirectory + '/' + book.getInitials() + ZIP_SUFFIX, null);
         }
         catch (URISyntaxException e)
         {

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstallerFactory.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstallerFactory.java	2007-05-07 00:50:49 UTC (rev 1319)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstallerFactory.java	2007-05-07 01:59:06 UTC (rev 1320)
@@ -21,6 +21,8 @@
  */
 package org.crosswire.jsword.book.install.sword;
 
+import java.util.regex.Pattern;
+
 import org.crosswire.jsword.book.install.Installer;
 import org.crosswire.jsword.book.install.InstallerFactory;
 
@@ -48,20 +50,49 @@
      */
     public Installer createInstaller(String installerDefinition)
     {
-        String[] parts = installerDefinition.split(",", 4); //$NON-NLS-1$
-        if (parts.length < 4)
+        String[] parts = commaPattern.split(installerDefinition, 6);
+        switch (parts.length)
         {
-            throw new IllegalArgumentException(Msg.INVALID_DEFINITION.toString(installerDefinition));
+            case 4:
+                return createOldInstaller(parts);
+            case 6:
+                return createInstaller(parts);
+            default:
+                throw new IllegalArgumentException(Msg.INVALID_DEFINITION.toString(installerDefinition));
         }
 
-        HttpSwordInstaller reply = new HttpSwordInstaller();
+    }
 
+    private Installer createInstaller(String[] parts)
+    {
+        AbstractSwordInstaller reply = new HttpSwordInstaller();
+
         reply.setHost(parts[0]);
-        reply.setDirectory(parts[1]);
+        reply.setPackageDirectory(parts[1]);
+        reply.setCatalogDirectory(parts[2]);
+        if (parts[3].length() > 0)
+        {
+            reply.setProxyHost(parts[3]);
+            if (parts[4].length() > 0)
+            {
+                reply.setProxyPort(Integer.valueOf(parts[4]));
+            }
+        }
+
+        return reply;
+    }
+
+    private Installer createOldInstaller(String[] parts)
+    {
+        AbstractSwordInstaller reply = new HttpSwordInstaller();
+
+        reply.setHost(parts[0]);
+        reply.setPackageDirectory(parts[1] + '/' + PACKAGE_DIR);
+        reply.setCatalogDirectory(parts[1] + '/' + LIST_DIR);
         if (parts[2].length() > 0)
         {
             reply.setProxyHost(parts[2]);
-            if (parts[5].length() > 0)
+            if (parts[3].length() > 0)
             {
                 reply.setProxyPort(Integer.valueOf(parts[3]));
             }
@@ -69,4 +100,17 @@
 
         return reply;
     }
+
+    /**
+     * The relative path of the dir holding the zip files
+     */
+    protected static final String PACKAGE_DIR = "packages/rawzip"; //$NON-NLS-1$
+
+    /**
+     * The relative path of the dir holding the index file
+     */
+    private static final String LIST_DIR = "raw"; //$NON-NLS-1$
+
+
+    private Pattern commaPattern = Pattern.compile(","); //$NON-NLS-1$
 }

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java	2007-05-07 00:50:49 UTC (rev 1319)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java	2007-05-07 01:59:06 UTC (rev 1320)
@@ -69,7 +69,7 @@
     /* @Override */
     public String getInstallerDefinition()
     {
-        return PROTOCOL_SWORD + "://" + username + ":" + password + "@" + host + directory; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        return PROTOCOL_SWORD + "://" + username + ":" + password + "@" + host + packageDirectory; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /* (non-Javadoc)
@@ -88,7 +88,7 @@
 
         try
         {
-            return new URI(NetUtil.PROTOCOL_FTP, host, directory + "/" + sbmd.getInitials() + ZIP_SUFFIX, null); //$NON-NLS-1$ 
+            return new URI(NetUtil.PROTOCOL_FTP, host, packageDirectory + "/" + sbmd.getInitials() + ZIP_SUFFIX, null); //$NON-NLS-1$ 
         }
         catch (URISyntaxException ex)
         {

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstallerFactory.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstallerFactory.java	2007-05-07 00:50:49 UTC (rev 1319)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstallerFactory.java	2007-05-07 01:59:06 UTC (rev 1320)
@@ -79,7 +79,7 @@
         {
             reply.setHost(part2);
         }
-        reply.setDirectory(NetUtil.SEPARATOR + parts[3]);
+        reply.setPackageDirectory(NetUtil.SEPARATOR + parts[3]);
 
         return reply;
     }




More information about the jsword-svn mailing list