-Changed ReservationApplication to conform to new setStyleName. Removed deprecated style constant usages also. Some margins enabled to layouts.
-IOrderedLayout vertical reverted back to DIV implementation.
-Margins added to demo layouts where needed.
svn changeset:2714/svn branch:trunk
setTheme("reservr");\r
\r
TabSheet mainTabs = new TabSheet();\r
- mainTabs.addStyleName(TabSheet.STYLE_NO_PADDING);\r
mainWindow.addComponent(mainTabs);\r
\r
OrderedLayout reservationTab = new OrderedLayout();\r
\r
Panel reservationPanel = new Panel("Reservation", new OrderedLayout(\r
OrderedLayout.ORIENTATION_HORIZONTAL));\r
- reservationPanel.setStyle("light");\r
+ reservationPanel.addStyleName(Panel.STYLE_LIGHT);\r
+ reservationPanel.getLayout().setMargin(true);\r
reservationTab.addComponent(reservationPanel);\r
\r
OrderedLayout infoLayout = new OrderedLayout();\r
\r
Label arrowLabel = new Label("»");\r
arrowLabel.setContentMode(Label.CONTENT_XHTML);\r
- arrowLabel.setStyle("arrow");\r
+ arrowLabel.setStyleName("arrow");\r
reservationPanel.addComponent(arrowLabel);\r
\r
Calendar to = Calendar.getInstance();\r
Panel allLayout = new Panel(new OrderedLayout(\r
OrderedLayout.ORIENTATION_HORIZONTAL));\r
allLayout.addStyleName(Panel.STYLE_LIGHT);\r
+ allLayout.getLayout().setMargin(true);\r
allCalendar = new CalendarField();\r
initCalendarFieldPropertyIds(allCalendar);\r
allLayout.addComponent(allCalendar);\r
\r
public ResourceSelectorPanel(String caption) {\r
super(caption, new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL));\r
- setStyle("light");\r
+ addStyleName(Panel.STYLE_LIGHT);\r
}\r
\r
public void setResourceContainer(Container resources) {\r
String description = (String) resource.getItemProperty(\r
SampleDB.Resource.PROPERTY_ID_DESCRIPTION).getValue();\r
Button rButton = new Button(name, this);\r
- rButton.setStyle("link");\r
+ rButton.setStyleName("link");\r
rButton.setDescription(description);\r
rButton.setData(resource);\r
Layout resourceLayout = (Layout) categoryLayouts.get(category);\r
.get(category);\r
if (resourceLayout == null) {\r
resourceLayout = new OrderedLayout();\r
+ resourceLayout.setMargin(true);\r
this.addComponent(resourceLayout);\r
categoryLayouts.put(category, resourceLayout);\r
resourceList = new LinkedList();\r
categoryResources.put(category, resourceList);\r
Button cButton = new Button(category + " (any)", this);\r
- cButton.setStyle("important-link");\r
+ cButton.setStyleName("important-link");\r
cButton.setData(category);\r
resourceLayout.addComponent(cButton);\r
}\r
.get(category);\r
setSelectedResources(resources);\r
}\r
- ((Button) source).setStyle("selected-link");\r
+ ((Button) source).setStyleName("selected-link");\r
}\r
\r
}\r
for (Iterator bit = lo.getComponentIterator(); bit.hasNext();) {\r
Button b = (Button) bit.next();\r
if (b.getData() instanceof Item) {\r
- b.setStyle("link");\r
+ b.setStyleName("link");\r
} else {\r
- b.setStyle("important-link");\r
+ b.setStyleName("important-link");\r
}\r
}\r
}\r
public static final int ALIGNMENT_RIGHT = 2;
public static final int ALIGNMENT_TOP = 4;
public static final int ALIGNMENT_BOTTOM = 8;
- public static final int HORIZONTAL_ALIGNMENT_CENTER = 16;
- public static final int VERTICAL_ALIGNMENT_CENTER = 32;
+ public static final int ALIGNMENT_HORIZONTAL_CENTER = 16;
+ public static final int ALIGNMENT_VERTICAL_CENTER = 32;
int orientationMode = ORIENTATION_VERTICAL;
protected Element childContainer;
/*
- * Margin element that provides marginals.
+ * Element that provides margins.
*/
private Element margin;
}
protected void constructDOM() {
- margin = DOM.createDiv();
- Element table = DOM.createTable();
- Element tBody = DOM.createTBody();
- childContainer = orientationMode == ORIENTATION_HORIZONTAL ? DOM
- .createTR() : tBody;
- DOM.appendChild(table, tBody);
- if (orientationMode == ORIENTATION_HORIZONTAL)
+ switch (orientationMode) {
+ case ORIENTATION_HORIZONTAL:
+ Element table = DOM.createTable();
+ Element tBody = DOM.createTBody();
+ childContainer = DOM.createTR();
+ DOM.appendChild(table, tBody);
DOM.appendChild(tBody, childContainer);
- setElement(table);
- // prevent unwanted spacing
- DOM.setElementAttribute(table, "cellSpacing", "0");
- DOM.setElementAttribute(table, "cellPadding", "0");
+ setElement(table);
+ // prevent unwanted spacing
+ DOM.setElementAttribute(table, "cellSpacing", "0");
+ DOM.setElementAttribute(table, "cellPadding", "0");
+ margin = table;
+ break;
+ default:
+ childContainer = DOM.createDiv();
+ setElement(childContainer);
+ margin = childContainer;
+ break;
+ }
}
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
vAlign = "top";
else if ((alignment & ALIGNMENT_BOTTOM) == ALIGNMENT_BOTTOM)
vAlign = "bottom";
- else if ((alignment & VERTICAL_ALIGNMENT_CENTER) == VERTICAL_ALIGNMENT_CENTER)
+ else if ((alignment & ALIGNMENT_VERTICAL_CENTER) == ALIGNMENT_VERTICAL_CENTER)
vAlign = "middle";
// Horizontal alignment
String hAlign = "";
hAlign = "left";
else if ((alignment & ALIGNMENT_RIGHT) == ALIGNMENT_RIGHT)
hAlign = "right";
- else if ((alignment & HORIZONTAL_ALIGNMENT_CENTER) == HORIZONTAL_ALIGNMENT_CENTER)
+ else if ((alignment & ALIGNMENT_HORIZONTAL_CENTER) == ALIGNMENT_HORIZONTAL_CENTER)
hAlign = "center";
Element td = DOM.getParent(((Widget) it.next()).getElement());
// Modify layout marginals
String marginClasses = "";
if (uidl.hasAttribute("marginTop"))
- marginClasses = StyleConstants.LAYOUT_MARGIN_TOP;
+ marginClasses += " " + StyleConstants.LAYOUT_MARGIN_TOP;
if (uidl.hasAttribute("marginRight"))
- marginClasses = StyleConstants.LAYOUT_MARGIN_RIGHT;
+ marginClasses += " " + StyleConstants.LAYOUT_MARGIN_RIGHT;
if (uidl.hasAttribute("marginBottom"))
- marginClasses = StyleConstants.LAYOUT_MARGIN_BOTTOM;
+ marginClasses += " " + StyleConstants.LAYOUT_MARGIN_BOTTOM;
if (uidl.hasAttribute("marginLeft"))
- marginClasses = StyleConstants.LAYOUT_MARGIN_LEFT;
+ marginClasses += " " + StyleConstants.LAYOUT_MARGIN_LEFT;
- DOM.setElementProperty(margin, "className", marginClasses);
-
- // Adjust size
- if(uidl.hasAttribute("width"))
- setWidth(uidl.getStringAttribute("width"));
- else setWidth("100%");
- if(uidl.hasAttribute("height"))
- setHeight(uidl.getStringAttribute("height"));
- else setHeight("");
+ if(marginClasses.equals(""))
+ DOM.setElementProperty(margin, "className", CLASSNAME);
+ else
+ DOM.setElementProperty(margin, "className", CLASSNAME + marginClasses);
+
}
/**
} else {
Element container = createWidgetWrappper();
DOM.insertChild(childContainer, container, beforeIndex);
- insert(w, orientationMode == ORIENTATION_HORIZONTAL ? container
- : DOM.getFirstChild(container), beforeIndex, false);
+ insert(w, container, beforeIndex, false);
}
}
-
+
/**
* creates an Element which will contain child widget
*/
case ORIENTATION_HORIZONTAL:
return DOM.createTD();
default:
- Element tr = DOM.createTR();
- DOM.appendChild(tr, DOM.createTD());
- return tr;
+ return DOM.createDiv();
}
}
public void add(Widget w) {
Element wrapper = createWidgetWrappper();
DOM.appendChild(childContainer, wrapper);
- super.add(w, orientationMode == ORIENTATION_HORIZONTAL ? wrapper : DOM
- .getFirstChild(wrapper));
+ super.add(w, wrapper);
}
public boolean remove(int index) {
boolean removed = super.remove(w);
if (removed) {
if (!(w instanceof Caption)) {
- DOM.removeChild(childContainer,
- orientationMode == ORIENTATION_HORIZONTAL ? wrapper
- : DOM.getParent(wrapper));
+ DOM.removeChild(childContainer, wrapper);
}
return true;
}
tab.setWidthUnits(Sizeable.UNITS_PERCENTAGE);\r
tab.setHeight(740);\r
tab.setHeightUnits(Sizeable.UNITS_PIXELS);\r
- tab.addStyleName(TabSheet.STYLE_NO_PADDING);\r
\r
Panel report = new Panel("Monthly Program Runs", new ExpandLayout());\r
OrderedLayout controls = new OrderedLayout();\r
+ controls.setMargin(true);\r
controls.addComponent(new Label("Report tab"));\r
controls.addComponent(click);\r
controls.addComponent(click2);\r
/** Contruct new property panel for configuring given object. */
public PropertyPanel(Object objectToConfigure) {
super();
+ getLayout().setMargin(false);
// Layout
setCaption("Properties");
// Control buttons
OrderedLayout buttons = new OrderedLayout(
OrderedLayout.ORIENTATION_HORIZONTAL);
+ buttons.setMargin(false, true, true, true);
buttons.addComponent(setButton);
buttons.addComponent(discardButton);
addComponent(buttons);
import java.util.Iterator;
import java.util.LinkedList;
-import com.itmill.toolkit.terminal.Sizeable;
-
/**
* Extension to {@link AbstractComponent} that defines the default
* implementation for the methods in {@link ComponentContainer}. Basic UI
* @since 3.0
*/
public abstract class AbstractComponentContainer extends AbstractComponent
- implements ComponentContainer, Sizeable {
-
+ implements ComponentContainer {
+
/**
* Constructs a new component container.
*/
fireComponentDetachEvent(c);
}
}
-
+
}
* space at that edge.
*/
protected boolean[] margins;
-
- /**
- * Height of the layout. Set to -1 for undefined height.
- */
- private int height = -1;
-
- /**
- * Height unit.
- *
- * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
- */
- private int heightUnit = UNITS_PIXELS;
-
- /**
- * Width of the layout. Set to -1 for undefined width.
- */
- private int width = -1;
-
- /**
- * Width unit.
- *
- * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
- */
- private int widthUnit = UNITS_PIXELS;
/*
* (non-Javadoc)
margins = new boolean[] { topEnabled, rightEnabled, bottomEnabled,
leftEnabled };
}
-
- /*
- * (non-Javadoc)
- *
- * @see com.itmill.toolkit.terminal.Sizeable#getHeight()
- */
- public int getHeight() {
- return height;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
- */
- public int getHeightUnits() {
- return heightUnit;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.itmill.toolkit.terminal.Sizeable#getWidth()
- */
- public int getWidth() {
- return width;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
- */
- public int getWidthUnits() {
- return widthUnit;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.itmill.toolkit.terminal.Sizeable#setHeight(int)
- */
- public void setHeight(int height) {
- this.height = height;
- requestRepaint();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int)
- */
- public void setHeightUnits(int units) {
- this.heightUnit = units;
- requestRepaint();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.itmill.toolkit.terminal.Sizeable#setSizeFull()
- */
- public void setSizeFull() {
- height = 100;
- width = 100;
- heightUnit = UNITS_PERCENTAGE;
- widthUnit = UNITS_PERCENTAGE;
- requestRepaint();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.itmill.toolkit.terminal.Sizeable#setSizeUndefined()
- */
- public void setSizeUndefined() {
- height = -1;
- width = -1;
- heightUnit = UNITS_PIXELS;
- widthUnit = UNITS_PIXELS;
- requestRepaint();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.itmill.toolkit.terminal.Sizeable#setWidth(int)
- */
- public void setWidth(int width) {
- this.width = width;
- requestRepaint();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int)
- */
- public void setWidthUnits(int units) {
- this.widthUnit = units;
- requestRepaint();
- }
/*
* (non-Javadoc)
target.addAttribute("marginBottom", margins[2]);
if (margins[3])
target.addAttribute("marginLeft", margins[3]);
-
- // Add size info
- if (getHeight() > -1)
- target.addAttribute("height", getHeight()
- + UNIT_SYMBOLS[getHeightUnits()]);
- if (getWidth() > -1)
- target.addAttribute("width", getWidth()
- + UNIT_SYMBOLS[getWidthUnits()]);
}
}
private Component expanded;
+ /**
+ * Height of the layout. Set to -1 for undefined height.
+ */
+ private int height = -1;
+
+ /**
+ * Height unit.
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
+ */
+ private int heightUnit = UNITS_PIXELS;
+
+ /**
+ * Width of the layout. Set to -1 for undefined width.
+ */
+ private int width = -1;
+
+ /**
+ * Width unit.
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
+ */
+ private int widthUnit = UNITS_PIXELS;
+
public ExpandLayout() {
setSizeFull();
}
}
public void paintContent(PaintTarget target) throws PaintException {
+
+ //TODO should we add margins?
+
// Size
if (getHeight() >= 0)
target.addAttribute("height", "" + getHeight()
expanded = newComponent;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getHeight()
+ */
+ public int getHeight() {
+ return height;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
+ */
+ public int getHeightUnits() {
+ return heightUnit;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getWidth()
+ */
+ public int getWidth() {
+ return width;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
+ */
+ public int getWidthUnits() {
+ return widthUnit;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setHeight(int)
+ */
+ public void setHeight(int height) {
+ this.height = height;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int)
+ */
+ public void setHeightUnits(int units) {
+ this.heightUnit = units;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setSizeFull()
+ */
+ public void setSizeFull() {
+ height = 100;
+ width = 100;
+ heightUnit = UNITS_PERCENTAGE;
+ widthUnit = UNITS_PERCENTAGE;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setSizeUndefined()
+ */
+ public void setSizeUndefined() {
+ height = -1;
+ width = -1;
+ heightUnit = UNITS_PIXELS;
+ widthUnit = UNITS_PIXELS;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setWidth(int)
+ */
+ public void setWidth(int width) {
+ this.width = width;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int)
+ */
+ public void setWidthUnits(int units) {
+ this.widthUnit = units;
+ requestRepaint();
+ }
+
}
/**
* Contained component should be aligned horizontally to the left.
*/
- private int ALIGNMENT_LEFT = 1;
+ public static final int ALIGNMENT_LEFT = 1;
/**
* Contained component should be aligned horizontally to the right.
*/
- private int ALIGNMENT_RIGHT = 2;
+ public static final int ALIGNMENT_RIGHT = 2;
/**
* Contained component should be aligned vertically to the top.
*/
- private int ALIGNMENT_TOP = 4;
+ public static final int ALIGNMENT_TOP = 4;
/**
* Contained component should be aligned vertically to the bottom.
*/
- private int ALIGNMENT_BOTTOM = 8;
+ public static final int ALIGNMENT_BOTTOM = 8;
/**
* Contained component should be horizontally aligned to center.
*/
- private int HORIZONTAL_ALIGNMENT_CENTER = 16;
-
+ public static final int HORIZONTAL_ALIGNMENT_CENTER = 16;
+
/**
* Contained component should be vertically aligned to center.
*/
- private int VERTICAL_ALIGNMENT_CENTER = 32;
-
+ public static final int VERTICAL_ALIGNMENT_CENTER = 32;
+
/**
* Is spacing between contained components enabled. Defaults to false.
*/
components.remove(component);
if (area != null)
areas.remove(area);
-
+
componentToAlignment.remove(component);
requestRepaint();
// TODO refactor attribute names in future release.
target.addAttribute("h", rows);
target.addAttribute("w", cols);
-
+
if (this.spacing)
target.addAttribute("spacing", this.spacing);
* </p>
*/
public void setWidth(int width) {
- super.setWidth(width);
+ // super.setWidth(width);
}
/**
* </p>
*/
public int getWidth() {
- return super.getWidth();
+ // return super.getWidth();
+ return -1;
}
/**
* </p>
*/
public void setHeight(int height) {
- super.setHeight(height);
+ // super.setHeight(height);
}
/**
* </p>
*/
public int getHeight() {
- return super.getHeight();
+ // return super.getHeight();
+ return -1;
}
/**
* @VERSION@
* @since 3.0
*/
-public interface Layout extends ComponentContainer, Sizeable {
+public interface Layout extends ComponentContainer {
/**
* Enable layout margins. Affects all four sides of the layout. This will
*/
private LinkedList components = new LinkedList();
+ /* Child component alignments ************************************** */
+
/**
* Mapping from components to alignments (horizontal + vertical).
*/
/**
* Contained component should be horizontally aligned to center.
*/
- public static final int HORIZONTAL_ALIGNMENT_CENTER = 16;
+ public static final int ALIGNMENT_HORIZONTAL_CENTER = 16;
/**
* Contained component should be vertically aligned to center.
*/
- public static final int VERTICAL_ALIGNMENT_CENTER = 32;
+ public static final int ALIGNMENT_VERTICAL_CENTER = 32;
/**
* Orientation of the layout.
if (orientation == ORIENTATION_HORIZONTAL)
target.addAttribute("orientation", "horizontal");
+ // Add spacing attribute (omitted if false)
if (this.spacing)
target.addAttribute("spacing", this.spacing);
import com.itmill.toolkit.terminal.PaintException;
import com.itmill.toolkit.terminal.PaintTarget;
import com.itmill.toolkit.terminal.Scrollable;
+import com.itmill.toolkit.terminal.Sizeable;
/**
* Panel - a simple single component container.
* @VERSION@
* @since 3.0
*/
-public class Panel extends AbstractLayout implements Scrollable,
+public class Panel extends AbstractLayout implements Sizeable, Scrollable,
ComponentContainer.ComponentAttachListener,
ComponentContainer.ComponentDetachListener, Action.Container {
public static final String STYLE_LIGHT = "light";
public static final String STYLE_EMPHASIZE = "emphasize";
+
+ /**
+ * Height of the layout. Set to -1 for undefined height.
+ */
+ private int height = -1;
+
+ /**
+ * Height unit.
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
+ */
+ private int heightUnit = UNITS_PIXELS;
+
+ /**
+ * Width of the layout. Set to -1 for undefined width.
+ */
+ private int width = -1;
+
+ /**
+ * Width unit.
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
+ */
+ private int widthUnit = UNITS_PIXELS;
/**
* Layout of the panel.
* Creates a new empty panel. Ordered layout is used.
*/
public Panel() {
- this(new OrderedLayout());
+ setLayout(null);
}
/**
public void paintContent(PaintTarget target) throws PaintException {
layout.paint(target);
- // We need to add these attributes here (and not in super.paintContent),
- // because Panel needs to have size information as variables.
-
- // Add margin info
- if (margins == null)
- setMargin(false);
- if (margins[0])
- target.addAttribute("marginTop", margins[0]);
- if (margins[1])
- target.addAttribute("marginRight", margins[1]);
- if (margins[2])
- target.addAttribute("marginBottom", margins[2]);
- if (margins[3])
- target.addAttribute("marginLeft", margins[3]);
+ super.paintContent(target);
// Add size info as variables
if (getHeight() > -1)
requestRepaint();
}
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getHeight()
+ */
+ public int getHeight() {
+ return height;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
+ */
+ public int getHeightUnits() {
+ return heightUnit;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getWidth()
+ */
+ public int getWidth() {
+ return width;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
+ */
+ public int getWidthUnits() {
+ return widthUnit;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setHeight(int)
+ */
+ public void setHeight(int height) {
+ this.height = height;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int)
+ */
+ public void setHeightUnits(int units) {
+ this.heightUnit = units;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setSizeFull()
+ */
+ public void setSizeFull() {
+ height = 100;
+ width = 100;
+ heightUnit = UNITS_PERCENTAGE;
+ widthUnit = UNITS_PERCENTAGE;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setSizeUndefined()
+ */
+ public void setSizeUndefined() {
+ height = -1;
+ width = -1;
+ heightUnit = UNITS_PIXELS;
+ widthUnit = UNITS_PIXELS;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setWidth(int)
+ */
+ public void setWidth(int width) {
+ this.width = width;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int)
+ */
+ public void setWidthUnits(int units) {
+ this.widthUnit = units;
+ requestRepaint();
+ }
}
* @VERSION@
* @since 5.0
*/
-public class SplitPanel extends AbstractLayout {
+public class SplitPanel extends AbstractLayout implements Sizeable {
/* Predefined orientations ***************************************** */
private int posUnit = UNITS_PERCENTAGE;
+ /**
+ * Height of the layout. Set to -1 for undefined height.
+ */
+ private int height = -1;
+
+ /**
+ * Height unit.
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
+ */
+ private int heightUnit = UNITS_PIXELS;
+
+ /**
+ * Width of the layout. Set to -1 for undefined width.
+ */
+ private int width = -1;
+
+ /**
+ * Width unit.
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
+ */
+ private int widthUnit = UNITS_PIXELS;
+
/**
* Creates a new split panel. The orientation of the panels is
* <code>ORIENTATION_VERTICAL</code>.
* if the paint operation failed.
*/
public void paintContent(PaintTarget target) throws PaintException {
-
super.paintContent(target);
String position = pos + UNIT_SYMBOLS[posUnit];
target.addAttribute("position", position);
+ // Add size info
+ if (getHeight() > -1)
+ target.addAttribute("height", getHeight()
+ + UNIT_SYMBOLS[getHeightUnits()]);
+ if (getWidth() > -1)
+ target.addAttribute("width", getWidth()
+ + UNIT_SYMBOLS[getWidthUnits()]);
+
if (firstComponent != null)
firstComponent.paint(target);
else
*
* @param pos
* size of the first region
- * @param unit the unit (from {@link Sizeable}) in which the size is given.
+ * @param unit
+ * the unit (from {@link Sizeable}) in which the size is given.
*/
public void setSplitPosition(int pos, int unit) {
this.pos = pos;
this.posUnit = unit;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getHeight()
+ */
+ public int getHeight() {
+ return height;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
+ */
+ public int getHeightUnits() {
+ return heightUnit;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getWidth()
+ */
+ public int getWidth() {
+ return width;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
+ */
+ public int getWidthUnits() {
+ return widthUnit;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setHeight(int)
+ */
+ public void setHeight(int height) {
+ this.height = height;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int)
+ */
+ public void setHeightUnits(int units) {
+ this.heightUnit = units;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setSizeFull()
+ */
+ public void setSizeFull() {
+ height = 100;
+ width = 100;
+ heightUnit = UNITS_PERCENTAGE;
+ widthUnit = UNITS_PERCENTAGE;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setSizeUndefined()
+ */
+ public void setSizeUndefined() {
+ height = -1;
+ width = -1;
+ heightUnit = UNITS_PIXELS;
+ widthUnit = UNITS_PIXELS;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setWidth(int)
+ */
+ public void setWidth(int width) {
+ this.width = width;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int)
+ */
+ public void setWidthUnits(int units) {
+ this.widthUnit = units;
+ requestRepaint();
+ }
+
}
import java.lang.reflect.Method;
import java.util.Hashtable;
-import java.util.LinkedList;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.Map;
-import com.itmill.toolkit.terminal.*;
+import com.itmill.toolkit.terminal.KeyMapper;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.terminal.Sizeable;
/**
* Tabsheet component.
* @VERSION@
* @since 3.0
*/
-public class TabSheet extends AbstractLayout {
-
- /**
- * Use this stylename with {@link #addStyleName(String)} to remove padding
- * between TabSheet borders and content. The actual client-side
- * implementation will determine which stylenames it implements.
- */
- public static final String STYLE_NO_PADDING = "nopad";
+public class TabSheet extends AbstractLayout implements Sizeable {
/**
* Linked list of component tabs.
*/
private boolean tabsHidden;
+ /**
+ * Height of the layout. Set to -1 for undefined height.
+ */
+ private int height = -1;
+
+ /**
+ * Height unit.
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
+ */
+ private int heightUnit = UNITS_PIXELS;
+
+ /**
+ * Width of the layout. Set to -1 for undefined width.
+ */
+ private int width = -1;
+
+ /**
+ * Width unit.
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
+ */
+ private int widthUnit = UNITS_PIXELS;
+
/**
* Constructs a new Tabsheet. Tabsheet is immediate by default.
*/
*/
public void paintContent(PaintTarget target) throws PaintException {
super.paintContent(target);
-
+
+ // Add size info
+ if (getHeight() > -1)
+ target.addAttribute("height", getHeight()
+ + UNIT_SYMBOLS[getHeightUnits()]);
+ if (getWidth() > -1)
+ target.addAttribute("width", getWidth()
+ + UNIT_SYMBOLS[getWidthUnits()]);
+
if (areTabsHidden())
target.addAttribute("hidetabs", true);
fireEvent(new SelectedTabChangeEvent(this));
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getHeight()
+ */
+ public int getHeight() {
+ return height;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
+ */
+ public int getHeightUnits() {
+ return heightUnit;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getWidth()
+ */
+ public int getWidth() {
+ return width;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
+ */
+ public int getWidthUnits() {
+ return widthUnit;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setHeight(int)
+ */
+ public void setHeight(int height) {
+ this.height = height;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int)
+ */
+ public void setHeightUnits(int units) {
+ this.heightUnit = units;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setSizeFull()
+ */
+ public void setSizeFull() {
+ height = 100;
+ width = 100;
+ heightUnit = UNITS_PERCENTAGE;
+ widthUnit = UNITS_PERCENTAGE;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setSizeUndefined()
+ */
+ public void setSizeUndefined() {
+ height = -1;
+ width = -1;
+ heightUnit = UNITS_PIXELS;
+ widthUnit = UNITS_PIXELS;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setWidth(int)
+ */
+ public void setWidth(int width) {
+ this.width = width;
+ requestRepaint();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int)
+ */
+ public void setWidthUnits(int units) {
+ this.widthUnit = units;
+ requestRepaint();
+ }
+
}
projects / vaadin-framework.git / commitdiff