View | Details | Raw Unified | Return to bug 189858 | Differences between
and this patch

Collapse All | Expand All

(-)tasks/tteamsup1.html (-8 / +8 lines)
Lines 15-25 Link Here
15
<div>
15
<div>
16
<div class="p">All connections, filter data, user actions, and compile
16
<div class="p">All connections, filter data, user actions, and compile
17
commands belong to profiles. Profiles can be shared by team members for the purpose of
17
commands belong to profiles. Profiles can be shared by team members for the purpose of
18
team development. You can work with your profiles in the Team view to enable
18
team development. You can work with your profiles in the Profiles view to enable
19
greater control over team-sharable elements in the Remote System Explorer.
19
greater control over team-sharable elements in the Remote System Explorer.
20
<div class="note"><span class="notetitle">Note: </span>Because
20
<div class="note"><span class="notetitle">Note: </span>Because
21
the Remote Systems view only displays connections, filters, user
21
the Remote Systems view only displays connections, filters, user
22
actions, and compile commands from active profiles, you need to be in the Team
22
actions, and compile commands from active profiles, you need to be in the Profiles
23
view to work with or activate your non-active profiles.
23
view to work with or activate your non-active profiles.
24
</div>
24
</div>
25
</div>
25
</div>
Lines 28-44 Link Here
28
<ol>
28
<ol>
29
<li>In the Remote Systems perspective, select the Team tab which by
29
<li>In the Remote Systems perspective, select the Team tab which by
30
default is located in the same pane as the Remote Systems view.
30
default is located in the same pane as the Remote Systems view.
31
This will bring the Team view to the front of the Remote System
31
This will bring the Profiles view to the front of the Remote System
32
Explorer. You can also use the
32
Explorer. You can also use the
33
<img  src="../images/gsarrow.gif" title="" alt="menu" style="width: 24px; height: 23px;"/>
33
<img  src="../images/gsarrow.gif" title="" alt="menu" style="width: 24px; height: 23px;"/>
34
button on the Remote Systems view and select the <span style="font-weight: bold;">Work With Profiles</span>
34
button on the Remote Systems view and select the <span style="font-weight: bold;">Work With Profiles</span>
35
action.<br/>
35
action.<br/>
36
  </li>
36
  </li>
37
  <li>In the Team view, expand the root element, <b>RemoteSystemsConnections</b>,
37
  <li>In the Profiles view, expand the root element, <b>RemoteSystemsConnections</b>,
38
to see a list of your profiles.
38
to see a list of your profiles.
39
    <ul>
39
    <ul>
40
      <li>To create a profile, right-click on the root element in the
40
      <li>To create a profile, right-click on the root element in the
41
Team view, and select <b>New &gt; Profile</b> and complete the dialog box for the
41
Profiles view, and select <b>New &gt; Profile</b> and complete the dialog box for the
42
profile.</li>
42
profile.</li>
43
      <li>To activate or deactivate a profile, right-click the profile
43
      <li>To activate or deactivate a profile, right-click the profile
44
and select <b>Active</b> (if it is deactivated) or <b>Not active</b> (if it is active).</li>
44
and select <b>Active</b> (if it is deactivated) or <b>Not active</b> (if it is active).</li>
Lines 48-68 Link Here
48
      <li>To rename a profile, right-click the profile and select <b>Rename</b>.</li>
48
      <li>To rename a profile, right-click the profile and select <b>Rename</b>.</li>
49
    </ul>
49
    </ul>
50
  </li>
50
  </li>
51
  <li>In the Team view, you can also expand your profiles to view
51
  <li>In the Profiles view, you can also expand your profiles to view
52
connections, filter pools, user actions, and compile commands that belong to each
52
connections, filter pools, user actions, and compile commands that belong to each
53
profile. Right-click on any of your specific filters, user actions, and so on,
53
profile. Right-click on any of your specific filters, user actions, and so on,
54
to open a <b>Work with</b> window. These are the same actions available in the
54
to open a <b>Work with</b> window. These are the same actions available in the
55
Remote Systems view. To work with filter pools, for example, right-click one
55
Remote Systems view. To work with filter pools, for example, right-click one
56
of your filters, and select <b>Work with filter pools</b>. Keep in mind that
56
of your filters, and select <b>Work with filter pools</b>. Keep in mind that
57
the Remote Systems view is the more ideal environment to manipulate filters,
57
the Remote Systems view is the more ideal environment to manipulate filters,
58
filter pools, compile commands, user actions, and so on. The Team view is designed to
58
filter pools, compile commands, user actions, and so on. The Profiles view is designed to
59
manage profiles, and view the elements that belong to each profile. The Remote
59
manage profiles, and view the elements that belong to each profile. The Remote
60
Systems view is designed for you to work with all the items that belong to your
60
Systems view is designed for you to work with all the items that belong to your
61
active profiles. It includes a greater number of right-click and menu options
61
active profiles. It includes a greater number of right-click and menu options
62
for a development-focused approach.</li>
62
for a development-focused approach.</li>
63
  <li>When you have finished working with your profiles, switch back to
63
  <li>When you have finished working with your profiles, switch back to
64
the Remote Systems view, by clicking the Remote Systems tab, to continue
64
the Remote Systems view, by clicking the Remote Systems tab, to continue
65
working with active profile artifacts, or remain in the Team view to
65
working with active profile artifacts, or remain in the Profiles view to
66
<a  href="tteamsup.html">synchronize your profiles with the repository</a>.</li>
66
<a  href="tteamsup.html">synchronize your profiles with the repository</a>.</li>
67
</ol>
67
</ol>
68
</div>
68
</div>
(-)tasks/tteamsup.html (-4 / +4 lines)
Lines 26-34 Link Here
26
the server's encoded version information with your local files. This
26
the server's encoded version information with your local files. This
27
happens only once and you can just receive all of the incoming changes
27
happens only once and you can just receive all of the incoming changes
28
and your local workspace will then be synchronized with the server. You
28
and your local workspace will then be synchronized with the server. You
29
might also find inactive profiles that belong to other teammates in the Team
29
might also find inactive profiles that belong to other teammates in the Profiles
30
view after you synchronize with the central server. You can choose whether
30
view after you synchronize with the central server. You can choose whether
31
or not to activate these profiles in the Team view if you want to see the
31
or not to activate these profiles in the Profiles view if you want to see the
32
profile's contents in the Remote System Explorer on your local workstation.</div>
32
profile's contents in the Remote System Explorer on your local workstation.</div>
33
<p>In a team programming environment, team members do work in their own workbench,
33
<p>In a team programming environment, team members do work in their own workbench,
34
isolated from others. Eventually they will want to share their work with
34
isolated from others. Eventually they will want to share their work with
Lines 38-44 Link Here
38
<ol>
38
<ol>
39
<li class="skipspace">In the Remote System Explorer perspective, select the Team tab which by
39
<li class="skipspace">In the Remote System Explorer perspective, select the Team tab which by
40
  default is located in the same pane as the Remote Systems view. This
40
  default is located in the same pane as the Remote Systems view. This
41
  will bring the Team view to the front of the Remote System Explorer.
41
  will bring the Profiles view to the front of the Remote System Explorer.
42
  You can also use the <img src="../images/gsarrow.gif" title="" alt="menu" style="width: 24px; height: 23px;"/>
42
  You can also use the <img src="../images/gsarrow.gif" title="" alt="menu" style="width: 24px; height: 23px;"/>
43
button on the Remote Systems view and select the <span style="font-weight: bold;">Work
43
button on the Remote Systems view and select the <span style="font-weight: bold;">Work
44
With Profiles</span> action.<span> </span></li>
44
With Profiles</span> action.<span> </span></li>
Lines 100-106 Link Here
100
receiving incoming resources from the repository, right-click on the <span
100
receiving incoming resources from the repository, right-click on the <span
101
 style="font-weight: bold;">RemoteSystemsConnection </span>project,
101
 style="font-weight: bold;">RemoteSystemsConnection </span>project,
102
and select <b>Reload Remote System Explorer</b>. This refreshes
102
and select <b>Reload Remote System Explorer</b>. This refreshes
103
the Remote System Explorer and Team view to reflect the new or changed
103
the Remote System Explorer and Profiles view to reflect the new or changed
104
resources.</span></li>
104
resources.</span></li>
105
</ol>
105
</ol>
106
</div>
106
</div>
(-)concepts/cprofile.html (-3 / +3 lines)
Lines 53-59 Link Here
53
shared by the team
53
shared by the team
54
assists in team support, since all connections, filter pools, and team
54
assists in team support, since all connections, filter pools, and team
55
profiles
55
profiles
56
can be shared among team members. You can use the Team view to control
56
can be shared among team members. You can use the Profiles view to control
57
which
57
which
58
profiles display in your workspace by making the profiles active.
58
profiles display in your workspace by making the profiles active.
59
<div class="note"><span class="notetitle">Note: </span>Making
59
<div class="note"><span class="notetitle">Note: </span>Making
Lines 63-69 Link Here
63
workspace,
63
workspace,
64
but a teammate can make that profile active in his or her workspace.
64
but a teammate can make that profile active in his or her workspace.
65
You will
65
You will
66
see the profiles you or your teammates have made inactive in the Team
66
see the profiles you or your teammates have made inactive in the Profiles
67
view when you perform a synchronization with the repository in which
67
view when you perform a synchronization with the repository in which
68
the profiles are stored. See topics in the help contents and
68
the profiles are stored. See topics in the help contents and
69
links
69
links
Lines 75-81 Link Here
75
resources in a profile are stored locally on your workstation. To
75
resources in a profile are stored locally on your workstation. To
76
participate
76
participate
77
in team support, you need to synchronize with, and upload your profiles
77
in team support, you need to synchronize with, and upload your profiles
78
to a central repository. Use the <a href="../tasks/tteamsup.html">Team
78
to a central repository. Use the <a href="../tasks/tteamsup.html">Profiles
79
view</a> to
79
view</a> to
80
share source and profile information with other team members, and to
80
share source and profile information with other team members, and to
81
synchronize
81
synchronize
(-)concepts/cteam.html (-1 / +1 lines)
Lines 35-41 Link Here
35
  <li>Compile commands</li>
35
  <li>Compile commands</li>
36
</ul>
36
</ul>
37
</div>
37
</div>
38
<p> Use the Team view of the Remote System Explorer perspective to
38
<p> Use the Profiles view of the Remote System Explorer perspective to
39
associate
39
associate
40
and synchronize the project named RemoteSystemsConnection that contains
40
and synchronize the project named RemoteSystemsConnection that contains
41
these profiles with a repository. After
41
these profiles with a repository. After
(-)guide/plugin/other.html (-1 / +1 lines)
Lines 31-37 Link Here
31
			<li><samp>org.eclipse.rse.ui.view.systemView</samp> for the primary
31
			<li><samp>org.eclipse.rse.ui.view.systemView</samp> for the primary
32
			  <A href="view_RS.gif">Remote Systems</A> view.
32
			  <A href="view_RS.gif">Remote Systems</A> view.
33
			<li><samp>org.eclipse.rse.ui.view.teamView</samp> for the
33
			<li><samp>org.eclipse.rse.ui.view.teamView</samp> for the
34
			  <A href="view_Team.gif">Team</A> view in the RSE perspective.
34
			  <A href="view_Team.gif">Profiles</A> view in the RSE perspective.
35
			<li><samp>org.eclipse.rse.ui.view.systemTableView</samp> for the
35
			<li><samp>org.eclipse.rse.ui.view.systemTableView</samp> for the
36
			  <A href="view_Table.gif">Remote System Details</A> view in the RSE perspective.
36
			  <A href="view_Table.gif">Remote System Details</A> view in the RSE perspective.
37
			</ul>
37
			</ul>
(-)src/org/eclipse/rse/core/SystemResourceManager.java (-38 / +32 lines)
Lines 13-18 Link Here
13
 * Contributors:
13
 * Contributors:
14
 * Dave McKnight (IBM) - [177155] Move from rse.ui/systems/org.eclipse.rse.core
14
 * Dave McKnight (IBM) - [177155] Move from rse.ui/systems/org.eclipse.rse.core
15
 * Martin Oberhuber (Wind River) - Re-add missing methods for user actions
15
 * Martin Oberhuber (Wind River) - Re-add missing methods for user actions
16
 * David Dykstal (IBM) - [189858] delayed the creation of the remote systems project
17
 *                                removed unneeded first time logic and flags
18
 *                                renamed createRemoteSystemsProjectInternal to ensureRemoteSystemsProject
19
 *                                made ensureRemoteSystemsProject private instead of protected 
16
 ********************************************************************************/
20
 ********************************************************************************/
17
21
18
package org.eclipse.rse.core;
22
package org.eclipse.rse.core;
Lines 59-66 Link Here
59
63
60
	private static IProject remoteSystemsProject = null;
64
	private static IProject remoteSystemsProject = null;
61
	private static IProject remoteSystemsTempFilesProject = null;
65
	private static IProject remoteSystemsTempFilesProject = null;
62
	private static boolean initDone = false;
63
	private static boolean firstTime = false;
64
	private static SystemResourceHelpers helpers = null;
66
	private static SystemResourceHelpers helpers = null;
65
67
66
	private static ISystemResourceListener _listener = null;
68
	private static ISystemResourceListener _listener = null;
Lines 146-166 Link Here
146
	}
148
	}
147
	
149
	
148
    /**
150
    /**
149
     * Get the default remote systems project.
151
	 * Get the default remote systems project.
150
     * @return IProject handle of the project. Use exists() to test existence.
152
	 * If found but closed, this will open the project.
151
     */
153
	 * @return IProject handle of the project. Use exists() to test existence.
152
    public static IProject getRemoteSystemsProject()
154
	 */
153
    {
155
	public static IProject getRemoteSystemsProject() 
154
    	if (remoteSystemsProject == null)
156
	{
155
    	{
157
		return getRemoteSystemsProject(true);
156
	      remoteSystemsProject = ResourcesPlugin.getWorkspace().getRoot().getProject(RESOURCE_PROJECT_NAME);
158
	}
157
	      if (!initDone || !remoteSystemsProject.isAccessible())
158
	        remoteSystemsProject = createRemoteSystemsProjectInternal(remoteSystemsProject);
159
    	}
160
	    return remoteSystemsProject;
161
    }
162
159
163
	/**
160
	/**
161
	 * Get the default remote systems project.
162
	 * If found but closed, this will open the project.
163
	 * @param force if true force the creation of the project if not found.
164
	 * In any case, returns handle to the project.
165
	 * @return IProject handle of the project. Use exists() to test existence.
166
	 */
167
	public static IProject getRemoteSystemsProject(boolean force) {
168
		if (remoteSystemsProject == null) {
169
			remoteSystemsProject = ResourcesPlugin.getWorkspace().getRoot().getProject(RESOURCE_PROJECT_NAME);
170
		}
171
		if ((!remoteSystemsProject.exists() && force) || (remoteSystemsProject.exists() && !remoteSystemsProject.isOpen())) {
172
			ensureRemoteSystemsProject(remoteSystemsProject);
173
		}
174
		return remoteSystemsProject;
175
	}
176
177
    /**
164
	 * Get the default remote systems temp files project.
178
	 * Get the default remote systems temp files project.
165
	 * @return IProject handle of the project. Use exists() to test existence.
179
	 * @return IProject handle of the project. Use exists() to test existence.
166
	 */
180
	 */
Lines 177-183 Link Here
177
     * @param proj the handle for the remote systems project
191
     * @param proj the handle for the remote systems project
178
     * @return the IProject handle of the project (the argument)
192
     * @return the IProject handle of the project (the argument)
179
     */
193
     */
180
    protected static IProject createRemoteSystemsProjectInternal(IProject proj) 
194
    private static IProject ensureRemoteSystemsProject(IProject proj) 
181
    {
195
    {
182
		// Check first for the project to be closed. If yes, try to open it and if this fails,
196
		// Check first for the project to be closed. If yes, try to open it and if this fails,
183
		// try to delete if first before failing here. The case is that the user removed the
197
		// try to delete if first before failing here. The case is that the user removed the
Lines 189-195 Link Here
189
			} catch (Exception e) {
203
			} catch (Exception e) {
190
				try {
204
				try {
191
					proj.delete(false, true, null);
205
					proj.delete(false, true, null);
192
					
193
					RSECorePlugin.getDefault().getLogger().logWarning("Removed stale remote systems project reference. Re-creating remote system project to recover."); //$NON-NLS-1$
206
					RSECorePlugin.getDefault().getLogger().logWarning("Removed stale remote systems project reference. Re-creating remote system project to recover."); //$NON-NLS-1$
194
				} catch (CoreException exc) {
207
				} catch (CoreException exc) {
195
					// If the delete fails, the original opening error will be passed to the error log.
208
					// If the delete fails, the original opening error will be passed to the error log.
Lines 205-235 Link Here
205
				String newNatures[] = { RemoteSystemsProject.ID };
218
				String newNatures[] = { RemoteSystemsProject.ID };
206
				description.setNatureIds(newNatures);
219
				description.setNatureIds(newNatures);
207
				proj.setDescription(description, null);
220
				proj.setDescription(description, null);
208
				firstTime = true;
209
			} catch (Exception e) {
221
			} catch (Exception e) {
210
				RSECorePlugin.getDefault().getLogger().logError("error creating remote systems project", e); //$NON-NLS-1$
222
				RSECorePlugin.getDefault().getLogger().logError("error creating remote systems project", e); //$NON-NLS-1$
211
			}
223
			}
212
		}
224
		}
213
		try {
214
			// create types folder...
215
			// getResourceHelpers().getOrCreateFolder(proj, RESOURCE_TYPE_FILTERS_FOLDER_NAME);
216
		} catch (Exception e) {
217
			RSECorePlugin.getDefault().getLogger().logError("error opening/creating types folder", e); //$NON-NLS-1$
218
		}
219
		initDone = true;
220
		return proj;
225
		return proj;
221
	}
226
	}
222
    /**
227
223
     * Return true if we just created the remote systems project for the first time.
224
     * This call has the side effect of resetting the flag to false so it doesn't return
225
     * true more than once, ever.
226
     */
227
    public static boolean isFirstTime()
228
    {
229
    	boolean firsttime = firstTime;
230
    	firstTime = false;
231
    	return firsttime;
232
    }
233
    // --------------------------------------------
228
    // --------------------------------------------
234
    // GET ALL EXISTING PROFILE NAMES OR FOLDERS...
229
    // GET ALL EXISTING PROFILE NAMES OR FOLDERS...
235
    // --------------------------------------------
230
    // --------------------------------------------
Lines 385-391 Link Here
385
        String folderName = getFolderName(ssFactory);
380
        String folderName = getFolderName(ssFactory);
386
        return getResourceHelpers().getOrCreateFolder(parentFolder, folderName); // Do create it.
381
        return getResourceHelpers().getOrCreateFolder(parentFolder, folderName); // Do create it.
387
    }
382
    }
388
383
   
389
    /**
384
    /**
390
     * Get compile commands root folder given a system profile name and subsystem factory Id.
385
     * Get compile commands root folder given a system profile name and subsystem factory Id.
391
     * This is a special-needs method provided for the Import action processing,
386
     * This is a special-needs method provided for the Import action processing,
Lines 396-402 Link Here
396
        IFolder parentFolder = getCompileCommandsFolder(profileName);
391
        IFolder parentFolder = getCompileCommandsFolder(profileName);
397
        return getResourceHelpers().getOrCreateFolder(parentFolder, factoryId); // Do create it.
392
        return getResourceHelpers().getOrCreateFolder(parentFolder, factoryId); // Do create it.
398
    }
393
    }
399
   
400
394
401
    // -------------------
395
    // -------------------
402
    // FOLDER ACTIONS...
396
    // FOLDER ACTIONS...
(-)src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java (-4 / +8 lines)
Lines 13-18 Link Here
13
 * Contributors:
13
 * Contributors:
14
 * David Dykstal (IBM) - 142806: refactoring persistence framework
14
 * David Dykstal (IBM) - 142806: refactoring persistence framework
15
 * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
15
 * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
16
 * David Dykstal (IBM) - [189858] made sure that a reference remains broken if the profile
17
 *                                contained in the reference was not found.
16
 ********************************************************************************/
18
 ********************************************************************************/
17
19
18
package org.eclipse.rse.internal.core.filters;
20
package org.eclipse.rse.internal.core.filters;
Lines 169-178 Link Here
169
			String profileName = getReferencedFilterPoolManagerName();
171
			String profileName = getReferencedFilterPoolManagerName();
170
			ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
172
			ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
171
			ISystemProfile profile = registry.getSystemProfile(profileName);
173
			ISystemProfile profile = registry.getSystemProfile(profileName);
172
			ISubSystem subsystem = (ISubSystem) getProvider();
174
			if (profile != null) {
173
			ISubSystemConfiguration config = subsystem.getSubSystemConfiguration();
175
				ISubSystem subsystem = (ISubSystem) getProvider();
174
			filterPoolManager = config.getFilterPoolManager(profile);
176
				ISubSystemConfiguration config = subsystem.getSubSystemConfiguration();
175
			filterPool = filterPoolManager.getSystemFilterPool(filterPoolName);
177
				filterPoolManager = config.getFilterPoolManager(profile);
178
				filterPool = filterPoolManager.getSystemFilterPool(filterPoolName);
179
			}
176
		}
180
		}
177
		if (filterPool != null) {
181
		if (filterPool != null) {
178
			setReferenceToFilterPool(filterPool);
182
			setReferenceToFilterPool(filterPool);
(-)src/org/eclipse/rse/internal/persistence/PFWorkspaceLocation.java (-7 / +22 lines)
Lines 7-12 Link Here
7
 * 
7
 * 
8
 * Contributors:
8
 * Contributors:
9
 * IBM Corporation - initial API and implementation
9
 * IBM Corporation - initial API and implementation
10
 * David Dykstal (IBM) - [189858] delayed the creation of the remote systems project by
11
 *                                using handle-only operations. The project is created only
12
 *                                if required to exist for writing.
10
 *******************************************************************************/
13
 *******************************************************************************/
11
14
12
package org.eclipse.rse.internal.persistence;
15
package org.eclipse.rse.internal.persistence;
Lines 17-22 Link Here
17
import java.util.List;
20
import java.util.List;
18
import java.util.Set;
21
import java.util.Set;
19
22
23
import org.eclipse.core.resources.IContainer;
20
import org.eclipse.core.resources.IFile;
24
import org.eclipse.core.resources.IFile;
21
import org.eclipse.core.resources.IFolder;
25
import org.eclipse.core.resources.IFolder;
22
import org.eclipse.core.resources.IResource;
26
import org.eclipse.core.resources.IResource;
Lines 24-29 Link Here
24
import org.eclipse.core.runtime.IPath;
28
import org.eclipse.core.runtime.IPath;
25
import org.eclipse.core.runtime.Path;
29
import org.eclipse.core.runtime.Path;
26
import org.eclipse.rse.core.RSECorePlugin;
30
import org.eclipse.rse.core.RSECorePlugin;
31
import org.eclipse.rse.core.SystemResourceManager;
27
32
28
class PFWorkspaceLocation implements PFPersistenceLocation {
33
class PFWorkspaceLocation implements PFPersistenceLocation {
29
	IFolder baseFolder = null;
34
	IFolder baseFolder = null;
Lines 37-49 Link Here
37
	}
42
	}
38
	
43
	
39
	public void ensure() {
44
	public void ensure() {
40
		if (!baseFolder.exists()) {
45
		ensure(baseFolder);
41
			try {
42
				baseFolder.create(true, true, null);
43
			} catch (CoreException e) {
44
				logException(e);
45
			}
46
		}
47
	}
46
	}
48
	
47
	
49
	public PFPersistenceLocation getChild(String childName) {
48
	public PFPersistenceLocation getChild(String childName) {
Lines 134-139 Link Here
134
		return result;
133
		return result;
135
	}
134
	}
136
	
135
	
136
	private void ensure(IContainer resource) {
137
		if (!resource.isAccessible()) {
138
			if (resource.getType() == IResource.PROJECT) {
139
				SystemResourceManager.getRemoteSystemsProject();
140
			} else {
141
				IFolder folder = (IFolder) resource;
142
				ensure(folder.getParent());
143
				try {
144
					folder.create(true, true, null);
145
				} catch (CoreException e) {
146
					logException(e);
147
				}
148
			}
149
		}
150
	}
151
	
137
	private void logException(Exception e) {
152
	private void logException(Exception e) {
138
		RSECorePlugin.getDefault().getLogger().logError("unexpected exception", e); //$NON-NLS-1$
153
		RSECorePlugin.getDefault().getLogger().logError("unexpected exception", e); //$NON-NLS-1$
139
	}
154
	}
(-)src/org/eclipse/rse/internal/persistence/PFWorkspaceAnchor.java (-28 / +29 lines)
Lines 7-12 Link Here
7
 * 
7
 * 
8
 * Contributors:
8
 * Contributors:
9
 * IBM Corporation - initial API and implementation
9
 * IBM Corporation - initial API and implementation
10
 * David Dykstal (IBM) - [189858] delayed the creation of the remote systems project by
11
 *                                using handle-only operations.
10
 *******************************************************************************/
12
 *******************************************************************************/
11
13
12
package org.eclipse.rse.internal.persistence;
14
package org.eclipse.rse.internal.persistence;
Lines 36-54 Link Here
36
	public String[] getProfileLocationNames() {
38
	public String[] getProfileLocationNames() {
37
		List names = new Vector(10);
39
		List names = new Vector(10);
38
		IFolder providerFolder = getProviderFolder();
40
		IFolder providerFolder = getProviderFolder();
39
		try {
41
		if (providerFolder.isAccessible()) {
40
			IResource[] profileCandidates = providerFolder.members();
42
			try {
41
			for (int i = 0; i < profileCandidates.length; i++) {
43
				IResource[] profileCandidates = providerFolder.members();
42
				IResource profileCandidate = profileCandidates[i];
44
				for (int i = 0; i < profileCandidates.length; i++) {
43
				if (profileCandidate.getType() == IResource.FOLDER) {
45
					IResource profileCandidate = profileCandidates[i];
44
					String candidateName = profileCandidate.getName();
46
					if (profileCandidate.getType() == IResource.FOLDER) {
45
					if (candidateName.startsWith(PFConstants.AB_PROFILE)) {
47
						String candidateName = profileCandidate.getName();
46
						names.add(candidateName);
48
						if (candidateName.startsWith(PFConstants.AB_PROFILE)) {
49
							names.add(candidateName);
50
						}
47
					}
51
					}
48
				}
52
				}
53
			} catch (CoreException e) {
54
				logException(e);
49
			}
55
			}
50
		} catch (CoreException e) {
51
			logException(e);
52
		}
56
		}
53
		String[] result = new String[names.size()];
57
		String[] result = new String[names.size()];
54
		names.toArray(result);
58
		names.toArray(result);
Lines 80-86 Link Here
80
84
81
	/**
85
	/**
82
	 * Returns the IFolder in which a profile is stored. 
86
	 * Returns the IFolder in which a profile is stored. 
83
	 * @return The folder that was created or found.
87
	 * This is a handle operation, the resulting folder may not exist.
88
	 * @return The folder that was found.
84
	 */
89
	 */
85
	private IFolder getProfileFolder(String profileLocationName) {
90
	private IFolder getProfileFolder(String profileLocationName) {
86
		IFolder providerFolder = getProviderFolder();
91
		IFolder providerFolder = getProviderFolder();
Lines 90-125 Link Here
90
95
91
	/**
96
	/**
92
	 * Returns the IFolder in which this persistence provider stores its profiles.
97
	 * Returns the IFolder in which this persistence provider stores its profiles.
93
	 * This will create the folder if the folder was not found.
98
	 * This is a handle operation. It will not create the folder if it is not 
94
	 * @return The folder that was created or found.
99
	 * found.
100
	 * @return The folder that contains the profiles for this provider.
95
	 */
101
	 */
96
	private IFolder getProviderFolder() {
102
	private IFolder getProviderFolder() {
97
		IProject project = SystemResourceManager.getRemoteSystemsProject();
103
		IProject project = SystemResourceManager.getRemoteSystemsProject(false);
98
		try {
104
		if (project.isAccessible()) {
99
			project.refreshLocal(IResource.DEPTH_INFINITE, null);
105
			try {
100
		} catch (Exception e) {
106
				project.refreshLocal(IResource.DEPTH_INFINITE, null);
107
			} catch (Exception e) {
108
			}
101
		}
109
		}
102
		IFolder providerFolder = getFolder(project, "dom.properties"); //$NON-NLS-1$
110
		IFolder providerFolder = getFolder(project, "dom.properties"); //$NON-NLS-1$
103
		return providerFolder;
111
		return providerFolder;
104
	}
112
	}
105
	
113
	
106
	/**
114
	/**
107
	 * Returns the specified folder of the parent container. If the folder does
115
	 * Returns the specified folder of the parent container.
108
	 * not exist it creates it.
116
	 * This is a handle operation. The folder may not exist.
109
	 * @param parent the parent container - typically a project or folder
117
	 * @param parent the parent container - typically a project or folder
110
	 * @param name the name of the folder to find or create
118
	 * @param name the name of the folder to find
111
	 * @return the found or created folder
119
	 * @return the found folder (may not exist)
112
	 */
120
	 */
113
	private IFolder getFolder(IContainer parent, String name) {
121
	private IFolder getFolder(IContainer parent, String name) {
114
		IPath path = new Path(name);
122
		IPath path = new Path(name);
115
		IFolder folder = parent.getFolder(path);
123
		IFolder folder = parent.getFolder(path);
116
		if (!folder.exists()) {
117
			try {
118
				folder.create(IResource.NONE, true, null);
119
			} catch (CoreException e) {
120
				logException(e);
121
			}
122
		}
123
		return folder;
124
		return folder;
124
	}
125
	}
125
126
(-)src/org/eclipse/rse/core/events/ISystemModelChangeEvents.java (-1 / +1 lines)
Lines 56-62 Link Here
56
56
57
	/**
57
	/**
58
	 * Event Type: all resource were reloaded from the workspace: you need to refresh your viewer!
58
	 * Event Type: all resource were reloaded from the workspace: you need to refresh your viewer!
59
	 * This is fired after the user selects the Reload RSE action in the Team view, after recieving files from the repository.
59
	 * This is fired after the user selects the Reload RSE action in the Profiles view, after receiving files from the repository.
60
	 */
60
	 */
61
	public static final int SYSTEM_RESOURCE_ALL_RELOADED = 128;
61
	public static final int SYSTEM_RESOURCE_ALL_RELOADED = 128;
62
62
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamView.java (-1 / +1 lines)
Lines 41-47 Link Here
41
//import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
41
//import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
42
42
43
/**
43
/**
44
 * We specialize tree viewer for the Team view, so we know
44
 * We specialize tree viewer for the Profiles view, so we know
45
 *  when we are dealing with the team view in common code.
45
 *  when we are dealing with the team view in common code.
46
 */
46
 */
47
public class SystemTeamView extends TreeViewer
47
public class SystemTeamView extends TreeViewer
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryAdapter.java (-1 / +1 lines)
Lines 38-44 Link Here
38
38
39
/**
39
/**
40
 * Adapter for displaying and processing SystemTeamViewCategoryNode objects in tree views, such as
40
 * Adapter for displaying and processing SystemTeamViewCategoryNode objects in tree views, such as
41
 *  the Team view.
41
 *  the Profiles view.
42
 */
42
 */
43
public class SystemTeamViewCategoryAdapter 
43
public class SystemTeamViewCategoryAdapter 
44
       extends AbstractSystemViewAdapter {
44
       extends AbstractSystemViewAdapter {
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java (-3 / +4 lines)
Lines 15-20 Link Here
15
 * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
15
 * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
16
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
16
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
17
 * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods
17
 * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods
18
 * David Dykstal (IBM) - [189858] Removed the remote systems project in the team view
18
 ********************************************************************************/
19
 ********************************************************************************/
19
20
20
package org.eclipse.rse.internal.ui.view.team;
21
package org.eclipse.rse.internal.ui.view.team;
Lines 27-33 Link Here
27
import org.eclipse.jface.viewers.IContentProvider;
28
import org.eclipse.jface.viewers.IContentProvider;
28
import org.eclipse.jface.viewers.Viewer;
29
import org.eclipse.jface.viewers.Viewer;
29
import org.eclipse.rse.core.RSECorePlugin;
30
import org.eclipse.rse.core.RSECorePlugin;
30
import org.eclipse.rse.core.SystemResourceManager;
31
import org.eclipse.rse.core.model.ISystemProfile;
31
import org.eclipse.rse.core.model.ISystemProfile;
32
import org.eclipse.rse.ui.SystemBasePlugin;
32
import org.eclipse.rse.ui.SystemBasePlugin;
33
import org.eclipse.rse.ui.model.ISystemShellProvider;
33
import org.eclipse.rse.ui.model.ISystemShellProvider;
Lines 39-45 Link Here
39
39
40
40
41
/**
41
/**
42
 * Content provider for the RSE's Team view part.
42
 * Content provider for the RSE's Profiles view part.
43
 */
43
 */
44
public class SystemTeamViewContentProvider extends WorkbenchContentProvider 
44
public class SystemTeamViewContentProvider extends WorkbenchContentProvider 
45
{
45
{
Lines 97-103 Link Here
97
	public Object getParent(Object element) 
97
	public Object getParent(Object element) 
98
	{
98
	{
99
		if (element instanceof ISystemProfile) 
99
		if (element instanceof ISystemProfile) 
100
			return SystemResourceManager.getRemoteSystemsProject();
100
//			return SystemResourceManager.getRemoteSystemsProject();
101
			return null;
101
		ISystemViewElementAdapter adapter = getSystemViewAdapter(element);
102
		ISystemViewElementAdapter adapter = getSystemViewAdapter(element);
102
		if (adapter != null)
103
		if (adapter != null)
103
			return adapter.getParent(element);
104
			return adapter.getParent(element);
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java (-2 / +3 lines)
Lines 13-18 Link Here
13
 * Contributors:
13
 * Contributors:
14
 * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
14
 * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
15
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
15
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
16
 * David Dykstal (IBM) - [189858] Removed the remote systems project in the team view
16
 ********************************************************************************/
17
 ********************************************************************************/
17
18
18
package org.eclipse.rse.internal.ui.view.team;
19
package org.eclipse.rse.internal.ui.view.team;
Lines 115-121 Link Here
115
116
116
117
117
/**
118
/**
118
 * The viewer and view part for the Team view
119
 * The viewer and view part for the Profiles view
119
 */
120
 */
120
public class SystemTeamViewPart
121
public class SystemTeamViewPart
121
	extends ViewPart
122
	extends ViewPart
Lines 1395-1401 Link Here
1395
				case 0: elementType = token; break;
1396
				case 0: elementType = token; break;
1396
				// profile
1397
				// profile
1397
				case 1: 
1398
				case 1: 
1398
					project = SystemResourceManager.getRemoteSystemsProject();
1399
					project = SystemResourceManager.getRemoteSystemsProject(false);
1399
					break;
1400
					break;
1400
				case 2: 					
1401
				case 2: 					
1401
					profile = sr.getSystemProfile(token);
1402
					profile = sr.getSystemProfile(token);
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java (-5 / +5 lines)
Lines 12-17 Link Here
12
 * 
12
 * 
13
 * Contributors:
13
 * Contributors:
14
 * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
14
 * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
15
 * David Dykstal (IBM) - [189858] Removed the remote systems project in the team view
15
 ********************************************************************************/
16
 ********************************************************************************/
16
17
17
package org.eclipse.rse.internal.ui.view.team;
18
package org.eclipse.rse.internal.ui.view.team;
Lines 19-26 Link Here
19
import org.eclipse.core.runtime.IAdaptable;
20
import org.eclipse.core.runtime.IAdaptable;
20
import org.eclipse.core.runtime.Platform;
21
import org.eclipse.core.runtime.Platform;
21
import org.eclipse.jface.viewers.Viewer;
22
import org.eclipse.jface.viewers.Viewer;
22
import org.eclipse.rse.core.SystemResourceManager;
23
import org.eclipse.rse.core.model.IHost;
23
import org.eclipse.rse.core.model.IHost;
24
import org.eclipse.rse.core.model.ISystemProfile;
25
import org.eclipse.rse.internal.core.model.SystemProfileManager;
24
import org.eclipse.rse.ui.view.ISystemViewInputProvider;
26
import org.eclipse.rse.ui.view.ISystemViewInputProvider;
25
import org.eclipse.swt.widgets.Shell;
27
import org.eclipse.swt.widgets.Shell;
26
28
Lines 31-37 Link Here
31
 */
33
 */
32
public class SystemTeamViewInputProvider implements IAdaptable, ISystemViewInputProvider
34
public class SystemTeamViewInputProvider implements IAdaptable, ISystemViewInputProvider
33
{
35
{
34
	private Object[] roots = new Object[1]; 
35
	private Shell shell;
36
	private Shell shell;
36
	private Viewer viewer;
37
	private Viewer viewer;
37
			
38
			
Lines 49-57 Link Here
49
	 */
50
	 */
50
	public Object[] getRoots()
51
	public Object[] getRoots()
51
	{
52
	{
52
		if (roots[0] == null)
53
		ISystemProfile[] roots = SystemProfileManager.getDefault().getSystemProfiles();
53
          roots[0] = SystemResourceManager.getRemoteSystemsProject();
54
		return roots;
54
        return roots;
55
	}
55
	}
56
	
56
	
57
    /**
57
    /**
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewRefreshAllAction.java (-1 / +1 lines)
Lines 27-33 Link Here
27
27
28
28
29
/**
29
/**
30
 * The action allows users to refresh the entire System Team tree view
30
 * The action allows users to refresh the entire System Profiles tree view
31
 */
31
 */
32
public class SystemTeamViewRefreshAllAction extends SystemBaseAction 
32
public class SystemTeamViewRefreshAllAction extends SystemBaseAction 
33
                                 //
33
                                 //
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java (-1 / +1 lines)
Lines 36-42 Link Here
36
36
37
/**
37
/**
38
 * Adapter for displaying and processing SystemTeamViewSubSystemConfigurationNode objects in tree views, such as
38
 * Adapter for displaying and processing SystemTeamViewSubSystemConfigurationNode objects in tree views, such as
39
 *  the Team view.
39
 *  the Profiles view.
40
 */
40
 */
41
public class SystemTeamViewSubSystemConfigurationAdapter 
41
public class SystemTeamViewSubSystemConfigurationAdapter 
42
       extends AbstractSystemViewAdapter
42
       extends AbstractSystemViewAdapter
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java (-1 / +1 lines)
Lines 42-48 Link Here
42
42
43
43
44
/**
44
/**
45
 * Base label provider for System Team View part
45
 * Base label provider for System Profiles View part
46
 */
46
 */
47
public class SystemTeamViewLabelProvider extends LabelProvider 
47
public class SystemTeamViewLabelProvider extends LabelProvider 
48
{
48
{
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationNode.java (-1 / +1 lines)
Lines 28-34 Link Here
28
28
29
29
30
/**
30
/**
31
 * This class represents a child node under category nodes, in the Team view.
31
 * This class represents a child node under category nodes, in the Profiles view.
32
 * It represents expandable subsystem factories such as "Files" or "iSeries Objects". 
32
 * It represents expandable subsystem factories such as "Files" or "iSeries Objects". 
33
 */
33
 */
34
public class SystemTeamViewSubSystemConfigurationNode implements IAdaptable
34
public class SystemTeamViewSubSystemConfigurationNode implements IAdaptable
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryNode.java (-1 / +1 lines)
Lines 23-29 Link Here
23
23
24
24
25
/**
25
/**
26
 * This class represents a child node under a profile, in the Team view.
26
 * This class represents a child node under a profile, in the Profiles view.
27
 * It represents expandable categories such as "Connections", "Filter Pools", 
27
 * It represents expandable categories such as "Connections", "Filter Pools", 
28
 * "User Actions" and "Compile Commands".
28
 * "User Actions" and "Compile Commands".
29
 */
29
 */
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewProfileAdapter.java (-1 / +1 lines)
Lines 52-58 Link Here
52
52
53
/**
53
/**
54
 * Adapter for displaying and processing SystemProfile objects in tree views, such as
54
 * Adapter for displaying and processing SystemProfile objects in tree views, such as
55
 *  the Team view.
55
 *  the Profiles view.
56
 */
56
 */
57
public class SystemTeamViewProfileAdapter 
57
public class SystemTeamViewProfileAdapter 
58
       extends AbstractSystemViewAdapter
58
       extends AbstractSystemViewAdapter
(-)subsystems/org/eclipse/rse/ui/subsystems/ISubSystemConfigurationAdapter.java (-1 / +1 lines)
Lines 149-155 Link Here
149
149
150
	/**
150
	/**
151
	 * In addition to a change filter action, we now also support the same functionality
151
	 * In addition to a change filter action, we now also support the same functionality
152
	 *  via a Properties page for filter strings, in the Team View. When this page is activated, 
152
	 *  via a Properties page for filter strings, in the Profiles View. When this page is activated, 
153
	 *  this method is called to enable customization of the page, given the selected filter string.
153
	 *  this method is called to enable customization of the page, given the selected filter string.
154
	 */
154
	 */
155
	public void customizeFilterStringPropertyPage(ISubSystemConfiguration config, SystemFilterStringPropertyPage page, ISystemFilterString selectedFilterString, Shell shell);
155
	public void customizeFilterStringPropertyPage(ISubSystemConfiguration config, SystemFilterStringPropertyPage page, ISystemFilterString selectedFilterString, Shell shell);
(-)UI/org/eclipse/rse/ui/RSEUIPlugin.java (-12 / +6 lines)
Lines 23-28 Link Here
23
 * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point
23
 * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point
24
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
24
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
25
 * Martin Oberhuber (Wind River) - [186779] Fix IRSESystemType.getAdapter()
25
 * Martin Oberhuber (Wind River) - [186779] Fix IRSESystemType.getAdapter()
26
 * David Dykstal (IBM) - [189858] Delay the creation of the remote systems project
26
 ********************************************************************************/
27
 ********************************************************************************/
27
28
28
package org.eclipse.rse.ui;
29
package org.eclipse.rse.ui;
Lines 85-91 Link Here
85
	    		ISystemRegistry registry = getSystemRegistryInternal();
86
	    		ISystemRegistry registry = getSystemRegistryInternal();
86
87
87
	    		
88
	    		
88
	        	SystemResourceManager.getRemoteSystemsProject(); // create core folder tree  
89
//	        	SystemResourceManager.getRemoteSystemsProject(); // create core folder tree  
89
	        	try
90
	        	try
90
	        	{
91
	        	{
91
	        		SystemStartHere.getSystemProfileManager(); // create folders per profile
92
	        		SystemStartHere.getSystemProfileManager(); // create folders per profile
Lines 99-111 Link Here
99
			   
100
			   
100
		
101
		
101
			    // add workspace listener for our project
102
			    // add workspace listener for our project
102
	        	IProject remoteSystemsProject = SystemResourceManager.getRemoteSystemsProject();
103
	        	IProject remoteSystemsProject = SystemResourceManager.getRemoteSystemsProject(false);
103
	        	SystemResourceListener listener = SystemResourceListener.getListener(remoteSystemsProject);
104
	        	SystemResourceListener listener = SystemResourceListener.getListener(remoteSystemsProject);
104
			    SystemResourceManager.startResourceEventListening(listener);
105
			    SystemResourceManager.startResourceEventListening(listener);
105
				
106
				
106
				// new support to allow products to not pre-create a local connection
107
				// new support to allow products to not pre-create a local connection
107
				if (SystemResourceManager.isFirstTime() && SystemPreferencesManager.getShowLocalConnection()) {
108
//				if (SystemResourceManager.isFirstTime() && SystemPreferencesManager.getShowLocalConnection()) {
108
					// create the connection only if the local system type is enabled!
109
				if (SystemPreferencesManager.getShowLocalConnection()) {
110
					// create the connection only if the local system type is enabled
109
					IRSESystemType systemType = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(IRSESystemType.SYSTEMTYPE_LOCAL_ID);
111
					IRSESystemType systemType = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(IRSESystemType.SYSTEMTYPE_LOCAL_ID);
110
					if (systemType != null) {
112
					if (systemType != null) {
111
						RSESystemTypeAdapter adapter = (RSESystemTypeAdapter)(systemType.getAdapter(RSESystemTypeAdapter.class));
113
						RSESystemTypeAdapter adapter = (RSESystemTypeAdapter)(systemType.getAdapter(RSESystemTypeAdapter.class));
Lines 548-561 Link Here
548
    }
550
    }
549
551
550
    /**
552
    /**
551
     * Return the project used to hold all the Remote System Framework files
552
     */
553
    public IProject getRemoteSystemsProject()
554
    {
555
    	return SystemResourceManager.getRemoteSystemsProject();
556
    }
557
    
558
    /**
559
     * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
553
     * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
560
     */
554
     */
561
    public void stop(BundleContext context) throws Exception {
555
    public void stop(BundleContext context) throws Exception {
(-)UI/org/eclipse/rse/ui/ISystemContextMenuConstants.java (-1 / +1 lines)
Lines 201-207 Link Here
201
	 * Pop-up menu: name of group for new actions (value <code>"group.new.noncascade"</code>).
201
	 * Pop-up menu: name of group for new actions (value <code>"group.new.noncascade"</code>).
202
	 * This is a non-cascading group.
202
	 * This is a non-cascading group.
203
	 * <p>
203
	 * <p>
204
	 * This is used in the Team view
204
	 * This is used in the Profiles view
205
	 * </p>
205
	 * </p>
206
	 */
206
	 */
207
	public static final String GROUP_NEW_NONCASCADING="group.new.noncascade"; //$NON-NLS-1$
207
	public static final String GROUP_NEW_NONCASCADING="group.new.noncascade"; //$NON-NLS-1$
(-)UI/org/eclipse/rse/internal/ui/SystemResources.properties (-1 / +1 lines)
Lines 696-702 Link Here
696
RESID_WORKWITHHISTORY_BUTTON_TIP=Bring up the Work With History dialog
696
RESID_WORKWITHHISTORY_BUTTON_TIP=Bring up the Work With History dialog
697
697
698
#=============================================================
698
#=============================================================
699
# Team View
699
# Profiles View
700
#=============================================================
700
#=============================================================
701
RESID_TEAMVIEW_SUBSYSFACTORY_VALUE=SubSystem factory
701
RESID_TEAMVIEW_SUBSYSFACTORY_VALUE=SubSystem factory
702
RESID_TEAMVIEW_CATEGORY_VALUE=Category
702
RESID_TEAMVIEW_CATEGORY_VALUE=Category
(-)UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java (-1 / +1 lines)
Lines 952-958 Link Here
952
	
952
	
953
		/**
953
		/**
954
		 * In addition to a change filter action, we now also support the same functionality
954
		 * In addition to a change filter action, we now also support the same functionality
955
		 *  via a Properties page for filter strings, in the Team View. When this page is activated, 
955
		 *  via a Properties page for filter strings, in the Profiles View. When this page is activated, 
956
		 *  this method is called to enable customization of the page, given the selected filter string.
956
		 *  this method is called to enable customization of the page, given the selected filter string.
957
		 * 
957
		 * 
958
		 * <p>
958
		 * <p>
(-)HelpContexts.xml (-1 / +1 lines)
Lines 84-90 Link Here
84
84
85
<!-- PULLDOWN ACTION: Work with profiles action...-->
85
<!-- PULLDOWN ACTION: Work with profiles action...-->
86
<context id="actnwwpr">
86
<context id="actnwwpr">
87
<description>Switch to the Team view, where you can create, delete, copy, rename and activate profiles</description>
87
<description>Switch to the Profiles view, where you can create, delete, copy, rename and activate profiles</description>
88
<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.htm" label="Remote System Explorer Profiles" />
88
<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.htm" label="Remote System Explorer Profiles" />
89
</context>
89
</context>
90
<!-- PULLDOWN ACTION: Qualify connections action...-->
90
<!-- PULLDOWN ACTION: Qualify connections action...-->
(-)plugin.properties (-1 / +2 lines)
Lines 16-21 Link Here
16
# Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
16
# Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
17
# Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core
17
# Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core
18
# Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point
18
# Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point
19
# David Dykstal (IBM) - [189858] Renamed the Team view the Profiles view
19
################################################################################
20
################################################################################
20
21
21
# NLS_MESSAGEFORMAT_NONE
22
# NLS_MESSAGEFORMAT_NONE
Lines 51-57 Link Here
51
View.RemoteSystems = Remote Systems
52
View.RemoteSystems = Remote Systems
52
View.RemoteSystemsDetails = Remote System Details
53
View.RemoteSystemsDetails = Remote System Details
53
54
54
View.Team = Team
55
View.Team = Profiles
55
56
56
Perspective.Explorer = Remote System Explorer
57
Perspective.Explorer = Remote System Explorer
57
58
(-)UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java (-1 / +1 lines)
Lines 209-215 Link Here
209
	// Property sheet values: Messages
209
	// Property sheet values: Messages
210
	public static String	RESID_PROPERTY_MESSAGE_TYPE_VALUE;
210
	public static String	RESID_PROPERTY_MESSAGE_TYPE_VALUE;
211
211
212
	// Property sheet values: Categories in Team view
212
	// Property sheet values: Categories in Profiles view
213
	public static String	RESID_PROPERTY_TEAM_CATEGORY_TYPE_VALUE;
213
	public static String	RESID_PROPERTY_TEAM_CATEGORY_TYPE_VALUE;
214
	public static String	RESID_PROPERTY_TEAM_SSFACTORY_TYPE_VALUE;
214
	public static String	RESID_PROPERTY_TEAM_SSFACTORY_TYPE_VALUE;
215
	
215
	
(-)UI/org/eclipse/rse/internal/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java (-1 / +1 lines)
Lines 30-36 Link Here
30
30
31
31
32
/**
32
/**
33
 * The property page for subsystem factory nodes in the Team view.
33
 * The property page for subsystem factory nodes in the Profiles view.
34
 * This is an output-only page.
34
 * This is an output-only page.
35
 */
35
 */
36
public class SystemTeamViewSubSystemConfigurationPropertyPage extends SystemBasePropertyPage
36
public class SystemTeamViewSubSystemConfigurationPropertyPage extends SystemBasePropertyPage
(-)UI/org/eclipse/rse/internal/ui/propertypages/SystemTeamViewProfilePropertyPage.java (-1 / +1 lines)
Lines 27-33 Link Here
27
27
28
28
29
/**
29
/**
30
 * The property page for profile nodes in the Team view.
30
 * The property page for profile nodes in the Profiles view.
31
 * This is an output-only page.
31
 * This is an output-only page.
32
 */
32
 */
33
public class SystemTeamViewProfilePropertyPage extends SystemBasePropertyPage
33
public class SystemTeamViewProfilePropertyPage extends SystemBasePropertyPage
(-)UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java (-1 / +1 lines)
Lines 54-60 Link Here
54
    private Exception runException = null;
54
    private Exception runException = null;
55
    	
55
    	
56
	/**
56
	/**
57
	 * Constructor for selection-sensitive popup menu for profiles in Team view. 
57
	 * Constructor for selection-sensitive popup menu for profiles in Profiles view. 
58
	 */
58
	 */
59
	public SystemProfileNameCopyAction(Shell shell) 
59
	public SystemProfileNameCopyAction(Shell shell) 
60
	{
60
	{
(-)UI/org/eclipse/rse/ui/propertypages/SystemTeamViewCategoryPropertyPage.java (-1 / +1 lines)
Lines 25-31 Link Here
25
25
26
26
27
/**
27
/**
28
 * The property page for category nodes in the Team view.
28
 * The property page for category nodes in the Profiles view.
29
 * This is an output-only page.
29
 * This is an output-only page.
30
 */
30
 */
31
public class SystemTeamViewCategoryPropertyPage extends SystemBasePropertyPage
31
public class SystemTeamViewCategoryPropertyPage extends SystemBasePropertyPage

Return to bug 189858