mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00
Code Issues Wiki Activity

[224906] [dstore] changes for getting properties and doing exit due to single-process capability

Browse source
This commit is contained in:
David McKnight 2008-03-31 15:01:42 +00:00
parent 962e46cef7
commit ac844e3d77
2 changed files with 42 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/EnvironmentMiner.java
View file

@ -21,16 +21,15 @@
package org.eclipse.rse.dstore.universal.miners; package org.eclipse.rse.dstore.universal.miners;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.eclipse.dstore.core.miners.Miner; import org.eclipse.dstore.core.miners.Miner;
import org.eclipse.dstore.core.model.Client;
import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DE;
import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.Client;
public class EnvironmentMiner extends Miner public class EnvironmentMiner extends Miner
@ -62,14 +61,14 @@ public class EnvironmentMiner extends Miner
{ {
if (_dataStore.getClient() != null) if (_dataStore.getClient() != null)
{ {
ServerLogger logger = new ServerLogger(getUserPreferencesDirectory()); ServerLogger logger = new ServerLogger(UniversalServerUtilities.getUserPreferencesDirectory(_dataStore));
_dataStore.getClient().setLogger(logger); _dataStore.getClient().setLogger(logger);
} }
else else
{ {
Client client = new Client(); Client client = new Client();
_dataStore.setClient(client); _dataStore.setClient(client);
ServerLogger logger = new ServerLogger(getUserPreferencesDirectory()); ServerLogger logger = new ServerLogger(UniversalServerUtilities.getUserPreferencesDirectory(_dataStore));
client.setLogger(logger); client.setLogger(logger);
} }
@ -253,44 +252,5 @@ public class EnvironmentMiner extends Miner
{ {
return "6.4.0"; //$NON-NLS-1$ return "6.4.0"; //$NON-NLS-1$
} }
/**
* getUserPreferencesDirectory() - returns directory on IFS where to store user settings
*/
public String getUserPreferencesDirectory()
{
String userPreferencesDirectory = _dataStore.getClient().getProperty("user.home"); //$NON-NLS-1$
String clientUserID = null;
if (_dataStore.getClient() != null){
clientUserID = _dataStore.getClient().getProperty("client.username"); //$NON-NLS-1$
}
else {
clientUserID = System.getProperty("client.username"); //$NON-NLS-1$
}
if (clientUserID == null || clientUserID.equals("")) //$NON-NLS-1$
{
clientUserID = ""; //$NON-NLS-1$
}
else
{
clientUserID += File.separator;
}
// append a '/' if not there
if ( userPreferencesDirectory.length() == 0 ||
userPreferencesDirectory.charAt( userPreferencesDirectory.length() -1 ) != File.separatorChar ) {
userPreferencesDirectory = userPreferencesDirectory + File.separator;
}
userPreferencesDirectory = userPreferencesDirectory + ".eclipse" + File.separator + //$NON-NLS-1$
"RSE" + File.separator + clientUserID; //$NON-NLS-1$
File dirFile = new File(userPreferencesDirectory);
if (!dirFile.exists()) {
dirFile.mkdirs();
}
return userPreferencesDirectory;
}
} }

38
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java
View file

@ -17,6 +17,8 @@
package org.eclipse.rse.dstore.universal.miners; package org.eclipse.rse.dstore.universal.miners;
import java.io.File;
import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.DataStore;
/** /**
@ -27,6 +29,42 @@ import org.eclipse.dstore.core.model.DataStore;
*/ */
public class UniversalServerUtilities { public class UniversalServerUtilities {
/**
* getUserPreferencesDirectory() - returns directory on IFS where to store user settings
*/
public static String getUserPreferencesDirectory(DataStore dataStore)
{
String userPreferencesDirectory = dataStore.getClient().getProperty("user.home"); //$NON-NLS-1$
String clientUserID = System.getProperty("client.username"); //$NON-NLS-1$
if (clientUserID == null || clientUserID.equals("")) //$NON-NLS-1$
{
clientUserID = ""; //$NON-NLS-1$
}
else
{
clientUserID += File.separator;
}
// append a '/' if not there
if ( userPreferencesDirectory.length() == 0 ||
userPreferencesDirectory.charAt( userPreferencesDirectory.length() -1 ) != File.separatorChar ) {
userPreferencesDirectory = userPreferencesDirectory + File.separator;
}
userPreferencesDirectory = userPreferencesDirectory + ".eclipse" + File.separator + //$NON-NLS-1$
"RSE" + File.separator + clientUserID; //$NON-NLS-1$
File dirFile = new File(userPreferencesDirectory);
if (!dirFile.exists()) {
dirFile.mkdirs();
}
return userPreferencesDirectory;
}
/** /**
* logInfo * logInfo
* *