Deprecate SWTUtil and TypeText

adangel · adangel · commit 34c4b9f140b1 · 2024-04-19T10:45:30.000+02:00
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -21,8 +21,9 @@ This is a minor release.
 
 #### Deprecations
 
-The following classes have been deprecated for removal. These were used to support the UI for rule configuration
-and were not intended to be used as API. With the switch to PMD 7.0.0, these editor factories are not used anymore.
+The following classes have been deprecated for removal. Either they were not intended to be public API at all
+or they were used to support the UI for rule configuration. With the switch to PMD 7.0.0, these editor
+factories are not used anymore.
 
 * `net.sourceforge.pmd.eclipse.ui.preferences.editors.AbstractEditorFactory`
 * `net.sourceforge.pmd.eclipse.ui.preferences.editors.AbstractMultiValueEditorFactory`
@@ -40,15 +41,20 @@ and were not intended to be used as API. With the switch to PMD 7.0.0, these edi
 * `net.sourceforge.pmd.eclipse.ui.preferences.editors.MultiStringEditorFactory`
 * `net.sourceforge.pmd.eclipse.ui.preferences.editors.RegexEditorFactory`
 * `net.sourceforge.pmd.eclipse.ui.preferences.editors.StringEditorFactory`
+* `net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil`
+* `net.sourceforge.pmd.eclipse.ui.preferences.editors.TypeText`
 
-Other deprecations:
+The following members have been deprecated for removal:
 
 * `net.sourceforge.pmd.eclipse.ui.dialogs.NewPropertyDialog#NewPropertyDialog(Shell, Map<Class<?>, EditorFactory<?>>, PropertySource, ValueChangeListener)`
 * `net.sourceforge.pmd.eclipse.ui.dialogs.NewPropertyDialog#NewPropertyDialog(Shell, Map<Class<?>, EditorFactory<?>>, Rule, PropertyDescriptor<?>, ValueChangeListener)`
 * `net.sourceforge.pmd.eclipse.ui.dialogs.NewPropertyDialog#withOnly(Map<Class<?>, EditorFactory<?>>, Class<?>[])`
+* `net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.AbstractRulePanelManager.show(TypeText, Class<?>)`
 * `net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.FormArranger#FormArranger(Composite, Map<Class<?>, EditorFactory<?>>, ValueChangeListener, SizeChangeListener)`
 * `net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.PerRulePropertyPanelManager#EDITOR_FACTORIES_BY_PROPERTY_TYPE`
 
+See the javadoc for more info and any possible alternatives if available.
+
 ### External Contributions
 
 ## 22-March-2024: 7.0.0.v20240322-0920-r
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/AbstractColumnDescriptor.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/AbstractColumnDescriptor.java
@@ -10,8 +10,8 @@
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeColumn;
 
-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;
 import net.sourceforge.pmd.eclipse.util.ResourceManager;
+import net.sourceforge.pmd.eclipse.util.internal.SWTUtil;
 
 /**
  * 
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/PageBuilder.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/PageBuilder.java
@@ -27,8 +27,8 @@
 import net.sourceforge.pmd.eclipse.ui.editors.StyleExtractor;
 import net.sourceforge.pmd.eclipse.ui.editors.SyntaxData;
 import net.sourceforge.pmd.eclipse.ui.editors.SyntaxManager;
-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;
 import net.sourceforge.pmd.eclipse.util.FontBuilder;
+import net.sourceforge.pmd.eclipse.util.internal.SWTUtil;
 import net.sourceforge.pmd.lang.Language;
 
 /**
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/dialogs/CPDCheckDialog.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/dialogs/CPDCheckDialog.java
@@ -23,7 +23,7 @@
 
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;
+import net.sourceforge.pmd.eclipse.util.internal.SWTUtil;
 
 /**
  *
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/dialogs/NewPropertyDialog.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/dialogs/NewPropertyDialog.java
@@ -31,9 +31,9 @@
 import net.sourceforge.pmd.eclipse.ui.preferences.br.RuleUIUtil;
 import net.sourceforge.pmd.eclipse.ui.preferences.br.SizeChangeListener;
 import net.sourceforge.pmd.eclipse.ui.preferences.br.ValueChangeListener;
-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;
 import net.sourceforge.pmd.eclipse.ui.preferences.internal.PropertyEditorFactory;
 import net.sourceforge.pmd.eclipse.util.Util;
+import net.sourceforge.pmd.eclipse.util.internal.SWTUtil;
 import net.sourceforge.pmd.lang.rule.Rule;
 import net.sourceforge.pmd.lang.rule.RuleReference;
 import net.sourceforge.pmd.lang.rule.xpath.XPathRule;
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/br/AbstractTreeTableManager.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/br/AbstractTreeTableManager.java
@@ -44,9 +44,9 @@
 import net.sourceforge.pmd.eclipse.ui.ModifyListener;
 import net.sourceforge.pmd.eclipse.ui.PMDUiConstants;
 import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;
 import net.sourceforge.pmd.eclipse.ui.views.ChangeRecord;
 import net.sourceforge.pmd.eclipse.util.ResourceManager;
+import net.sourceforge.pmd.eclipse.util.internal.SWTUtil;
 
 /**
  * Tree table support, everything non-Rule related.
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/br/PMDPreferencePage2.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/br/PMDPreferencePage2.java
@@ -37,14 +37,14 @@
 import net.sourceforge.pmd.eclipse.ui.ModifyListener;
 import net.sourceforge.pmd.eclipse.ui.actions.RuleSetUtil;
 import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;
 import net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.EditorUsageMode;
 import net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.ExclusionPanelManager;
 import net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.PerRulePropertyPanelManager;
 import net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.RulePanelManager;
 import net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.RulePropertyManager;
 import net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.SummaryPanelManager;
 import net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.XPathPanelManager;
+import net.sourceforge.pmd.eclipse.util.internal.SWTUtil;
 import net.sourceforge.pmd.lang.rule.Rule;
 import net.sourceforge.pmd.lang.rule.RuleSet;
 import net.sourceforge.pmd.properties.PropertyDescriptor;
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleTableManager.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleTableManager.java
@@ -56,10 +56,10 @@
 import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
 import net.sourceforge.pmd.eclipse.ui.preferences.RuleDupeChecker;
 import net.sourceforge.pmd.eclipse.ui.preferences.RuleSetSelectionDialog;
-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;
 import net.sourceforge.pmd.eclipse.ui.preferences.panelmanagers.CreateRuleWizard;
 import net.sourceforge.pmd.eclipse.util.ResourceManager;
 import net.sourceforge.pmd.eclipse.util.Util;
+import net.sourceforge.pmd.eclipse.util.internal.SWTUtil;
 import net.sourceforge.pmd.lang.rule.Rule;
 import net.sourceforge.pmd.lang.rule.RuleSet;
 import net.sourceforge.pmd.properties.PropertyDescriptor;
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/AbstractNumericEditorFactory.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/AbstractNumericEditorFactory.java
@@ -4,6 +4,8 @@
 
 package net.sourceforge.pmd.eclipse.ui.preferences.editors;
 
+import static net.sourceforge.pmd.eclipse.util.internal.SWTUtil.stringFor;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -38,12 +40,12 @@ protected AbstractNumericEditorFactory() {
     public Control[] createOtherControlsOn(Composite parent, PropertyDescriptor<T> desc, Rule rule,
                                            ValueChangeListener listener, SizeChangeListener sizeListener) {
 
-        Label defaultLabel = newLabel(parent, SWTUtil.stringFor(StringKeys.RULEEDIT_LABEL_DEFAULT));
+        Label defaultLabel = newLabel(parent, stringFor(StringKeys.RULEEDIT_LABEL_DEFAULT));
         Control valueControl = newEditorOn(parent, desc, rule, listener, sizeListener);
 
-        Label minLabel = newLabel(parent, SWTUtil.stringFor(StringKeys.RULEEDIT_LABEL_MIN));
+        Label minLabel = newLabel(parent, stringFor(StringKeys.RULEEDIT_LABEL_MIN));
         Spinner minWidget = newSpinnerFor(parent, digitPrecision());
-        Label maxLabel = newLabel(parent, SWTUtil.stringFor(StringKeys.RULEEDIT_LABEL_MAX));
+        Label maxLabel = newLabel(parent, stringFor(StringKeys.RULEEDIT_LABEL_MAX));
         Spinner maxWidget = newSpinnerFor(parent, digitPrecision());
 
         linkup(minWidget, (Spinner) valueControl, maxWidget);
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/EnumerationEditorFactory.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/EnumerationEditorFactory.java
@@ -67,7 +67,7 @@ public Control newEditorOn(Composite parent, final PropertyDescriptor<Object> de
         }
 
         combo.setData(choices);
-        combo.setItems(SWTUtil.labelsIn(choices, 0));
+        combo.setItems(net.sourceforge.pmd.eclipse.util.internal.SWTUtil.labelsIn(choices, 0));
         if (selectionIdx >= 0) {
             combo.select(selectionIdx);
         }
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/MultiEnumerationEditorFactory.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/MultiEnumerationEditorFactory.java
@@ -81,7 +81,7 @@ protected Control addWidget(Composite parent, Object value, PropertyDescriptor<L
         final Combo combo = new Combo(parent, SWT.READ_ONLY);
 
         // TODO remove all choices already chosen by previous widgets
-        combo.setItems(SWTUtil.labelsIn(choices(desc), 0));
+        combo.setItems(net.sourceforge.pmd.eclipse.util.internal.SWTUtil.labelsIn(choices(desc), 0));
         int selectionIdx = EnumerationEditorFactory.indexOf(value, choices(desc));
         if (selectionIdx >= 0) {
             combo.select(selectionIdx);
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/SWTUtil.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/SWTUtil.java
@@ -14,7 +14,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
@@ -24,20 +23,28 @@
 /**
  *
  * @author Brian Remedios
+ * @deprecated This is internal API and will be removed.
  */
+@Deprecated // for removal
 public final class SWTUtil {
 
     private static PMDPlugin plugin = PMDPlugin.getDefault();
 
-    private static final String TOOLTIP_SUFFIX = ".tooltip";
-
     private SWTUtil() {
     }
 
+    /**
+     * @deprecated use {@link PMDPlugin#logInformation(String)} instead.
+     */
+    @Deprecated // for removal
     public static void logInfo(String message) {
         plugin.logInformation(message);
     }
 
+    /**
+     * @deprecated use {@link PMDPlugin#logError(org.eclipse.core.runtime.IStatus)} instead.
+     */
+    @Deprecated // for removal
     public static void logError(String message, Throwable error) {
         plugin.logError(message, error);
     }
@@ -46,7 +53,9 @@ public static void logError(String message, Throwable error) {
      * Let the buttons operate as a radio group, with only one button selected at a time.
      * 
      * @param buttons
+     * @deprecated this is not used and will be removed
      */
+    @Deprecated // for removal
     public static void asRadioButtons(final Collection<Button> buttons) {
 
         Listener listener = new Listener() {
@@ -66,13 +75,19 @@ public void handleEvent(Event e) {
         }
     }
 
-    // TODO move this to to Collections utility
+    /**
+     * @deprecated this is not used and will be removed
+     */
+    @Deprecated // for removal
     public static Set<String> asStringSet(String input, char separator) {
         List<String> values = Arrays.asList(input.split("" + separator));
         return new HashSet<>(values);
     }
 
-    // TODO move this to to Collections utility
+    /**
+     * @deprecated this is not used and will be removed
+     */
+    @Deprecated // for removal
     public static String asString(Collection<String> values, char separator) {
         if (values == null || values.isEmpty()) {
             return "";
@@ -87,76 +102,86 @@ public static String asString(Collection<String> values, char separator) {
         return sb.toString();
     }
 
-    public static void setEnabled(Control control, boolean flag) {
-        if (control == null || control.isDisposed()) {
-            return;
-        }
-        control.setEnabled(flag);
+    /**
+     * @deprecated this is not used and will be removed
+     */
+    @Deprecated // for removal
+    public static void setEnabled(Control[] controls, boolean state) {
+        net.sourceforge.pmd.eclipse.util.internal.SWTUtil.setEnabled(Arrays.asList(controls), state);
     }
 
-    public static void setEnabled(Control[] controls, boolean state) {
-        for (Control control : controls) {
-            setEnabled(control, state);
-        }
+    /**
+     * @deprecated This is internal API and will be removed.
+     */
+    @Deprecated // for removal
+    public static void setEnabledRecursive(Control[] controls, boolean state) {
+        net.sourceforge.pmd.eclipse.util.internal.SWTUtil.setEnabledRecursive(controls, state);
     }
 
-    public static void setEnabled(Collection<Control> controls, boolean flag) {
-        for (Control control : controls) {
-            setEnabled(control, flag);
-        }
+    /**
+     * @deprecated This is internal API and will be removed.
+     */
+    @Deprecated // for removal
+    public static void setEnabled(Control control, boolean flag) {
+        net.sourceforge.pmd.eclipse.util.internal.SWTUtil.setEnabled(control, flag);
     }
 
-    public static void setEnabledRecursive(Control[] controls, boolean state) {
-        for (Control control : controls) {
-            if (control instanceof Composite) {
-                setEnabledRecursive(((Composite) control).getChildren(), state);
-            }
-            setEnabled(control, state);
-        }
+    /**
+     * @deprecated This is internal API and will be removed.
+     */
+    @Deprecated // for removal
+    public static void setEnabled(Collection<Control> controls, boolean flag) {
+        net.sourceforge.pmd.eclipse.util.internal.SWTUtil.setEnabled(controls, flag);
     }
 
+    /**
+     * @deprecated Use {@link PMDPlugin#getStringTable()} instead.
+     */
+    @Deprecated // for removal
     public static String stringFor(String key) {
-        return plugin.getStringTable().getString(key);
+        return net.sourceforge.pmd.eclipse.util.internal.SWTUtil.stringFor(key);
     }
 
+    /**
+     * @deprecated Use {@link PMDPlugin#getStringTable()} with suffix {@code .tooltip} instead.
+     */
+    @Deprecated // for removal
     public static String tooltipFor(String key) {
-        String ttKey = key + TOOLTIP_SUFFIX;
-        String tooltip = stringFor(ttKey);
-        return ttKey.equals(tooltip) ? stringFor(key) : tooltip;
+        return net.sourceforge.pmd.eclipse.util.internal.SWTUtil.tooltipFor(key);
     }
 
+    /**
+     * @deprecated this is not used and will be removed
+     */
+    @Deprecated // for removal
     public static void releaseListeners(Control control, int listenerType) {
         Listener[] listeners = control.getListeners(listenerType);
         for (Listener listener : listeners) {
             control.removeListener(listenerType, listener);
         }
     }
 
+    /**
+     * @deprecated This is internal API and will be removed.
+     */
+    @Deprecated // for removal
     public static String[] labelsIn(Object[][] items, int columnIndex) {
-
-        String[] labels = new String[items.length];
-        for (int i = 0; i < labels.length; i++) {
-            labels[i] = items[i][columnIndex].toString();
-        }
-        return labels;
-    }
-
-    public static void deselectAll(Combo combo) {
-        int count = combo.getItems().length;
-        for (int i = 0; i < count; i++) {
-            combo.deselect(i);
-        }
+        return net.sourceforge.pmd.eclipse.util.internal.SWTUtil.labelsIn(items, columnIndex);
     }
 
+    /**
+     * @deprecated This is internal API and will be removed.
+     */
+    @Deprecated // for removal
     public static String[] i18lLabelsIn(Object[][] items, int columnIndex) {
+        return net.sourceforge.pmd.eclipse.util.internal.SWTUtil.i18lLabelsIn(items, columnIndex);
+    }
 
-        String[] labels = labelsIn(items, columnIndex);
-        String xlation;
-
-        for (int i = 0; i < labels.length; i++) {
-            xlation = stringFor(labels[i]);
-            labels[i] = xlation == null ? labels[i] : xlation;
-        }
-        return labels;
+    /**
+     * @deprecated This is internal API and will be removed.
+     */
+    @Deprecated // for removal
+    public static void deselectAll(Combo combo) {
+        net.sourceforge.pmd.eclipse.util.internal.SWTUtil.deselectAll(combo);
     }
 }
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/TypeText.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/TypeText.java
@@ -24,7 +24,9 @@
  * <p>TODO - add a grey prompt within the field when it is empty, remove when user starts typing
  *
  * @author Brian Remedios
+ * @deprecated This class is not used anymore and will be removed.
  */
+@Deprecated // for removal
 public class TypeText extends Composite {
 
     private Text text;
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/AbstractRulePanelManager.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/AbstractRulePanelManager.java
@@ -289,6 +289,13 @@ protected void shutdown(Link control) {
         control.setEnabled(false);
     }
 
+    /**
+     * @deprecated The control {@link TypeText} is not used anymore. The implementation class is
+     *             shown in a normal Text control. USe {@link #show(Text, String)} instead.
+     * @param control
+     * @param type
+     */
+    @Deprecated // for removal
     protected void show(TypeText control, Class<?> type) {
         control.setType(type);
         // control.setEnabled(usageMode == EditorUsageMode.CreateNew);
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/DescriptionPanelManager.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/DescriptionPanelManager.java
@@ -31,7 +31,7 @@
 
 import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
 import net.sourceforge.pmd.eclipse.ui.preferences.br.ValueChangeListener;
-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;
+import net.sourceforge.pmd.eclipse.util.internal.SWTUtil;
 import net.sourceforge.pmd.lang.rule.Rule;
 import net.sourceforge.pmd.lang.rule.RuleReference;
 
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/ExclusionPanelManager.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/ExclusionPanelManager.java
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/FormArranger.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/FormArranger.java
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/RulePanelManager.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/RulePanelManager.java
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/PMDProjectPropertyPage.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/PMDProjectPropertyPage.java
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/util/internal/SWTUtil.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/util/internal/SWTUtil.java

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`import org.eclipse.swt.widgets.Tree;`
`11`	`11`	`import org.eclipse.swt.widgets.TreeColumn;`
`12`	`12`
`13`		`-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;`
`14`	`13`	`import net.sourceforge.pmd.eclipse.util.ResourceManager;`
	`14`	`+import net.sourceforge.pmd.eclipse.util.internal.SWTUtil;`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`*`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;`
`25`	`25`	`import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;`
`26`		`-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;`
	`26`	`+import net.sourceforge.pmd.eclipse.util.internal.SWTUtil;`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`*`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public Control newEditorOn(Composite parent, final PropertyDescriptor<Object> de`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`combo.setData(choices);`
`70`		`- combo.setItems(SWTUtil.labelsIn(choices, 0));`
	`70`	`+ combo.setItems(net.sourceforge.pmd.eclipse.util.internal.SWTUtil.labelsIn(choices, 0));`
`71`	`71`	`if (selectionIdx >= 0) {`
`72`	`72`	`combo.select(selectionIdx);`
`73`	`73`	`}`