Author: Varun Hiremath Date: Sun, 11 Apr 2010 19:43:53 -0400 Description: Remove all references to webdav, no longer supported in Debian Index: jftp-1.52.dfsg/src/java/net/sf/jftp/config/Settings.java =================================================================== --- jftp-1.52.dfsg.orig/src/java/net/sf/jftp/config/Settings.java 2010-04-11 19:42:59.000000000 -0400 +++ jftp-1.52.dfsg/src/java/net/sf/jftp/config/Settings.java 2010-04-11 19:43:09.000000000 -0400 @@ -65,7 +65,6 @@ public static boolean newTableGui = getUseJTableLayout(); public static boolean useFixedTableWidths = true; - public static boolean enableWebDav = false; // 1: manual, 2: onclick, 0: off @@ -189,7 +188,6 @@ public static String openImage; public static String sftpImage; public static String nfsImage; - public static String webdavImage; public static String linkImage; public static String typeImage; public static String deleteImage; @@ -612,7 +610,6 @@ openImage = "images/org/javalobby/icons/16x16/World2.gif"; sftpImage = "images/org/javalobby/icons/16x16/NewEnvelope.gif"; nfsImage = "images/org/javalobby/icons/16x16/TrafficGreen.gif"; - webdavImage = "images/org/javalobby/icons/16x16/DataStore.gif"; linkImage = "images/org/javalobby/icons/16x16/Right.gif"; typeImage = "images/org/javalobby/icons/20x20/Type.gif"; clearImage = "images/org/javalobby/icons/16x16/Undo.gif"; @@ -658,7 +655,6 @@ openImage = "images/current/drive_web.png"; sftpImage = "images/current/drive_link.png"; nfsImage = "images/current/drive_network.png"; - webdavImage = "images/current/house_go.png"; linkImage = "images/current/arrow_right.png"; typeImage = "images/current/email_go.png"; deleteImage = "images/current/control_stop.png"; Index: jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/AppMenuBar.java =================================================================== --- jftp-1.52.dfsg.orig/src/java/net/sf/jftp/gui/base/AppMenuBar.java 2010-04-11 19:42:06.000000000 -0400 +++ jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/AppMenuBar.java 2010-04-11 19:42:29.000000000 -0400 @@ -22,7 +22,6 @@ import net.sf.jftp.gui.hostchooser.NfsHostChooser; import net.sf.jftp.gui.hostchooser.SftpHostChooser; import net.sf.jftp.gui.hostchooser.SmbHostChooser; -import net.sf.jftp.gui.hostchooser.WebdavHostChooser; import net.sf.jftp.gui.tasks.AddBookmarks; import net.sf.jftp.gui.tasks.AdvancedOptions; import net.sf.jftp.gui.tasks.BookmarkItem; @@ -85,13 +84,11 @@ JMenuItem localSftpCon = new JMenuItem("Open SFTP Connection in Local Tab..."); JMenuItem localSmbCon = new JMenuItem("Open SMB/LAN Connection in Local Tab..."); JMenuItem localNfsCon = new JMenuItem("Open NFS Connection in Local Tab..."); - JMenuItem localWebdavCon = new JMenuItem("Open WebDAV Connection in Local Tab... (ALPHA)"); JMenuItem closeLocalCon = new JMenuItem("Close Active Connection in Local Tab"); JMenuItem ftpCon = new JMenuItem("Connect to FTP Server..."); JMenuItem sftpCon = new JMenuItem("Connect to SFTP Server..."); JMenuItem smbCon = new JMenuItem("Connect to SMB Server / Browse LAN..."); JMenuItem nfsCon = new JMenuItem("Connect to NFS Server..."); - JMenuItem webdavCon = new JMenuItem("Connect to WebDAV Server... (ALPHA)"); JMenuItem close = new JMenuItem("Disconnect and Connect to Filesystem"); JMenuItem exit = new JMenuItem("Exit"); JMenuItem readme = new JMenuItem("Show Readme..."); @@ -190,7 +187,6 @@ proxy.addActionListener(this); stdback.addActionListener(this); opts.addActionListener(this); - webdavCon.addActionListener(this); sshShell.addActionListener(this); shell.addActionListener(this); nl.addActionListener(this); @@ -199,7 +195,6 @@ localSftpCon.addActionListener(this); localSmbCon.addActionListener(this); localNfsCon.addActionListener(this); - localWebdavCon.addActionListener(this); closeLocalCon.addActionListener(this); add.addActionListener(this); storePasswords.addActionListener(this); @@ -452,7 +447,6 @@ file.add(sftpCon); file.add(smbCon); file.add(nfsCon); - file.add(webdavCon); file.addSeparator(); file.add(close); file.addSeparator(); @@ -462,7 +456,6 @@ file.add(localSmbCon); file.add(localNfsCon); - //file.add(localWebdavCon); -> not yet file.addSeparator(); file.add(closeLocalCon); file.addSeparator(); @@ -569,12 +562,6 @@ AddBookmarks a = new AddBookmarks(JFtp.statusP.jftp); a.update(); } - else if(e.getSource() == webdavCon) - { - WebdavHostChooser hc = new WebdavHostChooser(); - hc.toFront(); - hc.update(); - } else if((e.getSource() == localFtpCon) && (!jftp.uiBlocked)) { HostChooser hc = new HostChooser(null, true); @@ -607,14 +594,6 @@ //hc.setModal(true); hc.update(); } - else if((e.getSource() == localWebdavCon) && (!jftp.uiBlocked)) - { - WebdavHostChooser hc = new WebdavHostChooser(null, true); - hc.toFront(); - - //hc.setModal(true); - hc.update(); - } else if(e.getSource() == closeLocalCon) { JFtp.statusP.jftp.closeCurrentLocalTab(); Index: jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/StatusPanel.java =================================================================== --- jftp-1.52.dfsg.orig/src/java/net/sf/jftp/gui/base/StatusPanel.java 2010-04-11 19:42:37.000000000 -0400 +++ jftp-1.52.dfsg/src/java/net/sf/jftp/gui/base/StatusPanel.java 2010-04-11 19:42:51.000000000 -0400 @@ -22,7 +22,6 @@ import net.sf.jftp.gui.hostchooser.NfsHostChooser; import net.sf.jftp.gui.hostchooser.SftpHostChooser; import net.sf.jftp.gui.hostchooser.SmbHostChooser; -import net.sf.jftp.gui.hostchooser.WebdavHostChooser; import net.sf.jftp.gui.tasks.HttpBrowser; import net.sf.jftp.net.*; import net.sf.jftp.net.wrappers.HttpTransfer; @@ -51,10 +50,6 @@ this); private HImageButton nfscon = new HImageButton(Settings.nfsImage, "nfscon", "Add NFS Connection...", this); - private HImageButton webdavcon = new HImageButton(Settings.webdavImage, - "webdavcon", - "Add WebDAV Connection...", - this); public HImageButton close = new HImageButton(Settings.closeImage, "close", "Close active tab...", this); private HImageButton go = new HImageButton(Settings.refreshImage, "go", @@ -100,11 +95,6 @@ nfscon.setToolTipText("New NFS Connection..."); bar.add(new JLabel(" ")); - if(Settings.enableWebDav) bar.add(webdavcon); - webdavcon.setSize(24, 24); - webdavcon.setToolTipText("New WebDAV Connection..."); - bar.add(new JLabel(" ")); - bar.add(close); close.setSize(24, 24); close.setToolTipText("Close Active Remote tab..."); @@ -184,15 +174,6 @@ //hc.setModal(true); hc.update(); } - else if(e.getActionCommand().equals("webdavcon")) - { - //jftp.safeDisconnect(); - WebdavHostChooser hc = new WebdavHostChooser(); - hc.toFront(); - - //hc.setModal(true); - hc.update(); - } else if(e.getActionCommand().equals("close")) { jftp.closeCurrentTab();