Refactoring Regression Fix

Debugger improvment

Author: albilu

pom.xml

@@ -749,7 +749,7 @@
     <properties>
         <dev.name>albilu</dev.name>
         <netbeans.release.version>RELEASE170</netbeans.release.version>
-        <next.version>0.6</next.version>
+        <next.version>0.7</next.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 </project>

src/main/java/org/netbeans/modules/python/debugger/PythonDebugger.java

@@ -153,12 +153,12 @@ void kill() {
             pdbClient.getProcess().destroyForcibly();
             pdbClient.getReader().close();
             pdbClient.getWriter().close();
-            engineProvider.getDestructor().killEngine();
-            io.closeInputOutput();
-            createHandle.finish();
         } catch (IOException ex) {
             Exceptions.printStackTrace(ex);
         }
+        engineProvider.getDestructor().killEngine();
+        io.closeInputOutput();
+        createHandle.finish();
     }
 
     public PdbClient getPdbClient() {

src/main/java/org/netbeans/modules/python/debugger/pdb/PdbClient.java

@@ -67,16 +67,18 @@ public BufferedWriter getWriter() {
 
     public void sendCommand(String cmd) throws IOException {
         isStopped = false;
+        writeToStream(cmd);
+    }
+
+    private void writeToStream(String cmd) throws IOException {
         writer.write(cmd);
         writer.newLine();
         writer.flush();
     }
 
     public boolean sendCommandAndProcessResponse(String cmd) throws IOException {
         isStopped = false;
-        writer.write(cmd);
-        writer.newLine();
-        writer.flush();
+        writeToStream(cmd);
         try {
             return processResponse(getStreamResponse(false));
         } catch (IOException ex) {
@@ -88,9 +90,7 @@ public boolean sendCommandAndProcessResponse(String cmd) throws IOException {
 
     public Object[] sendBreakpointsCommand(String cmd) throws IOException {
         isStopped = false;
-        writer.write(cmd);
-        writer.newLine();
-        writer.flush();
+        writeToStream(cmd);
         try {
             return breakPointCommandResponse(getStreamResponse(false));
         } catch (IOException ex) {
@@ -103,18 +103,14 @@ public Object[] sendBreakpointsCommand(String cmd) throws IOException {
 
     public List<PythonDebuggerCallStack> sendWhere(String cmd) throws IOException {
         isStopped = false;
-        writer.write(cmd);
-        writer.newLine();
-        writer.flush();
+        writeToStream(cmd);
         return whereResponse(getStreamResponse(false));
 
     }
 
     public String sendCommandAndGetResponse(String cmd) throws IOException {
         isStopped = false;
-        writer.write(cmd);
-        writer.newLine();
-        writer.flush();
+        writeToStream(cmd);
         return StringUtils.removeEnd(getStreamResponse(false), "(Pdb)").trim();
     }
 

src/main/java/org/netbeans/modules/python/indexing/PythonCustomIndexer.java

@@ -52,7 +52,7 @@ protected void index(Iterable<? extends Indexable> files, Context context) {
         FileObject root = context.getRoot();
         Project owner = root != null ? FileOwnerQuery.getOwner(root) : null;
         boolean pyProject = owner != null && owner.getClass()
-                .getName().equals("org.netbeans.modules.python.PythonProject");
+                .getName().equals("org.netbeans.modules.python.project.PythonProject");
         boolean pyLibPath = root != null && root.getParent() != null
                 && root.getParent().getName().equals("lib");
         if (pyProject || pyLibPath) {

src/main/java/org/netbeans/modules/python/indexing/PythonCustomIndexerFactory.java

@@ -38,7 +38,7 @@ public void filesDeleted(Iterable<? extends Indexable> deleted, Context context)
         FileObject fo = context.getRoot();
         Project owner = fo != null ? FileOwnerQuery.getOwner(fo) : null;
         if (owner != null && owner.getClass()
-                .getName().equals("org.netbeans.modules.python.PythonProject")) {
+                .getName().equals("org.netbeans.modules.python.project.PythonProject")) {
             try {
                 IndexingSupport is = IndexingSupport.getInstance(context);
                 for (Indexable indexable : deleted) {
@@ -58,7 +58,7 @@ public void filesDirty(Iterable<? extends Indexable> dirty, Context context) {
         FileObject fo = context.getRoot();
         Project owner = fo != null ? FileOwnerQuery.getOwner(fo) : null;
         if (owner != null && owner.getClass()
-                .getName().equals("org.netbeans.modules.python.PythonProject")) {
+                .getName().equals("org.netbeans.modules.python.project.PythonProject")) {
             try {
                 IndexingSupport is = IndexingSupport.getInstance(context);
                 for (Indexable indexable : dirty) {

src/main/java/org/netbeans/modules/python/indexing/PythonErrorAnnotator.java

@@ -57,7 +57,7 @@ public Image annotateIcon(Image icon, int iconType, Set<? extends FileObject> fi
         Project owner = FileOwnerQuery.getOwner(fo);
 
         if (!Utilities.isBadgesEnabled() || owner == null || !owner.getClass().getName()
-                .equals("org.netbeans.modules.python.PythonProject")) {
+                .equals("org.netbeans.modules.python.project.PythonProject")) {
             return null;
         }
         boolean inError = false;
@@ -97,7 +97,7 @@ public Image annotateIcon(Image icon, int iconType, Set<? extends FileObject> fi
         }
 
         if (owner.getClass().getName()
-                .equals("org.netbeans.modules.python.PythonProject")
+                .equals("org.netbeans.modules.python.project.PythonProject")
                 && files.size() == 1 && fo.isFolder() && fo.getFileObject("__init__.py") != null) {
             icon = ImageUtilities.mergeImages(icon, ImageUtilities
                     .addToolTipToImage(ImageUtilities.loadImage(IMAGE), "<img src='"