Changeset 12346 in josm for trunk

Timestamp:

2017-06-08T23:11:17+02:00 (7 years ago)

Author:

michael2402

Message:

SearchAction: Use ExpertToggleAction to determine if expert mode is active.

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -42 +42 @@
 import org.openstreetmap.josm.actions.ActionParameter;
 import org.openstreetmap.josm.actions.ActionParameter.SearchSettingsActionParameter;
+import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.ParameterizedAction;
@@ -299 +300 @@
         additionalSettings.add(caseSensitive, GBC.eol().anchor(GBC.WEST).fill(GBC.HORIZONTAL));
 
-        if (Main.pref.getBoolean("expert", false)) {
+        left.add(selectionSettings, GBC.eol().fill(GBC.BOTH));
+        left.add(additionalSettings, GBC.eol().fill(GBC.BOTH));
+
+        if (ExpertToggleAction.isExpert()) {
             additionalSettings.add(allElements, GBC.eol());
             additionalSettings.add(addOnToolbar, GBC.eop());
@@ -309 +313 @@
             searchOptions.add(mapCSSSearch, GBC.eol());
 
-            left.add(selectionSettings, GBC.eol().fill(GBC.BOTH));
-            left.add(additionalSettings, GBC.eol().fill(GBC.BOTH));
             left.add(searchOptions, GBC.eol().fill(GBC.BOTH));
-        } else {
-            left.add(selectionSettings, GBC.eol().fill(GBC.BOTH));
-            left.add(additionalSettings, GBC.eol().fill(GBC.BOTH));
         }
 
@@ -450 +449 @@
                 GBC.eol());
 
-        if (Main.pref.getBoolean("expert", false)) {
+        if (ExpertToggleAction.isExpert()) {
             hintPanel.add(new SearchKeywordRow(hcbSearchString)
                 .addTitle(tr("objects"))