[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal ...

[Marshall Culpepper]

  User: mculpepper
  Date: 07/02/21 16:11:39

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal 
                        PackageBuildDelegate.java
  Log:
  in the case of an incremental build, createFile() was being called 2 times for every fileset.. the array is cached now
  
  Revision  Changes    Path
  1.14      +6 -9      jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageBuildDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageBuildDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageBuildDelegate.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- PackageBuildDelegate.java	21 Feb 2007 19:36:10 -0000	1.13
  +++ PackageBuildDelegate.java	21 Feb 2007 21:11:39 -0000	1.14
  @@ -767,11 +767,9 @@
   		return (File[]) files.toArray(new File[files.size()]); 
   	}
   	
  -	private OutputStream[] createFileOutputStreams (IPackageFileSet fileset, IPath subPath)
  +	private OutputStream[] createFileOutputStreams (File[] files)
   	{
   		ArrayList streams = new ArrayList();
  -		File[] files = createFiles(fileset, subPath);
  -		
   		for (int i = 0; i < files.length; i++)
   		{
   			try {
  @@ -780,7 +778,6 @@
   				Trace.trace(getClass(), e);
   			}	
   		}
  -		
   		return (OutputStream[]) streams.toArray(new OutputStream[streams.size()]);
   	}
   	
  @@ -843,10 +840,10 @@
   			for (int i = 0; i < filesets.length; i++)
   			{
   				IPath copyTo = getFileDestinationPath(file, filesets[i]);
  +				File[] packageFiles = createFiles(filesets[i], copyTo);
   				
   				if (checkStamps)
   				{
  -					File[] packageFiles = createFiles(filesets[i], copyTo);
   					for (int j = 0; j < packageFiles.length; j++)
   					{
   						File packageFile = packageFiles[j];
  @@ -864,7 +861,7 @@
   				OutputStream[] outStreams = null;
   				// I'm using the fully qualified package name here to avoid confusion with java.io
   				try {
  -					outStreams = createFileOutputStreams(filesets[i], copyTo);
  +					outStreams = createFileOutputStreams(packageFiles);
   					
   					for (int j = 0; j < outStreams.length; j++)
   					{
  @@ -904,10 +901,10 @@
   		synchronized (buildLock)
   		{
   			IPath copyTo = getPathDestinationPath(path, fileset);
  +			File[] packageFiles = createFiles(fileset, copyTo);
   			
   			if (checkStamps)
   			{
  -				File[] packageFiles = createFiles(fileset, copyTo);
   				File externalFile = new File(path.toFile());
   				
   				for (int i = 0; i < packageFiles.length; i++)
  @@ -926,7 +923,7 @@
   			InputStream in = null;
   			OutputStream[] outStreams = null;
   			try {
  -				outStreams = createFileOutputStreams(fileset, copyTo);
  +				outStreams = createFileOutputStreams(packageFiles);
   				for (int i = 0; i < outStreams.length; i++)
   				{
   					try {