Thread: [Jnode-svn-commits] SF.net SVN: jnode: [4050] trunk (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4050
          http://jnode.svn.sourceforge.net/jnode/?rev=4050&view=rev
Author:   fduminy
Date:     2008-05-03 11:17:04 -0700 (Sat, 03 May 2008)

Log Message:
-----------
AnnotateTask improvement : using faster method for timestamps (no more need for a properties file for that)

Modified Paths:
--------------
    trunk/all/build.xml
    trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java

Modified: trunk/all/build.xml
===================================================================

--- trunk/all/build.xml	2008-05-03 15:37:04 UTC (rev 4049)
+++ trunk/all/build.xml	2008-05-03 18:17:04 UTC (rev 4050)
@@ -180,8 +180,9 @@
     	<!-- Initialize timestamp -->
         <tstamp/>
         
+    	<property name="hotswap.class.tstamp.pattern" value="MM/dd/yyyy kk:mm:ss"/>
         <tstamp>
-            <format property="hotswap.class.tstamp" pattern="MM/dd/yyyy kk:mm:ss" />
+            <format property="hotswap.class.tstamp" pattern="${hotswap.class.tstamp.pattern}" />
         </tstamp>
 
 
@@ -728,8 +729,8 @@
         		classpathref="cp-jnode"/>
 
         <oj-annotate annotationFile="${root.dir}/all/conf/openjdk-annotations.properties"
-        			 timestampFile="${build.dir}/timestamps.properties"
-        		trace="false" failonerror="true">
+        			 buildStartTime="${hotswap.class.tstamp}" pattern="${hotswap.class.tstamp.pattern}"
+        			 trace="false" failonerror="true">
             <fileset dir="${root.dir}/core/build/classes">
                 <patternset includes="**/*.class"/>
             </fileset>        	

Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java	2008-05-03 15:37:04 UTC (rev 4049)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java	2008-05-03 18:17:04 UTC (rev 4050)
@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -63,22 +64,25 @@
 	private static final String MAGICPERMISSION_TYPE_DESC = Type.getDescriptor(MagicPermission.class);
 
 	private File annotationFile;
-	private File timestampFile;
 	private String[] classesFiles;
-	private Properties timestamps = new Properties();
+	
+	private String buildStartTime = "";
+	private String pattern = "";
+	private long startTime = 0;
+	
 	private Properties annotations = new Properties();
 
 	protected void doExecute() throws BuildException {
-		try
-		{
-			if(readProperties())
-			{
-				processFiles();
-			}
+		try {
+			SimpleDateFormat format = new SimpleDateFormat(pattern);
+			startTime = format.parse(buildStartTime).getTime();
+		} catch (Exception e) {
+			throw new BuildException("invalid buildStartTime or pattern", e);
 		}
-		finally
+		
+		if(readProperties())
 		{
-			saveTimestamps();
+			processFiles();
 		}
 	}
 
@@ -89,44 +93,23 @@
 	public final void setAnnotationFile(File annotationFile) {
 		this.annotationFile = annotationFile;
 	}
-
+	
 	/**
-	 * Defines the timestamp property file that is used to know if a class file 
-	 * has been recompiled since the annotation has been added 
-	 * (in such case, the annotation is lost and must be added again) 
-	 * 
-	 * @param timestampFile
+	 * Define the time at which build started
+	 * @param annotationFile
 	 */
-	public final void setTimestampFile(File timestampFile) {
-		this.timestampFile = timestampFile;
+	public final void setBuildStartTime(String buildStartTime) {
+		this.buildStartTime = buildStartTime;
 	}
-	
+
 	/**
-	 * Save the new timestamps in a property file 
+	 * Define the pattern with which buildStartTime is defined
+	 * @param annotationFile
 	 */
-	private void saveTimestamps()
-	{
-		FileOutputStream fos = null;
-		try
-		{
-			fos = new FileOutputStream(timestampFile);
-			timestamps.store(fos, "Here are the timestamps for classes with added annotations");
-		} catch (IOException e) {
-			throw new BuildException(e);
-		}
-		finally
-		{
-			if(fos != null)
-			{
-				try {
-					fos.close();
-				} catch (IOException e) {
-					throw new BuildException(e);
-				}
-			}
-		}
+	public final void setPattern(String pattern) {
+		this.pattern = pattern;
 	}
-	
+
 	/**
 	 * Read the properties file. For now, it simply contains a list of
 	 * classes that need the SharedStatics annotation.
@@ -136,8 +119,6 @@
 	 */
 	private boolean readProperties() throws BuildException
 	{
-		readProperties("timestampFile", timestampFile, timestamps);
-		
 		readProperties("annotationFile", annotationFile, annotations);		
 		if(annotations.isEmpty())
 		{
@@ -229,9 +210,8 @@
 		{
 			return;
 		}
-
-		long timestamp = Long.valueOf(timestamps.getProperty(classFile.getName(), "0")).longValue();
-		if(classFile.lastModified() <= timestamp)
+		
+		if(classFile.lastModified() < startTime)
 		{
 			System.out.println("Skipping already annotated file "+classFile.getName());
 			return;
@@ -273,8 +253,6 @@
 				throw new IOException("can't rename "+tmpFile.getAbsolutePath());
 			}
 		}
-		
-		timestamps.setProperty(classFile.getName(), Long.toString(classFile.lastModified()));			
 	}
 
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Jnode-svn-commits] SF.net SVN: jnode: [4050] trunk (Page 3)

jnode-svn-commits