Simplify getToolTip() logic

archimatetool · Jan 13, 2024 · f48f9e7 · f48f9e7
1 parent 2fb2eaa
commit f48f9e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasStickyFigure.java b/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasStickyFigure.java
@@ -185,17 +185,15 @@ protected void paintFigure(Graphics graphics) {
 
     @Override
     public IFigure getToolTip() {
-        boolean doShowViewTooltips = ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.VIEW_TOOLTIPS);
+        if(!ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.VIEW_TOOLTIPS)) {
+            return null;
+        }
 
-        if(fTooltip == null && doShowViewTooltips) {
+        if(fTooltip == null) {
             fTooltip = new MultiToolTipFigure();
             setToolTip(fTooltip);
         }
 
-        if(fTooltip == null || !doShowViewTooltips) {
-            return null;
-        }
-
         String notes = getDiagramModelObject().getNotes();
         if(StringUtils.isSet(notes)) {
             fTooltip.setText(notes);

diff --git a/...com/archimatetool/editor/diagram/figures/connections/AbstractDiagramConnectionFigure.java b/...com/archimatetool/editor/diagram/figures/connections/AbstractDiagramConnectionFigure.java
@@ -244,13 +244,15 @@ protected void setLineWidth() {
 
     @Override
     public IFigure getToolTip() {
-        boolean doShowViewTooltips = ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.VIEW_TOOLTIPS);
+        if(!ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.VIEW_TOOLTIPS)) {
+            return null;
+        }
 
-        if(super.getToolTip() == null && doShowViewTooltips) {
+        if(super.getToolTip() == null) {
             setToolTip(new ToolTipFigure());
         }
 
-        return doShowViewTooltips ? super.getToolTip() : null;
+        return super.getToolTip();
     }
 
     /**