You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sg...@apache.org on 2001/12/04 19:35:51 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/service JetspeedPersistenceService.java PersistenceService.java
sgala 01/12/04 10:35:51
Modified: src/java/org/apache/jetspeed/portal BasePortletConfig.java
BasePortletSet.java Portlet.java
src/java/org/apache/jetspeed/portal/controllers
CardPortletController.java
VelocityPanedPortletController.java
src/java/org/apache/jetspeed/portal/controls
AbstractPortletControl.java
src/java/org/apache/jetspeed/portal/service
JetspeedPersistenceService.java
PersistenceService.java
Log:
Javadoc warnings, deprecations, null check
Revision Changes Path
1.6 +6 -6 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletConfig.java
Index: BasePortletConfig.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasePortletConfig.java 2001/06/06 22:28:58 1.5
+++ BasePortletConfig.java 2001/12/04 18:35:51 1.6
@@ -71,7 +71,7 @@
* about the running environment of a given Portlet.
*
* @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- * @version $Id: BasePortletConfig.java,v 1.5 2001/06/06 22:28:58 raphael Exp $
+ * @version $Id: BasePortletConfig.java,v 1.6 2001/12/04 18:35:51 sgala Exp $
*/
public class BasePortletConfig extends BaseConfig implements PortletConfig
{
@@ -231,14 +231,14 @@
{
String value = null;
- if (name!=null)
+ if (name!=null && layoutConstraints != null)
{
value=(String)layoutConstraints.get(name.toLowerCase());
+ }
- if (value==null)
- {
- value=defaultValue;
- }
+ if (value==null)
+ {
+ value=defaultValue;
}
return value;
1.14 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java
Index: BasePortletSet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BasePortletSet.java 2001/11/29 13:47:18 1.13
+++ BasePortletSet.java 2001/12/04 18:35:51 1.14
@@ -81,7 +81,7 @@
*
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
* @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- * @version $Id: BasePortletSet.java,v 1.13 2001/11/29 13:47:18 kimptoc Exp $
+ * @version $Id: BasePortletSet.java,v 1.14 2001/12/04 18:35:51 sgala Exp $
*/
public class BasePortletSet implements PortletSet, Portlet, PortletState
{
@@ -441,7 +441,7 @@
}
/**
- @see Portlet.getCreationTime()
+ @see Portlet#getCreationTime()
*/
public long getCreationTime()
{
@@ -449,7 +449,7 @@
}
/**
- @see Portlet.setCreationTime
+ @see Portlet#setCreationTime
*/
public void setCreationTime( long creationTime )
{
1.41 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/Portlet.java
Index: Portlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/Portlet.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Portlet.java 2001/07/30 05:47:58 1.40
+++ Portlet.java 2001/12/04 18:35:51 1.41
@@ -64,7 +64,7 @@
extensible so that 3rd parties implement their own Portlets.
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
-@version $Id: Portlet.java,v 1.40 2001/07/30 05:47:58 taylor Exp $
+@version $Id: Portlet.java,v 1.41 2001/12/04 18:35:51 sgala Exp $
*/
public interface Portlet
{
@@ -80,9 +80,9 @@
public String getName();
/**
- Set the name on this Portlet.
+ Sets the name on this Portlet.
- @see getName()
+ @see #getName()
*/
public void setName(String name);
1.19 +2 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/CardPortletController.java
Index: CardPortletController.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/CardPortletController.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- CardPortletController.java 2001/06/25 10:53:48 1.18
+++ CardPortletController.java 2001/12/04 18:35:51 1.19
@@ -81,7 +81,7 @@
or with an invalid value, use the first portlet (position 0)</li>
</p>
@author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
-@version $Id: CardPortletController.java,v 1.18 2001/06/25 10:53:48 raphael Exp $
+@version $Id: CardPortletController.java,v 1.19 2001/12/04 18:35:51 sgala Exp $
*/
public class CardPortletController extends AbstractPortletController
implements PanedPortletController
@@ -260,6 +260,7 @@
String title = p.getTitle();
DynamicURI uri = new DynamicURI( rundata );
+
uri.removePathInfo( getParameterName() );
uri.removeQueryData( getParameterName() );
1.3 +1 -0 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java
Index: VelocityPanedPortletController.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VelocityPanedPortletController.java 2001/08/14 10:39:19 1.2
+++ VelocityPanedPortletController.java 2001/12/04 18:35:51 1.3
@@ -132,6 +132,7 @@
String title = p.getTitle();
DynamicURI uri = new DynamicURI( rundata );
+
uri.removePathInfo( getParameterName() );
uri.removeQueryData( getParameterName() );
1.12 +2 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/AbstractPortletControl.java
Index: AbstractPortletControl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/AbstractPortletControl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractPortletControl.java 2001/09/10 22:41:00 1.11
+++ AbstractPortletControl.java 2001/12/04 18:35:51 1.12
@@ -90,7 +90,8 @@
* a simple portlet wherever in a PSML object tree.
*
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
- * @version $Id: AbstractPortletControl.java,v 1.11 2001/09/10 22:41:00 sgala Exp $
+ * @author <a href="mailto:sgala@apache.org">Santiago Gala</a>
+ * @version $Id: AbstractPortletControl.java,v 1.12 2001/12/04 18:35:51 sgala Exp $
*/
public abstract class AbstractPortletControl extends AbstractPortlet
implements PortletControl
1.9 +1 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/service/JetspeedPersistenceService.java
Index: JetspeedPersistenceService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/service/JetspeedPersistenceService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JetspeedPersistenceService.java 2001/07/17 16:42:04 1.8
+++ JetspeedPersistenceService.java 2001/12/04 18:35:51 1.9
@@ -184,7 +184,7 @@
{
Page p = (Page) e.nextElement ();
- if (p.getName ().equals (pageName))
+ if (pageName == null || p.getName ().equals (pageName))
{
page = p;
break;
1.3 +0 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/service/PersistenceService.java
Index: PersistenceService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/service/PersistenceService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistenceService.java 2001/03/07 06:48:02 1.2
+++ PersistenceService.java 2001/12/04 18:35:51 1.3
@@ -67,7 +67,6 @@
** as the first and only parameter.
** <P>
**
- ** @see PersistenceFactory
**
** @author <a href="mailto:tboehme@raleigh.ibm.com">Thomas Boehme</a>
**/
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>