summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2007-04-04 11:52:10 (EDT)
committerpelder2007-04-04 11:52:10 (EDT)
commit5474d614aa28b690f8d730bbd38c17902ff7c833 (patch)
treebed9aef028490ff555e4e9b4c29306aa363f179c
parente2136fac0dc2aef97d801ea1f187b0f4a8b703fa (diff)
downloadorg.eclipse.jet-5474d614aa28b690f8d730bbd38c17902ff7c833.zip
org.eclipse.jet-5474d614aa28b690f8d730bbd38c17902ff7c833.tar.gz
org.eclipse.jet-5474d614aa28b690f8d730bbd38c17902ff7c833.tar.bz2
[180962,131208] Correct compilation warnings and JUnit failures
-rw-r--r--plugins/org.eclipse.jet.core/src/org/eclipse/jet/core/parser/ITemplateResolverHelperFactory.java3
-rw-r--r--plugins/org.eclipse.jet.core/src/org/eclipse/jet/internal/core/parser/jasper/Messages.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/IJETCompilerState.java3
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/Problem.java5
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/CustomTagFactory.java5
-rw-r--r--tests/org.eclipse.jet.tests/src/org/eclipse/jet/tests/compiler/TestJET2Parser.java2
6 files changed, 8 insertions, 12 deletions
diff --git a/plugins/org.eclipse.jet.core/src/org/eclipse/jet/core/parser/ITemplateResolverHelperFactory.java b/plugins/org.eclipse.jet.core/src/org/eclipse/jet/core/parser/ITemplateResolverHelperFactory.java
index 653040a..c047bd9 100644
--- a/plugins/org.eclipse.jet.core/src/org/eclipse/jet/core/parser/ITemplateResolverHelperFactory.java
+++ b/plugins/org.eclipse.jet.core/src/org/eclipse/jet/core/parser/ITemplateResolverHelperFactory.java
@@ -11,13 +11,12 @@
package org.eclipse.jet.core.parser;
import java.net.URI;
-import java.net.URL;
/**
* Protocol for a factory that creates {@link ITemplateResolverHelper} instances.
* A helper factory may be optionally passed to a {@link DefaultTemplateResolver} instance
* during creation to allow for resolution template base URIs in ways other than
- * using {@link URL#openConnection()}. An example is mapping a base URI to the eclipse workspace
+ * using {@link java.net.URL#openConnection()}. An example is mapping a base URI to the eclipse workspace
* and using the workspace APIs instead.
*
*/
diff --git a/plugins/org.eclipse.jet.core/src/org/eclipse/jet/internal/core/parser/jasper/Messages.java b/plugins/org.eclipse.jet.core/src/org/eclipse/jet/internal/core/parser/jasper/Messages.java
index 3f18413..da248a1 100644
--- a/plugins/org.eclipse.jet.core/src/org/eclipse/jet/internal/core/parser/jasper/Messages.java
+++ b/plugins/org.eclipse.jet.core/src/org/eclipse/jet/internal/core/parser/jasper/Messages.java
@@ -4,7 +4,7 @@ import java.util.MissingResourceException;
import java.util.ResourceBundle;
public class Messages {
- private static final String BUNDLE_NAME = "org.eclipse.jet.internal.tools.parser.jasper.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.jet.internal.core.parser.jasper.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
.getBundle(BUNDLE_NAME);
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/IJETCompilerState.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/IJETCompilerState.java
index 483ea44..f70bfb2 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/IJETCompilerState.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/IJETCompilerState.java
@@ -19,7 +19,6 @@ package org.eclipse.jet.compiler;
import java.util.Map;
-import org.eclipse.jet.core.parser.ast.JETASTParser;
import org.eclipse.jet.taglib.TagLibraryReference;
@@ -27,7 +26,7 @@ import org.eclipse.jet.taglib.TagLibraryReference;
* Provides access to the JET compiler state. Saving the compiler state, and then passing it
* to a new instances of {@link JET2Compiler} will allow the compiler to do a correct incremental
* compilation.
- * @deprecated Use {@link JETASTParser}
+ * @deprecated Use {@link org.eclipse.jet.core.parser.ast.JETASTParser}
*/
public interface IJETCompilerState
{
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/Problem.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/Problem.java
index e99b8cf..afb8793 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/Problem.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/Problem.java
@@ -19,7 +19,6 @@ package org.eclipse.jet.compiler;
import java.net.URI;
-import java.text.MessageFormat;
import org.eclipse.jet.core.parser.IProblem;
import org.eclipse.jet.core.parser.ProblemSeverity;
@@ -152,7 +151,7 @@ public final class Problem
* @param originatingFileName the file name from which the problem originates
* @param severity the severity
* @param id the problem id. See static constants declared on this class
- * @param message the error message in {@link MessageFormat} style
+ * @param message the error message in {@link java.text.MessageFormat} style
* @param messageArgs the error message arguments
* @param start the start offset of the problem (doc relative)
* @param end the end offset of the problem (doc relative)
@@ -190,7 +189,7 @@ public final class Problem
* @param templatePath the file name from which the problem originates
* @param problemSeverity the problemSeverity
* @param id the problem id. See static constants declared on this class
- * @param message the error message in {@link MessageFormat} style
+ * @param message the error message in {@link java.text.MessageFormat} style
* @param messageArgs the error message arguments
* @param start the start offset of the problem (doc relative)
* @param end the end offset of the problem (doc relative)
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/CustomTagFactory.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/CustomTagFactory.java
index 409b66d..9bf4c33 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/CustomTagFactory.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/CustomTagFactory.java
@@ -12,17 +12,16 @@
*
* </copyright>
*
- * $Id: CustomTagFactory.java,v 1.1 2007/04/04 14:59:32 pelder Exp $
+ * $Id: CustomTagFactory.java,v 1.2 2007/04/04 15:52:08 pelder Exp $
*/
package org.eclipse.jet.internal.runtime;
import org.eclipse.jet.taglib.CustomTag;
import org.eclipse.jet.taglib.JET2TagException;
-import org.eclipse.jet.taglib.TagDefinition;
/**
* Protocol supported by some TagDefinition instances indicating that a tag definition can be created.
- * @see TagDefinition
+ * @see org.eclipse.jet.taglib.TagDefinition
* @see CustomTag
*/
public interface CustomTagFactory
diff --git a/tests/org.eclipse.jet.tests/src/org/eclipse/jet/tests/compiler/TestJET2Parser.java b/tests/org.eclipse.jet.tests/src/org/eclipse/jet/tests/compiler/TestJET2Parser.java
index 5d2c819..f239946 100644
--- a/tests/org.eclipse.jet.tests/src/org/eclipse/jet/tests/compiler/TestJET2Parser.java
+++ b/tests/org.eclipse.jet.tests/src/org/eclipse/jet/tests/compiler/TestJET2Parser.java
@@ -258,7 +258,7 @@ public class TestJET2Parser extends TestCase {
cu.setOutputJavaPackage(JETCompilerOptions.DEFAULT_COMPILED_TEMPLATE_PACKAGE);
cu.setOutputJavaClassName("X");
- String result = new TemplateRunner().generate("templates/jet2java.jet", Collections.singletonMap("cu", cu.getDelegateCU()));
+ String result = new TemplateRunner().generate("templates/jet2java.jet", Collections.singletonMap("cu", cu));
assertEquals(FileUtils.getFileContents(urlString + ".expected.java", true), result);