github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-29_dev747368_hardcoded_delay_add_to_ver_control'

Browse Source
This commit is contained in:
ghidra1
2020-07-13 14:45:35 -04:00
parent 4271af3623 fd3e835be5
commit 796ad69cc0
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/VersionControlAddAction.java
View File

@@ -30,6 +30,7 @@ import ghidra.framework.model.DomainFile;
import ghidra.framework.plugintool.Plugin;
import ghidra.framework.plugintool.PluginTool;
import ghidra.util.Msg;
import ghidra.util.Swing;
import ghidra.util.exception.CancelledException;
import ghidra.util.task.TaskMonitor;
import resources.ResourceManager;
@@ -80,7 +81,7 @@ public class VersionControlAddAction extends VersionControlAction {
if (!checkRepositoryConnected()) {
return;
}
List<DomainFile> unversioned = new ArrayList<DomainFile>();
List<DomainFile> unversioned = new ArrayList<>();
for (DomainFile domainFile : domainFiles) {
if (domainFile.isVersionControlSupported() && !domainFile.isVersioned()) {
unversioned.add(domainFile);
@@ -89,8 +90,8 @@ public class VersionControlAddAction extends VersionControlAction {
if (unversioned.isEmpty()) {
return;
}
ArrayList<DomainFile> list = new ArrayList<DomainFile>();
ArrayList<DomainFile> changedList = new ArrayList<DomainFile>();
ArrayList<DomainFile> list = new ArrayList<>();
ArrayList<DomainFile> changedList = new ArrayList<>();
for (DomainFile domainFile : unversioned) {
if (domainFile.isBusy()) {
Msg.showWarn(getClass(), null, "Add To Version Control Failed!",
@@ -140,8 +141,7 @@ public class VersionControlAddAction extends VersionControlAction {
public void run(TaskMonitor monitor) {
checkFilesInUse();
try {
for (int i = 0; i < list.size(); i++) {
DomainFile df = list.get(i);
for (DomainFile df : list) {
String name = df.getName();
monitor.setMessage("Adding " + name + " to Version Control");
@@ -152,21 +152,14 @@ public class VersionControlAddAction extends VersionControlAction {
return;
}
if (i != 0) {
try {
// Give Swing a chance to update
Thread.sleep(200);
}
catch (InterruptedException e2) {
// don't care??
}
}
// Note: this used to be a sleep(200)
Swing.allowSwingToProcessEvents();
df.addToVersionControl(comments, keepCheckedOut, monitor);
}
}
catch (CancelledException e) {
System.out.println("Add to Version Control was canceled");
Msg.info(this, "Add to Version Control was canceled");
}
catch (IOException e) {
ClientUtil.handleException(repository, e, "Add to Version Control",