mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-05 10:49:34 +02:00
Merge remote-tracking branch 'origin/GT-3456-dragonmacher-toolbar-action-fixes'
This commit is contained in:
ghidorahrex
commit
1d77647007
23 changed files with 217 additions and 211 deletions
|
|
@ -39,7 +39,7 @@ import resources.icons.TranslateIcon;
|
|||
* This class is abstract to force implementors to supply the source of the
|
||||
* functions (may be the listing, a table, etc...)
|
||||
*
|
||||
* @see {@link #getSelectedFunctions(ActionContext) getSelectedFunctions}
|
||||
* @see #getSelectedFunctions(ActionContext)
|
||||
*/
|
||||
public abstract class CompareFunctionsAction extends DockingAction {
|
||||
|
||||
|
|
@ -99,9 +99,11 @@ public abstract class CompareFunctionsAction extends DockingAction {
|
|||
setDescription("Create Function Comparison");
|
||||
setPopupMenuData(new MenuData(new String[] { "Compare Selected Functions" },
|
||||
getToolBarIcon(), CREATE_COMPARISON_GROUP));
|
||||
|
||||
ToolBarData newToolBarData =
|
||||
new ToolBarData(getToolBarIcon(), CREATE_COMPARISON_GROUP);
|
||||
setToolBarData(newToolBarData);
|
||||
|
||||
setHelpLocation(new HelpLocation("FunctionComparison", "Function_Comparison"));
|
||||
|
||||
KeyBindingData data = new KeyBindingData('C', InputEvent.SHIFT_DOWN_MASK);
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ public class CompareFunctionsFromListingAction extends CompareFunctionsAction {
|
|||
*/
|
||||
public CompareFunctionsFromListingAction(PluginTool tool, String owner) {
|
||||
super(tool, owner);
|
||||
|
||||
// this action is used as a global action--do not add it to the toolbar
|
||||
setToolBarData(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -46,13 +46,14 @@ import ghidra.program.model.listing.Program;
|
|||
import ghidra.program.model.listing.ProgramChangeSet;
|
||||
import ghidra.util.*;
|
||||
import ghidra.util.exception.CancelledException;
|
||||
import ghidra.util.task.*;
|
||||
import ghidra.util.task.SwingUpdateManager;
|
||||
import ghidra.util.task.TaskMonitor;
|
||||
import ghidra.util.worker.Job;
|
||||
import ghidra.util.worker.Worker;
|
||||
import resources.ResourceManager;
|
||||
|
||||
/**
|
||||
* Manages the markers to display areas where changes have occured..
|
||||
* Manages the markers to display areas where changes have occurred
|
||||
*/
|
||||
@PluginInfo( //@formatter:off
|
||||
status = PluginStatus.RELEASED,
|
||||
|
|
@ -86,7 +87,6 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
|
||||
private DockingAction checkInAction;
|
||||
private DockingAction mergeAction;
|
||||
private TaskListener taskListener;
|
||||
|
||||
private AddressSetView otherChangeSet;
|
||||
private int serverVersion = -1;
|
||||
|
|
@ -105,18 +105,6 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
transactionListener = new ProgramTransactionListener();
|
||||
tool.getProject().getProjectData().addDomainFolderChangeListener(folderListener);
|
||||
|
||||
taskListener = new TaskListener() {
|
||||
@Override
|
||||
public void taskCancelled(Task task) {
|
||||
setActionsEnabled();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void taskCompleted(Task task) {
|
||||
setActionsEnabled();
|
||||
}
|
||||
};
|
||||
|
||||
createActions();
|
||||
}
|
||||
|
||||
|
|
@ -126,10 +114,15 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
mergeAction = new DockingAction("Update", getName()) {
|
||||
@Override
|
||||
public void actionPerformed(ActionContext context) {
|
||||
AppInfo.getFrontEndTool().merge(tool, currentProgram.getDomainFile(), taskListener);
|
||||
AppInfo.getFrontEndTool().merge(tool, currentProgram.getDomainFile(), null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEnabledForContext(ActionContext context) {
|
||||
return currentProgram != null && currentProgram.getDomainFile().canMerge();
|
||||
}
|
||||
};
|
||||
mergeAction.setEnabled(false);
|
||||
|
||||
mergeAction.setToolBarData(new ToolBarData(icon, "Repository"));
|
||||
mergeAction.setDescription("Update checked out file with latest version");
|
||||
mergeAction.setHelpLocation(new HelpLocation("VersionControl", mergeAction.getName()));
|
||||
|
|
@ -138,11 +131,16 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
checkInAction = new DockingAction("CheckIn", getName()) {
|
||||
@Override
|
||||
public void actionPerformed(ActionContext context) {
|
||||
AppInfo.getFrontEndTool().checkIn(tool, currentProgram.getDomainFile(),
|
||||
taskListener);
|
||||
AppInfo.getFrontEndTool()
|
||||
.checkIn(tool, currentProgram.getDomainFile());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEnabledForContext(ActionContext context) {
|
||||
return currentProgram != null && currentProgram.getDomainFile().canCheckin();
|
||||
}
|
||||
};
|
||||
checkInAction.setEnabled(false);
|
||||
|
||||
checkInAction.setToolBarData(new ToolBarData(icon, "Repository"));
|
||||
checkInAction.setDescription("Check in file");
|
||||
checkInAction.setHelpLocation(new HelpLocation("VersionControl", checkInAction.getName()));
|
||||
|
|
@ -151,11 +149,6 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
tool.addAction(checkInAction);
|
||||
}
|
||||
|
||||
private void setActionsEnabled() {
|
||||
mergeAction.setEnabled(currentProgram.getDomainFile().canMerge());
|
||||
checkInAction.setEnabled(currentProgram.getDomainFile().canCheckin());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
markerService = tool.getService(MarkerService.class);
|
||||
|
|
@ -165,13 +158,9 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
@Override
|
||||
protected void programActivated(Program program) {
|
||||
|
||||
mergeAction.setEnabled(false);
|
||||
checkInAction.setEnabled(false);
|
||||
|
||||
program.addListener(this);
|
||||
program.addTransactionListener(transactionListener);
|
||||
updateForDomainFileChanged();
|
||||
setActionsEnabled();
|
||||
|
||||
createMarkerSets(program);
|
||||
intializeChangeMarkers();
|
||||
|
|
@ -187,8 +176,6 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
programSaved = false;
|
||||
program.removeTransactionListener(transactionListener);
|
||||
program.removeListener(this);
|
||||
mergeAction.setEnabled(false);
|
||||
checkInAction.setEnabled(false);
|
||||
disposeMarkerSets(program);
|
||||
}
|
||||
|
||||
|
|
@ -268,7 +255,7 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
*/
|
||||
private void updateChangeMarkers() {
|
||||
|
||||
SystemUtilities.assertThisIsTheSwingThread(
|
||||
Swing.assertThisIsTheSwingThread(
|
||||
"Change markers must be manipulated on the Swing thread");
|
||||
|
||||
if (currentProgram == null) {
|
||||
|
|
@ -296,8 +283,10 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
// only update conflict markers when server changeSet changes or we end a transaction
|
||||
if (programChangedRemotely || updateConflicts) {
|
||||
AddressSet intersect =
|
||||
changeSet.getAddressSetCollectionSinceCheckout().getCombinedAddressSet().intersect(
|
||||
otherChangeSet);
|
||||
changeSet.getAddressSetCollectionSinceCheckout()
|
||||
.getCombinedAddressSet()
|
||||
.intersect(
|
||||
otherChangeSet);
|
||||
currentConflictChangeMarks.setAddressSetCollection(
|
||||
new SingleAddressSetCollection(intersect));
|
||||
}
|
||||
|
|
@ -400,7 +389,7 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
@Override
|
||||
public void domainFileStatusChanged(DomainFile file, boolean fileIDset) {
|
||||
|
||||
SystemUtilities.runSwingLater(() -> {
|
||||
Swing.runLater(() -> {
|
||||
if (currentProgram == null) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -416,7 +405,6 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
}
|
||||
updateForDomainFileChanged();
|
||||
}
|
||||
setActionsEnabled();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -451,7 +439,7 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
|
|||
|
||||
AddressSetView remoteChanges =
|
||||
changes != null ? changes.getAddressSet() : new AddressSet();
|
||||
SystemUtilities.runSwingNow(() -> applyChanges(remoteChanges));
|
||||
Swing.runNow(() -> applyChanges(remoteChanges));
|
||||
}
|
||||
|
||||
private void applyChanges(AddressSetView remoteChanges) {
|
||||
|
|
|
|||
|
|
@ -43,12 +43,12 @@ public abstract class AbstractNextPreviousAction extends CodeViewerContextAction
|
|||
this.tool = tool;
|
||||
|
||||
ToolBarData toolBarData =
|
||||
new ToolBarData(getIcon(), ToolConstants.NEXT_CODE_UNIT_NAVIGATION_MENU_GROUP);
|
||||
new ToolBarData(getIcon(), ToolConstants.TOOLBAR_GROUP_FOUR);
|
||||
toolBarData.setToolBarSubGroup(subGroup);
|
||||
setToolBarData(toolBarData);
|
||||
MenuData menuData =
|
||||
new MenuData(new String[] { ToolConstants.MENU_NAVIGATION, getMenuName() }, getIcon(),
|
||||
ToolConstants.NEXT_CODE_UNIT_NAVIGATION_MENU_GROUP);
|
||||
ToolConstants.MENU_GROUP_NEXT_CODE_UNIT_NAV);
|
||||
menuData.setMenuSubGroup(subGroup);
|
||||
setMenuBarData(menuData);
|
||||
setKeyBindingData(new KeyBindingData(getKeyStroke()));
|
||||
|
|
|
|||
|
|
@ -432,7 +432,9 @@ public class NavigationHistoryPlugin extends Plugin
|
|||
locationMemento = LocationMemento.getLocationMemento(mementoState, programs);
|
||||
}
|
||||
catch (IllegalArgumentException iae) {
|
||||
Msg.debug(this, "Unable to restore LocationMemento: " + iae.getMessage(), iae);
|
||||
// this can happen if a program is renamed or deleted but the tool config state
|
||||
// has not been saved since the delete
|
||||
Msg.trace(this, "Unable to restore LocationMemento: " + iae.getMessage(), iae);
|
||||
}
|
||||
return locationMemento;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,11 @@
|
|||
*/
|
||||
package ghidra.app.plugin.core.navigation;
|
||||
|
||||
import java.awt.event.KeyEvent;
|
||||
|
||||
import docking.DockingUtils;
|
||||
import docking.action.*;
|
||||
import docking.tool.ToolConstants;
|
||||
import ghidra.app.context.ProgramLocationActionContext;
|
||||
import ghidra.app.nav.NextRangeAction;
|
||||
import ghidra.app.plugin.PluginCategoryNames;
|
||||
|
|
@ -22,13 +27,7 @@ import ghidra.app.util.HelpTopics;
|
|||
import ghidra.framework.plugintool.PluginTool;
|
||||
import ghidra.program.util.ProgramSelection;
|
||||
import ghidra.util.HelpLocation;
|
||||
|
||||
import java.awt.event.InputEvent;
|
||||
import java.awt.event.KeyEvent;
|
||||
|
||||
import resources.ResourceManager;
|
||||
import docking.action.*;
|
||||
import docking.tool.ToolConstants;
|
||||
|
||||
public class NextHighlightedRangeAction extends NextRangeAction {
|
||||
|
||||
|
|
@ -41,8 +40,9 @@ public class NextHighlightedRangeAction extends NextRangeAction {
|
|||
|
||||
setToolBarData(new ToolBarData(
|
||||
ResourceManager.loadImage("images/NextHighlightBlock16.gif"),
|
||||
PluginCategoryNames.NAVIGATION, NextPrevHighlightRangePlugin.ACTION_SUB_GROUP));
|
||||
setKeyBindingData(new KeyBindingData(KeyEvent.VK_0, InputEvent.CTRL_DOWN_MASK));
|
||||
ToolConstants.TOOLBAR_GROUP_THREE, NextPrevHighlightRangePlugin.ACTION_SUB_GROUP));
|
||||
setKeyBindingData(
|
||||
new KeyBindingData(KeyEvent.VK_0, DockingUtils.CONTROL_KEY_MODIFIER_MASK));
|
||||
|
||||
setDescription("Go to next highlighted range");
|
||||
setHelpLocation(new HelpLocation(HelpTopics.HIGHLIGHT, getName()));
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import javax.swing.ImageIcon;
|
|||
import docking.ActionContext;
|
||||
import docking.action.*;
|
||||
import docking.menu.MultiActionDockingAction;
|
||||
import docking.tool.ToolConstants;
|
||||
import ghidra.app.CorePluginPackage;
|
||||
import ghidra.app.context.*;
|
||||
import ghidra.app.nav.LocationMemento;
|
||||
|
|
@ -60,7 +61,8 @@ import resources.ResourceManager;
|
|||
)
|
||||
//@formatter:on
|
||||
public class NextPrevAddressPlugin extends Plugin {
|
||||
private static final String HISTORY_GROUP = "1_History";
|
||||
|
||||
private static final String HISTORY_MENU_GROUP = "1_Menu_History_Group";
|
||||
private static ImageIcon previousIcon = ResourceManager.loadImage("images/left.png");
|
||||
private static ImageIcon nextIcon = ResourceManager.loadImage("images/right.png");
|
||||
|
||||
|
|
@ -203,7 +205,7 @@ public class NextPrevAddressPlugin extends Plugin {
|
|||
}
|
||||
};
|
||||
clearAction.setHelpLocation(new HelpLocation(HelpTopics.NAVIGATION, clearAction.getName()));
|
||||
MenuData menuData = new MenuData(CLEAR_MENUPATH, HISTORY_GROUP);
|
||||
MenuData menuData = new MenuData(CLEAR_MENUPATH, HISTORY_MENU_GROUP);
|
||||
menuData.setMenuSubGroup("1"); // first in menu!
|
||||
clearAction.setMenuBarData(menuData);
|
||||
|
||||
|
|
@ -306,7 +308,8 @@ public class NextPrevAddressPlugin extends Plugin {
|
|||
super(name, owner);
|
||||
this.isNext = isNext;
|
||||
|
||||
setToolBarData(new ToolBarData(isNext ? nextIcon : previousIcon, HISTORY_GROUP));
|
||||
setToolBarData(new ToolBarData(isNext ? nextIcon : previousIcon,
|
||||
ToolConstants.TOOLBAR_GROUP_TWO));
|
||||
setHelpLocation(new HelpLocation(HelpTopics.NAVIGATION, name));
|
||||
int keycode = isNext ? KeyEvent.VK_RIGHT : KeyEvent.VK_LEFT;
|
||||
setKeyBindingData(new KeyBindingData(keycode, InputEvent.ALT_DOWN_MASK));
|
||||
|
|
@ -418,7 +421,7 @@ public class NextPrevAddressPlugin extends Plugin {
|
|||
|
||||
String menuItemName = isNext ? "Next History Function" : "Previous History Function";
|
||||
MenuData menuData =
|
||||
new MenuData(new String[] { "Navigation", menuItemName }, HISTORY_GROUP);
|
||||
new MenuData(new String[] { "Navigation", menuItemName }, HISTORY_MENU_GROUP);
|
||||
menuData.setMenuSubGroup("2"); // after clear
|
||||
setMenuBarData(menuData);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,11 +128,11 @@ public class NextPrevCodeUnitPlugin extends Plugin {
|
|||
super("Toggle Search Direction", NextPrevCodeUnitPlugin.this.getName());
|
||||
MenuData menuData =
|
||||
new MenuData(new String[] { ToolConstants.MENU_NAVIGATION, getName() },
|
||||
forwardIcon, ToolConstants.NEXT_CODE_UNIT_NAVIGATION_MENU_GROUP);
|
||||
forwardIcon, ToolConstants.MENU_GROUP_NEXT_CODE_UNIT_NAV);
|
||||
menuData.setMenuSubGroup(subGroup);
|
||||
setMenuBarData(menuData);
|
||||
setToolBarData(new ToolBarData(forwardIcon,
|
||||
ToolConstants.NEXT_CODE_UNIT_NAVIGATION_MENU_GROUP, subGroup));
|
||||
ToolConstants.TOOLBAR_GROUP_FOUR, subGroup));
|
||||
setKeyBindingData(new KeyBindingData(KeyEvent.VK_T, InputEvent.CTRL_DOWN_MASK |
|
||||
InputEvent.ALT_DOWN_MASK));
|
||||
|
||||
|
|
|
|||
|
|
@ -41,10 +41,6 @@ public class NextPrevHighlightRangePlugin extends Plugin {
|
|||
private NextHighlightedRangeAction nextAction;
|
||||
private PreviousHighlightedRangeAction previousAction;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
* @param tool
|
||||
*/
|
||||
public NextPrevHighlightRangePlugin(PluginTool tool) {
|
||||
super(tool);
|
||||
navOptions = new NavigationOptions(tool);
|
||||
|
|
|
|||
|
|
@ -41,10 +41,6 @@ public class NextPrevSelectedRangePlugin extends Plugin {
|
|||
private NextSelectedRangeAction nextAction;
|
||||
private PreviousSelectedRangeAction previousAction;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
* @param tool
|
||||
*/
|
||||
public NextPrevSelectedRangePlugin(PluginTool tool) {
|
||||
super(tool);
|
||||
navOptions = new NavigationOptions(tool);
|
||||
|
|
|
|||
|
|
@ -58,13 +58,13 @@ public class NextPreviousBookmarkAction extends MultiStateDockingAction<String>
|
|||
this.tool = tool;
|
||||
|
||||
ToolBarData toolBarData =
|
||||
new ToolBarData(bookmarkIcon, ToolConstants.NEXT_CODE_UNIT_NAVIGATION_MENU_GROUP);
|
||||
new ToolBarData(bookmarkIcon, ToolConstants.TOOLBAR_GROUP_FOUR);
|
||||
toolBarData.setToolBarSubGroup(subGroup);
|
||||
setToolBarData(toolBarData);
|
||||
|
||||
MenuData menuData =
|
||||
new MenuData(new String[] { ToolConstants.MENU_NAVIGATION, getMenuName() },
|
||||
bookmarkIcon, ToolConstants.NEXT_CODE_UNIT_NAVIGATION_MENU_GROUP);
|
||||
bookmarkIcon, ToolConstants.MENU_GROUP_NEXT_CODE_UNIT_NAV);
|
||||
menuData.setMenuSubGroup(subGroup);
|
||||
setMenuBarData(menuData);
|
||||
|
||||
|
|
|
|||
|
|
@ -72,13 +72,13 @@ public class NextPreviousMarkerAction extends MultiStateDockingAction<String> {
|
|||
this.tool = tool;
|
||||
|
||||
ToolBarData toolBarData =
|
||||
new ToolBarData(markerIcon, ToolConstants.NEXT_CODE_UNIT_NAVIGATION_MENU_GROUP);
|
||||
new ToolBarData(markerIcon, ToolConstants.TOOLBAR_GROUP_FOUR);
|
||||
toolBarData.setToolBarSubGroup(subGroup);
|
||||
setToolBarData(toolBarData);
|
||||
|
||||
MenuData menuData =
|
||||
new MenuData(new String[] { ToolConstants.MENU_NAVIGATION, getMenuName() }, markerIcon,
|
||||
ToolConstants.NEXT_CODE_UNIT_NAVIGATION_MENU_GROUP);
|
||||
ToolConstants.MENU_GROUP_NEXT_CODE_UNIT_NAV);
|
||||
menuData.setMenuSubGroup(subGroup);
|
||||
setMenuBarData(menuData);
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,11 @@
|
|||
*/
|
||||
package ghidra.app.plugin.core.navigation;
|
||||
|
||||
import java.awt.event.KeyEvent;
|
||||
|
||||
import docking.DockingUtils;
|
||||
import docking.action.*;
|
||||
import docking.tool.ToolConstants;
|
||||
import ghidra.app.context.ProgramLocationActionContext;
|
||||
import ghidra.app.nav.NextRangeAction;
|
||||
import ghidra.app.plugin.PluginCategoryNames;
|
||||
|
|
@ -22,17 +27,12 @@ import ghidra.app.util.HelpTopics;
|
|||
import ghidra.framework.plugintool.PluginTool;
|
||||
import ghidra.program.util.ProgramSelection;
|
||||
import ghidra.util.HelpLocation;
|
||||
|
||||
import java.awt.event.InputEvent;
|
||||
import java.awt.event.KeyEvent;
|
||||
|
||||
import resources.ResourceManager;
|
||||
import docking.action.*;
|
||||
import docking.tool.ToolConstants;
|
||||
|
||||
public class NextSelectedRangeAction extends NextRangeAction {
|
||||
|
||||
public NextSelectedRangeAction(PluginTool tool, String ownerName, NavigationOptions navOptions) {
|
||||
public NextSelectedRangeAction(PluginTool tool, String ownerName,
|
||||
NavigationOptions navOptions) {
|
||||
super(tool, "Next Selected Range", ownerName, navOptions);
|
||||
|
||||
setMenuBarData(new MenuData(new String[] { ToolConstants.MENU_NAVIGATION,
|
||||
|
|
@ -42,8 +42,9 @@ public class NextSelectedRangeAction extends NextRangeAction {
|
|||
|
||||
setToolBarData(new ToolBarData(
|
||||
ResourceManager.loadImage("images/NextSelectionBlock16.gif"),
|
||||
PluginCategoryNames.NAVIGATION, NextPrevSelectedRangePlugin.ACTION_SUB_GROUP));
|
||||
setKeyBindingData(new KeyBindingData(KeyEvent.VK_BRACERIGHT, InputEvent.CTRL_DOWN_MASK));
|
||||
ToolConstants.TOOLBAR_GROUP_THREE, NextPrevSelectedRangePlugin.ACTION_SUB_GROUP));
|
||||
setKeyBindingData(
|
||||
new KeyBindingData(KeyEvent.VK_BRACERIGHT, DockingUtils.CONTROL_KEY_MODIFIER_MASK));
|
||||
|
||||
setDescription("Go to next selected range");
|
||||
setHelpLocation(new HelpLocation(HelpTopics.SELECTION, getName()));
|
||||
|
|
|
|||
|
|
@ -15,6 +15,11 @@
|
|||
*/
|
||||
package ghidra.app.plugin.core.navigation;
|
||||
|
||||
import java.awt.event.KeyEvent;
|
||||
|
||||
import docking.DockingUtils;
|
||||
import docking.action.*;
|
||||
import docking.tool.ToolConstants;
|
||||
import ghidra.app.context.ProgramLocationActionContext;
|
||||
import ghidra.app.nav.PreviousRangeAction;
|
||||
import ghidra.app.plugin.PluginCategoryNames;
|
||||
|
|
@ -22,13 +27,7 @@ import ghidra.app.util.HelpTopics;
|
|||
import ghidra.framework.plugintool.PluginTool;
|
||||
import ghidra.program.util.ProgramSelection;
|
||||
import ghidra.util.HelpLocation;
|
||||
|
||||
import java.awt.event.InputEvent;
|
||||
import java.awt.event.KeyEvent;
|
||||
|
||||
import resources.ResourceManager;
|
||||
import docking.action.*;
|
||||
import docking.tool.ToolConstants;
|
||||
|
||||
public class PreviousHighlightedRangeAction extends PreviousRangeAction {
|
||||
|
||||
|
|
@ -43,8 +42,9 @@ public class PreviousHighlightedRangeAction extends PreviousRangeAction {
|
|||
|
||||
setToolBarData(new ToolBarData(
|
||||
ResourceManager.loadImage("images/PreviousHighlightBlock16.gif"),
|
||||
PluginCategoryNames.NAVIGATION, NextPrevHighlightRangePlugin.ACTION_SUB_GROUP));
|
||||
setKeyBindingData(new KeyBindingData(KeyEvent.VK_9, InputEvent.CTRL_DOWN_MASK));
|
||||
ToolConstants.TOOLBAR_GROUP_THREE, NextPrevHighlightRangePlugin.ACTION_SUB_GROUP));
|
||||
setKeyBindingData(
|
||||
new KeyBindingData(KeyEvent.VK_9, DockingUtils.CONTROL_KEY_MODIFIER_MASK));
|
||||
|
||||
setDescription("Go to previous highlighted range");
|
||||
setHelpLocation(new HelpLocation(HelpTopics.HIGHLIGHT, getName()));
|
||||
|
|
|
|||
|
|
@ -15,6 +15,13 @@
|
|||
*/
|
||||
package ghidra.app.plugin.core.navigation;
|
||||
|
||||
import java.awt.event.KeyEvent;
|
||||
|
||||
import javax.swing.ImageIcon;
|
||||
|
||||
import docking.DockingUtils;
|
||||
import docking.action.*;
|
||||
import docking.tool.ToolConstants;
|
||||
import ghidra.app.context.ProgramLocationActionContext;
|
||||
import ghidra.app.nav.PreviousRangeAction;
|
||||
import ghidra.app.plugin.PluginCategoryNames;
|
||||
|
|
@ -22,15 +29,7 @@ import ghidra.app.util.HelpTopics;
|
|||
import ghidra.framework.plugintool.PluginTool;
|
||||
import ghidra.program.util.ProgramSelection;
|
||||
import ghidra.util.HelpLocation;
|
||||
|
||||
import java.awt.event.InputEvent;
|
||||
import java.awt.event.KeyEvent;
|
||||
|
||||
import javax.swing.ImageIcon;
|
||||
|
||||
import resources.ResourceManager;
|
||||
import docking.action.*;
|
||||
import docking.tool.ToolConstants;
|
||||
|
||||
public class PreviousSelectedRangeAction extends PreviousRangeAction {
|
||||
|
||||
|
|
@ -43,9 +42,10 @@ public class PreviousSelectedRangeAction extends PreviousRangeAction {
|
|||
"Previous Selected Range" }, icon, PluginCategoryNames.NAVIGATION,
|
||||
MenuData.NO_MNEMONIC, NextPrevSelectedRangePlugin.ACTION_SUB_GROUP));
|
||||
|
||||
setToolBarData(new ToolBarData(icon, PluginCategoryNames.NAVIGATION,
|
||||
setToolBarData(new ToolBarData(icon, ToolConstants.TOOLBAR_GROUP_THREE,
|
||||
NextPrevSelectedRangePlugin.ACTION_SUB_GROUP));
|
||||
setKeyBindingData(new KeyBindingData(KeyEvent.VK_BRACELEFT, InputEvent.CTRL_DOWN_MASK));
|
||||
setKeyBindingData(
|
||||
new KeyBindingData(KeyEvent.VK_BRACELEFT, DockingUtils.CONTROL_KEY_MODIFIER_MASK));
|
||||
|
||||
setDescription("Go to previous selected range");
|
||||
setHelpLocation(new HelpLocation(HelpTopics.SELECTION, getName()));
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@
|
|||
package ghidra.app.plugin.core.progmgr;
|
||||
|
||||
import java.awt.Component;
|
||||
import java.awt.event.*;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.KeyEvent;
|
||||
import java.beans.PropertyEditor;
|
||||
import java.io.IOException;
|
||||
import java.net.MalformedURLException;
|
||||
|
|
@ -28,6 +29,7 @@ import java.util.concurrent.atomic.AtomicReference;
|
|||
import javax.swing.Icon;
|
||||
|
||||
import docking.ActionContext;
|
||||
import docking.DockingUtils;
|
||||
import docking.action.*;
|
||||
import docking.options.editor.*;
|
||||
import docking.tool.ToolConstants;
|
||||
|
|
@ -535,7 +537,8 @@ public class ProgramManagerPlugin extends Plugin implements ProgramManager {
|
|||
new MenuData(new String[] { ToolConstants.MENU_FILE, "&Open..." }, "DomainObjectOpen");
|
||||
menuData.setMenuSubGroup(Integer.toString(subMenuGroupOrder++));
|
||||
openAction.setMenuBarData(menuData);
|
||||
openAction.setKeyBindingData(new KeyBindingData(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK));
|
||||
openAction.setKeyBindingData(
|
||||
new KeyBindingData(KeyEvent.VK_O, DockingUtils.CONTROL_KEY_MODIFIER_MASK));
|
||||
|
||||
closeAction = new ProgramContextAction("Close File", getName()) {
|
||||
@Override
|
||||
|
|
@ -626,14 +629,15 @@ public class ProgramManagerPlugin extends Plugin implements ProgramManager {
|
|||
};
|
||||
String[] saveMenuPath = { ToolConstants.MENU_FILE, "&Save" };
|
||||
Icon saveIcon = ResourceManager.loadImage("images/disk.png");
|
||||
String saveGroup = "DomainObjectSave";
|
||||
String saveGroup = ToolConstants.TOOLBAR_GROUP_ONE;
|
||||
subMenuGroupOrder = 0;
|
||||
|
||||
menuData = new MenuData(saveMenuPath, saveIcon, saveGroup);
|
||||
menuData.setMenuSubGroup(Integer.toString(subMenuGroupOrder++));
|
||||
saveAction.setMenuBarData(menuData);
|
||||
saveAction.setToolBarData(new ToolBarData(saveIcon, saveGroup));
|
||||
saveAction.setKeyBindingData(new KeyBindingData('S', InputEvent.CTRL_MASK));
|
||||
saveAction
|
||||
.setKeyBindingData(new KeyBindingData('S', DockingUtils.CONTROL_KEY_MODIFIER_MASK));
|
||||
saveAction.setDescription("Save Program");
|
||||
|
||||
saveAsAction = new ProgramContextAction("Save As File", getName()) {
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
|
|||
|
||||
ImageIcon icon = ResourceManager.getScaledIcon(
|
||||
ResourceManager.loadImage("defaultTools/images/Caution.png"),
|
||||
ToolConstants.LARGE_ICON_SIZE, ToolConstants.LARGE_ICON_SIZE);
|
||||
ToolIconURL.LARGE_ICON_SIZE, ToolIconURL.LARGE_ICON_SIZE);
|
||||
|
||||
assertEquals(icon.getDescription(), template.getIcon().getDescription());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -827,7 +827,7 @@
|
|||
the passed parameter as a character "string".</P>
|
||||
</BLOCKQUOTE>
|
||||
|
||||
<H3><A name="EditDataType"></A>Edit Data Type of Variable<BR>
|
||||
<H3><A name="Edit_Data_Type"></A>Edit Data Type of Variable<BR>
|
||||
</H3>
|
||||
|
||||
<BLOCKQUOTE>
|
||||
|
|
|
|||
|
|
@ -76,9 +76,6 @@ public interface ToolConstants extends DockingToolConstants {
|
|||
/** A group for actions that link directly to help content */
|
||||
public static final String HELP_CONTENTS_MENU_GROUP = "AAAHelpContents";
|
||||
|
||||
/** Used for navigation-based action */
|
||||
public static final String NEXT_CODE_UNIT_NAVIGATION_MENU_GROUP = "NextPrevCodeUnit";
|
||||
|
||||
/**
|
||||
* Constant for the options menu group for the Tool Options menu item
|
||||
*/
|
||||
|
|
@ -121,19 +118,26 @@ public interface ToolConstants extends DockingToolConstants {
|
|||
*/
|
||||
public static final String TOOL_HELP_TOPIC = "Tool";
|
||||
|
||||
/**
|
||||
* The large icon size (height and width)
|
||||
*/
|
||||
public static final int LARGE_ICON_SIZE = 24;
|
||||
/** Used for navigation-based action */
|
||||
public static final String MENU_GROUP_NEXT_CODE_UNIT_NAV = "NextPrevCodeUnit";
|
||||
|
||||
/**
|
||||
* The medium icon size (height and width)
|
||||
* Primary toolbar group number 1, starting from the left
|
||||
*/
|
||||
public static final int MEDIUM_ICON_SIZE = 22;
|
||||
public static final String TOOLBAR_GROUP_ONE = "1_Toolbar_Navigation_Group";
|
||||
|
||||
/**
|
||||
* The small icon size (height and width)
|
||||
* Primary toolbar group number 2, starting from the left
|
||||
*/
|
||||
public static final int SMALL_ICON_SIZE = 16;
|
||||
public static final String TOOLBAR_GROUP_TWO = "2_Toolbar_Navigation_Group";
|
||||
|
||||
/**
|
||||
* Primary toolbar group number 3, starting from the left
|
||||
*/
|
||||
public static final String TOOLBAR_GROUP_THREE = "3_Toolbar_Navigation_Group";
|
||||
|
||||
/**
|
||||
* Primary toolbar group number 4, starting from the left
|
||||
*/
|
||||
public static final String TOOLBAR_GROUP_FOUR = "4_Toolbar_Navigation_Group";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,15 +15,13 @@
|
|||
*/
|
||||
package docking.util.image;
|
||||
|
||||
import generic.Images;
|
||||
|
||||
import java.awt.image.*;
|
||||
import java.io.File;
|
||||
import java.util.Hashtable;
|
||||
|
||||
import javax.swing.ImageIcon;
|
||||
|
||||
import docking.tool.ToolConstants;
|
||||
import generic.Images;
|
||||
import resources.ResourceManager;
|
||||
|
||||
/**
|
||||
|
|
@ -31,6 +29,22 @@ import resources.ResourceManager;
|
|||
* not valid, then a default "bomb" icon is used as the icon.
|
||||
*/
|
||||
public class ToolIconURL implements Comparable<ToolIconURL> {
|
||||
|
||||
/**
|
||||
* The large icon size (height and width)
|
||||
*/
|
||||
public static final int LARGE_ICON_SIZE = 24;
|
||||
|
||||
/**
|
||||
* The medium icon size (height and width)
|
||||
*/
|
||||
public static final int MEDIUM_ICON_SIZE = 22;
|
||||
|
||||
/**
|
||||
* The small icon size (height and width)
|
||||
*/
|
||||
public static final int SMALL_ICON_SIZE = 16;
|
||||
|
||||
private static final int MAX_IMAGE_LOAD_TIME = 5000;
|
||||
|
||||
private String location;
|
||||
|
|
@ -91,19 +105,24 @@ public class ToolIconURL implements Comparable<ToolIconURL> {
|
|||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
if (this == obj) {
|
||||
return true;
|
||||
if (obj == null)
|
||||
}
|
||||
if (obj == null) {
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
}
|
||||
if (getClass() != obj.getClass()) {
|
||||
return false;
|
||||
}
|
||||
ToolIconURL other = (ToolIconURL) obj;
|
||||
if (location == null) {
|
||||
if (other.location != null)
|
||||
if (other.location != null) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (!location.equals(other.location))
|
||||
else if (!location.equals(other.location)) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -113,35 +132,35 @@ public class ToolIconURL implements Comparable<ToolIconURL> {
|
|||
}
|
||||
|
||||
private ImageIcon getSmallIcon(ImageIcon unscaledIcon) {
|
||||
if (unscaledIcon.getIconHeight() == ToolConstants.SMALL_ICON_SIZE &&
|
||||
unscaledIcon.getIconHeight() == ToolConstants.SMALL_ICON_SIZE) {
|
||||
if (unscaledIcon.getIconHeight() == SMALL_ICON_SIZE &&
|
||||
unscaledIcon.getIconHeight() == SMALL_ICON_SIZE) {
|
||||
return unscaledIcon;
|
||||
}
|
||||
|
||||
// can we find this icon in the desired size on disk?
|
||||
ImageIcon image = findCompatibleImageForSize(location, ToolConstants.SMALL_ICON_SIZE);
|
||||
ImageIcon image = findCompatibleImageForSize(location, SMALL_ICON_SIZE);
|
||||
if (image != null) {
|
||||
return image;
|
||||
}
|
||||
|
||||
return ResourceManager.getScaledIcon(unscaledIcon, ToolConstants.SMALL_ICON_SIZE,
|
||||
ToolConstants.SMALL_ICON_SIZE);
|
||||
return ResourceManager.getScaledIcon(unscaledIcon, SMALL_ICON_SIZE,
|
||||
SMALL_ICON_SIZE);
|
||||
}
|
||||
|
||||
private ImageIcon getLargeIcon(ImageIcon unscaledIcon) {
|
||||
if (unscaledIcon.getIconHeight() == ToolConstants.LARGE_ICON_SIZE &&
|
||||
unscaledIcon.getIconHeight() == ToolConstants.LARGE_ICON_SIZE) {
|
||||
if (unscaledIcon.getIconHeight() == LARGE_ICON_SIZE &&
|
||||
unscaledIcon.getIconHeight() == LARGE_ICON_SIZE) {
|
||||
return unscaledIcon;
|
||||
}
|
||||
|
||||
// can we find this icon in the desired size on disk?
|
||||
ImageIcon image = findCompatibleImageForSize(location, ToolConstants.LARGE_ICON_SIZE);
|
||||
ImageIcon image = findCompatibleImageForSize(location, LARGE_ICON_SIZE);
|
||||
if (image != null) {
|
||||
return image;
|
||||
}
|
||||
|
||||
// ...try the medium size
|
||||
image = findCompatibleImageForSize(location, ToolConstants.MEDIUM_ICON_SIZE);
|
||||
image = findCompatibleImageForSize(location, MEDIUM_ICON_SIZE);
|
||||
if (image != null) {
|
||||
return image;
|
||||
}
|
||||
|
|
@ -152,8 +171,8 @@ public class ToolIconURL implements Comparable<ToolIconURL> {
|
|||
return ResourceManager.loadImage(Images.BIG_BOMB);
|
||||
}
|
||||
|
||||
return ResourceManager.getScaledIcon(unscaledIcon, ToolConstants.LARGE_ICON_SIZE,
|
||||
ToolConstants.LARGE_ICON_SIZE);
|
||||
return ResourceManager.getScaledIcon(unscaledIcon, LARGE_ICON_SIZE,
|
||||
LARGE_ICON_SIZE);
|
||||
}
|
||||
|
||||
private ImageIcon findCompatibleImageForSize(String imagePath, int desiredSize) {
|
||||
|
|
@ -214,6 +233,7 @@ public class ToolIconURL implements Comparable<ToolIconURL> {
|
|||
* <p>
|
||||
* <b>WARNING: </b> This call may block the Swing thread for up to {@link #MAX_IMAGE_LOAD_TIME}
|
||||
* milliseconds the first time it is called!
|
||||
* @return true if animated
|
||||
*/
|
||||
public boolean isAnimated() {
|
||||
if (!hasCheckedForAnimatedStatus) {
|
||||
|
|
@ -225,14 +245,16 @@ public class ToolIconURL implements Comparable<ToolIconURL> {
|
|||
}
|
||||
|
||||
/**
|
||||
* Return the location of this icon.
|
||||
* Return the location of this icon
|
||||
* @return the location of this icon
|
||||
*/
|
||||
public String getLocation() {
|
||||
return location;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the icon as {@link ToolConstants#SMALL_ICON_SIZE} pixel size.
|
||||
* Return the icon as {@link #SMALL_ICON_SIZE} pixel size.
|
||||
* @return the icon
|
||||
*/
|
||||
public ImageIcon getSmallIcon() {
|
||||
if (smallIcon == null) {
|
||||
|
|
@ -243,7 +265,8 @@ public class ToolIconURL implements Comparable<ToolIconURL> {
|
|||
}
|
||||
|
||||
/**
|
||||
* Return the icon as {@link ToolConstants#LARGE_ICON_SIZE} pixel size.
|
||||
* Return the icon as {@link #LARGE_ICON_SIZE} pixel size.
|
||||
* @return the icon
|
||||
*/
|
||||
public ImageIcon getIcon() {
|
||||
if (largeIcon == null) {
|
||||
|
|
@ -254,7 +277,8 @@ public class ToolIconURL implements Comparable<ToolIconURL> {
|
|||
}
|
||||
|
||||
/**
|
||||
* Returns the icon bytes.
|
||||
* Returns the icon bytes
|
||||
* @return the bytes
|
||||
*/
|
||||
public byte[] getIconBytes() {
|
||||
return iconBytes;
|
||||
|
|
|
|||
|
|
@ -19,13 +19,19 @@ import java.io.File;
|
|||
import java.io.FileFilter;
|
||||
import java.util.*;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import ghidra.framework.preferences.Preferences;
|
||||
import util.CollectionUtils;
|
||||
|
||||
public class GenericRunInfo {
|
||||
|
||||
/** The name appended to application directories during testing */
|
||||
public static final String TEST_DIRECTORY_SUFFIX = "-Test";
|
||||
|
||||
private static final Logger LOG = LogManager.getLogger(GenericRunInfo.class);
|
||||
|
||||
/**
|
||||
* Get all of the applications's settings directories
|
||||
* (<tt>.<i>application_name_version</i></tt>) for various versions in descending order by the
|
||||
|
|
@ -39,9 +45,9 @@ public class GenericRunInfo {
|
|||
File userDataDirectory = Application.getUserSettingsDirectory();
|
||||
File userDataDirParentFile = userDataDirectory.getParentFile();
|
||||
|
||||
List<File> applicationDirectories = collectAllApplicationDirectories(userDataDirParentFile);
|
||||
List<File> appDirs = collectAllApplicationDirectories(userDataDirParentFile);
|
||||
|
||||
Comparator<File> userDirModifyComparator = (f1, f2) -> {
|
||||
Comparator<File> modifyTimeComparator = (f1, f2) -> {
|
||||
|
||||
//
|
||||
// We want to use a real file to tell the last time Ghidra was run, as we cannot
|
||||
|
|
@ -52,74 +58,40 @@ public class GenericRunInfo {
|
|||
if (!prefs1.exists() || !prefs2.exists()) {
|
||||
if (!prefs1.exists()) {
|
||||
if (!prefs2.exists()) {
|
||||
// neither file exists (user deleted?)
|
||||
return 0;
|
||||
return 0; // neither file exists (user deleted?)
|
||||
}
|
||||
|
||||
// prefs1 doesn't exist, but prefs2 does--prefer prefs2
|
||||
return 1;
|
||||
return 1; // prefs1 doesn't exist, but prefs2 does--prefer prefs2
|
||||
}
|
||||
|
||||
// prefs1 exists--prefer prefs1
|
||||
return -1;
|
||||
return -1; // prefs1 exists--prefer prefs1
|
||||
}
|
||||
|
||||
long modify1 = prefs1.lastModified();
|
||||
long modify2 = prefs2.lastModified();
|
||||
if (modify1 == modify2) {
|
||||
// If same time then compare names of the parent dirs, which have versions
|
||||
// in the name
|
||||
// If same time, compare parent dir names, which contain their version
|
||||
return f1.getName().compareTo(f2.getName());
|
||||
}
|
||||
return (modify1 < modify2) ? 1 : -1;
|
||||
};
|
||||
|
||||
Collections.sort(applicationDirectories, userDirModifyComparator);
|
||||
return applicationDirectories;
|
||||
Collections.sort(appDirs, modifyTimeComparator);
|
||||
return appDirs;
|
||||
}
|
||||
|
||||
private static List<File> collectAllApplicationDirectories(File dataDirectoryParentDir) {
|
||||
|
||||
String settingsDirPrefix =
|
||||
"." + Application.getName().replaceAll("\\s", "").toLowerCase();
|
||||
FileFilter userDirFilter = f -> {
|
||||
String name = f.getName();
|
||||
Application.getName();
|
||||
String userSettingsDirPrefix =
|
||||
"." + Application.getName().replaceAll("\\s", "").toLowerCase();
|
||||
|
||||
return f.isDirectory() && name.startsWith(userSettingsDirPrefix) &&
|
||||
return f.isDirectory() && name.startsWith(settingsDirPrefix) &&
|
||||
!name.endsWith(TEST_DIRECTORY_SUFFIX);
|
||||
};
|
||||
|
||||
// The current directory structure--rooted under '.<application name>'. For example,
|
||||
// /some/path/<user home>/.applicationname/.application-version
|
||||
File[] currentStyleUserDirs = dataDirectoryParentDir.listFiles(userDirFilter);
|
||||
|
||||
// Old structure (applications used to be rooted under <user home>). For example,
|
||||
// /some/path/<user home>/.application-version
|
||||
File userHomeDir = dataDirectoryParentDir.getParentFile();
|
||||
if (userHomeDir == null) {
|
||||
throw new IllegalArgumentException(
|
||||
"Must specify an absolute path; found instead: " + dataDirectoryParentDir);
|
||||
}
|
||||
|
||||
File[] oldStyleUserDirs = userHomeDir.listFiles(userDirFilter);
|
||||
|
||||
List<File> allDirs = new ArrayList<>();
|
||||
if (currentStyleUserDirs != null) {
|
||||
// should never be null, since the installation running this code will have a dir
|
||||
for (File file : currentStyleUserDirs) {
|
||||
allDirs.add(file);
|
||||
}
|
||||
}
|
||||
|
||||
if (oldStyleUserDirs != null) {
|
||||
// should never be null--it's the user's home dir!
|
||||
for (File file : oldStyleUserDirs) {
|
||||
allDirs.add(file);
|
||||
}
|
||||
}
|
||||
|
||||
return allDirs;
|
||||
// /some/path/<user home>/.application_name/..application_name_application-version
|
||||
File[] userDirs = dataDirectoryParentDir.listFiles(userDirFilter);
|
||||
return CollectionUtils.asList(userDirs);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -167,6 +139,8 @@ public class GenericRunInfo {
|
|||
String myRelease = myIdentifier.getApplicationReleaseName();
|
||||
String myDirName = Application.getUserSettingsDirectory().getName();
|
||||
|
||||
LOG.trace("Finding previous application settings directories for " + myIdentifier);
|
||||
|
||||
for (File dir : getUserSettingsDirsByTime()) {
|
||||
|
||||
// Ignore the currently active user settings directory.
|
||||
|
|
@ -176,6 +150,8 @@ public class GenericRunInfo {
|
|||
continue;
|
||||
}
|
||||
|
||||
LOG.trace("\tchecking " + dirName);
|
||||
|
||||
if (dirName.startsWith(".")) {
|
||||
dirName = dirName.substring(1);
|
||||
}
|
||||
|
|
@ -185,11 +161,16 @@ public class GenericRunInfo {
|
|||
ApplicationIdentifier identifier = new ApplicationIdentifier(dirName);
|
||||
String release = identifier.getApplicationReleaseName();
|
||||
if (release.equals(myRelease)) {
|
||||
LOG.trace("\t\tkeeping");
|
||||
settingsDirs.add(dir);
|
||||
}
|
||||
else {
|
||||
LOG.trace("\t\tskipping");
|
||||
}
|
||||
}
|
||||
catch (IllegalArgumentException e) {
|
||||
// The directory name didn't contain a valid application identifier...skip it
|
||||
LOG.trace("\tdir does not have an application identifier - skipping");
|
||||
}
|
||||
}
|
||||
return settingsDirs;
|
||||
|
|
|
|||
|
|
@ -356,12 +356,11 @@ public class FrontEndTool extends PluginTool implements OptionsChangeListener {
|
|||
*
|
||||
* @param tool tool that has the domain file opened
|
||||
* @param domainFile domain file to check in
|
||||
* @param taskListener listener that is notified when task completes
|
||||
*/
|
||||
public void checkIn(PluginTool tool, DomainFile domainFile, TaskListener taskListener) {
|
||||
public void checkIn(PluginTool tool, DomainFile domainFile) {
|
||||
ArrayList<DomainFile> list = new ArrayList<>();
|
||||
list.add(domainFile);
|
||||
checkIn(tool, list, taskListener, tool.getToolFrame());
|
||||
checkIn(tool, list, tool.getToolFrame());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -369,11 +368,9 @@ public class FrontEndTool extends PluginTool implements OptionsChangeListener {
|
|||
*
|
||||
* @param tool tool that has the domain files opened
|
||||
* @param fileList list of DomainFile objects
|
||||
* @param taskListener listener that is notified when task completes
|
||||
* @param parent parent of dialog if an error occurs during checkin
|
||||
*/
|
||||
public void checkIn(PluginTool tool, List<DomainFile> fileList, TaskListener taskListener,
|
||||
Component parent) {
|
||||
public void checkIn(PluginTool tool, List<DomainFile> fileList, Component parent) {
|
||||
|
||||
if (!checkRepositoryConnected(tool)) {
|
||||
return;
|
||||
|
|
@ -913,7 +910,11 @@ public class FrontEndTool extends PluginTool implements OptionsChangeListener {
|
|||
|
||||
private void notifyTaskListener() {
|
||||
|
||||
SystemUtilities.runSwingNow(() -> {
|
||||
if (taskListener == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Swing.runNow(() -> {
|
||||
if (wasCanceled) {
|
||||
taskListener.taskCancelled(MergeTask.this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public class DefaultProjectManager implements ProjectManager {
|
|||
*/
|
||||
private final static String LAST_OPENED_PROJECT = "LastOpenedProject";
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger(DefaultProjectManager.class);
|
||||
private static final Logger LOG = LogManager.getLogger(DefaultProjectManager.class);
|
||||
|
||||
private static final String RECENT_PROJECTS = "RecentProjects";
|
||||
private static final String VIEWED_PROJECTS = "ViewedProjects";
|
||||
|
|
@ -151,11 +151,11 @@ public class DefaultProjectManager implements ProjectManager {
|
|||
return null;
|
||||
}
|
||||
catch (ReadOnlyException e) {
|
||||
Msg.showError(LOGGER, null, "Read-only Project!",
|
||||
Msg.showError(LOG, null, "Read-only Project!",
|
||||
"Cannot open project for update: " + projectLocator);
|
||||
}
|
||||
catch (IOException e) {
|
||||
Msg.showError(LOGGER, null, "Open Project Failed!",
|
||||
Msg.showError(LOG, null, "Open Project Failed!",
|
||||
"Could not open project " + projectLocator + "\n \nCAUSE: " + e.getMessage());
|
||||
}
|
||||
finally {
|
||||
|
|
@ -310,7 +310,7 @@ public class DefaultProjectManager implements ProjectManager {
|
|||
|
||||
Set<ToolTemplate> tools = ToolUtils.getDefaultApplicationTools();
|
||||
if (tools == null || tools.isEmpty()) {
|
||||
Msg.showError(LOGGER, null, "Default Tools Not Found",
|
||||
Msg.showError(LOG, null, "Default Tools Not Found",
|
||||
"Could not find default tools for project.");
|
||||
return;
|
||||
}
|
||||
|
|
@ -321,10 +321,11 @@ public class DefaultProjectManager implements ProjectManager {
|
|||
}
|
||||
|
||||
private void installTools(ToolChest toolChest) {
|
||||
LOGGER.debug("No tools found; Installing default tools");
|
||||
LOG.debug("No tools found; Installing default tools");
|
||||
|
||||
File recoveryDirectory = getMostRecentValidProjectDirectory();
|
||||
if (recoveryDirectory == null) {
|
||||
LOG.debug("\tno recent project directories found");
|
||||
addDefaultTools(toolChest);
|
||||
return;
|
||||
}
|
||||
|
|
@ -332,7 +333,7 @@ public class DefaultProjectManager implements ProjectManager {
|
|||
// get old tools
|
||||
Set<ToolTemplate> tools = ToolUtils.getDefaultApplicationTools();
|
||||
if (tools == null || tools.isEmpty()) {
|
||||
Msg.showError(LOGGER, null, "Default Tools Not Found",
|
||||
Msg.showError(LOG, null, "Default Tools Not Found",
|
||||
"Could not find default tools for project.");
|
||||
return;
|
||||
}
|
||||
|
|
@ -376,14 +377,14 @@ public class DefaultProjectManager implements ProjectManager {
|
|||
return new HashSet<>(defaultTools);
|
||||
}
|
||||
|
||||
LOGGER.debug("Found the following default tools: ");
|
||||
LOG.debug("Found the following default tools: ");
|
||||
for (ToolTemplate tool : defaultTools) {
|
||||
LOGGER.debug("-" + tool);
|
||||
LOG.debug("-" + tool);
|
||||
}
|
||||
|
||||
LOGGER.debug("Found existing tools; merging existing tools: ");
|
||||
LOG.debug("Found existing tools; merging existing tools: ");
|
||||
for (ToolTemplate tool : userTools) {
|
||||
LOGGER.debug("-" + tool);
|
||||
LOG.debug("-" + tool);
|
||||
}
|
||||
|
||||
//@formatter:off
|
||||
|
|
@ -425,7 +426,7 @@ public class DefaultProjectManager implements ProjectManager {
|
|||
file -> file.isDirectory() && file.getName().equals(APPLICATION_TOOLS_DIR_NAME);
|
||||
File[] toolDirs = previousUserDir.listFiles(dirFilter);
|
||||
if (toolDirs == null || toolDirs.length != 1) {
|
||||
LOGGER.debug("No user tools found in '" + previousUserDir + "'");
|
||||
LOG.debug("No user tools found in '" + previousUserDir + "'");
|
||||
return Collections.emptySet();
|
||||
}
|
||||
|
||||
|
|
@ -450,7 +451,7 @@ public class DefaultProjectManager implements ProjectManager {
|
|||
saveTool(template);
|
||||
}
|
||||
catch (Exception e) {
|
||||
Msg.error(LOGGER,
|
||||
Msg.error(LOG,
|
||||
"Unable to save user tool '" + template.getName() + "': " + e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
|
|
@ -465,9 +466,9 @@ public class DefaultProjectManager implements ProjectManager {
|
|||
// this implies that there exist multiple *default* tools with the same name, which
|
||||
// is an error condition.
|
||||
if (toolChest.getToolTemplate(template.getName()) != null) {
|
||||
Msg.showWarn(LOGGER, null, "Error Adding Tool",
|
||||
Msg.showWarn(LOG, null, "Error Adding Tool",
|
||||
"Found multiple default tools with the same name: " + template.getName() +
|
||||
". Check the classpath for " +
|
||||
".\nCheck the classpath for " +
|
||||
"entries that contain tools that share the same tool name");
|
||||
}
|
||||
|
||||
|
|
@ -487,7 +488,7 @@ public class DefaultProjectManager implements ProjectManager {
|
|||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
Msg.showError(LOGGER, null, "Tool Chest Error", "Failed to create tool chest.", e);
|
||||
Msg.showError(LOG, null, "Tool Chest Error", "Failed to create tool chest.", e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue