[cig-commits] r7808 - in cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal: portlets util

[weimi at geodynamics.org]

Author: weimi
Date: 2007-08-10 20:05:59 -0700 (Fri, 10 Aug 2007)
New Revision: 7808

Modified:
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/MAGPortletConfig.java
Log:
More attributes and name change, make them consistent through out the package.

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java	2007-08-11 01:19:24 UTC (rev 7807)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java	2007-08-11 03:05:59 UTC (rev 7808)
@@ -28,6 +28,7 @@
 import org.cig.portal.grid.job.SimpleRunGT4;
 import org.cig.portal.grid.security.SimpleCred;
 import org.cig.portal.util.Config;
+import org.cig.portal.util.MAGPortletConfig;
 import org.cig.portal.util.SimpleGridConstants;
 import org.gisolve.demo.app.IDWVizThread;
 import org.gridsphere.portlet.impl.SportletProperties;
@@ -66,10 +67,10 @@
 			if (!isValidWebapp(mywebappname))
 				throw new PortletException("CigPortalMAGPortlet.fillTemplate(): "+mywebappname+" is not a valid name. Check your config file first.");
 			//TODO: object persistence
-			ArrayList joblist = (ArrayList)mysession.getAttribute(SimpleGridConstants.magJobList + uid, PortletSession.APPLICATION_SCOPE);
+			ArrayList joblist = (ArrayList)mysession.getAttribute(SimpleGridConstants.MagJobList + uid, PortletSession.APPLICATION_SCOPE);
 			// workflow 
-			String cursid = (String)mysession.getAttribute(SimpleGridConstants.magJobSid + uid, PortletSession.APPLICATION_SCOPE);
-			String curPage = (String)mysession.getAttribute(SimpleGridConstants.magPage + uid, PortletSession.APPLICATION_SCOPE);
+			String cursid = (String)mysession.getAttribute(SimpleGridConstants.MagJobSid + uid, PortletSession.APPLICATION_SCOPE);
+			String curPage = (String)mysession.getAttribute(SimpleGridConstants.MagPage + uid, PortletSession.APPLICATION_SCOPE);
 			if (curPage.equals("Viz")) {
 				MagjobBean item = null;
 				int i;
@@ -580,7 +581,7 @@
 		String storedSid = (String)mysession.getAttribute(SimpleGridConstants.SESSION_ATTR_ID + uid, PortletSession.APPLICATION_SCOPE);
 		if (storedSid == null || !storedSid.equals(mysession.getId())) {
 			storedSid = mysession.getId();
-			MagPortletConfig.init(req, this);
+			MAGPortletConfig.init(req, this);
 			mysession.setAttribute(SimpleGridConstants.SESSION_ATTR_ID + uid, storedSid, PortletSession.APPLICATION_SCOPE);
 		}
     	super.doView(req, res);

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/MAGPortletConfig.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/MAGPortletConfig.java	2007-08-11 01:19:24 UTC (rev 7807)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/MAGPortletConfig.java	2007-08-11 03:05:59 UTC (rev 7808)
@@ -62,16 +62,16 @@
 			// set initial error information
 			mysession.setAttribute(SimpleGridConstants.errorInfo + uid, "", PortletSession.APPLICATION_SCOPE);
 			// mag portlet: mag job list
-			ArrayList joblist = (ArrayList)mysession.getAttribute(SimpleGridConstants.magJobList + uid, PortletSession.APPLICATION_SCOPE);
+			ArrayList joblist = (ArrayList)mysession.getAttribute(SimpleGridConstants.MagJobList + uid, PortletSession.APPLICATION_SCOPE);
 			if (joblist == null) {
 				joblist = new ArrayList<MagjobBean>();
-				mysession.setAttribute(SimpleGridConstants.magJobList + uid, joblist, PortletSession.APPLICATION_SCOPE);
+				mysession.setAttribute(SimpleGridConstants.MagJobList + uid, joblist, PortletSession.APPLICATION_SCOPE);
 			}
 			// mag portlet: current page name
-			String curPage = (String)mysession.getAttribute(SimpleGridConstants.magPage + uid, PortletSession.APPLICATION_SCOPE);
+			String curPage = (String)mysession.getAttribute(SimpleGridConstants.MagPage + uid, PortletSession.APPLICATION_SCOPE);
 			if (curPage == null) {
 				curPage = new String("Main");
-				mysession.setAttribute(SimpleGridConstants.magPage + uid, curPage, PortletSession.APPLICATION_SCOPE);
+				mysession.setAttribute(SimpleGridConstants.MagPage + uid, curPage, PortletSession.APPLICATION_SCOPE);
 			}
 			// create user directories
 			String dataRoot = mysession.getPortletContext().getRealPath("storage");