Index: web/project/src/org/netbeans/modules/web/project/WebProjectOperations.java
===================================================================
RCS file: /cvs/web/project/src/org/netbeans/modules/web/project/WebProjectOperations.java,v
retrieving revision 1.4
diff -u -r1.4 WebProjectOperations.java
--- web/project/src/org/netbeans/modules/web/project/WebProjectOperations.java 26 Aug 2005 12:10:40 -0000 1.4
+++ web/project/src/org/netbeans/modules/web/project/WebProjectOperations.java 13 Sep 2005 14:32:12 -0000
@@ -130,7 +130,7 @@
}
public void notifyCopied(Project original, File originalPath, String nueName) {
- if (project == original) { //TODO: this is illegal
+ if (null == original) {
//do nothing for the original project.
return ;
}
@@ -145,7 +145,7 @@
}
public void notifyMoved(Project original, File originalPath, String nueName) {
- if (project == original) { //TODO: this is illegal
+ if (null == original) {
//do nothing for the original project.
return ;
}
Index: j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectOperations.java
===================================================================
RCS file: /cvs/j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectOperations.java,v
retrieving revision 1.3
diff -u -r1.3 EarProjectOperations.java
--- j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectOperations.java 25 Aug 2005 15:42:39 -0000 1.3
+++ j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectOperations.java 13 Sep 2005 14:32:27 -0000
@@ -103,7 +103,7 @@
}
public void notifyCopied(Project original, File originalPath, String nueName) {
- if (project == original) { //TODO: this is illegal
+ if (null == original) {
//do nothing for the original project.
return ;
}
@@ -116,7 +116,7 @@
}
public void notifyMoved(Project original, File originalPath, String nueName) {
- if (project == original) { //TODO: this is illegal
+ if (null == original) {
//do nothing for the original project.
return ;
}
Index: j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProjectOperations.java
===================================================================
RCS file: /cvs/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProjectOperations.java,v
retrieving revision 1.5
diff -u -r1.5 EjbJarProjectOperations.java
--- j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProjectOperations.java 31 Aug 2005 14:32:47 -0000 1.5
+++ j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProjectOperations.java 13 Sep 2005 14:32:27 -0000
@@ -133,7 +133,7 @@
}
public void notifyCopied(Project original, File originalPath, String nueName) {
- if (project == original) { //TODO: this is illegal
+ if (null == original) {
//do nothing for the original project.
return ;
}
@@ -148,7 +148,7 @@
}
public void notifyMoved(Project original, File originalPath, String nueName) {
- if (project == original) { //TODO: this is illegal
+ if (null == original) {
//do nothing for the original project.
return ;
}
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectOperations.java
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectOperations.java,v
retrieving revision 1.2
diff -u -r1.2 J2SEProjectOperations.java
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectOperations.java 22 Aug 2005 20:47:54 -0000 1.2
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectOperations.java 13 Sep 2005 14:32:35 -0000
@@ -115,7 +115,7 @@
}
public void notifyCopied(Project original, File originalPath, String nueName) {
- if (project == original) { //TODO: this is illegal
+ if (null == original) {
//do nothing for the original project.
return ;
}
@@ -130,7 +130,7 @@
}
public void notifyMoved(Project original, File originalPath, String nueName) {
- if (project == original) { //TODO: this is illegal
+ if (null == original) {
//do nothing for the original project.
return ;
}
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java,v
retrieving revision 1.5
diff -u -r1.5 J2SELogicalViewProvider.java
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java 6 Sep 2005 09:25:21 -0000 1.5
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java 13 Sep 2005 14:32:35 -0000
@@ -439,6 +439,8 @@
public void setName(String s) {
DefaultProjectOperations.performDefaultRenameOperation(project, s);
+ super.setName( ProjectUtils.getInformation( project ).getDisplayName() );
+ fireDisplayNameChange(null, null);
}
/*
Index: ant/freeform/src/org/netbeans/modules/ant/freeform/FreeformProjectOperations.java
===================================================================
RCS file: /cvs/ant/freeform/src/org/netbeans/modules/ant/freeform/FreeformProjectOperations.java,v
retrieving revision 1.3
diff -u -r1.3 FreeformProjectOperations.java
--- ant/freeform/src/org/netbeans/modules/ant/freeform/FreeformProjectOperations.java 28 Aug 2005 15:30:55 -0000 1.3
+++ ant/freeform/src/org/netbeans/modules/ant/freeform/FreeformProjectOperations.java 13 Sep 2005 14:32:45 -0000
@@ -117,7 +117,7 @@
}
public void notifyCopied(Project original, File originalPath, String nueName) throws IOException {
- if (!original.getProjectDirectory().equals(project.getProjectDirectory())) {
+ if ( null != original) {
project.setName(nueName);
}
}
@@ -126,7 +126,7 @@
}
public void notifyMoved(Project original, File originalPath, String nueName) throws IOException {
- if (!original.getProjectDirectory().equals(project.getProjectDirectory())) {
+ if (null != original) {
project.setName(nueName);
}
}
Index: projects/projectapi/src/org/netbeans/spi/project/CopyOperationImplementation.java
===================================================================
RCS file: /cvs/projects/projectapi/src/org/netbeans/spi/project/CopyOperationImplementation.java,v
retrieving revision 1.1
diff -u -r1.1 CopyOperationImplementation.java
--- projects/projectapi/src/org/netbeans/spi/project/CopyOperationImplementation.java 22 Aug 2005 20:47:43 -0000 1.1
+++ projects/projectapi/src/org/netbeans/spi/project/CopyOperationImplementation.java 13 Sep 2005 14:32:46 -0000
@@ -52,7 +52,7 @@
* newly created (copied) project into the correct state (including changing its display name
* to nueName). Should be called on both original and newly created project (in this order).
*
- * @param original the original project
+ * @param original null when called on the original project, the original project when called on the new project
* @param originalPath the project folder of the original project (for consistency
* with MoveOperationImplementation.notifyMoved)
* @param nueName new name for the newly created project.
Index: projects/projectapi/src/org/netbeans/spi/project/MoveOperationImplementation.java
===================================================================
RCS file: /cvs/projects/projectapi/src/org/netbeans/spi/project/MoveOperationImplementation.java,v
retrieving revision 1.1
diff -u -r1.1 MoveOperationImplementation.java
--- projects/projectapi/src/org/netbeans/spi/project/MoveOperationImplementation.java 22 Aug 2005 20:47:43 -0000 1.1
+++ projects/projectapi/src/org/netbeans/spi/project/MoveOperationImplementation.java 13 Sep 2005 14:32:46 -0000
@@ -53,7 +53,7 @@
* to nueName) and call {@link ProjectState#notifyDeleted} on the original project.
* Should be called on both original and newly created project (in this order).
*
- * @param original the original project
+ * @param original null when called on the original project, the original project when called on the new project
* @param originalPath the project folder of the original project
* @param nueName new name for the newly created project.
*
Index: projects/projectapi/src/org/netbeans/spi/project/support/ProjectOperations.java
===================================================================
RCS file: /cvs/projects/projectapi/src/org/netbeans/spi/project/support/ProjectOperations.java,v
retrieving revision 1.1
diff -u -r1.1 ProjectOperations.java
--- projects/projectapi/src/org/netbeans/spi/project/support/ProjectOperations.java 22 Aug 2005 20:47:44 -0000 1.1
+++ projects/projectapi/src/org/netbeans/spi/project/support/ProjectOperations.java 13 Sep 2005 14:32:46 -0000
@@ -147,7 +147,7 @@
*/
public static void notifyCopied(Project original, Project nue, File originalPath, String name) throws IOException {
for (Iterator i = getCopyOperationImplementation(original).iterator(); i.hasNext(); ) {
- ((CopyOperationImplementation) i.next()).notifyCopied(original, originalPath, name);
+ ((CopyOperationImplementation) i.next()).notifyCopied(null, originalPath, name);
}
for (Iterator i = getCopyOperationImplementation(nue).iterator(); i.hasNext(); ) {
((CopyOperationImplementation) i.next()).notifyCopied(original, originalPath, name);
@@ -184,7 +184,7 @@
*/
public static void notifyMoved(Project original, Project nue, File originalPath, String name) throws IOException {
for (Iterator i = getMoveOperationImplementation(original).iterator(); i.hasNext(); ) {
- ((MoveOperationImplementation) i.next()).notifyMoved(original, originalPath, name);
+ ((MoveOperationImplementation) i.next()).notifyMoved(null, originalPath, name);
}
for (Iterator i = getMoveOperationImplementation(nue).iterator(); i.hasNext(); ) {
((MoveOperationImplementation) i.next()).notifyMoved(original, originalPath, name);
Index: projects/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementation.java
===================================================================
RCS file: /cvs/projects/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementation.java,v
retrieving revision 1.9
diff -u -r1.9 DefaultProjectOperationsImplementation.java
--- projects/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementation.java 9 Sep 2005 08:13:15 -0000 1.9
+++ projects/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementation.java 13 Sep 2005 14:32:46 -0000
@@ -262,7 +262,18 @@
public void execute() {
String nueName = panel.getNewName();
- doMoveProject(handle, project, nueName, project.getProjectDirectory().getParent());
+ if (panel.getRenameProjectFolder()) {
+ doMoveProject(handle, project, nueName, project.getProjectDirectory().getParent());
+ } else {
+ try {
+ ProjectOperations.notifyMoving(project);
+ ProjectOperations.notifyMoved(project, project, FileUtil.toFile(project.getProjectDirectory()), nueName);
+
+ ProjectManager.getDefault().saveProject(project);
+ } catch (IOException e) {
+ ErrorManager.getDefault().notify(e);
+ }
+ }
}
});
}
Index: projects/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectRenamePanel.java
===================================================================
RCS file: /cvs/projects/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectRenamePanel.java,v
retrieving revision 1.6
diff -u -r1.6 DefaultProjectRenamePanel.java
--- projects/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectRenamePanel.java 7 Sep 2005 11:56:37 -0000 1.6
+++ projects/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectRenamePanel.java 13 Sep 2005 14:32:46 -0000
@@ -225,6 +225,10 @@
return projectName.getText();
}
+ public boolean getRenameProjectFolder() {
+ return alsoRenameFolder.isSelected();
+ }
+
public void changedUpdate(DocumentEvent e) {
//ignored
}