JBoss Portal SVN: r11228 - modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-30 18:22:41 -0400 (Mon, 30 Jun 2008)
New Revision: 11228
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java
Log:
a bit of reorg of the ui model
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java 2008-06-30 22:22:11 UTC (rev 11227)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java 2008-06-30 22:22:41 UTC (rev 11228)
@@ -38,8 +38,6 @@
public AjaxPage(String id, Map properties)
{
super(id, properties);
-
- //
}
protected Panel createPanel(String id, Map properties)
15 years, 10 months
JBoss Portal SVN: r11227 - in modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax: public and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-30 18:22:11 -0400 (Mon, 30 Jun 2008)
New Revision: 11227
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/public/style.css
Log:
a bit of reorg of the ui model
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java 2008-06-30 21:17:56 UTC (rev 11226)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java 2008-06-30 22:22:11 UTC (rev 11227)
@@ -24,7 +24,6 @@
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Panel;
@@ -41,22 +40,20 @@
{
/** . */
- private Label title;
+ private Panel layout;
/** . */
- private Panel container;
-
- /** . */
private Widget widget;
+// private boolean
+
public AjaxLayout(String id, Map properties)
{
super(id, properties);
//
- Label title = new Label("Pane " + id);
- VerticalPanel widget = new VerticalPanel();
- Panel container;
+ Panel widget = createPanel(id, properties);
+ Panel layout;
//
String layoutId = (String)getPropertyValue(Constants.LAYOUT_ID);
@@ -69,40 +66,38 @@
//
if (orientation == null || !Constants.VERTICAL_ORIENTATION.equals(orientation))
{
- container = new HorizontalPanel();
+ layout = new HorizontalPanel();
}
else
{
- container = new VerticalPanel();
+ layout = new VerticalPanel();
}
}
else
{
// todo
- container = new VerticalPanel();
+ layout = new VerticalPanel();
}
//
- widget.add(title);
- widget.add(container);
+ widget.add(layout);
//
- widget.setStyleName("pf-Pane");
- title.setStyleName("pf-Title");
- container.setStyleName("pf-Container");
+ layout.setStyleName("pf-Layout");
//
- this.title = title;
- this.container = container;
+ this.layout = layout;
this.widget = widget;
}
+ protected abstract Panel createPanel(String id, Map properties);
+
protected void doAddChild(AjaxObject child)
{
Widget childWidget = child.getWidget();
//
- container.add(childWidget);
+ layout.add(childWidget);
}
public Widget getWidget()
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java 2008-06-30 21:17:56 UTC (rev 11226)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java 2008-06-30 22:22:11 UTC (rev 11227)
@@ -22,6 +22,10 @@
******************************************************************************/
package org.jboss.portal.presentation.ajax.client.model;
+import com.google.gwt.user.client.ui.Panel;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Label;
+
import java.util.Map;
/**
@@ -30,8 +34,28 @@
*/
public class AjaxPage extends AjaxLayout
{
+
public AjaxPage(String id, Map properties)
{
super(id, properties);
+
+ //
}
+
+ protected Panel createPanel(String id, Map properties)
+ {
+ Label title = new Label();
+ title.setText("Page " + id);
+ title.setStyleName("pf-Title");
+
+ //
+ VerticalPanel panel = new VerticalPanel();
+ panel.setStyleName("pf-Pane");
+
+ //
+ panel.add(title);
+
+ //
+ return panel;
+ }
}
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java 2008-06-30 21:17:56 UTC (rev 11226)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java 2008-06-30 22:22:11 UTC (rev 11227)
@@ -22,6 +22,9 @@
******************************************************************************/
package org.jboss.portal.presentation.ajax.client.model;
+import com.google.gwt.user.client.ui.Panel;
+import com.google.gwt.user.client.ui.VerticalPanel;
+
import java.util.Map;
/**
@@ -34,4 +37,13 @@
{
super(id, properties);
}
+
+ protected Panel createPanel(String id, Map properties)
+ {
+ VerticalPanel panel = new VerticalPanel();
+ panel.setStyleName("pf-Pane");
+
+ //
+ return panel;
+ }
}
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/public/style.css
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/public/style.css 2008-06-30 21:17:56 UTC (rev 11226)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/public/style.css 2008-06-30 22:22:11 UTC (rev 11227)
@@ -24,7 +24,13 @@
border: 1px solid black;
padding: 1px;
}
-.pf-Container {
+
+.pf-Layout {
border: 1px solid black;
padding: 1px;
+}
+
+.pf-Pane {
+border: 1px solid black;
+padding: 1px;
}
\ No newline at end of file
15 years, 10 months
JBoss Portal SVN: r11226 - in modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation: model/ui and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-30 17:17:56 -0400 (Mon, 30 Jun 2008)
New Revision: 11226
Added:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java
Log:
a bit of reorg of the ui model
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java 2008-06-30 21:17:56 UTC (rev 11226)
@@ -0,0 +1,37 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.impl.model.ui;
+
+import org.jboss.portal.presentation.state.structural.StructuralObject;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class UIPaneImpl extends UILayoutImpl
+{
+ public UIPaneImpl(StructuralObject structuralObject, UIObjectContext context)
+ {
+ super(structuralObject, context);
+ }
+}
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java 2008-06-30 21:17:56 UTC (rev 11226)
@@ -0,0 +1,33 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.ui;
+
+/**
+ * A pane is a special kind of layout that cannot be displayed by itself.
+ *
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface UIPane extends UILayout
+{
+}
15 years, 10 months
JBoss Portal SVN: r11225 - in modules/presentation/trunk: portal/src/main/java/org/jboss/portal/presentation/portal/model and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-30 17:17:01 -0400 (Mon, 30 Jun 2008)
New Revision: 11225
Added:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java
Removed:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java
Log:
a bit of reorg of the ui model
Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java (from rev 11220, modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java)
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java (rev 0)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -0,0 +1,123 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.ajax.client.model;
+
+import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Panel;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.jboss.portal.presentation.ajax.client.Constants;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public abstract class AjaxLayout extends AjaxObject
+{
+
+ /** . */
+ private Label title;
+
+ /** . */
+ private Panel container;
+
+ /** . */
+ private Widget widget;
+
+ public AjaxLayout(String id, Map properties)
+ {
+ super(id, properties);
+
+ //
+ Label title = new Label("Pane " + id);
+ VerticalPanel widget = new VerticalPanel();
+ Panel container;
+
+ //
+ String layoutId = (String)getPropertyValue(Constants.LAYOUT_ID);
+
+ //
+ if (Constants.SIMPLE_LAYOUT.equals(layoutId))
+ {
+ String orientation = (String)getPropertyValue(Constants.SIMPLE_LAYOUT_ORIENTATION);
+
+ //
+ if (orientation == null || !Constants.VERTICAL_ORIENTATION.equals(orientation))
+ {
+ container = new HorizontalPanel();
+ }
+ else
+ {
+ container = new VerticalPanel();
+ }
+ }
+ else
+ {
+ // todo
+ container = new VerticalPanel();
+ }
+
+ //
+ widget.add(title);
+ widget.add(container);
+
+ //
+ widget.setStyleName("pf-Pane");
+ title.setStyleName("pf-Title");
+ container.setStyleName("pf-Container");
+
+ //
+ this.title = title;
+ this.container = container;
+ this.widget = widget;
+ }
+
+ protected void doAddChild(AjaxObject child)
+ {
+ Widget childWidget = child.getWidget();
+
+ //
+ container.add(childWidget);
+ }
+
+ public Widget getWidget()
+ {
+ return widget;
+ }
+
+ protected void doRefresh()
+ {
+ for (Iterator i = getChildren().iterator();i.hasNext();)
+ {
+ AjaxObject child = (AjaxObject)i.next();
+
+ //
+ child.refresh();
+ }
+ }
+}
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java 2008-06-30 20:59:30 UTC (rev 11224)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -28,7 +28,7 @@
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class AjaxPage extends AjaxPane
+public class AjaxPage extends AjaxLayout
{
public AjaxPage(String id, Map properties)
{
Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java 2008-06-30 20:59:30 UTC (rev 11224)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -1,123 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.ajax.client.model;
-
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Panel;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.jboss.portal.presentation.ajax.client.Constants;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class AjaxPane extends AjaxObject
-{
-
- /** . */
- private Label title;
-
- /** . */
- private Panel container;
-
- /** . */
- private Widget widget;
-
- public AjaxPane(String id, Map properties)
- {
- super(id, properties);
-
- //
- Label title = new Label("Pane " + id);
- VerticalPanel widget = new VerticalPanel();
- Panel container;
-
- //
- String layoutId = (String)getPropertyValue(Constants.LAYOUT_ID);
-
- //
- if (Constants.SIMPLE_LAYOUT.equals(layoutId))
- {
- String orientation = (String)getPropertyValue(Constants.SIMPLE_LAYOUT_ORIENTATION);
-
- //
- if (orientation == null || !Constants.VERTICAL_ORIENTATION.equals(orientation))
- {
- container = new HorizontalPanel();
- }
- else
- {
- container = new VerticalPanel();
- }
- }
- else
- {
- // todo
- container = new VerticalPanel();
- }
-
- //
- widget.add(title);
- widget.add(container);
-
- //
- widget.setStyleName("pf-Pane");
- title.setStyleName("pf-Title");
- container.setStyleName("pf-Container");
-
- //
- this.title = title;
- this.container = container;
- this.widget = widget;
- }
-
- protected void doAddChild(AjaxObject child)
- {
- Widget childWidget = child.getWidget();
-
- //
- container.add(childWidget);
- }
-
- public Widget getWidget()
- {
- return widget;
- }
-
- protected void doRefresh()
- {
- for (Iterator i = getChildren().iterator();i.hasNext();)
- {
- AjaxObject child = (AjaxObject)i.next();
-
- //
- child.refresh();
- }
- }
-}
Added: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java (rev 0)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -0,0 +1,37 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.ajax.client.model;
+
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class AjaxPane extends AjaxLayout
+{
+ public AjaxPane(String id, Map properties)
+ {
+ super(id, properties);
+ }
+}
Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-30 20:59:30 UTC (rev 11224)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -34,8 +34,8 @@
import org.jboss.portal.presentation.portal.model.node.PageNode;
import org.jboss.portal.presentation.portal.model.node.WindowNode;
import org.jboss.portal.presentation.model.ui.UIObject;
-import org.jboss.portal.presentation.model.ui.UILayout;
import org.jboss.portal.presentation.model.ui.UIWindow;
+import org.jboss.portal.presentation.model.ui.UIPane;
import org.jboss.portal.presentation.state.structural.StructuralState;
import org.jboss.portal.common.NotYetImplemented;
@@ -220,7 +220,7 @@
{
if (o instanceof NestedStructure)
{
- return UILayout.class;
+ return UIPane.class;
}
else if (o instanceof SimpleElement)
{
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java 2008-06-30 20:59:30 UTC (rev 11224)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -29,7 +29,7 @@
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class UILayoutImpl extends UIObjectImpl implements UILayout
+public abstract class UILayoutImpl extends UIObjectImpl implements UILayout
{
public UILayoutImpl(StructuralObject structuralObject, UIObjectContext context)
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 20:59:30 UTC (rev 11224)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -28,7 +28,7 @@
import org.jboss.portal.presentation.model.ui.UIContext;
import org.jboss.portal.presentation.model.ui.UIPage;
import org.jboss.portal.presentation.model.ui.UIWindow;
-import org.jboss.portal.presentation.model.ui.UILayout;
+import org.jboss.portal.presentation.model.ui.UIPane;
import org.jboss.portal.presentation.state.StateException;
import org.jboss.portal.presentation.state.StateType;
import org.jboss.portal.presentation.state.structural.StructuralObject;
@@ -66,9 +66,9 @@
{
object = new UIPageImpl(structuralObject, objectContext);
}
- else if (type == UILayout.class)
+ else if (type == UIPane.class)
{
- object = new UILayoutImpl(structuralObject, objectContext);
+ object = new UIPaneImpl(structuralObject, objectContext);
}
else if (type == UIContext.class)
{
Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java 2008-06-30 20:59:30 UTC (rev 11224)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -1,39 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.impl.model.ui;
-
-import org.jboss.portal.presentation.model.ui.UIPane;
-import org.jboss.portal.presentation.state.structural.StructuralObject;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class UIPaneImpl extends UIObjectImpl implements UIPane
-{
-
- public UIPaneImpl(StructuralObject structuralObject, UIObjectContext context)
- {
- super(structuralObject, context);
- }
-}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java 2008-06-30 20:59:30 UTC (rev 11224)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -23,6 +23,8 @@
package org.jboss.portal.presentation.model.ui;
/**
+ * A context is a special kind of page which denotes the root page.
+ *
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java 2008-06-30 20:59:30 UTC (rev 11224)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -23,6 +23,8 @@
package org.jboss.portal.presentation.model.ui;
/**
+ * A ui object having the role to layout children.
+ *
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java 2008-06-30 20:59:30 UTC (rev 11224)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -23,6 +23,9 @@
package org.jboss.portal.presentation.model.ui;
/**
+ * A page is a special kind of layout that can be displayed by itself and
+ * does not have an outer context.
+ *
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java 2008-06-30 20:59:30 UTC (rev 11224)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java 2008-06-30 21:17:01 UTC (rev 11225)
@@ -1,31 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.model.ui;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public interface UIPane extends UIObject
-{
-}
15 years, 10 months
JBoss Portal SVN: r11224 - in modules/presentation/trunk: classic/src/main/java/org/jboss/portal/presentation/classic and 4 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-30 16:59:30 -0400 (Mon, 30 Jun 2008)
New Revision: 11224
Added:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java
modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java
Log:
rename UIPane -> UILayout : makes more sense but gonna reuse the UIPane concept sooooon
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-06-30 19:03:54 UTC (rev 11223)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-06-30 20:59:30 UTC (rev 11224)
@@ -27,7 +27,7 @@
import org.jboss.portal.presentation.model.ui.UIContext;
import org.jboss.portal.presentation.model.ui.UIPage;
import org.jboss.portal.presentation.model.ui.UIWindow;
-import org.jboss.portal.presentation.model.ui.UIPane;
+import org.jboss.portal.presentation.model.ui.UILayout;
import org.jboss.portal.presentation.ajax.client.model.update.ModelUpdate;
import org.jboss.portal.presentation.ajax.client.model.update.AddObject;
import org.jboss.portal.presentation.ajax.client.model.update.RemoveObject;
@@ -95,7 +95,7 @@
{
objectType = ObjectType.WINDOW;
}
- else if (object instanceof UIPane)
+ else if (object instanceof UILayout)
{
objectType = ObjectType.PANE;
}
Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java
===================================================================
--- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-30 19:03:54 UTC (rev 11223)
+++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-30 20:59:30 UTC (rev 11224)
@@ -49,7 +49,7 @@
import org.jboss.portal.presentation.model.ui.UIContext;
import org.jboss.portal.presentation.model.ui.UIPage;
import org.jboss.portal.presentation.model.ui.UIWindow;
-import org.jboss.portal.presentation.model.ui.UIPane;
+import org.jboss.portal.presentation.model.ui.UILayout;
import org.jboss.portal.presentation.protocol.ProtocolAction;
import org.jboss.portal.presentation.protocol.ProtocolResponse;
import org.jboss.portal.presentation.protocol.ShowUIObjectResponse;
@@ -274,7 +274,7 @@
{
renderChildren(node, writer);
}
- else if (object instanceof UIPane)
+ else if (object instanceof UILayout)
{
if (node.getChildren() != null)
{
Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-30 19:03:54 UTC (rev 11223)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-30 20:59:30 UTC (rev 11224)
@@ -34,7 +34,7 @@
import org.jboss.portal.presentation.portal.model.node.PageNode;
import org.jboss.portal.presentation.portal.model.node.WindowNode;
import org.jboss.portal.presentation.model.ui.UIObject;
-import org.jboss.portal.presentation.model.ui.UIPane;
+import org.jboss.portal.presentation.model.ui.UILayout;
import org.jboss.portal.presentation.model.ui.UIWindow;
import org.jboss.portal.presentation.state.structural.StructuralState;
import org.jboss.portal.common.NotYetImplemented;
@@ -220,7 +220,7 @@
{
if (o instanceof NestedStructure)
{
- return UIPane.class;
+ return UILayout.class;
}
else if (o instanceof SimpleElement)
{
Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java (from rev 11193, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java)
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java 2008-06-30 20:59:30 UTC (rev 11224)
@@ -0,0 +1,39 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.impl.model.ui;
+
+import org.jboss.portal.presentation.model.ui.UILayout;
+import org.jboss.portal.presentation.state.structural.StructuralObject;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class UILayoutImpl extends UIObjectImpl implements UILayout
+{
+
+ public UILayoutImpl(StructuralObject structuralObject, UIObjectContext context)
+ {
+ super(structuralObject, context);
+ }
+}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 19:03:54 UTC (rev 11223)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 20:59:30 UTC (rev 11224)
@@ -28,7 +28,7 @@
import org.jboss.portal.presentation.model.ui.UIContext;
import org.jboss.portal.presentation.model.ui.UIPage;
import org.jboss.portal.presentation.model.ui.UIWindow;
-import org.jboss.portal.presentation.model.ui.UIPane;
+import org.jboss.portal.presentation.model.ui.UILayout;
import org.jboss.portal.presentation.state.StateException;
import org.jboss.portal.presentation.state.StateType;
import org.jboss.portal.presentation.state.structural.StructuralObject;
@@ -66,9 +66,9 @@
{
object = new UIPageImpl(structuralObject, objectContext);
}
- else if (type == UIPane.class)
+ else if (type == UILayout.class)
{
- object = new UIPaneImpl(structuralObject, objectContext);
+ object = new UILayoutImpl(structuralObject, objectContext);
}
else if (type == UIContext.class)
{
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java 2008-06-30 19:03:54 UTC (rev 11223)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java 2008-06-30 20:59:30 UTC (rev 11224)
@@ -29,7 +29,7 @@
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class UIPageImpl extends UIPaneImpl implements UIPage
+public class UIPageImpl extends UILayoutImpl implements UIPage
{
public UIPageImpl(
StructuralObject structuralObject,
Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java (from rev 11193, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java)
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java 2008-06-30 20:59:30 UTC (rev 11224)
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.ui;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface UILayout extends UIObject
+{
+}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java 2008-06-30 19:03:54 UTC (rev 11223)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java 2008-06-30 20:59:30 UTC (rev 11224)
@@ -26,6 +26,6 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public interface UIPage extends UIPane
+public interface UIPage extends UILayout
{
}
\ No newline at end of file
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java 2008-06-30 19:03:54 UTC (rev 11223)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java 2008-06-30 20:59:30 UTC (rev 11224)
@@ -27,7 +27,7 @@
import org.jboss.portal.presentation.model.ViewPortScope;
import org.jboss.portal.presentation.model.ui.UIPage;
import org.jboss.portal.presentation.model.ui.UIWindow;
-import org.jboss.portal.presentation.model.ui.UIPane;
+import org.jboss.portal.presentation.model.ui.UILayout;
/**
* A view scope that retrieves a page and its visible content.
@@ -69,7 +69,7 @@
public ObjectTraversalType enterObject(UIObject object)
{
- if (object instanceof UIPane)
+ if (object instanceof UILayout)
{
if (object instanceof UIPage)
{
15 years, 10 months
JBoss Portal SVN: r11223 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 15:03:54 -0400 (Mon, 30 Jun 2008)
New Revision: 11223
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java
Log:
oups v2.6
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-06-30 18:56:36 UTC (rev 11222)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-06-30 19:03:54 UTC (rev 11223)
@@ -301,7 +301,15 @@
String orderProperty1S = (String)node1.getProperties().get(ORDER);
String orderProperty2S = (String)node2.getProperties().get(ORDER);
- if (orderProperty1S != null && orderProperty2S !=null)
+ if (orderProperty1S != null && orderProperty2S == null)
+ {
+ return -1;
+ }
+ else if (orderProperty1S == null && orderProperty2S != null)
+ {
+ return 1;
+ }
+ else if (orderProperty1S != null && orderProperty2S != null)
{
float orderProperty1 = -1;
float orderProperty2 = -1;
15 years, 10 months
JBoss Portal SVN: r11222 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 14:56:36 -0400 (Mon, 30 Jun 2008)
New Revision: 11222
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java
Log:
Oups
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-06-30 18:38:27 UTC (rev 11221)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-06-30 18:56:36 UTC (rev 11222)
@@ -301,7 +301,15 @@
String orderProperty1S = (String)node1.getProperties().get(ORDER);
String orderProperty2S = (String)node2.getProperties().get(ORDER);
- if (orderProperty1S != null && orderProperty2S !=null)
+ if (orderProperty1S != null && orderProperty2S == null)
+ {
+ return -1;
+ }
+ else if (orderProperty1S == null && orderProperty2S != null)
+ {
+ return 1;
+ }
+ else if (orderProperty1S != null && orderProperty2S != null)
{
float orderProperty1 = -1;
float orderProperty2 = -1;
15 years, 10 months
JBoss Portal SVN: r11221 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 14:38:27 -0400 (Mon, 30 Jun 2008)
New Revision: 11221
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
Log:
Oups
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-06-30 18:27:15 UTC (rev 11220)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-06-30 18:38:27 UTC (rev 11221)
@@ -104,7 +104,7 @@
protected void getContent(RenderRequest req, RenderResponse resp, boolean newContent) throws PortletException, PortletSecurityException, IOException
{
- String selectedURI = req.getParameter("current_uri");
+ String selectedURI = req.getParameter(CONTENT_URI);
if (selectedURI == null)
{
// Get the uri value optionally provided by the portal
15 years, 10 months
JBoss Portal SVN: r11220 - in modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax: client/model and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-30 14:27:15 -0400 (Mon, 30 Jun 2008)
New Revision: 11220
Added:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Constants.java
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/public/style.css
Log:
add a bit of layouting and styling in ajax client
Added: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Constants.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Constants.java (rev 0)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Constants.java 2008-06-30 18:27:15 UTC (rev 11220)
@@ -0,0 +1,71 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.ajax.client;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class Constants
+{
+
+ /** . */
+ public static final String LAYOUT_ID = "org.jboss.portal.presentation.layout_id";
+
+ /** . */
+ public static final String SIMPLE_LAYOUT = "simple";
+
+ /** . */
+ public static final String REGION_LAYOUT = "region";
+
+ /** . */
+ public static final String DESKTOP_LAYOUT = "desktop";
+
+ /** . */
+ public static final String SIMPLE_LAYOUT_ORIENTATION = "org.jboss.portal.presentation.layout.simple.orientation";
+
+ /** . */
+ public static final String SIMPLE_LAYOUT_INDEX = "org.jboss.portal.presentation.layout.simple.index";
+
+ /** . */
+ public static final String VERTICAL_ORIENTATION = "vertical";
+
+ /** . */
+ public static final String HORIZONTAL_ORIENTATION = "horizontal";
+
+ /** . */
+ public static final String REGION_LAYOUT_TEMPLATE = "org.jboss.portal.presentation.layout.region.template";
+
+ /** . */
+ public static final String REGION_LAYOUT_NAME = "org.jboss.portal.presentation.layout.region.name";
+
+ /** . */
+ public static final String REGION_LAYOUT_INDEX = "org.jboss.portal.presentation.layout.region.index";
+
+ /** . */
+ public static final String DESKTOP_LAYOUT_X = "org.jboss.portal.presentation.layout.desktop.x";
+
+ /** . */
+ public static final String DESKTOP_LAYOUT_Y = "org.jboss.portal.presentation.layout.desktop.y";
+
+}
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java 2008-06-30 17:38:53 UTC (rev 11219)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java 2008-06-30 18:27:15 UTC (rev 11220)
@@ -52,20 +52,29 @@
private Map children;
/** . */
+ private Map properties;
+
+ /** . */
private AjaxObject parent;
- protected AjaxObject(String id)
+ protected AjaxObject(String id, Map properties)
{
this.id = id;
this.children = new HashMap();
+ this.properties = properties;
}
+ public final Object getPropertyValue(String propertyName)
+ {
+ return properties.get(propertyName);
+ }
+
public final Context getContext()
{
return context;
}
- public Collection getChildren()
+ public final Collection getChildren()
{
return children.values();
}
@@ -153,16 +162,16 @@
{
throw new IllegalStateException("Already a root page");
}
- object = root = new AjaxPage(addObject.getObjectId());
+ object = root = new AjaxPage(addObject.getObjectId(), addObject.getObjectProperties());
break;
case ObjectType.PAGE:
- object = root = new AjaxPage(addObject.getObjectId());
+ object = root = new AjaxPage(addObject.getObjectId(), addObject.getObjectProperties());
break;
case ObjectType.WINDOW:
- object = new AjaxWindow(addObject.getObjectId());
+ object = new AjaxWindow(addObject.getObjectId(), addObject.getObjectProperties());
break;
case ObjectType.PANE:
- object = new AjaxPane(addObject.getObjectId());
+ object = new AjaxPane(addObject.getObjectId(), addObject.getObjectProperties());
break;
}
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java 2008-06-30 17:38:53 UTC (rev 11219)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPage.java 2008-06-30 18:27:15 UTC (rev 11220)
@@ -22,14 +22,16 @@
******************************************************************************/
package org.jboss.portal.presentation.ajax.client.model;
+import java.util.Map;
+
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
public class AjaxPage extends AjaxPane
{
- public AjaxPage(String id)
+ public AjaxPage(String id, Map properties)
{
- super(id);
+ super(id, properties);
}
}
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java 2008-06-30 17:38:53 UTC (rev 11219)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxPane.java 2008-06-30 18:27:15 UTC (rev 11220)
@@ -25,9 +25,14 @@
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Panel;
import java.util.Iterator;
+import java.util.Map;
+import org.jboss.portal.presentation.ajax.client.Constants;
+
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
@@ -39,25 +44,54 @@
private Label title;
/** . */
- private VerticalPanel container;
+ private Panel container;
/** . */
- private VerticalPanel widget;
+ private Widget widget;
- public AjaxPane(String id)
+ public AjaxPane(String id, Map properties)
{
- super(id);
+ super(id, properties);
//
Label title = new Label("Pane " + id);
+ VerticalPanel widget = new VerticalPanel();
+ Panel container;
//
- VerticalPanel container = new VerticalPanel();
- VerticalPanel widget = new VerticalPanel();
+ String layoutId = (String)getPropertyValue(Constants.LAYOUT_ID);
+
+ //
+ if (Constants.SIMPLE_LAYOUT.equals(layoutId))
+ {
+ String orientation = (String)getPropertyValue(Constants.SIMPLE_LAYOUT_ORIENTATION);
+
+ //
+ if (orientation == null || !Constants.VERTICAL_ORIENTATION.equals(orientation))
+ {
+ container = new HorizontalPanel();
+ }
+ else
+ {
+ container = new VerticalPanel();
+ }
+ }
+ else
+ {
+ // todo
+ container = new VerticalPanel();
+ }
+
+ //
widget.add(title);
widget.add(container);
//
+ widget.setStyleName("pf-Pane");
+ title.setStyleName("pf-Title");
+ container.setStyleName("pf-Container");
+
+ //
this.title = title;
this.container = container;
this.widget = widget;
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java 2008-06-30 17:38:53 UTC (rev 11219)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java 2008-06-30 18:27:15 UTC (rev 11220)
@@ -63,9 +63,9 @@
/** . */
private HTML markup;
- public AjaxWindow(String id)
+ public AjaxWindow(String id, Map properties)
{
- super(id);
+ super(id, properties);
//
Label title = new Label("Window " + id);
@@ -75,6 +75,11 @@
widget.add(markup);
//
+ widget.setStyleName("pf-Window");
+ title.setStyleName("pf-Title");
+ markup.setStyleName("pf-Markup");
+
+ //
this.title = title;
this.markup = markup;
this.widget = widget;
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/public/style.css
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/public/style.css 2008-06-30 17:38:53 UTC (rev 11219)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/public/style.css 2008-06-30 18:27:15 UTC (rev 11220)
@@ -3,4 +3,28 @@
font-family:Courier New;
font-size:12px;
font-weight:bold;
+}
+
+.pf-Pane {
+border: 1px solid black;
+padding: 1px;
+}
+
+.pf-Window {
+border: 1px solid black;
+padding: 1px;
+}
+
+.pf-Title {
+border: 1px solid black;
+padding: 1px;
+}
+
+.pf-Markup {
+border: 1px solid black;
+padding: 1px;
+}
+.pf-Container {
+border: 1px solid black;
+padding: 1px;
}
\ No newline at end of file
15 years, 10 months
JBoss Portal SVN: r11219 - in branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms: model and 1 other directory.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-06-30 13:38:53 -0400 (Mon, 30 Jun 2008)
New Revision: 11219
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Content.java
Log:
JBPORTAL-2015 - CMS content object should return a long for the size
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java 2008-06-30 17:07:44 UTC (rev 11218)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java 2008-06-30 17:38:53 UTC (rev 11219)
@@ -60,7 +60,7 @@
protected String mimeType;
- protected int size;
+ protected long size;
protected boolean isWaitingForPublishApproval = false;
protected String approvalProcessId = null;
@@ -166,7 +166,7 @@
isLive = live;
}
- public int getSize()
+ public long getSize()
{
return this.size;
}
@@ -181,7 +181,7 @@
this.mimeType = mimeType;
}
- public void setSize(int size)
+ public void setSize(long size)
{
this.size = size;
}
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Content.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Content.java 2008-06-30 17:07:44 UTC (rev 11218)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Content.java 2008-06-30 17:38:53 UTC (rev 11219)
@@ -38,9 +38,9 @@
void setMimeType(String type);
/** @return the */
- int getSize();
+ long getSize();
- void setSize(int size);
+ void setSize(long size);
/** @return Returns the content. */
InputStream getStream();
15 years, 10 months