Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

9308 config paths #2

Merged
merged 1 commit into from
Jul 10, 2012
Merged

9308 config paths #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions components/insight/SRC/org/openmicroscopy/shoola/env/Container.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,14 @@ public String getConfigFileRelative()
*/
public String getConfigFileRelative(String file)
{
StringBuffer relPath = new StringBuffer(CONFIG_DIR);
if (IOUtil.isJavaWebStart() && UIUtilities.isWindowsOS())
relPath.append("/");
else relPath.append(File.separatorChar);
relPath.append(file);
return relPath.toString();
if (IOUtil.isJavaWebStart()) {
StringBuffer relPath = new StringBuffer(CONFIG_DIR);
if (UIUtilities.isWindowsOS()) relPath.append("/");
else relPath.append(File.separatorChar);
relPath.append(file);
return relPath.toString();
}
return resolveFilePath(file, CONFIG_DIR);
}

/**
Expand Down
5 changes: 2 additions & 3 deletions components/insight/SRC/org/openmicroscopy/shoola/env/init/AgentsInit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,8 @@ private void createAgent(AgentInfo info, int value)
private Registry createAgentRegistry(String configFile)
throws Exception
{
String absPathName = container.getHomeDir() + File.separator +
container.getConfigFileRelative(configFile);
Registry agentReg = RegistryFactory.makeNew(absPathName),
String pathName = container.getConfigFileRelative(configFile);
Registry agentReg = RegistryFactory.makeNew(pathName),
containerReg = container.getRegistry();
RegistryFactory.linkEventBus(containerReg.getEventBus(), agentReg);
RegistryFactory.linkLogger(containerReg.getLogger(), agentReg);
Expand Down
3 changes: 1 addition & 2 deletions components/insight/SRC/org/openmicroscopy/shoola/env/init/ContainerConfigInit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ void configure() {}
void execute()
throws StartupException
{
String file = container.getHomeDir() + File.separator +
container.getConfigFileRelative();
String file = container.getConfigFileRelative();
Registry reg = container.getRegistry();
try {
RegistryFactory.fillFromFile(file, reg);
Expand Down