Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Chandra2018-08-01 10:47:19 +0000
committerVikas Chandra2018-08-11 08:38:08 +0000
commit549a4d25d8dddd24a0d6e184001f66d834678475 (patch)
tree622297128adbce4b5690a8fa5a80fac802e0cfc2
parentc6720dd9ca7bef0a8e50c028d4f5f2a3f7aaee23 (diff)
downloadeclipse.pde.ui-549a4d25d8dddd24a0d6e184001f66d834678475.tar.gz
eclipse.pde.ui-549a4d25d8dddd24a0d6e184001f66d834678475.tar.xz
eclipse.pde.ui-549a4d25d8dddd24a0d6e184001f66d834678475.zip
Bug 537480 - [quick assist][quick fix] [Mac] configure problem severityI20180811-1500
gives no indication of which preference Change-Id: Ia5a43ae170d09a2989ee3c96e070aee92d20b7c5 Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
-rw-r--r--apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java12
-rw-r--r--apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java16
2 files changed, 28 insertions, 0 deletions
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java
index bb40803115..ba5fc10c44 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java
@@ -241,6 +241,10 @@ public class ApiBaselinesConfigurationBlock extends ConfigurationBlock {
* Listing of all of the {@link Combo}s added to the block
*/
private Combo fCombo = null;
+ /**
+ * Listing of the label in the block
+ */
+ private Label fLabel = null;
/**
* The context of settings locations to search for values in
@@ -405,6 +409,7 @@ public class ApiBaselinesConfigurationBlock extends ConfigurationBlock {
combo.addSelectionListener(selectionlistener);
combo.select(data.getSelection(key.getStoredValue(fLookupOrder, false, fManager)));
addHighlight(parent, lbl, combo);
+ fLabel = lbl;
return combo;
}
@@ -441,6 +446,13 @@ public class ApiBaselinesConfigurationBlock extends ConfigurationBlock {
public void selectOption() {
if (fCombo != null && !fCombo.isDisposed()) {
fCombo.setFocus();
+ if (fLabel != null && !fLabel.isDisposed()) {
+ if (org.eclipse.jface.util.Util.isMac()) {
+ if (fLabel != null) {
+ highlight(fCombo.getParent(), fLabel, fCombo, ConfigurationBlock.HIGHLIGHT_FOCUS);
+ }
+ }
+ }
}
}
}
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java
index 264226eb45..6f20342fcd 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java
@@ -13,6 +13,7 @@ package org.eclipse.pde.api.tools.ui.internal.preferences;
import java.awt.Checkbox;
import java.net.URL;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.List;
@@ -702,6 +703,11 @@ public class ApiErrorsWarningsConfigurationBlock extends ConfigurationBlock {
private ArrayList<Combo> fCombos = new ArrayList<>();
/**
+ * Map of combo and label
+ */
+ private HashMap<Combo, Label> fComboLabelMap = new HashMap<>();
+
+ /**
* Listing of all of the {@link Checkbox}es added to the block
*/
private ArrayList<Button> fCheckBoxes = new ArrayList<>();
@@ -1459,6 +1465,10 @@ public class ApiErrorsWarningsConfigurationBlock extends ConfigurationBlock {
combo.select(data.getSelection(key.getStoredValue(fLookupOrder, false, fManager)));
fCombos.add(combo);
addHighlight(parent, lbl, combo);
+ if (org.eclipse.jface.util.Util.isMac()) {
+ fComboLabelMap.put(combo, lbl);
+ }
+
}
/**
@@ -1627,6 +1637,12 @@ public class ApiErrorsWarningsConfigurationBlock extends ConfigurationBlock {
}
}
control.setFocus();
+ if (org.eclipse.jface.util.Util.isMac()) {
+ Label labelControl = fComboLabelMap.get(control);
+ if (labelControl != null && control instanceof Combo) {
+ highlight(control.getParent(), labelControl, (Combo) control, ConfigurationBlock.HIGHLIGHT_FOCUS);
+ }
+ }
}
}

Back to the top