Index: addon-cms/src/main/java/org/onehippo/forge/relateddocs/editor/DocumentPickerDialog.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- addon-cms/src/main/java/org/onehippo/forge/relateddocs/editor/DocumentPickerDialog.java	(revision 410427b6676d5b629eebd52860943364438f71eb)
+++ addon-cms/src/main/java/org/onehippo/forge/relateddocs/editor/DocumentPickerDialog.java	(date 1561454557000)
@@ -31,7 +31,6 @@
 import org.apache.wicket.util.value.ValueMap;
 import org.hippoecm.frontend.PluginRequestTarget;
 import org.hippoecm.frontend.dialog.AbstractDialog;
-import org.hippoecm.frontend.editor.plugins.linkpicker.LinkPickerDialog;
 import org.hippoecm.frontend.model.IModelReference;
 import org.hippoecm.frontend.model.JcrNodeModel;
 import org.hippoecm.frontend.model.event.IObservable;
@@ -53,19 +52,16 @@
  * @author vijaykiran
  */
 public class DocumentPickerDialog extends AbstractDialog<Node> {
-    private static final long serialVersionUID = 1L;
-
-    private static final Logger log = LoggerFactory.getLogger(LinkPickerDialog.class);
     protected static final String CLUSTER_OPTIONS = "cluster.options";
-
-    private List<String> nodetypes = new ArrayList<String>();
-
+    private static final long serialVersionUID = 1L;
+    private static final Logger log = LoggerFactory.getLogger(DocumentPickerDialog.class);
     protected final IPluginContext context;
     protected final IPluginConfig config;
+    private final RelatedDocCollection collection;
     protected IRenderService dialogRenderer;
+    private List<String> nodetypes = new ArrayList<String>();
     private IClusterControl control;
     private IModel<Node> selectedNode;
-    private final RelatedDocCollection collection;
     private String uuid;
 
     private IObserver selectionModelObserver;
@@ -97,7 +93,7 @@
         try {
             uuid = model.getObject().getIdentifier();
             if (uuid != null && !"".equals(uuid)) {
-                selectedNode = new JcrNodeModel(((UserSession) Session.get()).getJcrSession().getNodeByIdentifier(uuid));
+                selectedNode = new JcrNodeModel(((UserSession)Session.get()).getJcrSession().getNodeByIdentifier(uuid));
                 setOkEnabled(true);
             }
         } catch (RepositoryException ex) {
@@ -122,7 +118,7 @@
         }
 
         try {
-            Node targetNode = (Node) targetModel.getObject();
+            Node targetNode = (Node)targetModel.getObject();
 
             Node testNode = targetNode;
             if (targetNode.isNodeType(HippoNodeType.NT_HANDLE) && targetNode.hasNode(targetNode.getName())) {
@@ -157,7 +153,14 @@
     protected Component createContentPanel(String contentId) {
         IPluginConfigService pluginConfigService = context.getService(IPluginConfigService.class.getName(),
                 IPluginConfigService.class);
-        IClusterConfig template = pluginConfigService.getCluster("cms-pickers/documents");
+        String picker = "cms-pickers/documents";
+        if (config.containsKey(CLUSTER_OPTIONS) && config.getPluginConfig(CLUSTER_OPTIONS) != null) {
+            final IPluginConfig clusterOptionConfig = config.getPluginConfig(CLUSTER_OPTIONS);
+            if (clusterOptionConfig.containsKey("cluster.name")) {
+                picker = clusterOptionConfig.getString("cluster.name");
+            }
+        }
+        IClusterConfig template = pluginConfigService.getCluster(picker);
         //TODO: is this ok? IPluginConfig parameters = new JavaPluginConfig(config.getPluginConfig(CLUSTER_OPTIONS));
         control = context.newCluster(template, null);
 
@@ -175,7 +178,7 @@
             }
 
             public void onEvent(Iterator events) {
-                setSelectedModel((JcrNodeModel) selectionModelReference.getModel());
+                setSelectedModel((JcrNodeModel)selectionModelReference.getModel());
             }
 
         }, IObserver.class.getName());
@@ -240,7 +243,7 @@
             return;
         }
 
-        JcrNodeModel selectedNodeModel = (JcrNodeModel) selectedNode;
+        JcrNodeModel selectedNodeModel = (JcrNodeModel)selectedNode;
 
         try {
             if (uuid.equalsIgnoreCase(selectedNodeModel.getNode().getIdentifier())) {