[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers ...

[Robert Stryker]

  User: rawb    
  Date: 06/12/11 10:49:06

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers 
                        PackagesPublisher.java
  Log:
  Splendid! (added removal / undeployment of module)
  
  Revision  Changes    Path
  1.3       +23 -12    jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesPublisher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PackagesPublisher.java	30 Nov 2006 16:14:59 -0000	1.2
  +++ PackagesPublisher.java	11 Dec 2006 15:49:06 -0000	1.3
  @@ -68,7 +68,7 @@
       	
       	if( kind == IServer.PUBLISH_INCREMENTAL ) {
       		boolean incremental = false;
  -    		if( modulePublishState == IServer.PUBLISH_STATE_NONE ) return;
  +    		if( modulePublishState == IServer.PUBLISH_STATE_NONE ) incremental = false;
       		if( modulePublishState == IServer.PUBLISH_STATE_INCREMENTAL ) incremental = true;
       		publishModule(incremental, module, monitor);
       		return;
  @@ -87,17 +87,25 @@
   		
   		String projectName = module[0].getName();
   		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
  -		PackagesCore.buildProject(project, monitor);
  +		if( project.exists() ) {
   		IPackage[] packages = PackagesCore.getProjectPackages(project, new NullProgressMonitor());
   		for( int i = 0; i < packages.length; i++ ) {
   			if( packages[i].isDestinationInWorkspace()) {
   				IFile file = packages[i].getPackageFile();
   				IPath sourcePath = file.getLocation();
   				IPath destPath = new Path(server.getDeployDirectory(true)).append(sourcePath.lastSegment());
  -				boolean deleted = destPath.toFile().delete();
  +					destPath.toFile().delete();
   			} else {
  -				IFile file = packages[i].getPackageFile();
  -				boolean deleted = file.getLocation().toFile().delete();
  +					IPath path = packages[i].getPackageFilePath();
  +					Path deployDir = new Path(server.getDeployDirectory(true));
  +					if( path.toOSString().startsWith(deployDir.toOSString())) {
  +						try {
  +						path.toFile().delete();
  +						} catch( Exception e ) {
  +							e.printStackTrace();
  +						}
  +					}
  +				}
   			}
   		}
   	}
  @@ -108,6 +116,7 @@
   		int inc2 = incremental ? IncrementalProjectBuilder.INCREMENTAL_BUILD : IncrementalProjectBuilder.FULL_BUILD;
   		String projectName = module[0].getName();
   		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
  +		try {
   		PackagesCore.buildProject(project, inc2, monitor);
   		IPackage[] packages = PackagesCore.getProjectPackages(project, new NullProgressMonitor());
   		for( int i = 0; i < packages.length; i++ ) {
  @@ -123,5 +132,7 @@
   				}
   			}
   		}
  +		}catch( Exception ce ) {
  +		}
   	}
   }