From f89dbe5d0e505cc6e05a9bbb389d8303333ef4e0 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Sat, 24 Jul 2010 23:12:55 +0200
Subject: Uninstalling lombok from netbeans was broken in the previous
 installer update.

---
 .../lombok/installer/netbeans/NetbeansLocation.java          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/installer/lombok/installer/netbeans/NetbeansLocation.java b/src/installer/lombok/installer/netbeans/NetbeansLocation.java
index f4da8f3f..7ef5f1c8 100644
--- a/src/installer/lombok/installer/netbeans/NetbeansLocation.java
+++ b/src/installer/lombok/installer/netbeans/NetbeansLocation.java
@@ -156,11 +156,13 @@ public class NetbeansLocation extends IdeLocation {
 		
 		File lombokJar = new File(dir, "lombok.jar");
 		if (lombokJar.exists()) {
-			if (IdeFinder.getOS() == IdeFinder.OS.WINDOWS && Installer.isSelf(lombokJar.getAbsolutePath())) {
-				lombokJarsForWhichCantDeleteSelf.add(lombokJar);
-			} else {
-				throw new UninstallException(
-					"Can't delete " + lombokJar.getAbsolutePath() + generateWriteErrorMessage(), null);
+			if (!lombokJar.delete()) {
+				if (IdeFinder.getOS() == IdeFinder.OS.WINDOWS && Installer.isSelf(lombokJar.getAbsolutePath())) {
+					lombokJarsForWhichCantDeleteSelf.add(lombokJar);
+				} else {
+					throw new UninstallException(
+							"Can't delete " + lombokJar.getAbsolutePath() + generateWriteErrorMessage(), null);
+				}
 			}
 		}
 		
-- 
cgit