Skip to content

fixing 'edit host configuration' menu item #1456

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
merged 3 commits into from
Aug 2, 2022
Merged

fixing 'edit host configuration' menu item #1456

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4918ed0
fixing 'edit host configuration' menu item - due to listeners on obje…
rerpha Aug 2, 2022
4ebc2ec
review comments
rerpha Aug 2, 2022
746ba8a
further review comments, remove editBlockAction as instance var, retu…
rerpha Aug 2, 2022
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
52 changes: 18 additions & 34 deletions .../uk.ac.stfc.isis.ibex.ui.blocks/src/uk/ac/stfc/isis/ibex/ui/blocks/groups/BlocksMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,10 @@
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Item;

import uk.ac.stfc.isis.ibex.configserver.Configurations;
import uk.ac.stfc.isis.ibex.configserver.displaying.DisplayBlock;
import uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher.PerspectivesProvider;
import uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher.views.PerspectiveSwitcherView;
import uk.ac.stfc.isis.ibex.epics.writing.OnCanWriteChangeListener;
import uk.ac.stfc.isis.ibex.ui.blocks.presentation.Presenter;
import uk.ac.stfc.isis.ibex.ui.blocks.views.BlocksView;
import uk.ac.stfc.isis.ibex.ui.configserver.commands.EditBlockHandler;
Expand All @@ -58,31 +54,17 @@ public class BlocksMenu extends MenuManager {
private static final String CONFIGURATION_SUFFIX = "configuration";
private static final String DISPLAY_BLOCK_HISTORY = "Display block history...";
private static final String LOGPLOTTER_ID = "uk.ac.stfc.isis.ibex.client.e4.product.perspective.logplotter";

private static boolean canWrite = false;

private IAction editBlockAction;
private MenuManager logSubMenu;
private MenuManager noLogPlotterSubMenu;


/**
* This is an inner anonymous class inherited from SameTypeWriter with added functionality
* for modifying the command if the underlying configuration PV cannot be written to.
*/
protected final OnCanWriteChangeListener readOnlyListener = canWrite -> Display.getDefault().asyncExec(() -> {
if (canWrite) {
boolean buttonPresent = false;
for (Item item : getMenuItems()) {
if (item.getText().contains(EDIT_BLOCK_PREFIX)) {
buttonPresent = true;
}
}
if (find(editBlockAction.getId()) == null && buttonPresent) {
appendToGroup(BLOCK_MENU_GROUP, editBlockAction);
}
} else {
remove(editBlockAction.getId());
}
});
static {
// Set a listener for the edit host configuration/component menu item based on server write access status.
Configurations.getInstance().server().setCurrentConfig().addOnCanWriteChangeListener(canWrite -> BlocksMenu.canWrite = canWrite);
}


private IAction createAddToPlotAction(String plotName) {
return new Action("Add to new axis") {
Expand Down Expand Up @@ -116,8 +98,6 @@ public void run() {
public BlocksMenu(DisplayBlock displayBlock) {
this.block = displayBlock;

Configurations.getInstance().server().setCurrentConfig().addOnCanWriteChangeListener(readOnlyListener);

add(new GroupMarker(BLOCK_MENU_GROUP));

noLogPlotterSubMenu = new MenuManager(DISPLAY_BLOCK_HISTORY);
Expand Down Expand Up @@ -160,6 +140,10 @@ public void menuAboutToShow(IMenuManager manager) {

appendToGroup(BLOCK_MENU_GROUP, logSubMenu);

final var editBlockAction = createEditBlockLabelAndAction();

appendToGroup(BLOCK_MENU_GROUP, editBlockAction);

this.addMenuListener(new IMenuListener() {
@Override
public void menuAboutToShow(IMenuManager manager) {
Expand All @@ -170,16 +154,21 @@ public void menuAboutToShow(IMenuManager manager) {
logSubMenu.setVisible(false);
noLogPlotterSubMenu.setVisible(true);
}
editBlockAction.setEnabled(canWrite);
updateAll(true);
}
});
String editBlockLabel = EDIT_BLOCK_PREFIX;
}

private IAction createEditBlockLabelAndAction() {
String editBlockLabel = EDIT_BLOCK_PREFIX;
if (this.block.inComponent()) {
editBlockLabel += COMPONENT_SUFFIX;
} else {
editBlockLabel += CONFIGURATION_SUFFIX;
}
editBlockAction = new Action(editBlockLabel) {

return new Action(editBlockLabel) {
@Override
public void run() {
new EditBlockHandler(block.getName()).execute(null); //TODO e4 migrate: This will be added as a command which includes a shell at that time make this correct
Expand All @@ -204,9 +193,4 @@ public static boolean canAddPlot() {
}
return false;
}

@Override
protected void finalize() {
Configurations.getInstance().server().setCurrentConfig().removeOnCanWriteChangeListener(readOnlyListener);
}
}