Merge remote-tracking branch 'origin/GP-1816-dragonmacher-osgi-building-update--SQUASHED'

This commit is contained in:
Ryan Kurtz 2022-04-13 14:49:41 -04:00
commit a9c928bb14
20 changed files with 629 additions and 583 deletions

View file

@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
* REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -16,12 +15,12 @@
*/
package ghidra.framework.project;
import java.io.File;
import generic.util.FileLocker;
import generic.util.LockFactory;
import ghidra.framework.model.ProjectLocator;
import java.io.File;
/**
* A simple delegate for creating and using locks in Ghidra.
*/
@ -29,7 +28,7 @@ class ProjectLock {
private final File lockFile;
FileLocker locker;
private FileLocker locker;
public ProjectLock(ProjectLocator projectLocator) {
this.lockFile = projectLocator.getProjectLockFile();