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
Show replies by date