From 95eb3ec7192775a155f0ae5846c0b499b0f50dba Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Wed, 16 May 2007 09:09:14 +0000 Subject: [PATCH] Rename extension point to ftpFileEntryParsers and add to ISV Docs --- .../reference/extension-points/index.html | 2 ++ .../topics_Reference.xml | 1 + .../plugin.xml | 4 +-- ...ryParser.exsd => ftpFileEntryParsers.exsd} | 4 +-- .../ftp/parser/FTPClientConfigFactory.java | 30 +++++++++---------- 5 files changed, 22 insertions(+), 19 deletions(-) rename rse/plugins/org.eclipse.rse.subsystems.files.ftp/schema/{ftpFileEntryParser.exsd => ftpFileEntryParsers.exsd} (98%) diff --git a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html b/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html index 761f6c065a9..8be5ea7e84a 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html +++ b/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html @@ -17,6 +17,8 @@
  • org.eclipse.rse.core.systemTypeProviders
  • org.eclipse.rse.core.subsystemConfigurations
  • org.eclipse.rse.services.archivehandlers
    • +
  • org.eclipse.rse.services.archivehandlers
    • +
  • org.eclipse.rse.subsystems.files.ftp.ftpFileEntryParsers
    • diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml index 840400ee6ec..fd606797adb 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml +++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml @@ -12,6 +12,7 @@ + diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml index 8339bf925a2..33b96b6756a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml @@ -46,9 +46,9 @@ Javier Montalvo Orus (Symbian) - improved autodetection of FTPListingParser - + - + - + Extension point that allows providing extra parsers for the FTP LIST command output. @@ -235,7 +235,7 @@ If no priority is specified, the default value will be <code>Integer.MAX_V - Copyright (c) 2007 Symbian Software Ltd. All rights reserved. + Copyright (c) 2007 Symbian Software Ltd. and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/parser/FTPClientConfigFactory.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/parser/FTPClientConfigFactory.java index 8924d1b3487..1cf7eec6eac 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/parser/FTPClientConfigFactory.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/parser/FTPClientConfigFactory.java @@ -31,9 +31,9 @@ public class FTPClientConfigFactory implements IFTPClientConfigFactory { private Hashtable ftpConfigProxyById = new Hashtable(); - private Hashtable ftpConfig = new Hashtable(); - private Hashtable ftpFileEntryParser = new Hashtable(); - private IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.rse.subsystems.files.ftp","ftpFileEntryParser"); //$NON-NLS-1$ //$NON-NLS-2$ + private Hashtable ftpConfigs = new Hashtable(); + private Hashtable ftpParsers = new Hashtable(); + private IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.rse.subsystems.files.ftp","ftpFileEntryParsers"); //$NON-NLS-1$ //$NON-NLS-2$ /** * Constructor of the parser factory @@ -118,7 +118,7 @@ public class FTPClientConfigFactory implements IFTPClientConfigFactory { { FTPClientConfig config = null; - if(!ftpFileEntryParser.containsKey(foundProxy.getClassName())) + if(!ftpParsers.containsKey(foundProxy.getClassName())) { FTPFileEntryParser entryParser = null; try { @@ -130,7 +130,7 @@ public class FTPClientConfigFactory implements IFTPClientConfigFactory { } catch (ClassNotFoundException e) { e.printStackTrace(); } - ftpFileEntryParser.put(foundProxy.getClassName(), entryParser); + ftpParsers.put(foundProxy.getClassName(), entryParser); } config = new FTPClientConfig(foundProxy.getClassName()); @@ -151,10 +151,10 @@ public class FTPClientConfigFactory implements IFTPClientConfigFactory { if(ftpClientConfig==null) { - if(ftpConfig.containsKey(parser)) + if(ftpConfigs.containsKey(parser)) { //restore parser from hashtable - ftpClientConfig = (FTPClientConfig)ftpConfig.get(parser); + ftpClientConfig = (FTPClientConfig)ftpConfigs.get(parser); } else { @@ -169,7 +169,7 @@ public class FTPClientConfigFactory implements IFTPClientConfigFactory { { FTPClientConfig config = null; - if(!ftpFileEntryParser.containsKey(proxy.getClassName())) + if(!ftpParsers.containsKey(proxy.getClassName())) { FTPFileEntryParser entryParser = null; try { @@ -181,7 +181,7 @@ public class FTPClientConfigFactory implements IFTPClientConfigFactory { } catch (ClassNotFoundException e) { e.printStackTrace(); } - ftpFileEntryParser.put(proxy.getClassName(), entryParser); + ftpParsers.put(proxy.getClassName(), entryParser); } config = new FTPClientConfig(proxy.getClassName()); @@ -193,8 +193,8 @@ public class FTPClientConfigFactory implements IFTPClientConfigFactory { config.setShortMonthNames(proxy.getShortMonthNames()); config.setServerTimeZoneId(proxy.getServerTimeZoneId()); - ftpConfig.put(parser, config); - ftpClientConfig = (FTPClientConfig)ftpConfig.get(parser); + ftpConfigs.put(parser, config); + ftpClientConfig = (FTPClientConfig)ftpConfigs.get(parser); break; @@ -223,10 +223,10 @@ public class FTPClientConfigFactory implements IFTPClientConfigFactory { public FTPFileEntryParser createFileEntryParser(String key) throws ParserInitializationException { // - // the hashtable "ftpFileEntryParser" will be populated previously by getFTPClientConfig() + // the hashtable "ftpParsers" will be populated previously by getFTPClientConfig() // but in case the execution flow gets modified it's worth checking and populating it if required // - if(!ftpFileEntryParser.containsKey(key)) + if(!ftpParsers.containsKey(key)) { FTPClientConfigProxy proxy = (FTPClientConfigProxy)ftpConfigProxyById.get(key); @@ -240,11 +240,11 @@ public class FTPClientConfigFactory implements IFTPClientConfigFactory { } catch (ClassNotFoundException e) { e.printStackTrace(); } - ftpFileEntryParser.put(proxy.getClassName(), entryParser); + ftpParsers.put(proxy.getClassName(), entryParser); } - return (FTPFileEntryParser)ftpFileEntryParser.get(key); + return (FTPFileEntryParser)ftpParsers.get(key); } /*