Index: src/org/netbeans/installer/UpgradeProfilePanel.java
===================================================================
RCS file: /cvs/installer/src/org/netbeans/installer/UpgradeProfilePanel.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 UpgradeProfilePanel.java
--- src/org/netbeans/installer/UpgradeProfilePanel.java	23 Jul 2002 13:42:05 -0000	1.3
+++ src/org/netbeans/installer/UpgradeProfilePanel.java	28 Aug 2002 12:15:48 -0000
@@ -59,7 +59,7 @@
         debug("size: "+detectedData.size());                //NOI18N    
         while(el.hasMoreElements()){
             String[] data = (String[])el.nextElement();            
-            if(data[1] == null){
+            if((data[2] == null)||(data[2].length() != 0 )){
                 debug("continue");
                 continue;
             }else{
Index: src/org/netbeans/installer/actions/DetectAction.java
===================================================================
RCS file: /cvs/installer/src/org/netbeans/installer/actions/DetectAction.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 DetectAction.java
--- src/org/netbeans/installer/actions/DetectAction.java	23 Jul 2002 13:42:07 -0000	1.3
+++ src/org/netbeans/installer/actions/DetectAction.java	28 Aug 2002 12:15:48 -0000
@@ -150,17 +150,17 @@
     }
     
     /**
-     * Checks if there is something upgradable(with install and user dir)
+     * Checks if there is something upgradable(with uninstall and user dir)
      *
      */
     private void checkForUpgrade(){
-        debug("checkForUpgrade");
+  /*      debug("checkForUpgrade");
         boolean upgradable = false;
         for(int i=0; i<detectedData.size(); i++){
             String[] data = (String[])detectedData.elementAt(i);
-            if((data[1] != null)&&(data[1].length() != 0)){
-                debug("length: "+data[1].length());
-                debug("upgradable: "+data[1]);  //NOI18N
+            if((data[2] != null)&&(data[2].length() != 0)){       //checks if there is uninstaller or not
+                debug("!length: "+data[2].length());
+                debug("!upgradable: "+data[2]);  //NOI18N
                 upgradable = true;                
                 break;
             }
@@ -168,11 +168,11 @@
         if(upgradable){
             debug("upgrade=yes");
             System.getProperties().put("upgrade_nb","yes");  //NOI18N
-        }else{
+        }else{*/
             debug("upgrade=no");
             System.getProperties().put("upgrade_nb","no"); //NOI18N
             System.getProperties().put("showUpgradeInstall","no"); //NOI18N            
-        }
+       // }
     }
     
     
@@ -514,7 +514,7 @@
         d.setVisible(true);
     }
     
-    private boolean debug = false;
+    private boolean debug = true;
     private void debug(String message){
         if (!debug)
             return;
Index: src/org/netbeans/installer/actions/UninstallPreviousAction.java
===================================================================
RCS file: /cvs/installer/src/org/netbeans/installer/actions/UninstallPreviousAction.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 UninstallPreviousAction.java
--- src/org/netbeans/installer/actions/UninstallPreviousAction.java	22 Aug 2002 08:50:14 -0000	1.3
+++ src/org/netbeans/installer/actions/UninstallPreviousAction.java	28 Aug 2002 12:15:48 -0000
@@ -79,18 +79,9 @@
         }
         if(fileService == null)
             return;
-        //if there is no uninstaller - simply rmove install-dir
-        if(uninstaller_path == null){
+        if((uninstaller_path == null)||(uninstaller_path.length() == 0)){
             debug("uninstallPath is null"); //NOI18N
-            String filePath = getUpgradePath();
-            if(filePath != null){
-                debug("path is not null - will be removed:"+filePath);  //NOI18N
-                try{
-                    fileService.deleteDirectory(filePath,false,true);                
-                }catch(Exception expn){
-                    logEvent(this, Log.ERROR, expn);
-                }
-            }
+            return; //shouldn't happen
         }else{
             jdkHome = (String)System.getProperties().getProperty("java.home");              //NOI18N
             try {
@@ -121,8 +112,9 @@
                 return;
             
             if(fileService.fileExists(getUninstallerLocation())){
-                fileService.deleteFile(getUninstallerLocation());
-                fileService.deleteDirectory(getUpgradePath(),false,true);
+                File file = new File(getUninstallerLocation()); 
+                String uninstDir = file.getParent();
+                fileService.deleteDirectory(uninstDir, false,true);               
             }
         }catch (Exception e) {
             e.printStackTrace();