Remove Java builder and place Java2Script builder to the first place.

zhourenjian · zhourenjian · commit d1631e7e11bf · 2007-05-25T00:37:29.000Z
diff --git a/src/net/sf/j2s/core/Java2ScriptProjectNature.java b/src/net/sf/j2s/core/Java2ScriptProjectNature.java
@@ -209,6 +209,7 @@ public static boolean hasJavaBuilder(IProject project) {
 	}
 	
 	public static boolean removeJavaBuilder(IProject project) {
+		boolean removed = false;
 		try {
 			IProjectDescription description = project.getDescription();
 			ICommand[] commands = description.getBuildSpec();
@@ -219,12 +220,32 @@ public static boolean removeJavaBuilder(IProject project) {
 					System.arraycopy(commands, i + 1, newCommands, i, commands.length - i - 1);
 					description.setBuildSpec(newCommands);
 					project.setDescription(description, null);
-					return true;
+					removed = true;
+					break;
+				}
+			}
+			if (removed) { // remove java2script builder, so later the builder can be the first builder
+				for (int i = 0; i < commands.length; ++i) {
+					if (commands[i].getBuilderName().equals("net.sf.j2s.core.java2scriptbuilder")) {
+						ICommand[] newCommands = new ICommand[commands.length - 1];
+						System.arraycopy(commands, 0, newCommands, 0, i);
+						System.arraycopy(commands, i + 1, newCommands, i, commands.length - i - 1);
+						description.setBuildSpec(newCommands);
+						project.setDescription(description, null);
+						break;
+					}
 				}
 			}
 		} catch (CoreException e) {
 			e.printStackTrace();
 		}
-		return false;
+		Java2ScriptProjectNature pn = new Java2ScriptProjectNature();
+		pn.setProject(project);
+		try {
+			pn.configure();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+		return removed;
 	}
 }
