mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commented out code that uses EventDispatchChainImpl because it doesn't compile.

Browse Source
This commit is contained in:
esaunders 2020-08-25 14:11:33 -04:00
parent 658a5a15e6
commit 04f83b401f
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Core/src/org/sleuthkit/autopsy/contentviewers/imagetagging/ImageTag.java
View File

@ -18,7 +18,9 @@
*/ */
package org.sleuthkit.autopsy.contentviewers.imagetagging; package org.sleuthkit.autopsy.contentviewers.imagetagging;
import com.sun.javafx.event.EventDispatchChainImpl;
// TODO: See JIRA-6693
//import com.sun.javafx.event.EventDispatchChainImpl;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeSupport;
@ -46,7 +48,7 @@ import org.sleuthkit.autopsy.casemodule.services.contentviewertags.ContentViewer
public final class ImageTag extends Group { public final class ImageTag extends Group {
// Used to tell the 8 edit handles to hide if this tag is no longer selected // Used to tell the 8 edit handles to hide if this tag is no longer selected
private final EventDispatchChainImpl ALL_CHILDREN; // private final EventDispatchChainImpl ALL_CHILDREN;
private final PhysicalTag physicalTag; private final PhysicalTag physicalTag;
@ -57,13 +59,13 @@ public final class ImageTag extends Group {
private final ContentViewerTag<ImageTagRegion> appTag; private final ContentViewerTag<ImageTagRegion> appTag;
public ImageTag(ContentViewerTag<ImageTagRegion> contentViewerTag, ImageView image) { public ImageTag(ContentViewerTag<ImageTagRegion> contentViewerTag, ImageView image) {
ALL_CHILDREN = new EventDispatchChainImpl(); // ALL_CHILDREN = new EventDispatchChainImpl();
this.appTag = contentViewerTag; this.appTag = contentViewerTag;
this.getChildren().addListener((ListChangeListener<Node>) change -> { // this.getChildren().addListener((ListChangeListener<Node>) change -> {
change.next(); // change.next();
change.getAddedSubList().forEach((node) -> ALL_CHILDREN.append(node.getEventDispatcher())); // change.getAddedSubList().forEach((node) -> ALL_CHILDREN.append(node.getEventDispatcher()));
}); // });
ImageTagRegion details = contentViewerTag.getDetails(); ImageTagRegion details = contentViewerTag.getDetails();
physicalTag = new PhysicalTag(details); physicalTag = new PhysicalTag(details);
@ -120,8 +122,8 @@ public final class ImageTag extends Group {
Tooltip.install(this, new Tooltip(contentViewerTag.getContentTag() Tooltip.install(this, new Tooltip(contentViewerTag.getContentTag()
.getName().getDisplayName())); .getName().getDisplayName()));
this.addEventHandler(ImageTagControls.NOT_FOCUSED, event -> ALL_CHILDREN.dispatchEvent(event)); // this.addEventHandler(ImageTagControls.NOT_FOCUSED, event -> ALL_CHILDREN.dispatchEvent(event));
this.addEventHandler(ImageTagControls.FOCUSED, event -> ALL_CHILDREN.dispatchEvent(event)); // this.addEventHandler(ImageTagControls.FOCUSED, event -> ALL_CHILDREN.dispatchEvent(event));
} }
/** /**

17
Core/src/org/sleuthkit/autopsy/contentviewers/imagetagging/ImageTagsGroup.java
View File

@ -18,11 +18,11 @@
*/ */
package org.sleuthkit.autopsy.contentviewers.imagetagging; package org.sleuthkit.autopsy.contentviewers.imagetagging;
import com.sun.javafx.event.EventDispatchChainImpl;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeSupport;
import javafx.event.Event; import javafx.event.Event;
import javafx.event.EventDispatchChain;
import javafx.geometry.Point2D; import javafx.geometry.Point2D;
import javafx.scene.Group; import javafx.scene.Group;
import javafx.scene.Node; import javafx.scene.Node;
@ -41,7 +41,8 @@ import javafx.scene.input.MouseEvent;
*/ */
public final class ImageTagsGroup extends Group { public final class ImageTagsGroup extends Group {
private final EventDispatchChainImpl NO_OP_CHAIN = new EventDispatchChainImpl(); // TODO: See JIRA-6693
// private final EventDispatchChain NO_OP_CHAIN = new EventDispatchChainImpl();
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this); private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
private volatile ImageTag currentFocus; private volatile ImageTag currentFocus;
@ -50,10 +51,10 @@ public final class ImageTagsGroup extends Group {
//Reset focus of current selection if the back drop has focus. //Reset focus of current selection if the back drop has focus.
backDrop.setOnMousePressed((mouseEvent) -> { backDrop.setOnMousePressed((mouseEvent) -> {
if (currentFocus != null) { // if (currentFocus != null) {
currentFocus.getEventDispatcher().dispatchEvent( // currentFocus.getEventDispatcher().dispatchEvent(
new Event(ImageTagControls.NOT_FOCUSED), NO_OP_CHAIN); // new Event(ImageTagControls.NOT_FOCUSED), NO_OP_CHAIN);
} // }
this.pcs.firePropertyChange(new PropertyChangeEvent(this, this.pcs.firePropertyChange(new PropertyChangeEvent(this,
ImageTagControls.NOT_FOCUSED.getName(), currentFocus, null)); ImageTagControls.NOT_FOCUSED.getName(), currentFocus, null));
@ -130,7 +131,7 @@ public final class ImageTagsGroup extends Group {
* @param n * @param n
*/ */
private void resetFocus(ImageTag n) { private void resetFocus(ImageTag n) {
n.getEventDispatcher().dispatchEvent(new Event(ImageTagControls.NOT_FOCUSED), NO_OP_CHAIN); // n.getEventDispatcher().dispatchEvent(new Event(ImageTagControls.NOT_FOCUSED), NO_OP_CHAIN);
this.pcs.firePropertyChange(new PropertyChangeEvent(this, ImageTagControls.NOT_FOCUSED.getName(), n, null)); this.pcs.firePropertyChange(new PropertyChangeEvent(this, ImageTagControls.NOT_FOCUSED.getName(), n, null));
} }
@ -146,7 +147,7 @@ public final class ImageTagsGroup extends Group {
resetFocus(currentFocus); resetFocus(currentFocus);
} }
n.getEventDispatcher().dispatchEvent(new Event(ImageTagControls.FOCUSED), NO_OP_CHAIN); // n.getEventDispatcher().dispatchEvent(new Event(ImageTagControls.FOCUSED), NO_OP_CHAIN);
this.pcs.firePropertyChange(new PropertyChangeEvent(this, ImageTagControls.FOCUSED.getName(), currentFocus, n)); this.pcs.firePropertyChange(new PropertyChangeEvent(this, ImageTagControls.FOCUSED.getName(), currentFocus, n));
currentFocus = n; currentFocus = n;