mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 21:15:23 +02:00
Code Issues Wiki Activity

[191038][api] fix scratchpad init bug by fixing SystemRegistryUI initialization

Browse source
This commit is contained in:
David Dykstal 2007-06-05 17:22:16 +00:00
parent 7701d6a928
commit b0651de5ab
2 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
View file

@ -26,6 +26,7 @@
* David Dykstal (IBM) - [189858] Delay the creation of the remote systems project * David Dykstal (IBM) - [189858] Delay the creation of the remote systems project
* David Dykstal (IBM) - [186589] move user types, user actions, and compile commands * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
* API to the user actions plugin * API to the user actions plugin
* David Dykstal (IBM) - [191038] initialize SystemRegistryUI without a log file, it was not used
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.ui; package org.eclipse.rse.ui;
@ -657,8 +658,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
{ {
if (_systemRegistryUI == null) if (_systemRegistryUI == null)
{ {
String logfilePath = getStateLocation().toOSString(); _systemRegistryUI = SystemRegistryUI.getInstance();
_systemRegistryUI = SystemRegistryUI.getInstance(logfilePath);
} }
return _systemRegistryUI; return _systemRegistryUI;
} }

21
rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java
View file

@ -13,6 +13,8 @@
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [186773] split SystemRegistryUI from SystemRegistry implementation * Martin Oberhuber (Wind River) - [186773] split SystemRegistryUI from SystemRegistry implementation
* Martin Oberhuber (Wind River) - [189123] Prepare ISystemRegistry for move into non-UI * Martin Oberhuber (Wind River) - [189123] Prepare ISystemRegistry for move into non-UI
* David Dykstal (IBM) - [191038] remove getInstance(logFilePath) log file was not used
* initialize correctly in getInstance()
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.ui.internal.model; package org.eclipse.rse.ui.internal.model;
@ -80,9 +82,8 @@ public class SystemRegistryUI implements ISystemRegistryUI, ISystemViewInputProv
* Constructor. * Constructor.
* This is protected as the singleton instance should be retrieved by * This is protected as the singleton instance should be retrieved by
* calling @link{#getInstance()}. * calling @link{#getInstance()}.
* @param logfilePath Root folder. Where to place the log file.
*/ */
protected SystemRegistryUI(String logfilePath) protected SystemRegistryUI()
{ {
super(); super();
registry = SystemRegistry.getInstance(); registry = SystemRegistry.getInstance();
@ -93,23 +94,13 @@ public class SystemRegistryUI implements ISystemRegistryUI, ISystemViewInputProv
// ---------------------------- // ----------------------------
/** /**
* Return singleton instance. Must be used on first instantiate.
* @param logfilePath Root folder. Where to place the log file.
* @return the singleton SystemRegistryUI instance.
*/
public static SystemRegistryUI getInstance(String logfilePath)
{
if (_instance == null)
_instance = new SystemRegistryUI(logfilePath);
return _instance;
}
/**
* Return singleton instance assuming it already exists.
* @return the singleton SystemRegistryUI instance. * @return the singleton SystemRegistryUI instance.
*/ */
public static SystemRegistryUI getInstance() public static SystemRegistryUI getInstance()
{ {
if (_instance == null) {
_instance = new SystemRegistryUI();
}
return _instance; return _instance;
} }