[Treebase-guts] SF.net SVN: treebase:[805] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers

[<rv...@us...>]

Revision: 805
          http://treebase.svn.sourceforge.net/treebase/?rev=805&view=rev
Author:   rvos
Date:     2011-04-25 22:45:37 +0000 (Mon, 25 Apr 2011)

Log Message:
-----------
Changed hasWebPage method to use type prefix instead of class (which perhaps needs to be coerced first?)

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2011-04-25 22:27:59 UTC (rev 804)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2011-04-25 22:45:37 UTC (rev 805)
@@ -58,7 +58,7 @@
 	            NamespacedGUID namespacedGUID = new NamespacedGUID(substr);
 	            TreebaseIDString tbID = namespacedGUID.getTreebaseIDString();
 	        	String serializationFormat = createSerializationFormat(req);	            
-	            if ( hasWebPage(tbID.getClass()) && ! TreebaseUtil.isEmpty(serializationFormat) ) {
+	            if ( hasWebPage(tbID.getTypePrefix()) && ! TreebaseUtil.isEmpty(serializationFormat) ) {
 	            	
 	            	// output format is html, re-direct to display services
 	            	if ( serializationFormat.equals("html") ) {
@@ -149,7 +149,7 @@
 	 * @param pathComponents
 	 * @return true of web page exists, false otherwise
 	 */
-	abstract boolean hasWebPage(Class<?> theClass);
+	abstract boolean hasWebPage(String prefix);
 	
 	/**
 	 * 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java	2011-04-25 22:27:59 UTC (rev 804)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java	2011-04-25 22:45:37 UTC (rev 805)
@@ -43,8 +43,8 @@
 	}
 
 	@Override
-	boolean hasWebPage(Class<?> theClass) {
-		return Matrix.class.isAssignableFrom(theClass);
+	boolean hasWebPage(String prefix) {
+		return "M".equals(prefix);
 	}
 	
 	public MatrixService getMatrixService() {

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java	2011-04-25 22:27:59 UTC (rev 804)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java	2011-04-25 22:45:37 UTC (rev 805)
@@ -37,8 +37,8 @@
 	}
 
 	@Override
-	boolean hasWebPage(Class<?> theClass) {
-		return Study.class.isAssignableFrom(theClass);
+	boolean hasWebPage(String prefix) {
+		return "S".equals(prefix);
 	}
 
 	public StudyService getStudyService() {

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java	2011-04-25 22:27:59 UTC (rev 804)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java	2011-04-25 22:45:37 UTC (rev 805)
@@ -3,8 +3,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.cipres.treebase.domain.taxon.TaxonLabel;
-
 public class PhyloWSTaxonController extends PhyloWSController {
 
 	@Override
@@ -30,8 +28,8 @@
 	}
 
 	@Override
-	boolean hasWebPage(Class<?> theClass) {
-		return TaxonLabel.class.isAssignableFrom(theClass);
+	boolean hasWebPage(String prefix) {
+		return false;
 	}
 
 }

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java	2011-04-25 22:27:59 UTC (rev 804)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java	2011-04-25 22:45:37 UTC (rev 805)
@@ -43,8 +43,8 @@
 	}
 
 	@Override
-	boolean hasWebPage(Class<?> theClass) {
-		return PhyloTree.class.isAssignableFrom(theClass);
+	boolean hasWebPage(String prefix) {
+		return "Tr".equals(prefix);
 	}
 	
 	public PhyloTreeService getPhyloTreeService() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.