1.1 --- a/cnd.debugger.gdbserver/nbproject/project.xml	Sun Dec 04 13:37:51 2016 +0100
     1.2 +++ b/cnd.debugger.gdbserver/nbproject/project.xml	Sun Dec 04 19:42:56 2016 +0300
     1.3 @@ -29,7 +29,7 @@
     1.4                      <compile-dependency/>
     1.5                      <run-dependency>
     1.6                          <release-version>3</release-version>
     1.7 -                        <specification-version>3.31.5</specification-version>
     1.8 +                        <specification-version>3.31.7</specification-version>
     1.9                      </run-dependency>
    1.10                  </dependency>
    1.11                  <dependency>
    1.12 @@ -85,14 +85,6 @@
    1.13                      </run-dependency>
    1.14                  </dependency>
    1.15                  <dependency>
    1.16 -                    <code-name-base>org.openide.util.ui</code-name-base>
    1.17 -                    <build-prerequisite/>
    1.18 -                    <compile-dependency/>
    1.19 -                    <run-dependency>
    1.20 -                        <specification-version>9.3</specification-version>
    1.21 -                    </run-dependency>
    1.22 -                </dependency>
    1.23 -                <dependency>
    1.24                      <code-name-base>org.openide.util</code-name-base>
    1.25                      <build-prerequisite/>
    1.26                      <compile-dependency/>
    1.27 @@ -108,6 +100,14 @@
    1.28                          <specification-version>8.25</specification-version>
    1.29                      </run-dependency>
    1.30                  </dependency>
    1.31 +                <dependency>
    1.32 +                    <code-name-base>org.openide.util.ui</code-name-base>
    1.33 +                    <build-prerequisite/>
    1.34 +                    <compile-dependency/>
    1.35 +                    <run-dependency>
    1.36 +                        <specification-version>9.3</specification-version>
    1.37 +                    </run-dependency>
    1.38 +                </dependency>
    1.39              </module-dependencies>
    1.40              <public-packages/>
    1.41          </data>

     2.1 --- a/cnd.debugger.gdbserver/src/org/netbeans/modules/cnd/debugger/gdbserver/GdbServerAttachPanel.java	Sun Dec 04 13:37:51 2016 +0100
     2.2 +++ b/cnd.debugger.gdbserver/src/org/netbeans/modules/cnd/debugger/gdbserver/GdbServerAttachPanel.java	Sun Dec 04 19:42:56 2016 +0300
     2.3 @@ -49,23 +49,21 @@
     2.4  package org.netbeans.modules.cnd.debugger.gdbserver;
     2.5  
     2.6  import java.beans.PropertyChangeListener;
     2.7 -import java.lang.invoke.MethodHandles;
     2.8  import javax.swing.JPanel;
     2.9  import org.netbeans.modules.cnd.api.remote.RemoteSyncSupport;
    2.10  import org.netbeans.modules.cnd.debugger.common2.debugger.NativeDebuggerInfo;
    2.11  import org.netbeans.modules.cnd.debugger.common2.debugger.NativeDebuggerManager;
    2.12 -import org.netbeans.modules.cnd.debugger.common2.ui.ExecutableProjectPanel;
    2.13 -import org.netbeans.modules.cnd.debugger.common2.ui.ExecutableProjectPanel.ProjectCBItem;
    2.14  import org.netbeans.modules.cnd.debugger.common2.debugger.debugtarget.DebugTarget;
    2.15  import org.netbeans.modules.cnd.debugger.common2.debugger.options.DebuggerOption;
    2.16  import org.netbeans.modules.cnd.debugger.common2.debugger.remote.CndRemote;
    2.17 +import org.netbeans.modules.cnd.debugger.common2.utils.ProjectComboBoxSupport;
    2.18 +import org.netbeans.modules.cnd.debugger.common2.utils.ProjectComboBoxSupport.ProjectCBItem;
    2.19  import org.netbeans.modules.cnd.debugger.gdb2.options.GdbDebuggerInfoFactory;
    2.20  import org.netbeans.modules.cnd.makeproject.api.configurations.ConfigurationSupport;
    2.21  import org.netbeans.modules.cnd.makeproject.api.configurations.MakeConfiguration;
    2.22  import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;
    2.23  import org.netbeans.spi.debugger.ui.Controller;
    2.24  import org.openide.util.HelpCtx;
    2.25 -import org.openide.util.Lookup;
    2.26  import org.openide.util.NbPreferences;
    2.27  
    2.28  /**
    2.29 @@ -82,7 +80,7 @@
    2.30          controller = new GdbServerAttachController();
    2.31          initComponents();
    2.32          // Fill the Projects combo box
    2.33 -        ExecutableProjectPanel.fillProjectsCombo(projectCB, null);
    2.34 +        ProjectComboBoxSupport.fillProjectsCombo(projectCB, null);
    2.35          targetTF.setText(NbPreferences.forModule(GdbServerAttachPanel.class).get(TARGET_KEY, "remote host:port")); //NOI18N
    2.36      }
    2.37