codenotifier - Google Web Toolkit: revision 3597

Revision: 3597

Author: scottb@google.com

Date: 29 Aug 2008 16:41:29

Changes:

Adds getLastModified() to CompilationUnit and its dependencies.

Review by: bobv (TBR)

Files:
modified: /trunk/dev/core/test/com/google/gwt/dev/shell/StandardGeneratorContextTest.java (try)
modified: /trunk/dev/core/src/com/google/gwt/dev/resource/Resource.java (try)
modified: /trunk/dev/core/test/com/google/gwt/dev/javac/impl/MockResource.java (try)
modified: /trunk/dev/core/src/com/google/gwt/dev/resource/impl/FileResource.java (try)
modified: /trunk/dev/core/src/com/google/gwt/dev/shell/StandardGeneratorContext.java (try)
modified: /trunk/dev/core/src/com/google/gwt/dev/javac/impl/SourceFileCompilationUnit.java (try)
modified: /trunk/dev/core/src/com/google/gwt/dev/javac/JavaSourceFile.java (try)
modified: /trunk/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java (try)
modified: /trunk/dev/core/test/com/google/gwt/dev/javac/impl/MockJavaSourceFile.java (try)
modified: /trunk/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiContainerTest.java (try)
modified: /trunk/dev/core/src/com/google/gwt/dev/javac/impl/JavaSourceOracleImpl.java (try)
modified: /trunk/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java (try)
modified: /trunk/dev/core/src/com/google/gwt/dev/resource/impl/ZipFileResource.java (try)
modified: /trunk/dev/core/src/com/google/gwt/dev/javac/impl/FileCompilationUnit.java (try)
modified: /trunk/dev/core/test/com/google/gwt/dev/javac/MockCompilationUnit.java (try)
modified: /trunk/dev/core/test/com/google/gwt/dev/resource/impl/MockAbstractResource.java (try)

Diff:

......	@@ -100,6 +100,11 @@
100	100	return new Resource() {
101	101
102	102	@Override
	103	public long getLastModified() {
	104	return 0;
	105	}
	106
	107	@Override
103	108	public String getLocation() {
104	109	return "/mock/onPublicPath.txt";
105	110	}

......	@@ -32,6 +32,11 @@
32	32	}
33	33
34	34	/**
	35	* Returns the last modified time of the compilation unit.
	36	*/
	37	public abstract long getLastModified();
	38
	39	/**
35	40	* Returns the user-relevant location of the resource. No programmatic
36	41	* assumptions should be made about the return value.
37	42	*/

......	@@ -33,6 +33,11 @@
33	33	}
34	34
35	35	@Override
	36	public long getLastModified() {
	37	return 0;
	38	}
	39
	40	@Override
36	41	public String getLocation() {
37	42	return "/mock/" + path;
38	43	}

......	@@ -47,6 +47,11 @@
47	47	}
48	48
49	49	@Override
	50	public long getLastModified() {
	51	return file.lastModified();
	52	}
	53
	54	@Override
50	55	public String getLocation() {
51	56	return file.getAbsoluteFile().toURI().toString();
52	57	}

......	@@ -60,6 +60,8 @@
60	60	*/
61	61	private static class GeneratedUnitWithFile extends CompilationUnit {
62	62
	63	private long creationTime;
	64
63	65	private File file;
64	66
65	67	private PrintWriter pw;
......	@@ -83,6 +85,7 @@
83	85	source = sw.toString();
84	86	pw = null;
85	87	sw = null;
	88	creationTime = System.currentTimeMillis();
86	89	}
87	90
88	91	@Override
......	@@ -95,6 +98,11 @@
95	98	}
96	99
97	100	@Override
	101	public long getLastModified() {
	102	return creationTime;
	103	}
	104
	105	@Override
98	106	public String getSource() {
99	107	if (source == null && file == null) {
100	108	throw new IllegalStateException("source not committed");

......	@@ -36,6 +36,11 @@
36	36	}
37	37
38	38	@Override
	39	public long getLastModified() {
	40	return sourceFile.getLastModified();
	41	}
	42
	43	@Override
39	44	public String getSource() {
40	45	if (sourceCode == null) {
41	46	sourceCode = sourceFile.readSource();
......	@@ -61,5 +66,5 @@
61	66	protected void dumpSource() {
62	67	sourceCode = null;
63	68	}
64
	69
65	70	}

......	@@ -29,6 +29,11 @@
29	29	}
30	30
31	31	/**
	32	* Returns the last modified time of the compilation unit.
	33	*/
	34	public abstract long getLastModified();
	35
	36	/**
32	37	* Returns the user-relevant location of the source file. No programmatic
33	38	* assumptions should be made about the return value.
34	39	*/

......	@@ -89,6 +89,11 @@
89	89	}
90	90
91	91	@Override
	92	public long getLastModified() {
	93	return resource.getLastModified();
	94	}
	95
	96	@Override
92	97	public String getLocation() {
93	98	return resource.getLocation();
94	99	}

......	@@ -45,6 +45,11 @@
45	45	}
46	46
47	47	@Override
	48	public long getLastModified() {
	49	return 0;
	50	}
	51
	52	@Override
48	53	public String getLocation() {
49	54	return location;
50	55	}

......	@@ -50,6 +50,11 @@
50	50	}
51	51
52	52	@Override
	53	public long getLastModified() {
	54	return 0;
	55	}
	56
	57	@Override
53	58	public String getSource() {
54	59	return String.valueOf(source);
55	60	}

......	@@ -60,6 +60,11 @@
60	60	}
61	61
62	62	@Override
	63	public long getLastModified() {
	64	return resource.getLastModified();
	65	}
	66
	67	@Override
63	68	public String getLocation() {
64	69	return location;
65	70	}

......	@@ -149,6 +149,11 @@
149	149	public abstract String getDisplayLocation();
150	150
151	151	/**
	152	* Returns the last modified time of the compilation unit.
	153	*/
	154	public abstract long getLastModified();
	155
	156	/**
152	157	* Returns the source code for this unit.
153	158	*/
154	159	public abstract String getSource();

......	@@ -41,8 +41,16 @@
41	41	}
42	42
43	43	@Override
	44	public long getLastModified() {
	45	// Questionable: maybe we should do something with the jar's time instead.
	46	return zipEntry.getTime();
	47	}
	48
	49	@Override
44	50	public String getLocation() {
	51	// CHECKSTYLE_OFF
45	52	String proto = zipEntry instanceof JarEntry ? "jar:" : "zip:";
	53	// CHECKSTYLE_ON
46	54	return proto + classPathEntry.getLocation() + "!/" + getPath();
47	55	}
48	56

......	@@ -35,6 +35,11 @@
35	35	}
36	36
37	37	@Override
	38	public long getLastModified() {
	39	return 0;
	40	}
	41
	42	@Override
38	43	public String getSource() {
39	44	assert source != null;
40	45	return source;
......	@@ -47,4 +52,4 @@
47	52	public boolean isGenerated() {
48	53	return true;
49	54	}
50		}
51	55	\ No newline at end of file
	56	}