Refactor the internal usage of command buttons for the ribbon

For #447
kirill-grouchnikov · May 14, 2023 · 9487df9 · 9487df9
1 parent ec172f0
commit 9487df9
Show file tree

Hide file tree

Showing 21 changed files with 149 additions and 244 deletions.
diff --git a/...nent/src/main/java/org/pushingpixels/radiance/component/api/common/model/BaseCommand.java b/...nent/src/main/java/org/pushingpixels/radiance/component/api/common/model/BaseCommand.java
@@ -235,6 +235,10 @@ public Object getTag() {
         return this.tag;
     }
 
+    public void setTag(Object tag) {
+        this.tag = tag;
+    }
+
     @Override
     public void addChangeListener(ChangeListener l) {
         this.weakChangeSupport.addChangeListener(l);

diff --git a/component/src/main/java/org/pushingpixels/radiance/component/api/ribbon/JRibbon.java b/component/src/main/java/org/pushingpixels/radiance/component/api/ribbon/JRibbon.java
@@ -806,7 +806,7 @@ public synchronized void setApplicationMenuCommand(
         if (applicationMenuCommandProjection == null) {
             this.applicationMenuProjection = null;
         } else {
-            RibbonApplicationMenu ribbonApplicationMenu = (RibbonApplicationMenu)
+            RibbonApplicationMenu ribbonApplicationMenu =
                     applicationMenuCommandProjection.getContentModel().getSecondaryContentModel();
             RibbonApplicationMenuProjection ribbonApplicationMenuProjection =
                     new RibbonApplicationMenuProjection(

diff --git a/component/src/main/java/org/pushingpixels/radiance/component/api/ribbon/JRibbonFrame.java b/component/src/main/java/org/pushingpixels/radiance/component/api/ribbon/JRibbonFrame.java
@@ -36,13 +36,11 @@
 import org.pushingpixels.radiance.component.api.common.CommandButtonLayoutManager;
 import org.pushingpixels.radiance.component.api.common.CommandButtonPresentationState;
 import org.pushingpixels.radiance.component.api.common.JCommandButton;
-import org.pushingpixels.radiance.component.api.common.model.BaseCommand;
-import org.pushingpixels.radiance.component.api.common.model.Command;
-import org.pushingpixels.radiance.component.api.common.model.CommandButtonPresentationModel;
-import org.pushingpixels.radiance.component.api.common.model.CommandMenuContentModel;
+import org.pushingpixels.radiance.component.api.common.model.*;
 import org.pushingpixels.radiance.component.api.common.popup.JCommandPopupMenuPanel;
 import org.pushingpixels.radiance.component.api.common.popup.JPopupPanel;
 import org.pushingpixels.radiance.component.api.common.popup.PopupPanelManager;
+import org.pushingpixels.radiance.component.api.common.popup.model.BaseCommandPopupMenuPresentationModel;
 import org.pushingpixels.radiance.component.api.common.popup.model.CommandPopupMenuPresentationModel;
 import org.pushingpixels.radiance.component.api.common.projection.BaseCommandButtonProjection;
 import org.pushingpixels.radiance.component.api.common.projection.CommandButtonProjection;
@@ -53,7 +51,6 @@
 import org.pushingpixels.radiance.component.api.ribbon.synapse.projection.ComponentProjection;
 import org.pushingpixels.radiance.component.internal.theming.ribbon.ui.RadianceRibbonFrameTitlePane;
 import org.pushingpixels.radiance.component.internal.ui.common.CommandButtonUI;
-import org.pushingpixels.radiance.component.internal.ui.common.RadianceInternalButton;
 import org.pushingpixels.radiance.component.internal.ui.ribbon.*;
 import org.pushingpixels.radiance.component.internal.ui.ribbon.appmenu.JRibbonApplicationMenuPopupPanel;
 import org.pushingpixels.radiance.component.internal.utils.ComponentUtilities;
@@ -748,19 +745,25 @@ private void handlePopupTrigger(MouseEvent event, Component c) {
                     menuContentModel = onShowContextualMenuListener.getContextualMenuContentModel(
                             ribbon, component.getProjection());
                 } else {
-                    if ((c instanceof JCommandButton) &&
-                            (!(c instanceof RadianceInternalButton))) {
-                        BaseCommandButtonProjection projection = ((JCommandButton) c).getProjection();
-                        if (SwingUtilities.getAncestorOfClass(JRibbonApplicationMenuPopupPanel.class, c) != null) {
-                            // App menu link
-                            Command appMenuCommand = (Command) projection.getContentModel();
-                            menuContentModel =
-                                    onShowContextualMenuListener.getContextualMenuContentModel(
-                                            ribbon, appMenuCommand);
-                        } else {
-                            menuContentModel =
-                                    onShowContextualMenuListener.getContextualMenuContentModel(
-                                            ribbon, projection);
+                    if (c instanceof JCommandButton) {
+                        BaseCommandButtonProjection<? extends BaseCommand<?>,
+                                ? extends BaseCommandMenuContentModel,
+                                ? extends BaseCommandButtonPresentationModel<?, ?>,
+                                ? extends BaseCommandPopupMenuPresentationModel> projection =
+                                ((JCommandButton) c).getProjection();
+                        BaseCommand command = projection.getContentModel();
+                        if (!BasicRibbonUI.INTERNAL.equals(command.getTag())) {
+                            if (SwingUtilities.getAncestorOfClass(JRibbonApplicationMenuPopupPanel.class, c) != null) {
+                                // App menu link
+                                Command appMenuCommand = (Command) projection.getContentModel();
+                                menuContentModel =
+                                        onShowContextualMenuListener.getContextualMenuContentModel(
+                                                ribbon, appMenuCommand);
+                            } else {
+                                menuContentModel =
+                                        onShowContextualMenuListener.getContextualMenuContentModel(
+                                                ribbon, projection);
+                            }
                         }
                     }
                 }

diff --git a/...a/org/pushingpixels/radiance/component/api/ribbon/model/RibbonApplicationMenuCommand.java b/...a/org/pushingpixels/radiance/component/api/ribbon/model/RibbonApplicationMenuCommand.java
@@ -31,6 +31,7 @@
 
 import org.pushingpixels.radiance.component.api.common.model.BaseCommand;
 import org.pushingpixels.radiance.component.api.ribbon.RibbonApplicationMenu;
+import org.pushingpixels.radiance.component.internal.ui.ribbon.BasicRibbonUI;
 
 public class RibbonApplicationMenuCommand extends BaseCommand<RibbonApplicationMenu> {
     public static Builder builder() {
@@ -44,7 +45,7 @@ public static class Builder extends BaseBuilder<RibbonApplicationMenuCommand,
             RibbonApplicationMenu,
             RibbonApplicationMenuCommand.Builder> {
         /**
-         * Builds a color selector command from this builder.
+         * Builds a ribbon application menu command from this builder.
          *
          * @return Command.
          */
@@ -53,6 +54,7 @@ public RibbonApplicationMenuCommand build() {
             RibbonApplicationMenuCommand command = new RibbonApplicationMenuCommand();
 
             this.configureBaseCommand(command);
+            command.setTag(BasicRibbonUI.INTERNAL);
 
             return command;
         }

diff --git a/...adiance/component/api/ribbon/projection/RibbonApplicationMenuCommandButtonProjection.java b/...adiance/component/api/ribbon/projection/RibbonApplicationMenuCommandButtonProjection.java
@@ -51,7 +51,6 @@ public class RibbonApplicationMenuCommandButtonProjection extends BaseCommandBut
         RibbonApplicationMenuCommand, RibbonApplicationMenu,
         CommandButtonPresentationModel,
         CommandPopupMenuPresentationModel> {
-        //JRibbonApplicationMenuPopupPanel> {
     public static final CommandButtonPresentationState RIBBON_APP_MENU_SECONDARY_LEVEL =
             new CommandButtonPresentationState("Ribbon application menu tile level 2", 32) {
                 @Override
@@ -77,7 +76,6 @@ public Map<Command, CommandButtonPresentationState> getSecondaryLevelCommandPres
         return this.secondaryLevelCommandPresentationState;
     }
 
-    //@Override
     public RibbonApplicationMenuCommandButtonProjection reproject(
             CommandButtonPresentationModel newCommandPresentation) {
         RibbonApplicationMenuCommandButtonProjection result =

diff --git a/...va/org/pushingpixels/radiance/component/internal/ui/common/BasicCommandButtonStripUI.java b/...va/org/pushingpixels/radiance/component/internal/ui/common/BasicCommandButtonStripUI.java
@@ -32,11 +32,11 @@
 import org.pushingpixels.radiance.component.api.common.CommandAction;
 import org.pushingpixels.radiance.component.api.common.JCommandButton;
 import org.pushingpixels.radiance.component.api.common.JCommandButtonStrip;
-import org.pushingpixels.radiance.component.api.common.model.*;
-import org.pushingpixels.radiance.component.api.common.popup.model.BaseCommandPopupMenuPresentationModel;
-import org.pushingpixels.radiance.component.api.common.projection.BaseCommandButtonProjection;
+import org.pushingpixels.radiance.component.api.common.model.Command;
+import org.pushingpixels.radiance.component.api.common.model.CommandButtonPresentationModel;
+import org.pushingpixels.radiance.component.api.common.model.CommandGroup;
+import org.pushingpixels.radiance.component.api.common.model.CommandStripPresentationModel;
 import org.pushingpixels.radiance.component.api.common.projection.CommandButtonProjection;
-import org.pushingpixels.radiance.component.api.common.projection.Projection;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;

diff --git a/...in/java/org/pushingpixels/radiance/component/internal/ui/common/BasicCommandButtonUI.java b/...in/java/org/pushingpixels/radiance/component/internal/ui/common/BasicCommandButtonUI.java
@@ -29,23 +29,21 @@
  */
 package org.pushingpixels.radiance.component.internal.ui.common;
 
+import org.pushingpixels.radiance.common.api.AsynchronousLoading;
+import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
+import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.component.api.common.*;
 import org.pushingpixels.radiance.component.api.common.CommandButtonLayoutManager.CommandButtonLayoutInfo;
 import org.pushingpixels.radiance.component.api.common.model.BaseCommand;
 import org.pushingpixels.radiance.component.api.common.model.Command;
-import org.pushingpixels.radiance.component.api.common.model.CommandButtonPresentationModel;
 import org.pushingpixels.radiance.component.api.common.model.PopupButtonModel;
 import org.pushingpixels.radiance.component.api.common.popup.JCommandPopupMenuPanel;
 import org.pushingpixels.radiance.component.api.common.popup.JPopupPanel;
 import org.pushingpixels.radiance.component.api.common.popup.PopupPanelCallback;
 import org.pushingpixels.radiance.component.api.common.popup.PopupPanelManager;
-import org.pushingpixels.radiance.common.api.AsynchronousLoading;
-import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
-import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.theming.api.RadianceThemingCortex;
 import org.pushingpixels.radiance.theming.api.RadianceThemingSlices;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceCoreUtilities;
-import org.pushingpixels.radiance.theming.internal.utils.RadianceSizeUtils;
 
 import javax.swing.*;
 import javax.swing.border.Border;

diff --git a/...java/org/pushingpixels/radiance/component/internal/ui/common/BasicRichTooltipPanelUI.java b/...java/org/pushingpixels/radiance/component/internal/ui/common/BasicRichTooltipPanelUI.java
@@ -29,10 +29,10 @@
  */
 package org.pushingpixels.radiance.component.internal.ui.common;
 
+import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.component.api.common.RichTooltip;
 import org.pushingpixels.radiance.component.api.common.model.RichTooltipPresentationModel;
 import org.pushingpixels.radiance.component.internal.utils.ComponentUtilities;
-import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.theming.api.RadianceThemingCortex;
 import org.pushingpixels.radiance.theming.internal.utils.border.RadianceBorder;
 

diff --git a/.../src/main/java/org/pushingpixels/radiance/component/internal/ui/common/BasicSwitchUI.java b/.../src/main/java/org/pushingpixels/radiance/component/internal/ui/common/BasicSwitchUI.java
@@ -30,20 +30,10 @@
 package org.pushingpixels.radiance.component.internal.ui.common;
 
 import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
-import org.pushingpixels.radiance.common.api.model.TriStateButtonModel;
-import org.pushingpixels.radiance.common.api.model.TriStateSelectionChangeEvent;
-import org.pushingpixels.radiance.common.api.model.TriStateSelectionChangeListener;
-import org.pushingpixels.radiance.common.api.model.TriStateSelectionCycler;
 import org.pushingpixels.radiance.component.api.common.JSwitch;
-import org.pushingpixels.radiance.component.api.common.JTriStateCheckBox;
-import org.pushingpixels.radiance.component.internal.theming.common.tristate.RolloverTriStateListener;
 import org.pushingpixels.radiance.theming.internal.animation.StateTransitionTracker;
 import org.pushingpixels.radiance.theming.internal.animation.TransitionAwareUI;
-import org.pushingpixels.radiance.theming.internal.blade.BladeColorScheme;
-import org.pushingpixels.radiance.theming.internal.utils.RadianceMetricsUtilities;
-import org.pushingpixels.radiance.theming.internal.utils.RadianceSizeUtils;
 import org.pushingpixels.radiance.theming.internal.utils.RolloverButtonListener;
-import org.pushingpixels.radiance.theming.internal.utils.border.RadianceBorder;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -52,7 +42,6 @@
 import javax.swing.plaf.basic.BasicButtonListener;
 import javax.swing.plaf.basic.BasicToggleButtonUI;
 import java.awt.*;
-import java.awt.event.ItemEvent;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeListener;
 

diff --git a/...rg/pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerBig.java b/...rg/pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerBig.java
@@ -29,13 +29,13 @@
  */
 package org.pushingpixels.radiance.component.internal.ui.common;
 
+import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
+import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.component.api.common.CommandButtonLayoutManager;
 import org.pushingpixels.radiance.component.api.common.CommandButtonPresentationState;
 import org.pushingpixels.radiance.component.api.common.JCommandButton;
 import org.pushingpixels.radiance.component.api.common.model.BaseCommandButtonPresentationModel;
 import org.pushingpixels.radiance.component.internal.utils.ComponentUtilities;
-import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
-import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceMetricsUtilities;
 
 import javax.swing.*;

diff --git a/...pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerMedium.java b/...pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerMedium.java
@@ -29,13 +29,13 @@
  */
 package org.pushingpixels.radiance.component.internal.ui.common;
 
+import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
 import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.component.api.common.CommandButtonLayoutManager;
 import org.pushingpixels.radiance.component.api.common.JCommandButton;
 import org.pushingpixels.radiance.component.api.common.model.BaseCommandButtonPresentationModel;
 import org.pushingpixels.radiance.component.internal.ui.common.popup.BasicCommandPopupMenuPanelUI;
 import org.pushingpixels.radiance.component.internal.utils.ComponentUtilities;
-import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceMetricsUtilities;
 
 import javax.swing.*;

diff --git a/.../pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerSmall.java b/.../pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerSmall.java
@@ -29,12 +29,12 @@
  */
 package org.pushingpixels.radiance.component.internal.ui.common;
 
+import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
+import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.component.api.common.CommandButtonLayoutManager;
 import org.pushingpixels.radiance.component.api.common.JCommandButton;
 import org.pushingpixels.radiance.component.api.common.model.BaseCommandButtonPresentationModel;
 import org.pushingpixels.radiance.component.internal.utils.ComponentUtilities;
-import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
-import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceMetricsUtilities;
 
 import javax.swing.*;

diff --git a/...g/pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerTile.java b/...g/pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerTile.java
@@ -29,12 +29,12 @@
  */
 package org.pushingpixels.radiance.component.internal.ui.common;
 
+import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
+import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.component.api.common.CommandButtonLayoutManager;
 import org.pushingpixels.radiance.component.api.common.JCommandButton;
 import org.pushingpixels.radiance.component.api.common.model.BaseCommandButtonPresentationModel;
 import org.pushingpixels.radiance.component.internal.utils.ComponentUtilities;
-import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
-import org.pushingpixels.radiance.common.api.icon.RadianceIcon;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceMetricsUtilities;
 
 import javax.swing.*;

diff --git a/.../java/org/pushingpixels/radiance/component/internal/ui/common/RadianceInternalButton.java b/.../java/org/pushingpixels/radiance/component/internal/ui/common/RadianceInternalButton.java
diff --git a/...shingpixels/radiance/component/internal/ui/common/popup/BasicCommandPopupMenuPanelUI.java b/...shingpixels/radiance/component/internal/ui/common/popup/BasicCommandPopupMenuPanelUI.java
@@ -33,7 +33,6 @@
 import org.pushingpixels.radiance.component.api.common.JCommandButton;
 import org.pushingpixels.radiance.component.api.common.JCommandButtonPanel;
 import org.pushingpixels.radiance.component.api.common.JScrollablePanel;
-import org.pushingpixels.radiance.component.api.common.model.CommandPanelPresentationModel;
 import org.pushingpixels.radiance.component.api.common.model.CommandPopupMenuPanelPresentationModel;
 import org.pushingpixels.radiance.component.api.common.model.panel.PanelLayoutSpec;
 import org.pushingpixels.radiance.component.api.common.model.panel.PanelRowFillSpec;