Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[433] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers
|
From: <rv...@us...> - 2010-01-14 14:28:27
|
Revision: 433
http://treebase.svn.sourceforge.net/treebase/?rev=433&view=rev
Author: rvos
Date: 2010-01-14 14:28:21 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
Added more logging messages.
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAnalyzedDataController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteStudyController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTreeController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SummaryController.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAnalyzedDataController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAnalyzedDataController.java 2010-01-14 14:04:24 UTC (rev 432)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAnalyzedDataController.java 2010-01-14 14:28:21 UTC (rev 433)
@@ -9,6 +9,7 @@
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
+import org.apache.log4j.Logger;
import org.cipres.treebase.TreebaseUtil;
import org.cipres.treebase.domain.admin.UserRole.TBPermission;
import org.cipres.treebase.domain.matrix.Matrix;
@@ -31,6 +32,7 @@
import org.cipres.treebase.web.util.ControllerUtil;
public class AddAnalyzedDataController extends BaseFormController {
+ private static final Logger LOGGER = Logger.getLogger(AddAnalyzedDataController.class);
private AnalysisService mAnalysisService;
private StudyService mStudyService;
private AnalysisStepService mAnalysisStepService;
@@ -241,6 +243,7 @@
Study study;
if (TreebaseUtil.isEmpty(submission_id)) {
study = ControllerUtil.findStudy(request, mStudyService);
+ LOGGER.info("setAuthorizationChecked(true)");
setAuthorizationChecked(true);// This is needed in case one is clicking at Summary
// link at the bottom of the menu list on the right hand
// side.
@@ -255,8 +258,10 @@
Long.parseLong(submission_id));
if (perm2 == TBPermission.WRITE || perm2 == TBPermission.READ_ONLY
|| perm2 == TBPermission.SUBMITTED_WRITE) {
+ LOGGER.info("setAuthorizationChecked(true)");
setAuthorizationChecked(true);
} else {
+ LOGGER.info("setAuthorizationChecked(false)");
setAuthorizationChecked(false);
return new ArticleCitation();
}
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java 2010-01-14 14:04:24 UTC (rev 432)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java 2010-01-14 14:28:21 UTC (rev 433)
@@ -176,9 +176,11 @@
if (TreebaseUtil.isEmpty(analysis_id)) {
if (perm == TBPermission.WRITE) {
+ LOGGER.info("setAuthorizationChecked(true)");
setAuthorizationChecked(true);
return new Analysis();
} else {
+ LOGGER.info("setAuthorizationChecked(false)");
setAuthorizationChecked(false);
return null;
}
@@ -195,11 +197,12 @@
// FIXME set a session variable to hide the edit buttons.
}
-
+ LOGGER.info("setAuthorizationChecked(true)");
setAuthorizationChecked(true);
return analysis;
} else {
LOGGER.debug("NULL CONDITION SATISFIED");
+ LOGGER.info("setAuthorizationChecked(false)");
setAuthorizationChecked(false);
return new Analysis();
}
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java 2010-01-14 14:04:24 UTC (rev 432)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java 2010-01-14 14:28:21 UTC (rev 433)
@@ -326,9 +326,11 @@
if (TreebaseUtil.isEmpty(analysisStep_id)) {
if (perm == TBPermission.WRITE) {
+ LOGGER.info("setAuthorizationChecked(true)");
setAuthorizationChecked(true);
return analysisStepCommand;
} else {
+ LOGGER.info("setAuthorizationChecked(false)");
setAuthorizationChecked(false);
return null;
}
@@ -360,14 +362,14 @@
// FIXME set a session variable to hide the edit buttons.
}
-
+ LOGGER.info("setAuthorizationChecked(true)");
setAuthorizationChecked(true);
return analysisStepCommand;
} else {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("NULL CONDITION SATISFIED");
}
-
+ LOGGER.info("setAuthorizationChecked(false)");
setAuthorizationChecked(false);
return analysisStepCommand;
}
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteStudyController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteStudyController.java 2010-01-14 14:04:24 UTC (rev 432)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteStudyController.java 2010-01-14 14:28:21 UTC (rev 433)
@@ -135,8 +135,10 @@
TBPermission perm = getSubmissionService().getPermission(username, Long.parseLong(subid));
if (perm == TBPermission.WRITE) {
+ LOGGER.info("setAuthorizationChecked(true)");
setAuthorizationChecked(true);
} else {
+ LOGGER.info("setAuthorizationChecked(false)");
setAuthorizationChecked(false);
}
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTreeController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTreeController.java 2010-01-14 14:04:24 UTC (rev 432)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTreeController.java 2010-01-14 14:28:21 UTC (rev 433)
@@ -171,6 +171,7 @@
request.getRemoteUser(),
submission_id);
if (perm2 == TBPermission.WRITE || perm2 == TBPermission.SUBMITTED_WRITE) {
+ LOGGER.info("setAuthorizationChecked(true)");
setAuthorizationChecked(true);
Collection<PhyloTree> phyloTreeList = treeblock.getTreeList();
ControllerUtil.setTreeBlockId(TBID, request);
@@ -178,6 +179,7 @@
// This ID has to be saved for success/cancel view.
return new AGenericList<Collection<PhyloTree>>(phyloTreeList);
} else {
+ LOGGER.info("setAuthorizationChecked(false)");
setAuthorizationChecked(false);
return new AGenericList<Collection<PhyloTree>>(new ArrayList<PhyloTree>());
}
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SummaryController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SummaryController.java 2010-01-14 14:04:24 UTC (rev 432)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SummaryController.java 2010-01-14 14:28:21 UTC (rev 433)
@@ -108,6 +108,7 @@
Study study;
if (TreebaseUtil.isEmpty(submission_id)) {
study = ControllerUtil.findStudy(request, mStudyService);
+ LOGGER.info("setAuthorizationChecked(true)");
setAuthorizationChecked(true);// This is needed in case one is clicking at Summary
// link at the bottom of the menu list on the right hand
// side.
@@ -122,8 +123,10 @@
Long.parseLong(submission_id));
if (perm2 == TBPermission.WRITE || perm2 == TBPermission.READ_ONLY
|| perm2 == TBPermission.SUBMITTED_WRITE) {
+ LOGGER.info("setAuthorizationChecked(true)");
setAuthorizationChecked(true);
} else {
+ LOGGER.info("setAuthorizationChecked(false)");
setAuthorizationChecked(false);
return new ArticleCitation();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
