woc-commit Mailing List for Dictionary for Chemistry (Page 20)

Brought to you by: egonw, grtjn, michafleuren

woc-commit — CVS commit messages are posted to this list.

You can subscribe to this list here.

2002	_Jan	_Feb	_Mar	_Apr	_May	_Jun (132)	_Jul (50)	_Aug (172)	_Sep (87)	_Oct	_Nov (1)	_Dec
2003	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep (39)	_Oct (2)	_Nov	_Dec
2004	_Jan (47)	_Feb	_Mar (11)	_Apr	_May	_Jun	_Jul	_Aug (2)	_Sep	_Oct (9)	_Nov	_Dec
2005	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep (2)	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 18 19 20 21 22 23 > >> (Page 20 of 23)

[Woc-commit] CVS: woc/source/wocjava .cvsignore,1.2,1.3

From: Egon W. <eg...@us...> - 2002-06-08 20:43:17

Update of /cvsroot/woc/woc/source/wocjava
In directory usw-pr-cvs1:/tmp/cvs-serv22120

Modified Files:
	.cvsignore 
Log Message:
Removed files not involved in compiling source.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** .cvsignore	8 Jun 2002 20:38:36 -0000	1.2
--- .cvsignore	8 Jun 2002 20:43:15 -0000	1.3
***************
*** 1,2 ****
- woclist.xml
  build
--- 1 ----

[Woc-commit] CVS: woc/bin/wml2html - New directory

From: Egon W. <eg...@us...> - 2002-06-08 20:40:14

Update of /cvsroot/woc/woc/bin/wml2html
In directory usw-pr-cvs1:/tmp/cvs-serv21541/wml2html

Log Message:
Directory /cvsroot/woc/woc/bin/wml2html added to the repository

[Woc-commit] CVS: woc/source/wocjava .cvsignore,1.1,1.2 Makefile,1.3,1.4

From: Egon W. <eg...@us...> - 2002-06-08 20:38:39

Update of /cvsroot/woc/woc/source/wocjava
In directory usw-pr-cvs1:/tmp/cvs-serv21169

Modified Files:
	.cvsignore Makefile 
Log Message:
Fixed path. Ignore build dir.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .cvsignore	8 Jun 2002 20:12:42 -0000	1.1
--- .cvsignore	8 Jun 2002 20:38:36 -0000	1.2
***************
*** 1 ****
--- 1,2 ----
  woclist.xml
+ build

Index: Makefile
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile	8 Jun 2002 20:33:26 -0000	1.3
--- Makefile	8 Jun 2002 20:38:36 -0000	1.4
***************
*** 10,13 ****
--- 10,14 ----
  
  classes:
+ 	mkdir -p build
  	${JAVAC} -classpath ${JARS} -d build -O `find source/com -name "*.java"`
  
***************
*** 16,18 ****
  
  jar: classes
! 	cd build; ${JAR} cvf ../../lib/java/wocjava.jar com/*
--- 17,19 ----
  
  jar: classes
! 	cd build; ${JAR} cvf ../../../lib/java/wocjava.jar com/*

[Woc-commit] CVS: woc/lib/java wocutil.jar,NONE,1.1

From: Egon W. <eg...@us...> - 2002-06-08 20:35:30

Update of /cvsroot/woc/woc/lib/java
In directory usw-pr-cvs1:/tmp/cvs-serv20634

Added Files:
	wocutil.jar 
Log Message:
Added binary only (source got lost some time ago) utility classes.


--- NEW FILE: wocutil.jar ---
PK
ß(wv{ß;mkq®bÜíÝÓÖÊÉJÓa#IïJ/·++ÃÐoÅ¾É}áÆrÇ;V%"ð@ç¡ë¦4Ý9¤P§E6E6[«1õ%&i¤2i~YR,ÇT|ÍÒ¡i¬&Ú)ÀÔ×¦2µ!¬K1¬c~iþ2lý;
¬Ì¿âÒ
u²rÄ $*ÜJOòÎøì>5É? 9ßPKËÕØU
UP;ÝT 44Î@aìWZ 6öîÈlÆ¼<¹(½UúÌ+²)-f¡9÷Á¬¢Ü0ØÒ8±ðÙAé©±o+¿zãÝYfÁXùïhå	iÉmä¯7B>ùÅ¯2&Ì{7Ä×¯¡Ê¡òPK¡¨UY¶
;q Fwâ¨£x¤<ìRn=?ñE[Iª2Õc
Hþ!T#Úq¢^ÈPlhÂïÇÝÄºBïh¾gáAðRð@$dÈÛmE?;õã'qtìu½3IÎÄzH5Ð/ûÝ$:-ñJ¡¤&ÓëÊØÛ}ý§uóaâ¯Ï%ZtË´ú=ãJ¿A¶¤ÍÏ²d0UÉÑu_u	0ôô(Òþ
e1¨`c
î!Æâ¦q¸«à)î(bkãfÐ¯`Ïùlw¨/)ÐêÚP·Ô¡ë±;«ë£p© _
Bñó1ÎÚ¥ÈH¨]ÝÐRöèÂ[CçÛq«Ú1ÝÔíqOÜJk
qËÌÙªi/©C¾{r6! Oî¤´F¥t+6Gel*¦©Ô¢©Ú@SVJ5Ô¬®®eËMi	Ý êþEmÇ×Ô4». hôZ5ÑÌ´@MÊ°rHY1mÝ2·c±Ê<úÍj¦=¥äµéõÞíåcÎI§Ä\ XÌXvÂrÌtEfsOÎV;ØïìÚª¿Ó±¯s¶Fé^3
c¸-ÇP2YmK·\q6/»E\Êp_x¨5íÊËª¦°9C¥JYö+=gLë×¶X£s§×Ùqà:#] Vt3@ÊÅ_9Y.þ²:YÒt7HKKWü[äE)ÏEº;ÜÇð1êVòPÑþÏÝðÿnZÐg@º[¥"]¤é°àLÁ9$ZÃy´ÎãæÏ!Éy~ÒWþöB Àªp c 
ìÿTg)»Hj&c¸á÷ès¦G¬.1C.zÏJÈ£ñç)¼Å¹É÷~ã+ÖÚ=L»i¦RÇ>y^ÏØ>¾=ô9
D|
GhZß²Ú\²®ïþ|ºö¦¶¼Î/hãúM®<|Ñ#4áò:öáYyPz/DÑUh´S?vé).`¤ðªGÿPKs3¢·
çe3æ\Ò	ò!ó,.¸Y,øn¢ÌbÞ@¸KqÑÀ
>5°%ß±ù=nøÓ,|d`± Óf±Kñ|¡*0/ÔZ?Y%×ò¥eÕr¼F9®	$òª*¤a9L¨\¾fûÛ%Ùð½Òoå¸¥%¹í9<ß[ß|(mU~îZpÿ¾l_G¥Þ¯¾Á*^¸|J 5o»ç¨+Éùè¨ø[R`¤â{meyjÍr²õlÙTy¼Çíø¥[D¬^ZÛT4;hj¾m¹kVË±6]IÙÛ«õb\ö-è³+òºÛrThÏ1
â sOyÜw¤
Z^>ìJlP;V³)½-:Ø¬ÖU%0d»~*åþßI¸dSoYøGDZCªã6é´WoVï	é9êjÑLÆú¡j}oû¼ûæ×÷Ó«Ð-[É@æõ
L^ûAìã¶Dt¥×Phå~ÀchrEê¢-Uïò)å÷yÂY
¤CÝkrxß|AË£G	Äp_x¢7F:M1zd_#ktô°YìâÿS»àßuúÕè£·ÁGÉ¤Ì.Æßþ+$xæñ=JÁO8OFqÝ,vpØNõ0£üÖ#ÌñÆI/ÿÂuyøÂs6¹Æº8ñ$&røùÕ?»K/pô%×³±.3$f;íàÇvÃÁYºi¯Îå¨ÎªÂuf{ä¼O¹YäCè>Ù¿§½?åÿ].Ìñ¿WóõÆýÏ¿aê)Òffú13:ÉÝZ¿x¯a<ì E}¶\XÈ¼Dz=3ÝÅHÇE¦?÷jXý«ÿ

[Woc-commit] CVS: woc/source/wocjava Makefile,1.2,1.3

From: Egon W. <eg...@us...> - 2002-06-08 20:33:28

Update of /cvsroot/woc/woc/source/wocjava
In directory usw-pr-cvs1:/tmp/cvs-serv20341

Modified Files:
	Makefile 
Log Message:
Use JAVA_HOME variable.


Index: Makefile
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile	8 Jun 2002 20:29:56 -0000	1.2
--- Makefile	8 Jun 2002 20:33:26 -0000	1.3
***************
*** 1,5 ****
! JAVAC=/usr/lib/j2sdk1.3/bin/javac
! JAR=/usr/lib/j2sdk1.3/bin/jar
! JAVA=/usr/lib/j2sdk1.3/bin/java
  
  JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
--- 1,5 ----
! JAVAC=${JAVA_HOME}/bin/javac
! JAR=${JAVA_HOME}/bin/jar
! JAVA=${JAVA_HOME}/java
  
  JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`

[Woc-commit] CVS: woc/source/wocjava Makefile,1.1,1.2

From: Egon W. <eg...@us...> - 2002-06-08 20:29:58

Update of /cvsroot/woc/woc/source/wocjava
In directory usw-pr-cvs1:/tmp/cvs-serv19674/source/wocjava

Modified Files:
	Makefile 
Log Message:
Adapted some paths.


Index: Makefile
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile	8 Jun 2002 20:12:42 -0000	1.1
--- Makefile	8 Jun 2002 20:29:56 -0000	1.2
***************
*** 3,7 ****
  JAVA=/usr/lib/j2sdk1.3/bin/java
  
! JARS="jars/dadml.jar:jars/jgl.jar:jars/xt2.jar:jars/xalan.jar:jars/xerces.jar:jars/wocjava.jar:jars/wocutil.jar:build"
  
  OPTIONS=-R /home/egonw/data/Projects/Woc/wocjava/repository_def.xml
--- 3,7 ----
  JAVA=/usr/lib/j2sdk1.3/bin/java
  
! JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
  
  OPTIONS=-R /home/egonw/data/Projects/Woc/wocjava/repository_def.xml
***************
*** 16,28 ****
  
  jar: classes
! 	cd build; ${JAR} cvf ../jars/wocjava.jar com/*
! 
! items:
! 	${JAVA} -cp ${JARS} com.egonw.woc.tools.MaakLosseItems ${OPTIONS}
! 
! woord:
! 	${JAVA} -cp ${JARS} com.egonw.woc.tools.Woord ${OPTIONS}
! 
! groups:
! 	${JAVA} -cp ${JARS} com.egonw.woc.tools.GroupFiles ${OPTIONS}
! 
--- 16,18 ----
  
  jar: classes
! 	cd build; ${JAR} cvf ../../lib/java/wocjava.jar com/*

[Woc-commit] CVS: woc/source/wocjava/source/com/egonw/woc/predicate HasBrutoFormule.java,NONE,1.1 HasEnglishWord.java,NONE,1.1 HasField.java,NONE,1.1 HasGermanWord.java,NONE,1.1 HasItem.java,NONE,1.1 HasURL.java,NONE,1.1 IsAfkorting.java,NONE,1.1 IsChemical.java,NONE,1.1 IsCode.java,NONE,1.1 IsGroup.java,NONE,1.1 IsName.java,NONE,1.1 IsSource.java,NONE,1.1 LessBrutoFormule.java,NONE,1.1 LessCasNumber.java,NONE,1.1 LessEnglishWord.java,NONE,1.1 LessFWord.java,NONE,1.1 LessGermanWord.java,NONE,1.1 LessWocWord.java,NONE,1.1 SortsAsLetter.java,NONE,1.1 StartsWith.java,NONE,1.1

From: Egon W. <eg...@us...> - 2002-06-08 20:29:08

Update of /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/predicate
In directory usw-pr-cvs1:/tmp/cvs-serv19480/predicate

Added Files:
	HasBrutoFormule.java HasEnglishWord.java HasField.java 
	HasGermanWord.java HasItem.java HasURL.java IsAfkorting.java 
	IsChemical.java IsCode.java IsGroup.java IsName.java 
	IsSource.java LessBrutoFormule.java LessCasNumber.java 
	LessEnglishWord.java LessFWord.java LessGermanWord.java 
	LessWocWord.java SortsAsLetter.java StartsWith.java 
Log Message:
Added java source files.


--- NEW FILE: HasBrutoFormule.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class HasBrutoFormule implements UnaryPredicate  {  
  public boolean execute( Object object ) {
    return ((Item)object).contains(Item.BRUTO);
  }  
}

--- NEW FILE: HasEnglishWord.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class HasEnglishWord implements UnaryPredicate  {  
  public boolean execute( Object object ) {
    return ((Item)object).contains(Item.ENGLISH);
  }  
}

--- NEW FILE: HasField.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class HasField implements BinaryPredicate
{
  public boolean execute( Object first, Object second ) {
    if (!(first instanceof Item) || !(second instanceof Integer)) {
      return false;
    } else {
      return ((Item)first).contains( ((Integer)second).intValue() );
    }
  }
}
--- NEW FILE: HasGermanWord.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class HasGermanWord implements UnaryPredicate  {  
  public boolean execute( Object object ) {
    return ((Item)object).contains(XItem.XGERMAN);
  }  
}

--- NEW FILE: HasItem.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

/**
 * HasItem is a binary predicate that
 * returns true if the first operand (an Item) has 
 * the name of the second operand
 */

public final class HasItem implements BinaryPredicate
{
  /**
   * Return true if the first operand is greater than the second operand.
   * @param first The first operand.
necessary.
   * @param second The second operand.
necessary.
   * @return first.get(Item.NAME).equals(second)
   */
  public boolean execute( Object first, Object second )
  {
    boolean result = false;
    if (first instanceof Item && second instanceof String)
      result = ((String)((Item)first).get(Item.NAME)).equals(second);
    return result;
  }
}
--- NEW FILE: HasURL.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class HasURL implements UnaryPredicate  {
  public boolean execute( Object object ) {
    return ((Item)object).contains(Item.URL);
  }
}

--- NEW FILE: IsAfkorting.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class IsAfkorting implements UnaryPredicate  { 
  public boolean execute( Object object ) {
    boolean result = false;
    if (((Item)object).contains(XItem.XTYPE)) {
      XTYPE xt = (XTYPE)((Item)object).get(XItem.XTYPE);
      result = xt.isType(XTYPE.ABBREV);
    };
    return result;
  }
}

--- NEW FILE: IsChemical.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class IsChemical implements UnaryPredicate  {
  public boolean execute( Object object ) {
    boolean result = false;
    if (((Item)object).contains(XItem.XTYPE)) {
      XTYPE xt = (XTYPE)((Item)object).get(XItem.XTYPE);
      result = (((Item)object).contains(Item.CHEMICAL) ||
              ((Item)object).contains(Item.CASNR) ||
	      xt.isType(XTYPE.CHEMICAL) ||
	      xt.isType(XTYPE.POLYMER) ||
	      xt.isType(XTYPE.MIXTURE));
    } else {
      result = (((Item)object).contains(Item.CHEMICAL) ||
              ((Item)object).contains(Item.CASNR));
    }	      
    return result;
  }
}

--- NEW FILE: IsCode.java ---
package com.egonw.woc.predicate;

import java.util.Vector;
import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class IsCode implements BinaryPredicate
{
  public boolean execute( Object first, Object second )
  {
    return ((String)((Item)first).get(XItem.XCODE)).toLowerCase().equals(((String)second).toLowerCase());
  }
}

--- NEW FILE: IsGroup.java ---
package com.egonw.woc.predicate;

import java.util.Vector;
import com.objectspace.jgl.*;
import com.egonw.woc.*;

/**
 * Checks wether this Item belongs to a group.
 */

public final class IsGroup implements BinaryPredicate
{
  /**
   * Return true if the Group field of
   * the item first contains the value of the second operand.
   * @param first The first operand. Must be off class Item.
   * @param second The second operand. Must be a string.
   * @return
   */
  public boolean execute( Object first, Object second )
  {
    if (((Item)first).contains(Item.GROUP)) {
      return ((Vector)((Item)first).get(Item.GROUP)).contains(second);
    } else { return false; }
  }
}
--- NEW FILE: IsName.java ---
package com.egonw.woc.predicate;

import java.util.Vector;
import com.objectspace.jgl.*;
import com.egonw.woc.*;

/**
 * Checks wether this Item belongs to a group.
 */

public final class IsName implements BinaryPredicate
{
  /**
   * Return true if the Name field of 
   * the item first contains the value of the second operand.
   * @param first The item to be checked.
   * @param second The name that the item should have.
   * @return 
   */
  public boolean execute( Object first, Object second )
  {
    return ((String)((Item)first).get(Item.NAME)).toLowerCase().equals(((String)second).toLowerCase());
  }
}

--- NEW FILE: IsSource.java ---
package com.egonw.woc.predicate;

import java.util.*;
import com.objectspace.jgl.*;
import com.egonw.woc.*;

/**
 * Checks wether this Item belongs to a group.
 */

public final class IsSource implements BinaryPredicate
{
  /**
   */
  public boolean execute( Object first, Object second ) {
    boolean result = false;
    result = ((String)((Item)first).get(Item.NAME)).toLowerCase().equals(second);
    //if (((Item)first).contains(Item.VERVOEGINGEN)) {
    //  Enumeration vvn = ((Vector)((Item)first).get(Item.VERVOEGINGEN)).elements();        
    //  while (vvn.hasMoreElements())
    //   result = (result || ((String)vvn.nextElement()).toLowerCase().equals(second));
    //}
    return result;
  }
}
--- NEW FILE: LessBrutoFormule.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class LessBrutoFormule implements BinaryPredicate  {  
  
  private String pakSymbool(String s) {
    StringBuffer sb = new StringBuffer();
    if (s.length() >= 2) {
      char c = s.charAt(0);
      if (Character.isLetter(c) && Character.isUpperCase(c)) {
        sb.append(c);
        c = s.charAt(1);
        if (Character.isLetter(c) && Character.isLowerCase(c))
          sb.append(c);
      }
    } else if (s.length() >= 1) {
      char c= s.charAt(0);
      if (Character.isLetter(c) && Character.isUpperCase(c)) {
        sb.append(c);
      }
    }
    return sb.toString();
  }

  private String pakAantal(String s) {
    StringBuffer sb = new StringBuffer();
    for (int i = 0; i < s.length(); i++) {
      char c = s.charAt(i);
      if (Character.isDigit(c)) { 
        sb.append(c);
      } else {
        i = s.length();
      }
    }
    return sb.toString();
  }

  private String stripSymbool(String s) {
    int start = 0;
    if (s.length() >= 2) {
      char c = s.charAt(0);
      if (Character.isLetter(c) && Character.isUpperCase(c)) {
        start = 1;
        c = s.charAt(1);
        if (Character.isLetter(c) && Character.isLowerCase(c))
          start = 2;
      }
    } else if (s.length() >= 1) {
      char c= s.charAt(0);
      if (Character.isLetter(c) && Character.isUpperCase(c)) {
        start = 1;
      }
    }
    String result = "";
    if (s.length() > start) 
      result = new String(s.substring(start));
    return result;
  }

  private String stripAantal(String s) {
    while ((s.length() > 0) && (Character.isDigit(s.charAt(0)))) {
      if (s.length() > 1) { s = new String(s.substring(1)); }
      else { s = new String(); };
    }
    return s;
  }

  public boolean execute( Object first, Object second ) {
    boolean result = false;
    if ( !((Item)first).contains(Item.BRUTO) ) {
      result = true;
    } else if ( !((Item)second).contains(Item.BRUTO) ) {
      result = false;
    } else {
      String eerste = ((Bruto)((Item)first).get(Item.BRUTO)).toString();
      String tweede = ((Bruto)((Item)second).get(Item.BRUTO)).toString();
      String tekenE = new String();
      String tekenT = new String();
      String digitE = new String();
      String digitT = new String();
      boolean succes = false;
      while (!succes) {
        tekenE = new String(pakSymbool(eerste));
        tekenT = new String(pakSymbool(tweede));
        eerste = new String(stripSymbool(eerste));
        tweede = new String(stripSymbool(tweede));
        digitE = new String(pakAantal(eerste));
        digitT = new String(pakAantal(tweede));
        eerste = new String(stripAantal(eerste));
        tweede = new String(stripAantal(tweede));
        if (tekenE.equals(tekenT)) {
          if (digitE.equals(digitT)) {
            if (tekenE.length() == 0) succes = true;
          } else {
            if (digitE.length() == digitT.length()) {
              result = (digitE.compareTo(digitT) < 0);
            } else {
              result = (digitE.length() < digitT.length());
            }
            succes = true;
          }
        } else {
          succes = true;
          result = (tekenE.compareTo(tekenT) < 0);
        }
      }
    }
    return result;
  }  
}

--- NEW FILE: LessCasNumber.java ---
package com.egonw.woc.predicate;

import java.util.*;
import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class LessCasNumber implements BinaryPredicate  {

  public boolean execute( Object first, Object second ) {
    boolean result = false;
    if (((Item)first).contains(Item.CASNR)) {
      if (((Item)second).contains(Item.CASNR)) {
        // assume altijd drie tokens
        StringTokenizer st1 = new StringTokenizer((String)((Item)first).get(Item.CASNR), "-");
        StringTokenizer st2 = new StringTokenizer((String)((Item)second).get(Item.CASNR), "-");
        int i = Integer.parseInt(st1.nextToken());
        int j = Integer.parseInt(st2.nextToken());
        if ( i == j ) {
          if ( Integer.parseInt(st1.nextToken()) <=
               Integer.parseInt(st2.nextToken()) ) {
            result = true;
          } else {
            result = false;
          }
        } else if ( i < j ) {
          result = true;
        } else {
          result = false;
        }
      } else {
        result = false;
      }
    } else {
      result = true;
    }
    return result;
  }
}

--- NEW FILE: LessEnglishWord.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class LessEnglishWord implements BinaryPredicate  {  
  public boolean execute( Object first, Object second ) {
    try {
      return (
        strip((String)((Item)first).get(Item.ENGLISH))).compareTo(
        strip((String)((Item)second).get(Item.ENGLISH))) < 0; 
    } catch (NullPointerException e) {
      if (((Item)first).contains(Item.ENGLISH)) {
        return false;
      } else {
        return true;
      }
    }
  }
    
  private String strip(String s) {
    StringBuffer sb = new StringBuffer();
    int i = 0;
    while ((i <= s.length() -1) && (!Character.isLetter(s.charAt(i))))
      i++;
    while (i <= s.length() -1) { 
      sb.append(s.charAt(i));
      i++;
    }
    return sb.toString();
  }
}

--- NEW FILE: LessFWord.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class LessFWord implements BinaryPredicate  {  
  public boolean execute( Object first, Object second ) {
    try {
      return 
        strip(((FWord)first).getFWord()).compareTo(
        strip(((FWord)second).getFWord())) < 0;
    } catch (NullPointerException e) {
      return false;
    }
  }

private String strip(String s) {
    StringBuffer sb = new StringBuffer();
    int i = 0;
    while ((i <= s.length() -1) && (!Character.isLetter(s.charAt(i))))
      i++;
    while (i <= s.length() -1) { 
      sb.append(s.charAt(i));
      i++;
    }
    return sb.toString();
  }
}

--- NEW FILE: LessGermanWord.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

public final class LessGermanWord implements BinaryPredicate  {  
  public boolean execute( Object first, Object second ) {
    try {
      return (
        strip((String)((Item)first).get(XItem.XGERMAN))).compareTo(
        strip((String)((Item)second).get(XItem.XGERMAN))) < 0; 
    } catch (NullPointerException e) {
      if (((Item)first).contains(XItem.XGERMAN)) {
        return false;
      } else {
        return true;
      }
    }
  }
    
  private String strip(String s) {
    StringBuffer sb = new StringBuffer();
    int i = 0;
    while ((i <= s.length() -1) && (!Character.isLetter(s.charAt(i))))
      i++;
    while (i <= s.length() -1) { 
      sb.append(s.charAt(i));
      i++;
    }
    return sb.toString();
  }
}

--- NEW FILE: LessWocWord.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

/**
 * Sorts items by strings.
 *
 * @author  Egon Willighagen
 * @version 1.1, 2/7/98
 *
 * 2/7/98: placed in com.egonw.woc
 * 24/2/98: Now skips the first non-characters for sorting
 *
 */
public final class LessWocWord implements BinaryPredicate {
  public boolean execute( Object first, Object second ) {
    return strip(first.toString().toLowerCase()).compareTo(
      strip(second.toString().toLowerCase()) ) < 0;
  }
  
  private String strip(String s) {
    StringBuffer sb = new StringBuffer();
    int i = 0;
    while ((i <= s.length() -1) && (!Character.isLetter(s.charAt(i))))
      i++;
    while (i <= s.length() -1) { 
      sb.append(s.charAt(i));
      i++;
    }
    return sb.toString();
  }
}

--- NEW FILE: SortsAsLetter.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;
import com.egonw.woc.util.*;

/**
 * StartsWith is a binary predicate that
 * returns true if the first operand as a string
 * starts with the second operand as a string.
 */

public final class SortsAsLetter implements BinaryPredicate
{
  /**
   * Return true if the first operand is greater than the second operand.
   * @param first The first operand. necessary.
   * @param second The second operand. necessary.
   * @return first.toString().startsWith( second.toString()
   */
  public boolean execute( Object first, Object second ) {
    return Convert.stripTillFirstLetter(first.toString()).startsWith( second.toString() );
  }
}
--- NEW FILE: StartsWith.java ---
package com.egonw.woc.predicate;

import com.objectspace.jgl.*;
import com.egonw.woc.*;

/**
 * StartsWith is a binary predicate that
 * returns true if the first operand as a string
 * starts with the second operand as a string.
 */

public final class StartsWith implements BinaryPredicate
{
  /**
   * Return true if the first operand is greater than the second operand.
   * @param first The first operand.
necessary.
   * @param second The second operand.
necessary.
   * @return first.toString().startsWith( second.toString()
   */
  public boolean execute( Object first, Object second )
    {
    return first.toString().startsWith( second.toString() );
    }
}

[Woc-commit] CVS: woc/source/wocjava/source/com/egonw/woc/exception BadCommentNotification.java,NONE,1.1 BadItemNotification.java,NONE,1.1 DuplicateItemNotification.java,NONE,1.1 EmptyItemNotification.java,NONE,1.1 IncompleteItemNotification.java,NONE,1.1 UnknownFieldNotification.java,NONE,1.1 WocException.java,NONE,1.1 WocFatalError.java,NONE,1.1 WocNotification.java,NONE,1.1