[Arianne-commits] stendhal/src/games/stendhal/server/entity/npc/parser SentenceBuilder.java, 1.8, 1.9 ExpressionType.java, 1.17, 1.18

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/parser
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25901/src/games/stendhal/server/entity/npc/parser

Modified Files:
	SentenceBuilder.java ExpressionType.java 
Log Message:
added missing javadoc  tags, added missing overrides
removed unnecessary casts

Index: SentenceBuilder.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/parser/SentenceBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SentenceBuilder.java	12 Jul 2008 14:43:58 -0000	1.8
--- SentenceBuilder.java	8 Sep 2008 12:09:38 -0000	1.9
***************
*** 50,53 ****
--- 50,54 ----
       * @param it
       *            Expression iterator
+      * @return amount of appended tokens
       */
      public int appendUntilBreak(final Iterator<Expression> it) {

Index: ExpressionType.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/parser/ExpressionType.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ExpressionType.java	12 Jul 2008 14:43:58 -0000	1.17
--- ExpressionType.java	8 Sep 2008 12:09:38 -0000	1.18
***************
*** 140,144 ****
      /**
       * Determine if the Expression consists of numeral words.
!      *
       */
      public boolean isNumeral() {
--- 140,144 ----
      /**
       * Determine if the Expression consists of numeral words.
!      * @return true if typeString start with 'NUM' false otherwise.
       */
      public boolean isNumeral() {
***************
*** 148,152 ****
      /**
       * Determine if the Expression consists of adjectives or adverbs.
!      *
       */
      public boolean isAdjective() {
--- 148,152 ----
      /**
       * Determine if the Expression consists of adjectives or adverbs.
!      * @return true if typeString start with 'ADJ' false otherwise.
       */
      public boolean isAdjective() {
***************
*** 156,160 ****
      /**
       * Determine if the Expression consists of prepositions.
!      *
       */
      public boolean isPreposition() {
--- 156,161 ----
      /**
       * Determine if the Expression consists of prepositions.
!      * @return true if typeString start with 'PRE' false otherwise.
! 
       */
      public boolean isPreposition() {
***************
*** 164,168 ****
      /**
       * Determine Expressions to ignore.
!      *
       */
      public boolean isIgnore() {
--- 165,170 ----
      /**
       * Determine Expressions to ignore.
!      * @return true if typeString start with 'IGN' false otherwise.
! 
       */
      public boolean isIgnore() {
***************
*** 172,176 ****
      /**
       * Determine if the Expression is in plural form.
!      *
       */
      public boolean isPlural() {
--- 174,179 ----
      /**
       * Determine if the Expression is in plural form.
!       * @return true if typeString contains '-PLU' false otherwise.
!   
       */
      public boolean isPlural() {
***************
*** 180,184 ****
      /**
       * Determine if the Expression is a creature name.
!      *
       */
      public boolean isName() {
--- 183,188 ----
      /**
       * Determine if the Expression is a creature name.
!       * @return true if typeString contains '-NAM' false otherwise.
!   
       */
      public boolean isName() {
***************
*** 188,192 ****
      /**
       * Determine if the Expression consists of question words.
!      *
       */
      public boolean isQuestion() {
--- 192,197 ----
      /**
       * Determine if the Expression consists of question words.
!          * @return true if typeString start with 'QUE' false otherwise.
! 
       */
      public boolean isQuestion() {
***************
*** 196,200 ****
      /**
       * Determine if the Expression is a or is merged with a question word.
!      *
       */
      public boolean hasQuestion() {
--- 201,205 ----
      /**
       * Determine if the Expression is a or is merged with a question word.
!    * @return true if typeString contains 'QUE' false otherwise.
       */
      public boolean hasQuestion() {
***************
*** 204,208 ****
      /**
       * Determine if the Expression specifies a color.
!      *
       */
      public boolean hasColor() {
--- 209,214 ----
      /**
       * Determine if the Expression specifies a color.
!       * @return true if typeString contains 'COL' false otherwise.
!   
       */
      public boolean hasColor() {
***************
*** 212,216 ****
      /**
       * Determine if the Expression is a pronoun.
!      *
       */
      public boolean isPronoun() {
--- 218,223 ----
      /**
       * Determine if the Expression is a pronoun.
!       * @return true if typeString contains '-PRO' false otherwise.
!   
       */
      public boolean isPronoun() {
***************
*** 220,224 ****
      /**
       * Determine if the Expression is in conditional form.
!      *
       */
      public boolean isConditional() {
--- 227,232 ----
      /**
       * Determine if the Expression is in conditional form.
!       * @return true if typeString contains '-CON' false otherwise.
!   
       */
      public boolean isConditional() {
***************
*** 228,232 ****
      /**
       * Determine if the Expression is negated.
!      *
       */
      public boolean isNegated() {
--- 236,241 ----
      /**
       * Determine if the Expression is negated.
!      * @return true if typeString contains '-NEG' false otherwise.
!   
       */
      public boolean isNegated() {
***************
*** 236,240 ****
      /**
       * Determine if the Expression contains a dynamically defined word.
!      *
       */
      public boolean isDynamic() {
--- 245,250 ----
      /**
       * Determine if the Expression contains a dynamically defined word.
!       * @return true if typeString contains '-DYN' false otherwise.
!   
       */
      public boolean isDynamic() {
***************
*** 246,250 ****
       *
       * @param str
! s     */
      public static boolean isTypeString(final String str) {
          if (str.length() > 0) {
--- 256,262 ----
       *
       * @param str
!      * 
!      * @return true if first letter is Uppercase and contains any of the predefined TYPESTRINGs 
!      * */
      public static boolean isTypeString(final String str) {
          if (str.length() > 0) {