1.1 --- a/cnd.debugger.gdbserver/src/org/netbeans/modules/cnd/debugger/gdbserver/GdbServerAttachPanel.java	Mon Sep 05 00:29:59 2016 +0200
     1.2 +++ b/cnd.debugger.gdbserver/src/org/netbeans/modules/cnd/debugger/gdbserver/GdbServerAttachPanel.java	Sun Dec 04 19:42:56 2016 +0300
     1.3 @@ -49,23 +49,22 @@
     1.4  package org.netbeans.modules.cnd.debugger.gdbserver;
     1.5  
     1.6  import java.beans.PropertyChangeListener;
     1.7 -import java.lang.invoke.MethodHandles;
     1.8  import javax.swing.JPanel;
     1.9  import org.netbeans.modules.cnd.api.remote.RemoteSyncSupport;
    1.10  import org.netbeans.modules.cnd.debugger.common2.debugger.NativeDebuggerInfo;
    1.11  import org.netbeans.modules.cnd.debugger.common2.debugger.NativeDebuggerManager;
    1.12 -import org.netbeans.modules.cnd.debugger.common2.debugger.actions.ExecutableProjectPanel;
    1.13 -import org.netbeans.modules.cnd.debugger.common2.debugger.actions.ExecutableProjectPanel.ProjectCBItem;
    1.14  import org.netbeans.modules.cnd.debugger.common2.debugger.debugtarget.DebugTarget;
    1.15  import org.netbeans.modules.cnd.debugger.common2.debugger.options.DebuggerOption;
    1.16  import org.netbeans.modules.cnd.debugger.common2.debugger.remote.CndRemote;
    1.17 +import org.netbeans.modules.cnd.debugger.common2.ui.ExecutableProjectPanel;
    1.18 +import org.netbeans.modules.cnd.debugger.common2.utils.ProjectComboBoxSupport;
    1.19 +import org.netbeans.modules.cnd.debugger.common2.utils.ProjectComboBoxSupport.ProjectCBItem;
    1.20  import org.netbeans.modules.cnd.debugger.gdb2.options.GdbDebuggerInfoFactory;
    1.21  import org.netbeans.modules.cnd.makeproject.api.configurations.ConfigurationSupport;
    1.22  import org.netbeans.modules.cnd.makeproject.api.configurations.MakeConfiguration;
    1.23  import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;
    1.24  import org.netbeans.spi.debugger.ui.Controller;
    1.25  import org.openide.util.HelpCtx;
    1.26 -import org.openide.util.Lookup;
    1.27  import org.openide.util.NbPreferences;
    1.28  
    1.29  /**
    1.30 @@ -82,7 +81,7 @@
    1.31          controller = new GdbServerAttachController();
    1.32          initComponents();
    1.33          // Fill the Projects combo box
    1.34 -        ExecutableProjectPanel.fillProjectsCombo(projectCB, null);
    1.35 +        ProjectComboBoxSupport.fillProjectsCombo(projectCB, null);
    1.36          targetTF.setText(NbPreferences.forModule(GdbServerAttachPanel.class).get(TARGET_KEY, "remote host:port")); //NOI18N
    1.37      }
    1.38