Author: vjrj_ Date: 2010-12-19 04:01:32 +0100 (Sun, 19 Dec 2010) New Revision: 1171 Added: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorEntryPoint.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.ui.xml Removed: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java Modified: kune-ws-armor/trunk/pom.xml kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java Log: Minor refacts Modified: kune-ws-armor/trunk/pom.xml =================================================================== --- kune-ws-armor/trunk/pom.xml 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/pom.xml 2010-12-19 03:01:32 UTC (rev 1171) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>kune-ws-armor</groupId> <artifactId>kune-ws-armor</artifactId> - <version>0.0.5</version> + <version>0.0.8</version> <name>Kune Armor Main Layout</name> <description>The current armor of Kune Workspace</description> <properties> Modified: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,12 +1,13 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd"> <module> - <inherits name="com.google.gwt.user.User" /> - <inherits name="com.google.gwt.user.theme.standard.Standard" /> - <entry-point class="cc.kune.core.ws.armor.client.WsArmor" /> - <public path="public" /> - <source path="client" /> - <!-- NOTE: this only compiles for chromium/safari ============= --> - <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> - <!-- <set-property name="user.agent" value="gecko1_8" /> --> - <set-property name="user.agent" value="safari" /> + <inherits name="com.google.gwt.user.User" /> + <inherits name="com.google.gwt.user.theme.standard.Standard" /> + <!-- <entry-point class="cc.kune.core.ws.armor.client.WsArmorEntryPoint" + /> --> + <public path="public" /> + <source path="client" /> + <!-- NOTE: this only compiles for chromium/safari ============= --> + <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> + <!-- <set-property name="user.agent" value="gecko1_8" /> --> + <set-property name="user.agent" value="safari" /> </module> \ No newline at end of file Deleted: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,99 +0,0 @@ -package cc.kune.core.ws.armor.client; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.DockLayoutPanel; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.HasWidgets; -import com.google.gwt.user.client.ui.SplitLayoutPanel; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; - -public class Body extends Composite implements IBody { - - interface BodyUiBinder extends UiBinder<Widget, Body> { - } - - private static BodyUiBinder uiBinder = GWT.create(BodyUiBinder.class); - - @UiField - DockLayoutPanel mainpanel; - @UiField - FlowPanel sitebar; - @UiField - SplitLayoutPanel split; - @UiField - DockLayoutPanel splitCenter; - @UiField - DockLayoutPanel splitEast; - @UiField - VerticalPanel entityToolsSouth; - @UiField - VerticalPanel entityToolsNorth; - @UiField - VerticalPanel entityToolsCenter; - @UiField - FlowPanel entityHeader; - @UiField - FlowPanel entityFooter; - @UiField - FlowPanel docHeader; - @UiField - FlowPanel docSubheader; - @UiField - FlowPanel docFooter; - - public Body() { - initWidget(uiBinder.createAndBindUi(this)); - split.setWidgetMinSize(splitEast, 150); - // split.setWidgetMinSize(splitCenter, 200); - } - - @Override - public HasWidgets getDocFooter() { - return docFooter; - } - - @Override - public HasWidgets getDocHeader() { - return docHeader; - } - - @Override - public HasWidgets getDocSubheader() { - return docSubheader; - } - - @Override - public HasWidgets getEntityFooter() { - return entityFooter; - } - - @Override - public HasWidgets getEntityHeader() { - return entityHeader; - } - - @Override - public HasWidgets getEntityToolsCenter() { - return entityToolsCenter; - } - - @Override - public HasWidgets getEntityToolsNorth() { - return entityToolsNorth; - } - - @Override - public HasWidgets getEntityToolsSouth() { - return entityToolsSouth; - } - - @Override - public HasWidgets getSitebar() { - return sitebar; - } - -} Deleted: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,86 +0,0 @@ -<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> -<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" - xmlns:g="urn:import:com.google.gwt.user.client.ui"> - <ui:with field='res' - type='cc.kune.core.ws.armor.client.resources.WsArmorResources' /> - <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}' - unit="PX"> - <g:north size="20"> - <g:FlowPanel ui:field="sitebar" height="20px" - styleName='{res.style.siteBar}'> - </g:FlowPanel> - </g:north> - <g:center> - <g:SplitLayoutPanel width="100%" height="100%" - ui:field="split"> - <g:center size="1.0"> - <g:DockLayoutPanel unit="PX" ui:field="splitCenter"> - <g:north size="168"> - <g:VerticalPanel width="100%" height="168px"> - <g:FlowPanel height="70px" width="100%" - styleName="{res.style.entityHeader}" ui:field="entityHeader"> - <!--<g:RichTextArea width="100%" height="70px" /> --> - </g:FlowPanel> - <g:FlowPanel width="100%" height="38px" - styleName="{res.style.docHeader}" ui:field="docHeader"> - </g:FlowPanel> - <g:FlowPanel width="100%" height="60px" - styleName="{res.style.docSubheader}" ui:field="docSubheader"> - <g:Image resource='{res.defThemeDocArrowDown}' - styleName='{res.style.docHeaderArrow}' /> - </g:FlowPanel> - </g:VerticalPanel> - </g:north> - <g:center> - <g:DockLayoutPanel unit="PX" - styleName="{res.style.docEditorMargin}"> - <g:west size="10"> - <g:HTMLPanel /> - </g:west> - <g:east size="15"> - <g:HTMLPanel /> - </g:east> - <g:center> - <g:ScrollPanel styleName="{res.style.docEditor}"> - <g:HTML wordWrap="true" width="100%" height="100%"></g:HTML> - </g:ScrollPanel> - </g:center> - <g:south size="33.0"> - <g:VerticalPanel height="33px" width="100%" - styleName="{res.style.docFooter}"> - <g:FlowPanel width="100%" height="33" - ui:field="docFooter"> - </g:FlowPanel> - </g:VerticalPanel> - </g:south> - </g:DockLayoutPanel> - </g:center> - <g:south size="36"> - <g:FlowPanel height="36px" width="100%" - styleName="{res.style.entityFooter}" ui:field="entityFooter"> - </g:FlowPanel> - </g:south> - </g:DockLayoutPanel> - </g:center> - <g:east size="200.0"> - <g:DockLayoutPanel unit="PX" - styleName="{res.style.entityTools}" ui:field="splitEast"> - <g:north size="190"> - <g:VerticalPanel width="100%" ui:field="entityToolsNorth" - styleName="{res.style.entityToolsNorth}"></g:VerticalPanel> - </g:north> - <g:center> - <g:VerticalPanel width="100%" ui:field="entityToolsCenter" - styleName="{res.style.entityToolsCenter}"> - </g:VerticalPanel> - </g:center> - <g:south size="98"> - <g:VerticalPanel width="100%" - styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth"></g:VerticalPanel> - </g:south> - </g:DockLayoutPanel> - </g:east> - </g:SplitLayoutPanel> - </g:center> - </g:DockLayoutPanel> -</ui:UiBinder> \ No newline at end of file Deleted: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,24 +0,0 @@ -package cc.kune.core.ws.armor.client; - -import com.google.gwt.user.client.ui.HasWidgets; - -public interface IBody { - - HasWidgets getDocFooter(); - - HasWidgets getDocHeader(); - - HasWidgets getDocSubheader(); - - HasWidgets getEntityFooter(); - - HasWidgets getEntityHeader(); - - HasWidgets getEntityToolsCenter(); - - HasWidgets getEntityToolsNorth(); - - HasWidgets getEntityToolsSouth(); - - HasWidgets getSitebar(); -} \ No newline at end of file Modified: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,43 +1,25 @@ package cc.kune.core.ws.armor.client; +import com.google.gwt.user.client.ui.HasWidgets; -import cc.kune.core.ws.armor.client.resources.WsArmorResources; +public interface WsArmor { -import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.user.client.ui.InlineLabel; -import com.google.gwt.user.client.ui.RootLayoutPanel; + HasWidgets getDocFooter(); -/** - * Entry point classes define <code>onModuleLoad()</code>. - */ -public class WsArmor implements EntryPoint { - public void onModuleLoad() { - final WsArmorResources resources = WsArmorResources.INSTANCE; - resources.style().ensureInjected(); + HasWidgets getDocHeader(); - final RootLayoutPanel rootPanel = RootLayoutPanel.get(); - final Body armor = new Body(); - final InlineLabel icons = new InlineLabel("Icons"); - final InlineLabel login = new InlineLabel("Login"); - final InlineLabel logo = new InlineLabel("Logo"); - icons.setStyleName(resources.style().floatLeft()); - login.setStyleName(resources.style().floatRight()); - logo.setStyleName(resources.style().floatRight()); - armor.getSitebar().add(icons); - armor.getSitebar().add(logo); - armor.getSitebar().add(login); - armor.getEntityToolsNorth().add(new InlineLabel("Group members")); - armor.getEntityToolsCenter().add(new InlineLabel("Documents")); - armor.getEntityToolsSouth().add(new InlineLabel("Group tags")); - armor.getEntityHeader().add(new InlineLabel("Name of the Initiative")); - armor.getDocHeader().add(new InlineLabel("Some doc title")); - final InlineLabel editors = new InlineLabel("Editors:"); - editors.addStyleName(resources.style().docSubheaderLeft()); - armor.getDocSubheader().add(editors); - armor.getDocFooter().add(new InlineLabel("Tags:")); - armor.getEntityFooter().add(new InlineLabel("Rate it:")); - rootPanel.add(armor); + HasWidgets getDocSubheader(); - } + HasWidgets getEntityFooter(); -} + HasWidgets getEntityHeader(); + + HasWidgets getEntityToolsCenter(); + + HasWidgets getEntityToolsNorth(); + + HasWidgets getEntityToolsSouth(); + + HasWidgets getSitebar(); + +} \ No newline at end of file Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorEntryPoint.java (from rev 1166, kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorEntryPoint.java (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorEntryPoint.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -0,0 +1,44 @@ +package cc.kune.core.ws.armor.client; + +import cc.kune.core.ws.armor.client.resources.WsArmorResources; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.RootLayoutPanel; + +/** + * Entry point classes define <code>onModuleLoad()</code>. + */ +public class WsArmorEntryPoint implements EntryPoint { + @Override + public void onModuleLoad() { + final WsArmorResources resources = GWT.create(WsArmorResources.class); + resources.style().ensureInjected(); + + final RootLayoutPanel rootPanel = RootLayoutPanel.get(); + final WsArmorImpl armor = new WsArmorImpl(); + final InlineLabel icons = new InlineLabel("Icons"); + final InlineLabel login = new InlineLabel("Login"); + final InlineLabel logo = new InlineLabel("Logo"); + icons.setStyleName(resources.style().floatLeft()); + login.setStyleName(resources.style().floatRight()); + logo.setStyleName(resources.style().floatRight()); + armor.getSitebar().add(icons); + armor.getSitebar().add(logo); + armor.getSitebar().add(login); + armor.getEntityToolsNorth().add(new InlineLabel("Group members")); + armor.getEntityToolsCenter().add(new InlineLabel("Documents")); + armor.getEntityToolsSouth().add(new InlineLabel("Group tags")); + armor.getEntityHeader().add(new InlineLabel("Name of the Initiative")); + armor.getDocHeader().add(new InlineLabel("Some doc title")); + final InlineLabel editors = new InlineLabel("Editors:"); + editors.addStyleName(resources.style().docSubheaderLeft()); + armor.getDocSubheader().add(editors); + armor.getDocFooter().add(new InlineLabel("Tags:")); + armor.getEntityFooter().add(new InlineLabel("Rate it:")); + rootPanel.add(armor); + + } + +} Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.java (from rev 1166, kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.java (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -0,0 +1,98 @@ +package cc.kune.core.ws.armor.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.DockLayoutPanel; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HasWidgets; +import com.google.gwt.user.client.ui.SplitLayoutPanel; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; + +public class WsArmorImpl extends Composite implements WsArmor { + + interface WsArmorImplUiBinder extends UiBinder<Widget, WsArmorImpl> { + } + + private static WsArmorImplUiBinder uiBinder = GWT.create(WsArmorImplUiBinder.class); + + @UiField + DockLayoutPanel mainpanel; + @UiField + FlowPanel sitebar; + @UiField + SplitLayoutPanel split; + @UiField + DockLayoutPanel splitCenter; + @UiField + DockLayoutPanel splitEast; + @UiField + VerticalPanel entityToolsSouth; + @UiField + VerticalPanel entityToolsNorth; + @UiField + VerticalPanel entityToolsCenter; + @UiField + FlowPanel entityHeader; + @UiField + FlowPanel entityFooter; + @UiField + FlowPanel docHeader; + @UiField + FlowPanel docSubheader; + @UiField + FlowPanel docFooter; + + public WsArmorImpl() { + initWidget(uiBinder.createAndBindUi(this)); + split.setWidgetMinSize(splitEast, 150); + // split.setWidgetMinSize(splitCenter, 200); + } + + @Override + public HasWidgets getDocFooter() { + return docFooter; + } + + @Override + public HasWidgets getDocHeader() { + return docHeader; + } + + @Override + public HasWidgets getDocSubheader() { + return docSubheader; + } + + @Override + public HasWidgets getEntityFooter() { + return entityFooter; + } + + @Override + public HasWidgets getEntityHeader() { + return entityHeader; + } + + @Override + public HasWidgets getEntityToolsCenter() { + return entityToolsCenter; + } + + @Override + public HasWidgets getEntityToolsNorth() { + return entityToolsNorth; + } + + @Override + public HasWidgets getEntityToolsSouth() { + return entityToolsSouth; + } + + @Override + public HasWidgets getSitebar() { + return sitebar; + } +} Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.ui.xml (from rev 1166, kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.ui.xml (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.ui.xml 2010-12-19 03:01:32 UTC (rev 1171) @@ -0,0 +1,86 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:with field='res' + type='cc.kune.core.ws.armor.client.resources.WsArmorResources' /> + <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}' + unit="PX"> + <g:north size="20"> + <g:FlowPanel ui:field="sitebar" height="20px" + styleName='{res.style.siteBar}'> + </g:FlowPanel> + </g:north> + <g:center> + <g:SplitLayoutPanel width="100%" height="100%" + ui:field="split"> + <g:center size="1.0"> + <g:DockLayoutPanel unit="PX" ui:field="splitCenter"> + <g:north size="168"> + <g:VerticalPanel width="100%" height="168px"> + <g:FlowPanel height="70px" width="100%" + styleName="{res.style.entityHeader}" ui:field="entityHeader"> + <!--<g:RichTextArea width="100%" height="70px" /> --> + </g:FlowPanel> + <g:FlowPanel width="100%" height="38px" + styleName="{res.style.docHeader}" ui:field="docHeader"> + </g:FlowPanel> + <g:FlowPanel width="100%" height="60px" + styleName="{res.style.docSubheader}" ui:field="docSubheader"> + <g:Image resource='{res.defThemeDocArrowDown}' + styleName='{res.style.docHeaderArrow}' /> + </g:FlowPanel> + </g:VerticalPanel> + </g:north> + <g:center> + <g:DockLayoutPanel unit="PX" + styleName="{res.style.docEditorMargin}"> + <g:west size="10"> + <g:HTMLPanel /> + </g:west> + <g:east size="15"> + <g:HTMLPanel /> + </g:east> + <g:center> + <g:ScrollPanel styleName="{res.style.docEditor}"> + <g:HTML wordWrap="true" width="100%" height="100%"></g:HTML> + </g:ScrollPanel> + </g:center> + <g:south size="33.0"> + <g:VerticalPanel height="33px" width="100%" + styleName="{res.style.docFooter}"> + <g:FlowPanel width="100%" height="33" + ui:field="docFooter"> + </g:FlowPanel> + </g:VerticalPanel> + </g:south> + </g:DockLayoutPanel> + </g:center> + <g:south size="36"> + <g:FlowPanel height="36px" width="100%" + styleName="{res.style.entityFooter}" ui:field="entityFooter"> + </g:FlowPanel> + </g:south> + </g:DockLayoutPanel> + </g:center> + <g:east size="200.0"> + <g:DockLayoutPanel unit="PX" + styleName="{res.style.entityTools}" ui:field="splitEast"> + <g:north size="190"> + <g:VerticalPanel width="100%" ui:field="entityToolsNorth" + styleName="{res.style.entityToolsNorth}"></g:VerticalPanel> + </g:north> + <g:center> + <g:VerticalPanel width="100%" ui:field="entityToolsCenter" + styleName="{res.style.entityToolsCenter}"> + </g:VerticalPanel> + </g:center> + <g:south size="98"> + <g:VerticalPanel width="100%" + styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth"></g:VerticalPanel> + </g:south> + </g:DockLayoutPanel> + </g:east> + </g:SplitLayoutPanel> + </g:center> + </g:DockLayoutPanel> +</ui:UiBinder> \ No newline at end of file Modified: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,6 +1,5 @@ package cc.kune.core.ws.armor.client.resources; -import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; import com.google.gwt.resources.client.ImageResource; @@ -43,9 +42,6 @@ String siteBar(); } - @Deprecated - public static final WsArmorResources INSTANCE = GWT.create(WsArmorResources.class); - @Source("def-theme-doc-arrow-down.png") ImageResource defThemeDocArrowDown();