Redesign TabBase to get rid of mandatory inheritance of dialog element interfaces

plugins/org.chromium.debug.ui/src/org/chromium/debug/ui/launcher/WipRemoteTab.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.debug.ui.launcher;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.chromium.debug.core.model.LaunchParams;
 import org.chromium.debug.core.model.LaunchParams.ValueConverter;
 import org.chromium.debug.ui.PluginUtil;
 import org.chromium.debug.ui.launcher.LaunchTabGroup.Params;
 import org.chromium.sdk.wip.WipBackend;
 import org.chromium.sdk.wip.eclipse.BackendRegistry;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.jface.preference.PreferenceStore;
-import org.eclipse.jface.preference.StringFieldEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Text;
 
 class WipRemoteTab extends ChromiumRemoteTab<WipRemoteTab.WipTabElements> {
   private final Map<String, WipBackend> backendMap;
 
   WipRemoteTab() {
     super(PARAMS);
 
     backendMap = new LinkedHashMap<String, WipBackend>();
     for (WipBackend b : BackendRegistry.INSTANCE.getBackends()) {
       backendMap.put(b.getId(), b);
     }
   }
 
-  interface WipTabElements extends ChromiumRemoteTab.TabElements {
+  interface WipTabElements {
     BackendSelectorControl getBackendSelector();
+    ChromiumRemoteTab.TabElements getBase();
   }
 
   @Override
   protected String getWarning(ILaunchConfiguration config) throws CoreException {
     String result = super.getWarning(config);
     if (result != null) {
       return result;
     }
     String backendId = config.getAttribute(LaunchParams.WIP_BACKEND_ID, (String) null);
     if (backendId == null) {
       return "Wip backend should be selected";
     }
     if (backendMap.get(backendId) == null) {
       return "Unknown Wip backend id";
     }
     return null;
   }
 
   @Override
   protected WipTabElements createDialogElements(Composite composite, final Runnable modifyListener,
       PreferenceStore store) {
     final TabElements basicElements =
         createBasicTabElements(composite, modifyListener, store, getParams());
 
     final BackendSelectorControl backendSelector =
         new BackendSelectorControl(composite, backendMap, modifyListener);
     backendSelector.getMainControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
     return new WipTabElements() {
-      @Override public StringFieldEditor getHost() {
-        return basicElements.getHost();
-      }
-      @Override public IntegerFieldEditor getPort() {
-        return basicElements.getPort();
-      }
-      @Override public BooleanFieldEditor getAddNetworkConsole() {
-        return basicElements.getAddNetworkConsole();
-      }
-      @Override public RadioButtonsLogic<Integer> getBreakpointRadioButtons() {
-        return basicElements.getBreakpointRadioButtons();
-      }
       @Override public BackendSelectorControl getBackendSelector() {
         return backendSelector;
       }
+      @Override
+      public TabElements getBase() {
+        return basicElements;
+      }
     };
   }
 
   @Override
-  protected List<? extends TabField<?, ?, ? super WipTabElements, Params>> getTabFields() {
+  protected TabFieldList<? super WipTabElements, ? super Params> getTabFields() {
     return WIP_TAB_FIELDS;
   }
 
-  private static final List<? extends TabField<?, ?, ? super WipTabElements, Params>>
+  private static final TabFieldList<? super WipTabElements, ? super Params>
       WIP_TAB_FIELDS;
   static {
-    List<TabField<?, ?, ? super WipTabElements, Params>> list =
-        new ArrayList<TabField<?, ?, ? super WipTabElements, Params>>(5);
-
-    list.addAll(BASIC_TAB_FIELDS);
-
-    list.add(new TabField<String, String, WipTabElements, Params>(
+    TabField<String, String, WipTabElements, Params> backendChooser = new TabField<String, String, WipTabElements, Params>(

[apavlov, 2012/08/06 08:19:06]

line way too long

[Peter Rybin, 2012/08/06 22:40:35]

Done.

         LaunchParams.WIP_BACKEND_ID, TypedMethods.STRING,
         new FieldAccess<String, WipTabElements>() {
           @Override void setValue(String value, WipTabElements tabElements) {
             tabElements.getBackendSelector().setId(value);
           }
           @Override String getValue(WipTabElements tabElements) {
             return tabElements.getBackendSelector().getId();
           }
         },
         new DefaultsProvider<String, Params>() {
           @Override String getFallbackValue() {
             // TODO: support default value from eclipse variables.
             return null;
           }
           @Override String getInitialConfigValue(Params context) {
             // TODO: support default value from eclipse variables.
             return null;
           }
         },
-        ValueConverter.<String>getTrivial()));
+        ValueConverter.<String>getTrivial());
 
-    WIP_TAB_FIELDS = Collections.unmodifiableList(list);
+    List<TabFieldList<? super WipTabElements, ? super Params>> list  = new ArrayList<TabFieldList<? super WipTabElements, ? super Params>>(2);

[apavlov, 2012/08/06 08:19:06]

line way too long

[Peter Rybin, 2012/08/06 22:40:35]

Done.

+    list.add(createFieldListAdapting(BASIC_TAB_FIELDS,
+        new Adapter<WipTabElements, TabElements>() {
+          @Override
+          public TabElements get(WipTabElements from) {
+            return from.getBase();
+          }
+       }));
+    list.add(createFieldListImpl(Collections.singletonList(backendChooser)));
+
+    WIP_TAB_FIELDS = createCompositeFieldList(list);
   }
 
   private static final Params PARAMS = new Params(HostChecker.LOCAL_ONLY,
       Messages.ChromiumRemoteTab_URL, false);
 
   /**
    * UI control elements that allows to choose {@link WipBackend}. It consists of a dialog group,
    * that contains a drop-down list with backend ids and a multiline text field with backend
    * description.
    */
@@ skipping 80 matching lines @@
         textContent = backend.getDescription();
       }
       text.setText(textContent);
     }
 
     Group getMainControl() {
       return mainControl;
     }
   }
 }