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 ta...@apache.org on 2002/03/22 19:42:06 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/screens Customizer1.java Customizer2.java
taylor 02/03/22 10:42:06
Modified: src/java/org/apache/jetspeed/modules/actions/controllers
MultiColumnControllerAction.java
PanedControllerAction.java
RowColumnControllerAction.java
src/java/org/apache/jetspeed/modules/actions/controls
Maximize.java Minimize.java Restore.java
src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java
Removed: src/java/org/apache/jetspeed/modules/actions
CustomizeUserPSMLFile.java SavePageConfig.java
src/java/org/apache/jetspeed/modules/screens
Customizer1.java Customizer2.java
Log:
o Add - updated controls and controllers to use new PSML OM
o Removed - old customizers
Revision Changes Path
1.7 +23 -21 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java
Index: MultiColumnControllerAction.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultiColumnControllerAction.java 14 Feb 2002 03:38:16 -0000 1.6
+++ MultiColumnControllerAction.java 22 Mar 2002 18:42:06 -0000 1.7
@@ -63,11 +63,13 @@
import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.registry.PortletEntry;
-import org.apache.jetspeed.xml.api.portletmarkup.Portlets;
-import org.apache.jetspeed.xml.api.portletmarkup.Entry;
-import org.apache.jetspeed.xml.api.portletmarkup.Metainfo;
-import org.apache.jetspeed.xml.api.portletmarkup.Layout;
-import org.apache.jetspeed.xml.api.portletmarkup.Property;
+import org.apache.jetspeed.om.profile.Portlets;
+import org.apache.jetspeed.om.profile.Entry;
+import org.apache.jetspeed.om.profile.MetaInfo;
+import org.apache.jetspeed.om.profile.Layout;
+import org.apache.jetspeed.om.profile.Parameter;
+import org.apache.jetspeed.om.profile.psml.PsmlParameter;
+import org.apache.jetspeed.om.profile.psml.PsmlLayout;
// Turbine stuff
import org.apache.turbine.util.DynamicURI;
@@ -314,9 +316,9 @@
for(int row=0; row < columns[col].size(); row++)
{
Entry entry = (Entry)columns[col].get(row);
- if ((entry.getMetainfo()!=null)&&(entry.getMetainfo().getTitle()!=null))
+ if ((entry.getMetaInfo()!=null)&&(entry.getMetaInfo().getTitle()!=null))
{
- titles.put(entry.getParent(),entry.getMetainfo().getTitle());
+ titles.put(entry.getParent(),entry.getMetaInfo().getTitle());
}
else
{
@@ -488,13 +490,13 @@
if (layout==null)
{
- layout = new Layout();
+ layout = new PsmlLayout();
entry.setLayout(layout);
}
- for (int i=0; i < layout.getPropertyCount(); i++)
+ for (int i=0; i < layout.getParameterCount(); i++)
{
- Property p = layout.getProperty(i);
+ Parameter p = layout.getParameter(i);
if (p.getName().equals("column"))
{
@@ -510,18 +512,18 @@
if (!colFound)
{
- Property p = new Property();
+ Parameter p = new PsmlParameter();
p.setName("column");
p.setValue(String.valueOf(col));
- layout.addProperty(p);
+ layout.addParameter(p);
}
if (!rowFound)
{
- Property p = new Property();
+ Parameter p = new PsmlParameter();
p.setName("row");
p.setValue(String.valueOf(row));
- layout.addProperty(p);
+ layout.addParameter(p);
}
}
}
@@ -558,21 +560,21 @@
protected static List[] buildColumns(Portlets set, int colNum)
{
// normalize the constraints and calculate max num of rows needed
- Enumeration en = set.enumerateEntry();
+ Iterator iterator = set.getEntriesIterator();
int row = 0;
int col = 0;
int rowNum = 0;
- while(en.hasMoreElements())
+ while(iterator.hasNext())
{
- Entry entry = (Entry)en.nextElement();
+ Entry entry = (Entry)iterator.next();
Layout layout = entry.getLayout();
if (layout != null)
{
- for (int p=0; p < layout.getPropertyCount(); p++)
+ for (int p=0; p < layout.getParameterCount(); p++)
{
- Property prop = layout.getProperty(p);
+ Parameter prop = layout.getParameter(p);
try
{
@@ -632,9 +634,9 @@
{
try
{
- for (int p=0; p < layout.getPropertyCount(); p++)
+ for (int p=0; p < layout.getParameterCount(); p++)
{
- Property prop = layout.getProperty(p);
+ Parameter prop = layout.getParameter(p);
if (prop.getName().equals("row"))
{
1.7 +5 -5 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/PanedControllerAction.java
Index: PanedControllerAction.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/PanedControllerAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PanedControllerAction.java 11 Mar 2002 07:22:11 -0000 1.6
+++ PanedControllerAction.java 22 Mar 2002 18:42:06 -0000 1.7
@@ -61,10 +61,10 @@
import org.apache.jetspeed.portal.PanedPortletController;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.xml.api.portletmarkup.Portlets;
-import org.apache.jetspeed.xml.api.portletmarkup.Entry;
-import org.apache.jetspeed.xml.api.portletmarkup.Metainfo;
-import org.apache.jetspeed.xml.api.portletmarkup.Layout;
+import org.apache.jetspeed.om.profile.Portlets;
+import org.apache.jetspeed.om.profile.Entry;
+import org.apache.jetspeed.om.profile.MetaInfo;
+import org.apache.jetspeed.om.profile.Layout;
// Turbine stuff
import org.apache.turbine.util.Log;
@@ -85,7 +85,7 @@
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
*
- * @version $Id: PanedControllerAction.java,v 1.6 2002/03/11 07:22:11 taylor Exp $
+ * @version $Id: PanedControllerAction.java,v 1.7 2002/03/22 18:42:06 taylor Exp $
*/
public class PanedControllerAction extends RowColumnControllerAction
{
1.8 +27 -26 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java
Index: RowColumnControllerAction.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RowColumnControllerAction.java 14 Feb 2002 03:38:16 -0000 1.7
+++ RowColumnControllerAction.java 22 Mar 2002 18:42:06 -0000 1.8
@@ -64,10 +64,11 @@
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.registry.RegistryEntry;
-import org.apache.jetspeed.xml.api.portletmarkup.Portlets;
-import org.apache.jetspeed.xml.api.portletmarkup.Entry;
-import org.apache.jetspeed.xml.api.portletmarkup.Metainfo;
-import org.apache.jetspeed.xml.api.portletmarkup.Layout;
+import org.apache.jetspeed.om.profile.Portlets;
+import org.apache.jetspeed.om.profile.Entry;
+import org.apache.jetspeed.om.profile.MetaInfo;
+import org.apache.jetspeed.om.profile.Layout;
+import org.apache.jetspeed.om.profile.psml.PsmlLayout;
import org.apache.jetspeed.util.AutoProfile;
// Turbine stuff
@@ -163,7 +164,7 @@
{
try
{
- int pos = Integer.parseInt(layout.getPosition());
+ int pos = (int)layout.getPosition();
if (pos>=0)
{
plist.set(pos,p);
@@ -175,7 +176,7 @@
}
catch (Exception e)
{
- layout.setPosition(null);
+ layout.setPosition(-1);
work.add(p);
}
}
@@ -193,7 +194,7 @@
{
try
{
- int pos = Integer.parseInt(layout.getPosition());
+ int pos = (int)layout.getPosition();
if (pos>=0)
{
plist.set(pos,p);
@@ -205,7 +206,7 @@
}
catch (Exception e)
{
- layout.setPosition(null);
+ layout.setPosition(-1);
work.add(p);
}
}
@@ -240,17 +241,17 @@
if (obj instanceof Portlets)
{
Portlets entry = (Portlets)obj;
- if ((entry.getMetainfo()!=null)&&(entry.getMetainfo().getTitle()!=null))
+ if ((entry.getMetaInfo()!=null)&&(entry.getMetaInfo().getTitle()!=null))
{
- titles.put(entry.getName(),entry.getMetainfo().getTitle());
+ titles.put(entry.getName(),entry.getMetaInfo().getTitle());
}
}
else
{
Entry entry = (Entry)obj;
- if ((entry.getMetainfo()!=null)&&(entry.getMetainfo().getTitle()!=null))
+ if ((entry.getMetaInfo()!=null)&&(entry.getMetaInfo().getTitle()!=null))
{
- titles.put(entry.getParent(),entry.getMetainfo().getTitle());
+ titles.put(entry.getParent(),entry.getMetaInfo().getTitle());
}
else
{
@@ -373,10 +374,10 @@
// nl.setPosition (String.valueOf(i));
//
// }
- if ((layout!=null) && (layout.getPosition() != null))
+ if ((layout!=null) && (layout.getPosition() != -1))
{
- int lpos = Integer.parseInt(layout.getPosition());
+ int lpos = (int)layout.getPosition();
if (lpos==position)
{
set.removePortlets(i);
@@ -396,9 +397,9 @@
Entry p = set.getEntry(i);
Layout layout = p.getLayout();
- if ((layout!=null) && (layout.getPosition() != null))
+ if ((layout!=null) && (layout.getPosition() != -1))
{
- int lpos = Integer.parseInt(layout.getPosition());
+ int lpos = (int)layout.getPosition();
if (lpos==position)
{
@@ -521,9 +522,9 @@
Portlets p = set.getPortlets(i);
Layout layout = p.getLayout();
- if ((layout!=null)&&(layout.getPosition()!=null))
+ if ((layout!=null)&&(layout.getPosition()!=-1))
{
- int lpos = Integer.parseInt(layout.getPosition());
+ int lpos = (int)layout.getPosition();
if ((baseLayout == null) && (lpos==position))
{
baseLayout = layout;
@@ -543,9 +544,9 @@
Entry p = set.getEntry(i);
Layout layout = p.getLayout();
- if ((layout!=null)&&(layout.getPosition()!=null))
+ if ((layout!=null)&&(layout.getPosition()!=-1))
{
- int lpos = Integer.parseInt(layout.getPosition());
+ int lpos = (int)layout.getPosition();
if ((baseLayout == null) && (lpos==position))
{
baseLayout = layout;
@@ -566,7 +567,7 @@
Portlets p = set.getPortlets(position);
if (p.getLayout()==null)
{
- p.setLayout(new Layout());
+ p.setLayout(new PsmlLayout());
}
baseLayout=p.getLayout();
}
@@ -576,7 +577,7 @@
Entry p = set.getEntry(position);
if (p.getLayout()==null)
{
- p.setLayout(new Layout());
+ p.setLayout(new PsmlLayout());
}
baseLayout=p.getLayout();
}
@@ -589,7 +590,7 @@
Portlets p = set.getPortlets(target);
if (p.getLayout()==null)
{
- p.setLayout(new Layout());
+ p.setLayout(new PsmlLayout());
}
targetLayout=p.getLayout();
}
@@ -599,7 +600,7 @@
Entry p = set.getEntry(target);
if (p.getLayout()==null)
{
- p.setLayout(new Layout());
+ p.setLayout(new PsmlLayout());
}
targetLayout=p.getLayout();
}
@@ -610,8 +611,8 @@
if ((baseLayout == null) || (targetLayout == null)) return;
- baseLayout.setPosition(String.valueOf(target));
- targetLayout.setPosition(String.valueOf(position));
+ baseLayout.setPosition(target);
+ targetLayout.setPosition(position);
}
}
1.8 +1 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Maximize.java
Index: Maximize.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Maximize.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Maximize.java 13 Mar 2002 05:41:15 -0000 1.7
+++ Maximize.java 22 Mar 2002 18:42:06 -0000 1.8
@@ -63,7 +63,7 @@
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.services.PortletFactory;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.jetspeed.xml.api.portletmarkup.Entry;
+import org.apache.jetspeed.om.profile.Entry;
/**
* Change the state of a portlet to maximized. This setting is not persistent.
1.5 +1 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Minimize.java
Index: Minimize.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Minimize.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Minimize.java 13 Mar 2002 05:41:15 -0000 1.4
+++ Minimize.java 22 Mar 2002 18:42:06 -0000 1.5
@@ -64,7 +64,7 @@
import org.apache.jetspeed.portal.PortletState;
import org.apache.jetspeed.services.PortletFactory;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.jetspeed.xml.api.portletmarkup.Entry;
+import org.apache.jetspeed.om.profile.Entry;
/**
* Change the internal state of a portlet from normal to minimized
1.10 +1 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Restore.java
Index: Restore.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Restore.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Restore.java 13 Mar 2002 05:41:15 -0000 1.9
+++ Restore.java 22 Mar 2002 18:42:06 -0000 1.10
@@ -64,7 +64,7 @@
import org.apache.jetspeed.portal.PortletState;
import org.apache.jetspeed.services.PortletFactory;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.jetspeed.xml.api.portletmarkup.Entry;
+import org.apache.jetspeed.om.profile.Entry;
/**
Change the internal state of a portlet from minimized to normal
1.15 +24 -18 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
Index: CustomizeSetAction.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CustomizeSetAction.java 15 Mar 2002 19:01:29 -0000 1.14
+++ CustomizeSetAction.java 22 Mar 2002 18:42:06 -0000 1.15
@@ -68,15 +68,21 @@
import org.apache.jetspeed.om.registry.PortletEntry;
import org.apache.jetspeed.om.registry.PortletInfoEntry;
import org.apache.jetspeed.om.registry.MediaTypeEntry;
-import org.apache.jetspeed.xml.api.portletmarkup.Portlets;
-import org.apache.jetspeed.xml.api.portletmarkup.Entry;
-import org.apache.jetspeed.xml.api.portletmarkup.Skin;
-import org.apache.jetspeed.xml.api.portletmarkup.Metainfo;
-import org.apache.jetspeed.xml.api.portletmarkup.Controller;
-import org.apache.jetspeed.xml.api.portletmarkup.Control;
+import org.apache.jetspeed.om.profile.Portlets;
+import org.apache.jetspeed.om.profile.psml.PsmlPortlets;
+import org.apache.jetspeed.om.profile.Entry;
+import org.apache.jetspeed.om.profile.psml.PsmlEntry;
+import org.apache.jetspeed.om.profile.Skin;
+import org.apache.jetspeed.om.profile.psml.PsmlSkin;
+import org.apache.jetspeed.om.profile.MetaInfo;
+import org.apache.jetspeed.om.profile.psml.PsmlMetaInfo;
+import org.apache.jetspeed.om.profile.Controller;
+import org.apache.jetspeed.om.profile.psml.PsmlController;
+import org.apache.jetspeed.om.profile.Control;
+import org.apache.jetspeed.om.profile.psml.PsmlControl;
import org.apache.jetspeed.services.idgenerator.JetspeedIdGenerator;
import org.apache.jetspeed.services.JetspeedSecurity;
-import org.apache.jetspeed.xml.api.portletmarkup.Layout;
+import org.apache.jetspeed.om.profile.Layout;
import org.apache.jetspeed.util.AutoProfile;
@@ -324,9 +330,9 @@
if (portlets != null)
{
- Portlets p = new Portlets();
- p.setMetainfo(new Metainfo());
- p.getMetainfo().setTitle(title);
+ Portlets p = new PsmlPortlets();
+ p.setMetaInfo(new PsmlMetaInfo());
+ p.getMetaInfo().setTitle(title);
p.setId(JetspeedIdGenerator.getNextPeid());
portlets.addPortlets(p);
}
@@ -352,7 +358,7 @@
String[] pnames = rundata.getParameters().getStrings("pname");
// Create a ClearPortletControl
- Control ctrl = new Control();
+ Control ctrl = new PsmlControl();
ctrl.setName ("ClearPortletControl");
@@ -390,7 +396,7 @@
*/
if (addIt)
{
- Entry p = new Entry();
+ Entry p = new PsmlEntry();
// add the ClearPortletControl to wml entries
if (isWML)
p.setControl (ctrl);
@@ -436,11 +442,11 @@
if (portlets!=null)
{
- Metainfo meta = portlets.getMetainfo();
+ MetaInfo meta = portlets.getMetaInfo();
if (meta==null)
{
- meta = new Metainfo();
- portlets.setMetainfo(meta);
+ meta = new PsmlMetaInfo();
+ portlets.setMetaInfo(meta);
}
if (title!=null)
@@ -477,7 +483,7 @@
Controller c = portlets.getController();
if (c == null)
{
- c = new Controller();
+ c = new PsmlController();
portlets.setController(c);
}
c.setName(controller);
@@ -486,7 +492,7 @@
if (linkedControl!=null)
{
- Control ctl = new Control();
+ Control ctl = new PsmlControl();
ctl.setName(linkedControl);
portlets.setControl(ctl);
}
@@ -529,7 +535,7 @@
Skin psmlSkin = portlets.getSkin();
if (psmlSkin == null)
{
- portlets.setSkin(new Skin());
+ portlets.setSkin(new PsmlSkin());
}
portlets.getSkin().setName(skin);
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>