From 615e181bec42938015e4d6fc31252ab5886e71ad Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Mon, 2 Apr 2007 17:03:08 +0000 Subject: [PATCH] [cleanup] move FTPSubsystemResources out of core --- .../files/core/SystemFileResources.java | 3 --- .../files/core/SystemFileResources.properties | 3 --- .../files/ftp/FTPSubsystemResources.java | 27 +++++++++++++++++++ .../ftp/FTPSubsystemResources.properties | 16 +++++++++++ .../connectorservice/FTPConnectorService.java | 5 ++-- 5 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/FTPSubsystemResources.java create mode 100644 rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/FTPSubsystemResources.properties diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java index ba5e6f3ce2b..de758a0e2f9 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java @@ -183,9 +183,6 @@ public class SystemFileResources extends NLS public static String RESID_JOB_SEARCH_NAME; public static String RESID_JOB_DECORATEFILES_NAME; - public static String RESID_FTP_CONNECTORSERVICE_NAME; - public static String RESID_FTP_CONNECTORSERVICE_DESCRIPTION; - static { // load message values from bundle file NLS.initializeMessages(BUNDLE_NAME, SystemFileResources.class); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.properties b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.properties index 35e0615d97b..48b38b5a1f5 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.properties @@ -220,6 +220,3 @@ WIDGET_BROWSE_TOOLTIP=Browse for folder path RESID_JOB_SEARCH_NAME=Search RESID_JOB_DECORATEFILES_NAME=Decorate Files - -RESID_FTP_CONNECTORSERVICE_NAME=FTP Connector Service -RESID_FTP_CONNECTORSERVICE_DESCRIPTION=The FTP Connector Service uses the FTP protocol to connect to a remote host. You must have an FTP daemon running on the host. diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/FTPSubsystemResources.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/FTPSubsystemResources.java new file mode 100644 index 00000000000..9a2ae79624a --- /dev/null +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/FTPSubsystemResources.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2007 Wind River Systems, Inc. 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 + * + * Contributors: + * Martin Oberhuber (Wind River) - initial API and implementation + *******************************************************************************/ + +package org.eclipse.rse.internal.subsystems.files.ftp; + +import org.eclipse.osgi.util.NLS; + +public class FTPSubsystemResources extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.rse.internal.subsystems.files.ftp.FTPSubsystemResources"; //$NON-NLS-1$ + static { + NLS.initializeMessages(BUNDLE_NAME, FTPSubsystemResources.class); + } + private FTPSubsystemResources() { + } + + public static String RESID_FTP_CONNECTORSERVICE_NAME; + public static String RESID_FTP_CONNECTORSERVICE_DESCRIPTION; + +} diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/FTPSubsystemResources.properties b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/FTPSubsystemResources.properties new file mode 100644 index 00000000000..2216e707af5 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/FTPSubsystemResources.properties @@ -0,0 +1,16 @@ +################################################################################ +# Copyright (c) 2007 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber (Wind River) - initial API and implementation +################################################################################ + +# NLS_MESSAGEFORMAT_VAR +# NLS_ENCODING=UTF-8 + +RESID_FTP_CONNECTORSERVICE_NAME=FTP Connector Service +RESID_FTP_CONNECTORSERVICE_DESCRIPTION=The FTP Connector Service uses the FTP protocol to connect to a remote host. You must have an FTP daemon running on the host. diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java index cff1b97da89..258dca1bd1f 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java @@ -15,6 +15,7 @@ * Javier Montalvo Orus (Symbian) - Bug 161209 - Need a Log of ftp commands * Javier Montalvo Orus (Symbian) - Bug 169680 - [ftp] FTP files subsystem and service should use passive mode * David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies + * Martin Oberhuber (WindRiver) - [cleanup] move FTPSubsystemResources out of core ********************************************************************************/ package org.eclipse.rse.internal.subsystems.files.ftp.connectorservice; @@ -27,8 +28,8 @@ import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.model.PropertyType; import org.eclipse.rse.core.model.SystemSignonInformation; import org.eclipse.rse.internal.services.files.ftp.FTPService; +import org.eclipse.rse.internal.subsystems.files.ftp.FTPSubsystemResources; import org.eclipse.rse.services.files.IFileService; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.ui.subsystems.StandardConnectorService; import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsole; @@ -43,7 +44,7 @@ public class FTPConnectorService extends StandardConnectorService public FTPConnectorService(IHost host, int port) { - super(SystemFileResources.RESID_FTP_CONNECTORSERVICE_NAME,SystemFileResources.RESID_FTP_CONNECTORSERVICE_DESCRIPTION, host, port); + super(FTPSubsystemResources.RESID_FTP_CONNECTORSERVICE_NAME,FTPSubsystemResources.RESID_FTP_CONNECTORSERVICE_DESCRIPTION, host, port); _ftpService = new FTPService(); }