Author: kwright
Date: Mon Feb 25 12:47:13 2013
New Revision: 1449684
URL: http://svn.apache.org/r1449684
Log:
Add missing overrides
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewArray.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConfiguration.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConfigurationNode.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConnectionName.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewDictionary.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewURL.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableArray.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableBase.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableBoolean.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfiguration.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConnectionName.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableDict.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableFloat.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableInt.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableResult.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableString.java
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableURL.java
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewArray.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewArray.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewArray.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewArray.java
Mon Feb 25 12:47:13 2013
@@ -28,6 +28,7 @@ public class NewArray implements NewOper
*@param currentStream is the current token stream.
*@return the variable reference that got created. Should never be null.
*/
+ @Override
public VariableReference parseAndCreate(ScriptParser sp, TokenStream
currentStream)
throws ScriptException
{
@@ -38,6 +39,7 @@ public class NewArray implements NewOper
*@param sp is the script parser to use to help in the parsing.
*@param currentStream is the current token stream.
*/
+ @Override
public void parseAndSkip(ScriptParser sp, TokenStream currentStream)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConfiguration.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConfiguration.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConfiguration.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConfiguration.java
Mon Feb 25 12:47:13 2013
@@ -28,6 +28,7 @@ public class NewConfiguration implements
*@param currentStream is the current token stream.
*@return the variable reference that got created. Should never be null.
*/
+ @Override
public VariableReference parseAndCreate(ScriptParser sp, TokenStream
currentStream)
throws ScriptException
{
@@ -38,6 +39,7 @@ public class NewConfiguration implements
*@param sp is the script parser to use to help in the parsing.
*@param currentStream is the current token stream.
*/
+ @Override
public void parseAndSkip(ScriptParser sp, TokenStream currentStream)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConfigurationNode.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConfigurationNode.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConfigurationNode.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConfigurationNode.java
Mon Feb 25 12:47:13 2013
@@ -28,6 +28,7 @@ public class NewConfigurationNode implem
*@param currentStream is the current token stream.
*@return the variable reference that got created. Should never be null.
*/
+ @Override
public VariableReference parseAndCreate(ScriptParser sp, TokenStream
currentStream)
throws ScriptException
{
@@ -43,6 +44,7 @@ public class NewConfigurationNode implem
*@param sp is the script parser to use to help in the parsing.
*@param currentStream is the current token stream.
*/
+ @Override
public void parseAndSkip(ScriptParser sp, TokenStream currentStream)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConnectionName.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConnectionName.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConnectionName.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewConnectionName.java
Mon Feb 25 12:47:13 2013
@@ -28,6 +28,7 @@ public class NewConnectionName implement
*@param currentStream is the current token stream.
*@return the variable reference that got created. Should never be null.
*/
+ @Override
public VariableReference parseAndCreate(ScriptParser sp, TokenStream
currentStream)
throws ScriptException
{
@@ -42,6 +43,7 @@ public class NewConnectionName implement
*@param sp is the script parser to use to help in the parsing.
*@param currentStream is the current token stream.
*/
+ @Override
public void parseAndSkip(ScriptParser sp, TokenStream currentStream)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewDictionary.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewDictionary.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewDictionary.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewDictionary.java
Mon Feb 25 12:47:13 2013
@@ -28,6 +28,7 @@ public class NewDictionary implements Ne
*@param currentStream is the current token stream.
*@return the variable reference that got created. Should never be null.
*/
+ @Override
public VariableReference parseAndCreate(ScriptParser sp, TokenStream
currentStream)
throws ScriptException
{
@@ -38,6 +39,7 @@ public class NewDictionary implements Ne
*@param sp is the script parser to use to help in the parsing.
*@param currentStream is the current token stream.
*/
+ @Override
public void parseAndSkip(ScriptParser sp, TokenStream currentStream)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewURL.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewURL.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewURL.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/NewURL.java
Mon Feb 25 12:47:13 2013
@@ -28,6 +28,7 @@ public class NewURL implements NewOperat
*@param currentStream is the current token stream.
*@return the variable reference that got created. Should never be null.
*/
+ @Override
public VariableReference parseAndCreate(ScriptParser sp, TokenStream
currentStream)
throws ScriptException
{
@@ -42,6 +43,7 @@ public class NewURL implements NewOperat
*@param sp is the script parser to use to help in the parsing.
*@param currentStream is the current token stream.
*/
+ @Override
public void parseAndSkip(ScriptParser sp, TokenStream currentStream)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableArray.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableArray.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableArray.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableArray.java
Mon Feb 25 12:47:13 2013
@@ -32,6 +32,7 @@ public class VariableArray extends Varia
{
}
+ @Override
public int hashCode()
{
int rval = 0;
@@ -44,6 +45,7 @@ public class VariableArray extends Varia
return rval;
}
+ @Override
public boolean equals(Object o)
{
if (!(o instanceof VariableArray))
@@ -64,6 +66,7 @@ public class VariableArray extends Varia
}
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -84,6 +87,7 @@ public class VariableArray extends Varia
}
/** Get a named attribute of the variable; e.g. xxx.yyy */
+ @Override
public VariableReference getAttribute(String attributeName)
throws ScriptException
{
@@ -94,6 +98,7 @@ public class VariableArray extends Varia
}
/** Get an indexed property of the variable */
+ @Override
public VariableReference getIndexed(Variable index)
throws ScriptException
{
@@ -106,6 +111,7 @@ public class VariableArray extends Varia
}
/** Insert an object into this variable at a position. */
+ @Override
public void insertAt(Variable v, Variable index)
throws ScriptException
{
@@ -121,6 +127,7 @@ public class VariableArray extends Varia
}
/** Delete an object from this variable at a position. */
+ @Override
public void removeAt(Variable index)
throws ScriptException
{
@@ -141,7 +148,8 @@ public class VariableArray extends Varia
{
this.index = index;
}
-
+
+ @Override
public void setReference(Variable v)
throws ScriptException
{
@@ -150,6 +158,7 @@ public class VariableArray extends Varia
array.set(index,v);
}
+ @Override
public Variable resolve()
throws ScriptException
{
@@ -159,6 +168,7 @@ public class VariableArray extends Varia
}
/** Check if this reference is null */
+ @Override
public boolean isNull()
{
return index < 0 || index >= array.size() || array.get(index) == null;
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableBase.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableBase.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableBase.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableBase.java
Mon Feb 25 12:47:13 2013
@@ -32,6 +32,7 @@ public class VariableBase implements Var
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -39,6 +40,7 @@ public class VariableBase implements Var
}
/** Get the variable's value as a string */
+ @Override
public String getStringValue()
throws ScriptException
{
@@ -46,6 +48,7 @@ public class VariableBase implements Var
}
/** Get the variable's value as a Configuration object */
+ @Override
public Configuration getConfigurationValue()
throws ScriptException
{
@@ -53,6 +56,7 @@ public class VariableBase implements Var
}
/** Get the variable's value as a ConfigurationNode object */
+ @Override
public ConfigurationNode getConfigurationNodeValue()
throws ScriptException
{
@@ -60,6 +64,7 @@ public class VariableBase implements Var
}
/** Get the variable's value as a boolean */
+ @Override
public boolean getBooleanValue()
throws ScriptException
{
@@ -67,6 +72,7 @@ public class VariableBase implements Var
}
/** Get the variable's value as an integer */
+ @Override
public int getIntValue()
throws ScriptException
{
@@ -74,6 +80,7 @@ public class VariableBase implements Var
}
/** Get the variable's value as a double */
+ @Override
public double getDoubleValue()
throws ScriptException
{
@@ -82,96 +89,112 @@ public class VariableBase implements Var
// Operations
+ @Override
public VariableReference plus(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '+' operator illegal for
this type"));
}
+ @Override
public VariableReference minus(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '-' operator illegal for
this type"));
}
+ @Override
public VariableReference asterisk(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '*' operator illegal for
this type"));
}
+ @Override
public VariableReference slash(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '/' operator illegal for
this type"));
}
+ @Override
public VariableReference unaryMinus()
throws ScriptException
{
throw new ScriptException(composeMessage("Unary '-' operator illegal for
this type"));
}
+ @Override
public VariableReference greaterAngle(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '>' operator illegal for
this type"));
}
+ @Override
public VariableReference lesserAngle(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '<' operator illegal for
this type"));
}
+ @Override
public VariableReference doubleEquals(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '==' operator illegal for
this type"));
}
+ @Override
public VariableReference greaterAngleEquals(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '>=' operator illegal for
this type"));
}
+ @Override
public VariableReference lesserAngleEquals(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '<=' operator illegal for
this type"));
}
+ @Override
public VariableReference exclamationEquals(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '!=' operator illegal for
this type"));
}
+ @Override
public VariableReference ampersand(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '&' operator illegal for
this type"));
}
+ @Override
public VariableReference pipe(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '|' operator illegal for
this type"));
}
+ @Override
public VariableReference doubleAmpersand(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '&&' operator illegal for
this type"));
}
+ @Override
public VariableReference doublePipe(Variable v)
throws ScriptException
{
throw new ScriptException(composeMessage("Binary '||' operator illegal for
this type"));
}
+ @Override
public VariableReference unaryExclamation()
throws ScriptException
{
@@ -181,6 +204,7 @@ public class VariableBase implements Var
// The following operations allow manipulation of a Configuration structure
/** Get a named attribute of the variable; e.g. xxx.yyy */
+ @Override
public VariableReference getAttribute(String attributeName)
throws ScriptException
{
@@ -199,6 +223,7 @@ public class VariableBase implements Var
}
/** Insert an object into this variable at a position. */
+ @Override
public void insertAt(Variable v, Variable index)
throws ScriptException
{
@@ -206,6 +231,7 @@ public class VariableBase implements Var
}
/** Delete an object from this variable at a position. */
+ @Override
public void removeAt(Variable index)
throws ScriptException
{
@@ -216,6 +242,7 @@ public class VariableBase implements Var
// The following two operations correspond to <xxx> and xxx[index]
/** Get an indexed property of the variable */
+ @Override
public VariableReference getIndexed(Variable index)
throws ScriptException
{
@@ -225,6 +252,7 @@ public class VariableBase implements Var
// As a variable reference, refer to self
/** Set the reference */
+ @Override
public void setReference(Variable object)
throws ScriptException
{
@@ -232,6 +260,7 @@ public class VariableBase implements Var
}
/** Resolve the reference */
+ @Override
public Variable resolve()
throws ScriptException
{
@@ -239,6 +268,7 @@ public class VariableBase implements Var
}
/** Check if this reference is null */
+ @Override
public boolean isNull()
{
return false;
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableBoolean.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableBoolean.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableBoolean.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableBoolean.java
Mon Feb 25 12:47:13 2013
@@ -30,11 +30,13 @@ public class VariableBoolean extends Var
this.value = value;
}
+ @Override
public int hashCode()
{
return new Boolean(value).hashCode();
}
+ @Override
public boolean equals(Object o)
{
if (!(o instanceof VariableBoolean))
@@ -43,6 +45,7 @@ public class VariableBoolean extends Var
}
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -52,12 +55,14 @@ public class VariableBoolean extends Var
}
/** Get the variable's value as a boolean */
+ @Override
public boolean getBooleanValue()
throws ScriptException
{
return value;
}
+ @Override
public VariableReference doubleEquals(Variable v)
throws ScriptException
{
@@ -74,6 +79,7 @@ public class VariableBoolean extends Var
return new VariableBoolean(value != v.getBooleanValue());
}
+ @Override
public VariableReference doubleAmpersand(Variable v)
throws ScriptException
{
@@ -82,6 +88,7 @@ public class VariableBoolean extends Var
return new VariableBoolean(value && v.getBooleanValue());
}
+ @Override
public VariableReference doublePipe(Variable v)
throws ScriptException
{
@@ -90,6 +97,7 @@ public class VariableBoolean extends Var
return new VariableBoolean(value || v.getBooleanValue());
}
+ @Override
public VariableReference ampersand(Variable v)
throws ScriptException
{
@@ -98,6 +106,7 @@ public class VariableBoolean extends Var
return new VariableBoolean(value && v.getBooleanValue());
}
+ @Override
public VariableReference pipe(Variable v)
throws ScriptException
{
@@ -106,6 +115,7 @@ public class VariableBoolean extends Var
return new VariableBoolean(value || v.getBooleanValue());
}
+ @Override
public VariableReference unaryExclamation()
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfiguration.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfiguration.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfiguration.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfiguration.java
Mon Feb 25 12:47:13 2013
@@ -52,6 +52,7 @@ public class VariableConfiguration exten
}
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -70,6 +71,7 @@ public class VariableConfiguration exten
}
/** Get the variable's value as a Configuration object */
+ @Override
public Configuration getConfigurationValue()
throws ScriptException
{
@@ -77,6 +79,7 @@ public class VariableConfiguration exten
}
/** Get a named attribute of the variable; e.g. xxx.yyy */
+ @Override
public VariableReference getAttribute(String attributeName)
throws ScriptException
{
@@ -99,6 +102,7 @@ public class VariableConfiguration exten
}
/** Get an indexed property of the variable */
+ @Override
public VariableReference getIndexed(Variable index)
throws ScriptException
{
@@ -111,6 +115,7 @@ public class VariableConfiguration exten
}
/** Insert an object into this variable at a position. */
+ @Override
public void insertAt(Variable v, Variable index)
throws ScriptException
{
@@ -128,6 +133,7 @@ public class VariableConfiguration exten
}
/** Delete an object from this variable at a position. */
+ @Override
public void removeAt(Variable index)
throws ScriptException
{
@@ -139,6 +145,7 @@ public class VariableConfiguration exten
configuration.removeChild(indexValue);
}
+ @Override
public VariableReference plus(Variable v)
throws ScriptException
{
@@ -167,6 +174,7 @@ public class VariableConfiguration exten
this.index = index;
}
+ @Override
public void setReference(Variable v)
throws ScriptException
{
@@ -177,6 +185,7 @@ public class VariableConfiguration exten
configuration.addChild(index,confNode);
}
+ @Override
public Variable resolve()
throws ScriptException
{
@@ -186,6 +195,7 @@ public class VariableConfiguration exten
}
/** Check if this reference is null */
+ @Override
public boolean isNull()
{
return index < 0 || index >= configuration.getChildCount();
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java
Mon Feb 25 12:47:13 2013
@@ -39,6 +39,7 @@ public class VariableConfigurationNode e
}
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -89,6 +90,7 @@ public class VariableConfigurationNode e
}
/** Convert to a value */
+ @Override
public String getStringValue()
throws ScriptException
{
@@ -105,6 +107,7 @@ public class VariableConfigurationNode e
}
/** Get a named attribute of the variable; e.g. xxx.yyy */
+ @Override
public VariableReference getAttribute(String attributeName)
throws ScriptException
{
@@ -140,6 +143,7 @@ public class VariableConfigurationNode e
}
/** Get an indexed property of the variable */
+ @Override
public VariableReference getIndexed(Variable index)
throws ScriptException
{
@@ -152,6 +156,7 @@ public class VariableConfigurationNode e
}
/** Insert an object into this variable at a position. */
+ @Override
public void insertAt(Variable v, Variable index)
throws ScriptException
{
@@ -169,6 +174,7 @@ public class VariableConfigurationNode e
}
/** Delete an object from this variable at a position. */
+ @Override
public void removeAt(Variable index)
throws ScriptException
{
@@ -181,6 +187,7 @@ public class VariableConfigurationNode e
}
+ @Override
public VariableReference plus(Variable v)
throws ScriptException
{
@@ -213,6 +220,7 @@ public class VariableConfigurationNode e
{
}
+ @Override
public void setReference(Variable v)
throws ScriptException
{
@@ -225,6 +233,7 @@ public class VariableConfigurationNode e
}
}
+ @Override
public Variable resolve()
throws ScriptException
{
@@ -234,6 +243,7 @@ public class VariableConfigurationNode e
return new VariableString(value);
}
+ @Override
public boolean isNull()
{
return false;
@@ -250,6 +260,7 @@ public class VariableConfigurationNode e
this.attributeName = attributeName;
}
+ @Override
public void setReference(Variable v)
throws ScriptException
{
@@ -262,6 +273,7 @@ public class VariableConfigurationNode e
}
}
+ @Override
public Variable resolve()
throws ScriptException
{
@@ -271,6 +283,7 @@ public class VariableConfigurationNode e
return new VariableString(attrValue);
}
+ @Override
public boolean isNull()
{
return (configurationNode.getAttributeValue(attributeName) == null);
@@ -287,6 +300,7 @@ public class VariableConfigurationNode e
this.index = index;
}
+ @Override
public void setReference(Variable v)
throws ScriptException
{
@@ -297,6 +311,7 @@ public class VariableConfigurationNode e
configurationNode.addChild(index,confNode);
}
+ @Override
public Variable resolve()
throws ScriptException
{
@@ -306,6 +321,7 @@ public class VariableConfigurationNode e
}
/** Check if this reference is null */
+ @Override
public boolean isNull()
{
return index < 0 || index >= configurationNode.getChildCount();
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConnectionName.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConnectionName.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConnectionName.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConnectionName.java
Mon Feb 25 12:47:13 2013
@@ -35,11 +35,13 @@ public class VariableConnectionName exte
this.encodedConnectionName = encode(connectionName);
}
+ @Override
public int hashCode()
{
return connectionName.hashCode();
}
+ @Override
public boolean equals(Object o)
{
if (!(o instanceof VariableConnectionName))
@@ -48,6 +50,7 @@ public class VariableConnectionName exte
}
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -66,12 +69,14 @@ public class VariableConnectionName exte
}
/** Get the variable's value as a string */
+ @Override
public String getStringValue()
throws ScriptException
{
return encodedConnectionName;
}
+ @Override
public VariableReference doubleEquals(Variable v)
throws ScriptException
{
@@ -80,6 +85,7 @@ public class VariableConnectionName exte
return new
VariableBoolean(encodedConnectionName.equals(v.getStringValue()));
}
+ @Override
public VariableReference exclamationEquals(Variable v)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableDict.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableDict.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableDict.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableDict.java
Mon Feb 25 12:47:13 2013
@@ -33,6 +33,7 @@ public class VariableDict extends Variab
}
/** Get a named attribute of the variable; e.g. xxx.yyy */
+ @Override
public VariableReference getAttribute(String attributeName)
throws ScriptException
{
@@ -43,6 +44,7 @@ public class VariableDict extends Variab
}
/** Get an indexed property of the variable */
+ @Override
public VariableReference getIndexed(Variable index)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableFloat.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableFloat.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableFloat.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableFloat.java
Mon Feb 25 12:47:13 2013
@@ -30,11 +30,13 @@ public class VariableFloat extends Varia
this.value = value;
}
+ @Override
public int hashCode()
{
return new Double(value).hashCode();
}
+ @Override
public boolean equals(Object o)
{
if (!(o instanceof VariableFloat))
@@ -43,6 +45,7 @@ public class VariableFloat extends Varia
}
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -50,6 +53,7 @@ public class VariableFloat extends Varia
}
/** Get the variable's value as a string */
+ @Override
public String getStringValue()
throws ScriptException
{
@@ -57,6 +61,7 @@ public class VariableFloat extends Varia
}
/** Get the variable's value as an integer */
+ @Override
public int getIntValue()
throws ScriptException
{
@@ -64,12 +69,14 @@ public class VariableFloat extends Varia
}
/** Get the variable's value as a double */
+ @Override
public double getDoubleValue()
throws ScriptException
{
return value;
}
+ @Override
public VariableReference plus(Variable v)
throws ScriptException
{
@@ -78,6 +85,7 @@ public class VariableFloat extends Varia
return new VariableFloat(value + v.getDoubleValue());
}
+ @Override
public VariableReference minus(Variable v)
throws ScriptException
{
@@ -86,6 +94,7 @@ public class VariableFloat extends Varia
return new VariableFloat(value - v.getDoubleValue());
}
+ @Override
public VariableReference asterisk(Variable v)
throws ScriptException
{
@@ -94,6 +103,7 @@ public class VariableFloat extends Varia
return new VariableFloat(value * v.getDoubleValue());
}
+ @Override
public VariableReference slash(Variable v)
throws ScriptException
{
@@ -102,12 +112,14 @@ public class VariableFloat extends Varia
return new VariableFloat(value / v.getDoubleValue());
}
+ @Override
public VariableReference unaryMinus()
throws ScriptException
{
return new VariableFloat(-value);
}
+ @Override
public VariableReference greaterAngle(Variable v)
throws ScriptException
{
@@ -116,6 +128,7 @@ public class VariableFloat extends Varia
return new VariableBoolean(value > v.getDoubleValue());
}
+ @Override
public VariableReference lesserAngle(Variable v)
throws ScriptException
{
@@ -124,6 +137,7 @@ public class VariableFloat extends Varia
return new VariableBoolean(value < v.getDoubleValue());
}
+ @Override
public VariableReference doubleEquals(Variable v)
throws ScriptException
{
@@ -132,6 +146,7 @@ public class VariableFloat extends Varia
return new VariableBoolean(value == v.getDoubleValue());
}
+ @Override
public VariableReference greaterAngleEquals(Variable v)
throws ScriptException
{
@@ -140,6 +155,7 @@ public class VariableFloat extends Varia
return new VariableBoolean(value >= v.getDoubleValue());
}
+ @Override
public VariableReference lesserAngleEquals(Variable v)
throws ScriptException
{
@@ -148,6 +164,7 @@ public class VariableFloat extends Varia
return new VariableBoolean(value <= v.getDoubleValue());
}
+ @Override
public VariableReference exclamationEquals(Variable v)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableInt.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableInt.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableInt.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableInt.java
Mon Feb 25 12:47:13 2013
@@ -30,11 +30,13 @@ public class VariableInt extends Variabl
this.value = value;
}
+ @Override
public int hashCode()
{
return new Integer(value).hashCode();
}
+ @Override
public boolean equals(Object o)
{
if (!(o instanceof VariableInt))
@@ -43,6 +45,7 @@ public class VariableInt extends Variabl
}
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -50,6 +53,7 @@ public class VariableInt extends Variabl
}
/** Get the variable's value as a string */
+ @Override
public String getStringValue()
throws ScriptException
{
@@ -57,6 +61,7 @@ public class VariableInt extends Variabl
}
/** Get the variable's value as an integer */
+ @Override
public int getIntValue()
throws ScriptException
{
@@ -64,12 +69,14 @@ public class VariableInt extends Variabl
}
/** Get the variable's value as a double */
+ @Override
public double getDoubleValue()
throws ScriptException
{
return (double)value;
}
+ @Override
public VariableReference plus(Variable v)
throws ScriptException
{
@@ -78,6 +85,7 @@ public class VariableInt extends Variabl
return new VariableInt(value + v.getIntValue());
}
+ @Override
public VariableReference minus(Variable v)
throws ScriptException
{
@@ -87,6 +95,7 @@ public class VariableInt extends Variabl
}
+ @Override
public VariableReference asterisk(Variable v)
throws ScriptException
{
@@ -95,6 +104,7 @@ public class VariableInt extends Variabl
return new VariableInt(value * v.getIntValue());
}
+ @Override
public VariableReference slash(Variable v)
throws ScriptException
{
@@ -103,12 +113,14 @@ public class VariableInt extends Variabl
return new VariableInt(value / v.getIntValue());
}
+ @Override
public VariableReference unaryMinus()
throws ScriptException
{
return new VariableInt(-value);
}
+ @Override
public VariableReference greaterAngle(Variable v)
throws ScriptException
{
@@ -117,6 +129,7 @@ public class VariableInt extends Variabl
return new VariableBoolean(value > v.getIntValue());
}
+ @Override
public VariableReference lesserAngle(Variable v)
throws ScriptException
{
@@ -125,6 +138,7 @@ public class VariableInt extends Variabl
return new VariableBoolean(value < v.getIntValue());
}
+ @Override
public VariableReference doubleEquals(Variable v)
throws ScriptException
{
@@ -133,6 +147,7 @@ public class VariableInt extends Variabl
return new VariableBoolean(value == v.getIntValue());
}
+ @Override
public VariableReference greaterAngleEquals(Variable v)
throws ScriptException
{
@@ -141,6 +156,7 @@ public class VariableInt extends Variabl
return new VariableBoolean(value >= v.getIntValue());
}
+ @Override
public VariableReference lesserAngleEquals(Variable v)
throws ScriptException
{
@@ -149,6 +165,7 @@ public class VariableInt extends Variabl
return new VariableBoolean(value <= v.getIntValue());
}
+ @Override
public VariableReference exclamationEquals(Variable v)
throws ScriptException
{
@@ -157,6 +174,7 @@ public class VariableInt extends Variabl
return new VariableBoolean(value != v.getIntValue());
}
+ @Override
public VariableReference ampersand(Variable v)
throws ScriptException
{
@@ -165,6 +183,7 @@ public class VariableInt extends Variabl
return new VariableInt(value & v.getIntValue());
}
+ @Override
public VariableReference pipe(Variable v)
throws ScriptException
{
@@ -173,6 +192,7 @@ public class VariableInt extends Variabl
return new VariableInt(value | v.getIntValue());
}
+ @Override
public VariableReference unaryExclamation()
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableResult.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableResult.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableResult.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableResult.java
Mon Feb 25 12:47:13 2013
@@ -35,6 +35,7 @@ public class VariableResult extends Vari
}
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -42,6 +43,7 @@ public class VariableResult extends Vari
}
/** Get the variable's value as an integer */
+ @Override
public int getIntValue()
throws ScriptException
{
@@ -49,6 +51,7 @@ public class VariableResult extends Vari
}
/** Get a named attribute of the variable; e.g. xxx.yyy */
+ @Override
public VariableReference getAttribute(String attributeName)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableString.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableString.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableString.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableString.java
Mon Feb 25 12:47:13 2013
@@ -30,11 +30,13 @@ public class VariableString extends Vari
this.value = value;
}
+ @Override
public int hashCode()
{
return value.hashCode();
}
+ @Override
public boolean equals(Object o)
{
if (!(o instanceof VariableString))
@@ -43,6 +45,7 @@ public class VariableString extends Vari
}
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -61,6 +64,7 @@ public class VariableString extends Vari
}
/** Get the variable's value as a string */
+ @Override
public String getStringValue()
throws ScriptException
{
@@ -68,6 +72,7 @@ public class VariableString extends Vari
}
/** Get the variable's value as an integer */
+ @Override
public int getIntValue()
throws ScriptException
{
@@ -82,12 +87,14 @@ public class VariableString extends Vari
}
/** Get the variable's value as a double */
+ @Override
public double getDoubleValue()
throws ScriptException
{
return new Double(value).doubleValue();
}
+ @Override
public VariableReference plus(Variable v)
throws ScriptException
{
@@ -96,6 +103,7 @@ public class VariableString extends Vari
return new VariableString(value + v.getStringValue());
}
+ @Override
public VariableReference doubleEquals(Variable v)
throws ScriptException
{
@@ -104,6 +112,7 @@ public class VariableString extends Vari
return new VariableBoolean(value.equals(v.getStringValue()));
}
+ @Override
public VariableReference exclamationEquals(Variable v)
throws ScriptException
{
Modified:
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableURL.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableURL.java?rev=1449684&r1=1449683&r2=1449684&view=diff
==============================================================================
---
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableURL.java
(original)
+++
manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableURL.java
Mon Feb 25 12:47:13 2013
@@ -36,11 +36,13 @@ public class VariableURL extends Variabl
this.encodedURL =
this.encodedURL.substring(0,this.encodedURL.length()-1);
}
+ @Override
public int hashCode()
{
return encodedURL.hashCode();
}
+ @Override
public boolean equals(Object o)
{
if (!(o instanceof VariableURL))
@@ -49,6 +51,7 @@ public class VariableURL extends Variabl
}
/** Get the variable's script value */
+ @Override
public String getScriptValue()
throws ScriptException
{
@@ -67,12 +70,14 @@ public class VariableURL extends Variabl
}
/** Get the variable's value as a string */
+ @Override
public String getStringValue()
throws ScriptException
{
return encodedURL;
}
+ @Override
public VariableReference plus(Variable v)
throws ScriptException
{
@@ -88,6 +93,7 @@ public class VariableURL extends Variabl
}
}
+ @Override
public VariableReference doubleEquals(Variable v)
throws ScriptException
{
@@ -96,6 +102,7 @@ public class VariableURL extends Variabl
return new VariableBoolean(encodedURL.equals(v.getStringValue()));
}
+ @Override
public VariableReference exclamationEquals(Variable v)
throws ScriptException
{
