[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets OrderAction.java, 1.17, 1.18 OrderFullfillAction.java, 1.16, 1.17

[Stefan K. <sh...@us...>]

Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31234/src/java/org/openscience/nmrshiftdb/modules/actions/portlets

Modified Files:
	OrderAction.java OrderFullfillAction.java 
Log Message:
some cleanup of the labgroup interface


Index: OrderAction.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** OrderAction.java	11 Sep 2006 14:21:16 -0000	1.17
--- OrderAction.java	14 Sep 2006 16:24:01 -0000	1.18
***************
*** 5,8 ****
--- 5,9 ----
  import java.io.FileWriter;
  import java.io.StringReader;
+ import java.util.Collections;
  import java.util.Date;
  import java.util.Vector;
***************
*** 166,169 ****
--- 167,171 ----
  	        files.add(local);
  	      }
+ 	      Collections.sort(files, new OrderFullfillAction.LocalComparator());
  	      if(!((File)data.getSession().getAttribute("currentraw")).getCanonicalFile().equals(rawfiledir.getCanonicalFile())){
  	    	  Vector local=new Vector();

Index: OrderFullfillAction.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderFullfillAction.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** OrderFullfillAction.java	14 Sep 2006 14:40:17 -0000	1.16
--- OrderFullfillAction.java	14 Sep 2006 16:24:01 -0000	1.17
***************
*** 156,160 ****
  	}
  	
! 	class LocalComparator implements Comparator{
  		public int compare(Object o1, Object o2){
  			return ((String)((Vector)o1).get(1)).compareTo(((String)((Vector)o2).get(1)));
--- 156,160 ----
  	}
  	
! 	public static class LocalComparator implements Comparator{
  		public int compare(Object o1, Object o2){
  			return ((String)((Vector)o1).get(1)).compareTo(((String)((Vector)o2).get(1)));