summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2006-04-20 09:06:50 (EDT)
committer pelder2006-04-20 09:06:50 (EDT)
commit2d5c070890214a7617b5c36b5d4e83e37ae48916 (patch)
tree70ca8bdcf6893a40399918107c3d3af7d13a5b2c
parent4f2300aa5ef6232de618f97225fc1c361ac6782f (diff)
downloadorg.eclipse.jet-2d5c070890214a7617b5c36b5d4e83e37ae48916.zip
org.eclipse.jet-2d5c070890214a7617b5c36b5d4e83e37ae48916.tar.gz
org.eclipse.jet-2d5c070890214a7617b5c36b5d4e83e37ae48916.tar.bz2
[137508] Fix PDE Build compiler warnings
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java1
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/parser/JETReader.java4
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/SafeConditionalRuntimeTag.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/AbstractChooseAlternative.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/StringTokensTag.java8
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/taglib/workspace/ActionsUtil.java5
-rw-r--r--plugins/org.eclipse.jet/templates/jet2java.javajet2
7 files changed, 13 insertions, 11 deletions
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java
index 09dcc7a..09c654a 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java
@@ -5,7 +5,6 @@ import org.eclipse.jet.compiler.*;
import org.eclipse.jet.internal.JavaUtil;
import org.eclipse.jet.taglib.TagLibraryReference;
import java.util.Iterator;
-import java.util.Map;
public class JET2JavaGenerator
{
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/parser/JETReader.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/parser/JETReader.java
index 77ce178..2605a84 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/parser/JETReader.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/parser/JETReader.java
@@ -270,10 +270,8 @@ public class JETReader
int len = current.stream.length;
if (cur_cursor == len)
return ""; //$NON-NLS-1$
- char ch;
-
// pure obsfuscated genius!
- while (++current.cursor < len && (ch = current.stream[current.cursor]) != startTagInitialChar)
+ while (++current.cursor < len && (current.stream[current.cursor]) != startTagInitialChar)
{
// do nothing
}
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/SafeConditionalRuntimeTag.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/SafeConditionalRuntimeTag.java
index c6b2f41..30bb642 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/SafeConditionalRuntimeTag.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/SafeConditionalRuntimeTag.java
@@ -30,7 +30,7 @@ import org.eclipse.jet.taglib.RuntimeTagElement;
* A safe (throws no exceptions) adaptor of a {@link ConditionalTag} to
* a {@link RuntimeTagElement}.
*/
-public class SafeConditionalRuntimeTag extends SafeContainerRuntimeTag
+public class SafeConditionalRuntimeTag extends SafeContainerRuntimeTag implements RuntimeTagElement
{
private boolean doEvalResult;
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/AbstractChooseAlternative.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/AbstractChooseAlternative.java
index b63106c..911e039 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/AbstractChooseAlternative.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/AbstractChooseAlternative.java
@@ -48,7 +48,7 @@ import org.eclipse.jet.taglib.JET2TagException;
* </li>
* </ul>
*/
-public abstract class AbstractChooseAlternative extends AbstractConditionalTag
+public abstract class AbstractChooseAlternative extends AbstractConditionalTag implements ConditionalTag
{
/**
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/StringTokensTag.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/StringTokensTag.java
index 25908ae..0b46178 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/StringTokensTag.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/StringTokensTag.java
@@ -76,7 +76,13 @@ public class StringTokensTag extends AbstractIteratingTag {
* Begin doEvalLoopCondition logic
*/
- // TODO: stringTokens - implement doEvalLoopCondition()
+ doAnotherIteration = index < tokens.length;
+
+ tokenNode = tokens[index];
+
+ context.setVariable(_name, tokenNode); // TODO Need an inspector for StringToken
+
+ index++;
/**
* End doEvalLoopCondition logic
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/taglib/workspace/ActionsUtil.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/taglib/workspace/ActionsUtil.java
index 5a6d594..feb9c94 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/taglib/workspace/ActionsUtil.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/taglib/workspace/ActionsUtil.java
@@ -32,7 +32,6 @@ import java.text.MessageFormat;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -431,7 +430,7 @@ public final class ActionsUtil
* Generally, workspace actions authors will not need this tag.
* </p>
* @param build <code>true</code> if a workspace build should be performed after the event broadcast.
- * @see IWorkspace#checkpoint(boolean)
+ * @see org.eclipse.core.resources.IWorkspace#checkpoint(boolean)
* @deprecated Use {@link #checkpointWorkspace(boolean,IProgressMonitor)} instead
*/
public static void checkpointWorkspace(boolean build)
@@ -450,7 +449,7 @@ public final class ActionsUtil
* </p>
* @param build <code>true</code> if a workspace build should be performed after the event broadcast.
* @param monitor TODO
- * @see IWorkspace#checkpoint(boolean)
+ * @see org.eclipse.core.resources.IWorkspace#checkpoint(boolean)
*/
public static void checkpointWorkspace(boolean build, IProgressMonitor monitor)
{
diff --git a/plugins/org.eclipse.jet/templates/jet2java.javajet b/plugins/org.eclipse.jet/templates/jet2java.javajet
index 57ad85e..cf4ec76 100644
--- a/plugins/org.eclipse.jet/templates/jet2java.javajet
+++ b/plugins/org.eclipse.jet/templates/jet2java.javajet
@@ -1,6 +1,6 @@
<%@jet package="org.eclipse.jet.internal.compiler.templates"
class="JET2JavaGenerator"
- imports="org.eclipse.jet.internal.compiler.* org.eclipse.jet.compiler.* org.eclipse.jet.internal.JavaUtil org.eclipse.jet.taglib.TagLibraryReference java.util.Iterator java.util.Map"
+ imports="org.eclipse.jet.internal.compiler.* org.eclipse.jet.compiler.* org.eclipse.jet.internal.JavaUtil org.eclipse.jet.taglib.TagLibraryReference java.util.Iterator"
%>
<%
JET2CompilationUnit cu = (JET2CompilationUnit)argument;