Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
f4bec3d
Add options to dock/float views in preferences
sol695510 Apr 30, 2025
205236d
Requested changes
sol695510 Jun 27, 2025
5696ca1
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Jun 27, 2025
72df323
Update genfiles.properties
sol695510 Jun 30, 2025
1cca81f
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Jul 7, 2025
5092446
Update AbstractTopComponent.java
sol695510 Jul 16, 2025
b9498d4
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Jul 25, 2025
866c1d7
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Aug 6, 2025
2236ed2
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Aug 11, 2025
91a1850
Update Bundle.properties
sol695510 Aug 11, 2025
966d9a3
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Aug 13, 2025
9263a03
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Aug 28, 2025
cf9e9ac
Fix SonarQube issues
sol695510 Sep 2, 2025
335f939
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Sep 10, 2025
2cce67e
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Sep 15, 2025
0f54f60
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Sep 17, 2025
528a47f
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Sep 22, 2025
64a52ab
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Oct 9, 2025
ad89b75
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Oct 13, 2025
03bcfc8
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Oct 20, 2025
a02fbe7
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Oct 27, 2025
b12c4f4
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Nov 11, 2025
7d39045
Rename classes
sol695510 Nov 12, 2025
cfa8e47
Create ViewOptionsPanelControllerNGTest.java
sol695510 Nov 12, 2025
0d641df
Update ViewOptionsPanelControllerNGTest.java
sol695510 Nov 12, 2025
b103d05
Update ViewOptionsPanelControllerNGTest.java
sol695510 Nov 12, 2025
e634c8a
Update ViewOptionsPanelControllerNGTest.java
sol695510 Nov 13, 2025
1b1cacb
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Nov 13, 2025
0bda403
Update ViewOptionsPanelControllerNGTest.java
sol695510 Nov 14, 2025
df177fc
Add Help page
sol695510 Nov 20, 2025
a09bd7a
Revert Help booleans
sol695510 Nov 20, 2025
868dc4d
Add requested changes
sol695510 Nov 20, 2025
ce898ff
Update whatsnew.txt
sol695510 Nov 20, 2025
7e7960a
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Nov 24, 2025
c0dee01
Move view floating preferences to View Framework and add lookup on Ab…
sol695510 Nov 24, 2025
1baecd4
Add setFloating to topcomponents missing it
sol695510 Nov 25, 2025
1a0500a
Move getDefaultFloatingPreferences() to controller
sol695510 Nov 25, 2025
68d6f4e
Update ViewFloatingOptionsPanelControllerNGTest.java
sol695510 Nov 25, 2025
0d50e92
Rename classes
sol695510 Nov 25, 2025
725646d
Rename classes
sol695510 Nov 25, 2025
175bd54
Remove position from ServiceProvider
sol695510 Nov 25, 2025
8b8fee7
Update ViewOptionsPanelControllerNGTest.java
sol695510 Nov 25, 2025
bc49706
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Nov 26, 2025
e536dba
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Nov 26, 2025
2eb5307
Update HistogramTopComponent2.java
sol695510 Dec 1, 2025
2d0897c
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Dec 5, 2025
c48026c
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Dec 12, 2025
e99e1d5
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Dec 18, 2025
4b1c6e8
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Jan 18, 2026
3a0a0be
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Jan 20, 2026
ce2316f
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Jan 22, 2026
e22db54
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Feb 10, 2026
bbffa3b
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Feb 16, 2026
718cad4
Remove Welcome Page and What's New from the floating view preferences
sol695510 Feb 18, 2026
5a281f5
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Feb 18, 2026
46728b0
Update ViewOptionsPanelController.java
sol695510 Feb 18, 2026
73ac0d2
Add listener to check when views are floated or docked
sol695510 Feb 18, 2026
c4a8f0b
Update HistogramTopComponent2.java
sol695510 Feb 19, 2026
2ddac1c
Update AbstractTopComponent.java
sol695510 Feb 19, 2026
a602b4d
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Feb 23, 2026
a54d1e2
Move logic for floating top components
sol695510 Mar 10, 2026
f3c4f66
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Mar 10, 2026
35683c0
Update SimpleGraphTopComponent.java
sol695510 Mar 10, 2026
57c0d8b
Update AbstractTopComponent.java
sol695510 Mar 10, 2026
1467c19
Add functionality to save floating preferences to a file
sol695510 Mar 19, 2026
eea533e
Update DataAccessViewTopComponent.java
sol695510 Mar 19, 2026
1855de0
Update whatsnew.txt
sol695510 Mar 19, 2026
3c1ba26
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Mar 26, 2026
163ea10
Update ErrorReportTopComponent.java
sol695510 Mar 26, 2026
7ae2d57
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Apr 8, 2026
8c8e375
Update ViewOptionsPanelControllerNGTest.java
sol695510 Apr 22, 2026
43fd72e
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Apr 27, 2026
693bf79
Add file to save default floating preferences
sol695510 May 4, 2026
a08e045
Update help page
sol695510 May 7, 2026
f048553
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 May 7, 2026
9ed057c
Update view-preferences.md
sol695510 May 7, 2026
6fb09d1
Update PreferencesHelpProviderNGTest.java
sol695510 May 8, 2026
7e79db2
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 May 21, 2026
2d46ffd
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 May 26, 2026
0cce240
Update file location to save default floating preferences
sol695510 May 26, 2026
c1116b0
Fix code smells
sol695510 May 26, 2026
ffaf46c
Update ViewOptionsUtility.java
sol695510 May 28, 2026
6beab74
Fix tests for class ViewOptionsPanelController
sol695510 May 28, 2026
881af68
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 May 28, 2026
dbb4fb0
Create ViewOptionsPanelNGTest.java
sol695510 May 28, 2026
3305755
Fix resizing issue
sol695510 Jun 2, 2026
cd2ebbf
Restore FindView's original floating dimensions
sol695510 Jun 2, 2026
cfa2aad
Restore FindView's original floating location
sol695510 Jun 2, 2026
c887a4b
Fix FindView opening on correct window when using multiple displays
sol695510 Jun 2, 2026
9742dd3
Adjust sizing of side opening floating views
sol695510 Jun 2, 2026
4358390
Update AbstractTopComponent.java
sol695510 Jun 3, 2026
84d6851
Update whatsnew.txt
sol695510 Jun 3, 2026
c6751dc
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Jun 10, 2026
030fb8b
Add requested changes
sol695510 Jun 11, 2026
805a754
Merge branch 'master' into enhancement/docked-or-floated-pref
sol695510 Jun 11, 2026
b5f78b7
Add requested changes
sol695510 Jun 12, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"HINT_AnalyticViewTopComponent=Analytic View"
})
public final class AnalyticViewTopComponent extends JavaFxTopComponent<AnalyticViewPane> {

private static final String ANALYTIC_VIEW_GRAPH_CHANGED_THREAD_NAME = "Analytic View Graph Changed Updater";
private final AnalyticViewPane analyticViewPane;
private final AnalyticViewController analyticController;
Expand Down Expand Up @@ -127,7 +127,7 @@ public AnalyticViewTopComponent() {
analyticViewPane.getConfigurationPane().updateSelectablePluginsParameters();
}
}));

refreshRunnable = () -> {
final List<Object> devNull = new ArrayList<>();
while (!queue.isEmpty()) {
Expand All @@ -140,7 +140,9 @@ public AnalyticViewTopComponent() {
}

/**
* This method is called from within the constructor to initialize the form. WARNING: Do NOT modify this code. The content of this method is always regenerated by the Form Editor.
* This method is called from within the constructor to initialize the form.
* WARNING: Do NOT modify this code. The content of this method is always
* regenerated by the Form Editor.
*/
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
Expand Down Expand Up @@ -215,6 +217,8 @@ protected void handleComponentOpened() {
if (activeGraph == null) {
analyticViewPane.reset();
}

setFloating(0, 0);
}

@Override
Expand All @@ -227,7 +231,7 @@ protected void componentShowing() {
analyticController.readState();
handleNewGraph(activeGraph);
}

@Override
protected void handleGraphChange(final GraphChangeEvent event) {
if (event == null) { // can be null at this point in time
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ public AttributeEditorTopComponent() {

};


GraphManager.getDefault().addGraphManagerListener(AttributeEditorTopComponent.this);
newActiveGraph(GraphManager.getDefault().getActiveGraph());
initContent();
Expand Down Expand Up @@ -175,12 +174,14 @@ protected void handleComponentOpened() {
newActiveGraph(GraphManager.getDefault().getActiveGraph());

PreferenceUtilities.addPreferenceChangeListener(prefs.absolutePath(), this);

// Ensure that all the 'Show Empty' buttons are toggled on when panel
// is re-displayed
if (attributePanel != null) {
attributePanel.refreshShowEmpty();
}

setFloating(0, 0);
}

@Override
Expand Down Expand Up @@ -267,7 +268,7 @@ protected String createStyle() {
protected AttributeEditorPanel createContent() {
return attributePanel;
}

@Override
protected void handlePreferenceChange(final PreferenceChangeEvent event) {
if (reader != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public ConversationViewTopComponent() {
setName(Bundle.CTL_ConversationViewTopComponent());
setToolTipText(Bundle.HINT_ConversationViewTopComponent());
Platform.setImplicitExit(false);
controller = ConversationController.getDefault();
controller = ConversationController.getDefault();
controller.getConversation().getGraphUpdateManager().setManaged(true);
initContent();
}
Expand All @@ -82,6 +82,7 @@ public ConversationViewTopComponent() {
protected void handleComponentOpened() {
super.handleComponentOpened();
controller.getConversation().getGraphUpdateManager().setManaged(needsUpdate());
setFloating(0, 0);
}

@Override
Expand Down Expand Up @@ -117,12 +118,12 @@ protected String createStyle() {
protected ConversationBox createContent() {
return controller.getConversationBox();
}

@Override
protected void handleNewGraph(final Graph graph) {
controller.updateComponent();
}

/**
* This method is called from within the constructor to initialize the form.
* WARNING: Do NOT modify this code. The content of this method is always
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public DataAccessViewTopComponent() {

dataAccessPane = new DataAccessPane(this);
dataAccessPane.addUIComponents();

// The data access pane that is initialized above is returned in the
// overridden method getContent() below. That is how the initContent()
// in the super class can reference it and add the data accees view to
Expand All @@ -106,7 +106,7 @@ public DataAccessViewTopComponent() {
public DataAccessPane getDataAccessPane() {
return dataAccessPane;
}

/**
* A fixed single thread pool for execution of jobs in the data access view
* that need to happen in an asynchronous manner.
Expand All @@ -124,8 +124,8 @@ public DataAccessPane createContent() {

@Override
public String createStyle() {
return JavafxStyleManager.isDarkTheme()
? "resources/data-access-view-dark.css"
return JavafxStyleManager.isDarkTheme()
? "resources/data-access-view-dark.css"
: "resources/data-access-view-light.css";
}

Expand All @@ -137,6 +137,7 @@ public void handleComponentOpened() {
super.handleComponentOpened();
manageQualityControlListeners(true);
QualityControlAutoVetter.getInstance().addObserver(getDataAccessPane());
setFloating(0, 0);
}

/**
Expand All @@ -160,12 +161,12 @@ protected void handleNewGraph(final Graph graph) {
System.setProperty("dav.graph.ready", Boolean.FALSE.toString());
if (needsUpdate() && getDataAccessPane() != null) {
getDataAccessPane().update(graph);
Platform.runLater(() ->
DataAccessUtilities.loadDataAccessState(getDataAccessPane(), graph)
Platform.runLater(()
-> DataAccessUtilities.loadDataAccessState(getDataAccessPane(), graph)
);
}
Platform.runLater(() ->
// nested runLater so it runs after all the other triggered processes for opening a graph have been run
Platform.runLater(()
-> // nested runLater so it runs after all the other triggered processes for opening a graph have been run
Comment thread
Delphinus8821 marked this conversation as resolved.
Platform.runLater(() -> System.setProperty("dav.graph.ready", Boolean.TRUE.toString()))
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
import au.gov.asd.tac.constellation.utilities.color.ConstellationColor;
import au.gov.asd.tac.constellation.utilities.icon.UserInterfaceIconProvider;
import au.gov.asd.tac.constellation.utilities.javafx.JavafxStyleManager;
import javafx.scene.layout.BorderPane;
import au.gov.asd.tac.constellation.views.JavaFxTopComponent;
import java.awt.Color;
import java.awt.Image;
import java.io.IOException;
import javafx.scene.input.MouseEvent;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
Expand Down Expand Up @@ -53,6 +51,8 @@
import javafx.scene.control.Tooltip;
import javafx.scene.image.ImageView;
import javafx.scene.image.WritableImage;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
Expand Down Expand Up @@ -498,10 +498,12 @@ protected ScrollPane.ScrollBarPolicy getVerticalScrollPolicy() {
protected void handleComponentOpened() {
errorReportRunning = true;
ErrorReportDialogManager.getInstance().setErrorReportRunning(errorReportRunning);
setFloating(0, 0);
}

/**
* Return popup control to the ErrorReportDialogManager when this view is closed
* Return popup control to the ErrorReportDialogManager when this view is
* closed
*/
@Override
protected void handleComponentClosed() {
Expand Down Expand Up @@ -643,7 +645,7 @@ public void updateSessionErrorsBox(final int insertPos) {
refreshSessionErrors();
final Date nextFilterDate = new Date();
final int errCount = sessionErrors.size();
// rebuild
// rebuild
sessionErrorsBox.getChildren().clear();
for (int i = 0; i < errCount; i++) {
boolean allowPopupDisplay = false;
Expand Down Expand Up @@ -685,7 +687,8 @@ public boolean isIconFlashing() {
}

/**
* enable or disable flashing of the alert icon, as well as flashing of the tab label
* enable or disable flashing of the alert icon, as well as flashing of the
* tab label
*
* @param enabled
*/
Expand Down Expand Up @@ -792,7 +795,8 @@ private List<String> getErrorLevelList(final boolean unAcknowledgedEntriesOnly)
}

/**
* Generate the TitledPane object containing the details for the error report entry.
* Generate the TitledPane object containing the details for the error
* report entry.
*
* @param entry
* @return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,11 @@
import au.gov.asd.tac.constellation.views.JavaFxTopComponent;
import au.gov.asd.tac.constellation.views.find.components.FindViewPane;
import au.gov.asd.tac.constellation.views.find.components.advanced.AdvancedCriteriaBorderPane;
import java.awt.Dimension;
import java.awt.Window;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionReferences;
import org.openide.util.NbBundle;
import org.openide.windows.TopComponent;
import org.openide.windows.WindowManager;

/**
* Find View Top Component.
Expand Down Expand Up @@ -72,28 +69,29 @@ public FindViewTopComponent() {
setToolTipText(Bundle.HINT_FindViewTopComponent());

/**
* initialize the FindViewController, initialize the Components of the topComponenet, set pane to a new
* FindViewPane and initialize the content.
* initialize the FindViewController, initialize the Components of the
* topComponenet, set pane to a new FindViewPane and initialize the
* content.
*/
FindViewController.getDefault().init(this);
initComponents();
this.pane = new FindViewPane(this);
initContent();

// Set the findView window to float
WindowManager.getDefault().setTopComponentFloating(this, true);

// View will be disable if no graphs are opened, enabled if otherwise
// View will be disabled if no graphs are opened, enabled if otherwise.
disableFindView();

/**
* This is called whenever a node or transaction is added or deleted. It resets the searching index back to the
* default to avoid index out of bounds issues when trying to find a node or transaction that no longer exists.
* This is called whenever a node or transaction is added or deleted. It
* resets the searching index back to the default to avoid index out of
* bounds issues when trying to find a node or transaction that no
* longer exists.
*/
addStructureChangeHandler(graph -> FindViewController.getDefault().clearResultsLists());

/**
* This updates the attribute list UI element when a attribute is added or removed from the graph.
* This updates the attribute list UI element when a attribute is added
* or removed from the graph.
*/
addAttributeCountChangeHandler(graph -> UpdateUI());

Expand All @@ -120,8 +118,9 @@ protected String createStyle() {
}

/**
* Handles what occurs when the find view is closed. This updates the UI, to ensure its current and toggles the
* findview to set it to enabled or disabled based on if a graph is open.
* Handles what occurs when the find view is closed. This updates the UI, to
* ensure its current and toggles the findview to set it to enabled or
* disabled based on if a graph is open.
*/
@Override
protected void handleComponentClosed() {
Expand All @@ -131,31 +130,19 @@ protected void handleComponentClosed() {
}

/**
* Handles what occurs when the component is opened. This updates the UI to ensure its current, toggles the find
* view to set it to enabled or disabled based on if a graph is open, focuses the findTextBox for UX quality,
* ensures the view window is floating. It also sets the size and location of the view to be in the top right of the
* users screen.
* Handles what occurs when the component is opened. This updates the UI to
* ensure its current, toggles the find view to set it to enabled or
* disabled based on if a graph is open, focuses the findTextBox for UX
* quality, ensures the view window is floating. It also sets the size and
* location of the view to be in the top right of the users screen.
*/
@Override
protected void handleComponentOpened() {
super.handleComponentOpened();
UpdateUI();
disableFindView();
focusFindTextField();
WindowManager.getDefault().setTopComponentFloating(this, true);

this.setRequestFocusEnabled(true);

/**
* This loops through all the current windows and compares this top components top level ancestor with the
* windows parent. If they match the window is the find view so we set the size of the window.
*/
for (final Window window : Window.getWindows()) {
if (this.getTopLevelAncestor() != null && this.getTopLevelAncestor().getName().equals(window.getName())) {
window.setMinimumSize(new Dimension(600, 350));
window.setSize(new Dimension(600, 350));
}
}
setFloating(600, 350);
}

/**
Expand Down Expand Up @@ -202,7 +189,8 @@ public FindViewPane getFindViewPane() {
}

/**
* Toggles the disabled state of the findView based on if any graphs are open.
* Toggles the disabled state of the findView based on if any graphs are
* open.
*/
public void disableFindView() {
getFindViewPane().setDisable(GraphManager.getDefault().getAllGraphs().isEmpty());
Expand All @@ -216,8 +204,8 @@ public void focusFindTextField() {
}

/**
* This calls all the necessary functions for each tab to update the attributes list based on what attributes are
* available for the user.
* This calls all the necessary functions for each tab to update the
* attributes list based on what attributes are available for the user.
*/
public void UpdateUI() {
// Update the basic find tab
Expand All @@ -236,8 +224,9 @@ public void UpdateUI() {
final GraphElementType advancedType = GraphElementType.getValue(getFindViewPane().getTabs().getAdvancedFindTab().getLookForChoiceBox().getSelectionModel().getSelectedItem());
for (final AdvancedCriteriaBorderPane criteriaPane : getFindViewPane().getTabs().getAdvancedFindTab().getCorrespondingCriteriaList(advancedType)) {
/**
* set the updateUI variable to true. This avoids the change criteria pane function from occurring when re
* selecting the currently selected element after updating the attribute list
* set the updateUI variable to true. This avoids the change
* criteria pane function from occurring when re selecting the
* currently selected element after updating the attribute list
*/
criteriaPane.setUpdateUI(true);
criteriaPane.updateAttributesList(advancedType);
Expand All @@ -263,7 +252,6 @@ private void initComponents() {
);
}// </editor-fold>//GEN-END:initComponents


// Variables declaration - do not modify//GEN-BEGIN:variables
// End of variables declaration//GEN-END:variables
}
4 changes: 2 additions & 2 deletions CoreGraphNode/nbproject/genfiles.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
build.xml.data.CRC32=856b9c6f
build.xml.data.CRC32=086632b7
build.xml.script.CRC32=ab19df9f
build.xml.stylesheet.CRC32=15ca8a54@2.95
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=856b9c6f
nbproject/build-impl.xml.data.CRC32=086632b7
nbproject/build-impl.xml.script.CRC32=2a6ab1a9
nbproject/build-impl.xml.stylesheet.CRC32=49aa68b0@2.95
Loading
Loading