diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java index c7dd044a1d6..60ca6d8da5f 100644 --- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java +++ b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2006, 2007 IBM Corporation. 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 @@ -386,7 +386,7 @@ public class RSEPersistenceManager implements IRSEPersistenceManager { job = new SaveRSEDOMJob(dom, getRSEPersistenceProvider()); dom.setSaveJob(job); } - job.schedule(3000); // five second delay + job.schedule(3000); // three second delay } } return result; diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java index 27ab063d3c6..648e50c2aa5 100644 --- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java +++ b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2006, 2007 IBM Corporation. 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 @@ -22,9 +22,15 @@ import org.eclipse.core.resources.WorkspaceJob; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.persistence.IRSEPersistenceProvider; import org.eclipse.rse.persistence.dom.RSEDOM; +/** + * The SaveRSEDOMJob is a workspace job that belongs to the family + * {@link RSECorePlugin#getThePersistenceManager()}. It is used to + * same a DOM to the workspace. A DOM corresponds to a profile. + */ public class SaveRSEDOMJob extends WorkspaceJob { private RSEDOM _dom; @@ -50,5 +56,14 @@ public class SaveRSEDOMJob extends WorkspaceJob { } return result; } + + public boolean belongsTo(Object family) { + Object[] families = new Object[] {RSECorePlugin.getThePersistenceManager()}; + for (int i = 0; i < families.length; i++) { + Object object = families[i]; + if (family == object) return true; + } + return super.belongsTo(family); + } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfileManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfileManager.java index 9749ae846a5..5f7c6cfa0e7 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfileManager.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfileManager.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2002, 2007 IBM Corporation. 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 @@ -126,8 +126,8 @@ public interface ISystemProfileManager { public boolean isSystemProfileActive(String profileName); /** - * @generated This field/method will be replaced during code generation - * @return The list of Profiles references + * @return The list of profiles known to this manager. This list is generated + * at the point of this call and may thus be manipulated by the caller. */ java.util.List getProfiles(); diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java index 35bb55d959b..7603bf528c5 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2006, 2007 IBM Corporation. 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 @@ -536,12 +536,12 @@ public interface ISystemRegistry extends ISchedulingRule { * @param systemType system type matching one of the system type names defined via the * systemTypes extension point. * @param connectionName unique connection name. - * @param hostName ip name of host. + * @param hostAddress ip name of host. * @param description optional description of the connection. Can be null. * @return SystemConnection object, or null if it failed to create. This is typically * because the connectionName is not unique. Call getLastException() if necessary. */ - public IHost createHost(String systemType, String connectionName, String hostName, String description) throws Exception; + public IHost createHost(String systemType, String connectionName, String hostAddress, String description) throws Exception; /** * Creates subsystems for a given host and subsystem configurations. diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java index 212aa8f8b23..e103982c542 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2006, 2007 IBM Corporation. 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 @@ -27,10 +27,17 @@ public class RSEModelResources extends NLS { public static String RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION; public static String RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION; + public static String RESID_MODELOBJECTS_FILTERSTRING_DESCRIPTION; + public static String RESID_MODELOBJECTS_HOSTPOOL_DESCRIPTION; + public static String RESID_MODELOBJECTS_PROFILE_DESCRIPTION; + public static String RESID_MODELOBJECTS_SERVERLAUNCHER_DESCRIPTION; + public static String RESID_MODELOBJECTS_FILTER_DESCRIPTION; + public static String RESID_MODELOBJECTS_FILTERPOOL_DESCRIPTION; static { // load message values from bundle file NLS.initializeMessages(BUNDLE_NAME, RSEModelResources.class); } + } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties index 964e5473d54..0ce05bf24a1 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2000, 2006 IBM Corporation. All rights reserved. +# Copyright (c) 2000, 2007 IBM Corporation. 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 @@ -19,3 +19,9 @@ RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION=An RSE Model Object represents any object in the Remote System Explorer. RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION=A Referencing Object encapsulates the operations required of an object which is merely a reference to another object. +RESID_MODELOBJECTS_FILTERSTRING_DESCRIPTION=A filter string is a single string in a filter. It describes which files will pass through the filter. +RESID_MODELOBJECTS_HOSTPOOL_DESCRIPTION=A host pool is a group of hosts. There is one host pool associated with each profile. +RESID_MODELOBJECTS_PROFILE_DESCRIPTION=Your profile is the object with which all your unique settings and RSE objects such as connections are associated. +RESID_MODELOBJECTS_SERVERLAUNCHER_DESCRIPTION=The Server Launcher is an object for storing configuration details about how to launch servers on the remote host. +RESID_MODELOBJECTS_FILTER_DESCRIPTION=A filter is a collection of filter strings that determines which files will pass through it. +RESID_MODELOBJECTS_FILTERPOOL_DESCRIPTION=A filter pool is a group of filters. There is one filter pool associated with each profile. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java index 55a225d3868..03700fc5586 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2006, 2007 IBM Corporation. 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 @@ -1230,14 +1230,6 @@ public class SystemResources extends NLS public static String ACTION_COMPILE_NOPROMPT_LABEL; - // RSE Model Objects - public static String RESID_MODELOBJECTS_FILTERSTRING_DESCRIPTION; - public static String RESID_MODELOBJECTS_HOSTPOOL_DESCRIPTION; - public static String RESID_MODELOBJECTS_PROFILE_DESCRIPTION; - public static String RESID_MODELOBJECTS_SERVERLAUNCHER_DESCRIPTION; - public static String RESID_MODELOBJECTS_FILTER_DESCRIPTION; - public static String RESID_MODELOBJECTS_FILTERPOOL_DESCRIPTION; - // Services form public static String RESID_SERVICESFORM_CONFIGURATION_TOOLTIP; public static String RESID_SERVICESFORM_SERVICES_TOOLTIP; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties index c78a71575d6..5f34c4259ca 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2000, 2006 IBM Corporation. All rights reserved. +# Copyright (c) 2000, 2007 IBM Corporation. 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 @@ -1418,13 +1418,6 @@ RESID_PROPERTIES_PROPERTIES_LABEL=Properties RESID_PROPERTIES_PROPERTIES_TOOLTIP= ACTION_COMPILE_NOPROMPT_LABEL=Compile -#### RSE Model Objects #### -RESID_MODELOBJECTS_FILTERSTRING_DESCRIPTION=A filter string is a single string in a filter. It describes which files will pass through the filter. -RESID_MODELOBJECTS_HOSTPOOL_DESCRIPTION=A host pool is a group of hosts. There is one host pool associated with each profile. -RESID_MODELOBJECTS_PROFILE_DESCRIPTION=Your profile is the object with which all your unique settings and RSE objects such as connections are associated. -RESID_MODELOBJECTS_SERVERLAUNCHER_DESCRIPTION=The Server Launcher is an object for storing configuration details about how to launch servers on the remote host. -RESID_MODELOBJECTS_FILTER_DESCRIPTION=A filter is a collection of filter strings that determines which files will pass through it. -RESID_MODELOBJECTS_FILTERPOOL_DESCRIPTION=A filter pool is a group of filters. There is one filter pool associated with each profile. RESID_SERVICESFORM_CONFIGURATION_TOOLTIP=Select the configuration you wish to use to enable this subsystem. A configuration comprises a connector service and a subsystem service. RESID_SERVICESFORM_SERVICES_TOOLTIP=Select the elements of your chosen configuration and you can view and edit their properties in the Properties section. diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPool.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPool.java index a5398ef45d4..49d364468da 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPool.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPool.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2002, 2007 IBM Corporation. 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 @@ -32,6 +32,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterSavePolicies; import org.eclipse.rse.core.filters.SystemFilterNamingPolicy; +import org.eclipse.rse.core.model.RSEModelResources; import org.eclipse.rse.internal.filters.SystemFilter; import org.eclipse.rse.internal.filters.SystemFilterContainerCommonMethods; import org.eclipse.rse.internal.filters.SystemFilterPoolReference; @@ -286,8 +287,6 @@ public class SystemFilterPool extends SystemPersistableReferencedObject * Use this method only if you are not using a SystemFilterPoolManager, else * use the createSystemFilterPool method in that class. * - * @param mofHelpers SystemMOFHelpers object with helper methods for saving and restoring via mof - * @param poolFolder the folder that will hold the filter pool. * This folder will be created if it does not already exist. * @param name the name of the filter pool. Typically this is also the name * of the given folder, but this is not required. For the save policy of one file @@ -296,15 +295,6 @@ public class SystemFilterPool extends SystemPersistableReferencedObject * to allow nested filters. * @param isDeletable true if this filter pool is allowed to be deleted by users. * @param tryToRestore true to attempt a restore first, false if a pure create operation. - * @param savePolicy The save policy for the filter pool and filters. One of the - * following constants from the SystemFilterConstants interface: - * - * @param namingPolicy The names to use for file and folders when persisting to disk. Pass - * null to just use the defaults. */ public ISystemFilterPool createSystemFilterPool( String name, @@ -558,7 +548,7 @@ public class SystemFilterPool extends SystemPersistableReferencedObject public String getDescription() { - return SystemResources.RESID_MODELOBJECTS_FILTERPOOL_DESCRIPTION; + return RSEModelResources.RESID_MODELOBJECTS_FILTERPOOL_DESCRIPTION; } /** @@ -860,7 +850,7 @@ public class SystemFilterPool extends SystemPersistableReferencedObject /** * Duplicates a given filter in the list. * @param filter SystemFilter object to clone - * @param alias New, unique, alias name to give this filter. Clone will fail if this is not unique. + * @param aliasName New, unique, alias name to give this filter. Clone will fail if this is not unique. */ public ISystemFilter cloneSystemFilter(ISystemFilter filter, String aliasName) { @@ -945,8 +935,6 @@ public class SystemFilterPool extends SystemPersistableReferencedObject * Restore specific filter pool. You should not call this directly, as it is possible * that certain data is not restored if the save policy is one file per filter. Rather, * you should call the createSystemFilterPoolMethod. - * @param mofHelpers SystemMOFHelpers object with helper methods for saving and restoring via mof - * @param folder The filter pool folder. * @param name name of pool to restore. Used to deduce file name for save policy of one file per pool. * @param savePolicy policy used to save the pool. One of the following from SystemFilterPoolManager: *