Skip to content

Launcher: Add '-layout /path/to/Example.memento' option #1747

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

Merged
kasemir merged 1 commit into from
Jan 26, 2021
+14 −4
Merged

Launcher: Add '-layout /path/to/Example.memento' option #1747

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/launcher/src/main/java/org/phoebus/product/Launcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ private static void help()
System.out.println("-server port - Create instance server on given TCP port");
System.out.println("-app probe - Launch an application with input arguments");
System.out.println("-resource /tmp/example.plt - Open an application configuration file with the default application");
System.out.println("-layout /path/to/Example.memento - Start with the specified saved layout instead of the default 'memento'");
System.out.println("-main org.package.Main - Run alternate application Main");
System.out.println();
System.out.println("In 'server' mode, first instance opens UI.");
Expand Down
17 changes: 13 additions & 4 deletions core/ui/src/main/java/org/phoebus/ui/application/PhoebusApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ private void backgroundStartup(final JobMonitor monitor, final Splash splash) th

// Load saved state (slow file access) off UI thread, allocating 30% to that
monitor.beginTask(Messages.MonitorTaskSave);
final MementoTree memento = loadDefaultMemento(new SubJobMonitor(monitor, 30));
final MementoTree memento = loadDefaultMemento(getParameters().getRaw(), new SubJobMonitor(monitor, 30));

// Trigger initialization of authentication service
AuthorizationService.init();
Expand Down Expand Up @@ -964,15 +964,24 @@ private void replaceLayout(final MementoTree memento)
});
}

/** @param monitor {@link JobMonitor}
/** @param parameters Command line parameters that may contain '-layout /path/to/Example.memento'
* @param monitor {@link JobMonitor}
* @return Memento for previously persisted state or <code>null</code> if none found
*/
private MementoTree loadDefaultMemento(final JobMonitor monitor)
private MementoTree loadDefaultMemento(final List<String> parameters, final JobMonitor monitor)
{
monitor.beginTask(Messages.MonitorTaskPers, 1);
final File memfile = XMLMementoTree.getDefaultFile();
File memfile = XMLMementoTree.getDefaultFile();
try
{
for (int i=0; i<parameters.size(); ++i)
if ("-layout".equals(parameters.get(i)))
{
if (i >= parameters.size() - 1)
throw new Exception("Missing /path/to/Example.memento for -layout option");
memfile = new File(parameters.get(i+1));
break;
}
if (memfile.canRead())
{
logger.log(Level.INFO, "Loading state from " + memfile);
Expand Down