-
Notifications
You must be signed in to change notification settings - Fork 12
Event logging #53
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.
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
Event logging #53
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
031443c
added events for logging in 3D
porterbot f1eb4fe
handles null data for event logging
porterbot 5319f73
Merge remote-tracking branch 'origin/master' into event_logging
porterbot abe3dbc
disabled buttons to prevent non-admins accessing admin functions
porterbot 72bdd15
added Admin Tool Action to prevent non-admins
porterbot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
...ationGUI/src/main/java/org/janelia/workstation/admin/nb_actions/OpenAdminPanelAction.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package org.janelia.workstation.admin.nb_actions; | ||
| import java.awt.event.ActionEvent; | ||
|
|
||
| import org.janelia.workstation.admin.AdministrationTopComponent; | ||
| import org.janelia.workstation.core.api.AccessManager; | ||
| import org.openide.awt.ActionID; | ||
| import org.openide.awt.ActionReference; | ||
| import org.openide.awt.ActionRegistration; | ||
| import org.openide.util.HelpCtx; | ||
| import org.openide.util.NbBundle.Messages; | ||
| import org.openide.util.actions.SystemAction; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.openide.windows.TopComponent; | ||
| import org.openide.windows.WindowManager; | ||
|
|
||
| @ActionID( | ||
| category = "Window", | ||
| id = "org.janelia.workstation.admin.OpenAdminTopComponentAction" | ||
| ) | ||
| @ActionRegistration( | ||
| displayName = "#CTL_AdministrationTopComponentAction", | ||
| lazy = false | ||
| ) | ||
| @Messages("CTL_AdministrationTopComponentAction=Administration Tool") | ||
| public final class OpenAdminPanelAction extends SystemAction { | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return "Administration Tool"; | ||
| } | ||
|
|
||
| @Override | ||
| public HelpCtx getHelpCtx() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public void actionPerformed(ActionEvent e) { | ||
| if (AccessManager.getAccessManager().isAdmin()) { | ||
| TopComponent win = WindowManager.getDefault() | ||
| .findTopComponent(AdministrationTopComponent.PREFERRED_ID); | ||
| if (win != null) { | ||
| win.open(); | ||
| win.requestActive(); | ||
| } | ||
| } else { | ||
| // either silently disable, or tell the user | ||
| LoggerFactory.getLogger(getClass()) | ||
| .warn("Non-admin attempted to open Administration Tool"); | ||
| } | ||
| } | ||
| } | ||
|
|
22 changes: 22 additions & 0 deletions
22
...I/src/main/java/org/janelia/workstation/admin/nb_actions/OpenAdminPanelActionBuilder.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package org.janelia.workstation.admin.nb_actions; | ||
|
|
||
| import javax.swing.Action; | ||
|
|
||
| import org.janelia.workstation.common.nb_action.RunAsMenuAction; | ||
| import org.janelia.workstation.integration.spi.actions.AdminActionBuilder; | ||
| import org.openide.util.actions.SystemAction; | ||
| import org.openide.util.lookup.ServiceProvider; | ||
|
|
||
| /** | ||
| * Builds the admin menu item for launching the Admin GUI. | ||
| * | ||
| * @author <a href="mailto:[email protected]">David Schauder</a> | ||
| */ | ||
| @ServiceProvider(service = AdminActionBuilder.class, position=1) | ||
| public final class OpenAdminPanelActionBuilder implements AdminActionBuilder { | ||
| @Override | ||
| public Action getAction() { | ||
| return SystemAction.get(OpenAdminPanelAction.class); | ||
| } | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like you deleted a method
splitNeurite()here. Is that intentional? I didn't see a usage in IntelliJ, but then again, I don't see a usage forcanSplitNeurite()either, which you've kept.