Author: vjrj Date: 2008-07-21 00:12:04 +0200 (Mon, 21 Jul 2008) New Revision: 808 Modified: trunk/script/generateBasicUIElements.sh trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/WorkspaceManager.java trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitelogo/SiteLogoPanel.java Log: Incomplete - task 9: New DropDown+ GridMenuPanel Modified: trunk/script/generateBasicUIElements.sh =================================================================== --- trunk/script/generateBasicUIElements.sh 2008-07-20 20:48:21 UTC (rev 807) +++ trunk/script/generateBasicUIElements.sh 2008-07-20 22:12:04 UTC (rev 808) @@ -16,6 +16,11 @@ # DO PACKAGE=`echo $DIR | cut -d "/" -f 4- | sed 's/\//\./g'` +if [[ ! -d $DIR ]] +then + mkdir $DIR +fi + cat <<EOF > $DIR/${NAME}.java package $PACKAGE; @@ -62,9 +67,11 @@ cat <<EOF > $DIR/${NAME}Panel.java package $PACKAGE; +import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton; + public class ${NAME}Panel implements ${NAME}View { -public ${NAME}Panel(final ${NAME}Presenter presenter) { +public ${NAME}Panel(final ${NAME}Presenter presenter, final WorkspaceSkeleton ws) { } } EOF @@ -81,7 +88,7 @@ builder.registerProvider(${NAME}.class, new Provider<${NAME}>() { public ${NAME} get() { final ${NAME}Presenter presenter = new ${NAME}Presenter(); - final ${NAME}Panel panel = new ${NAME}Panel(presenter); + final ${NAME}Panel panel = new ${NAME}Panel(presenter, ws); presenter.init(panel); return presenter; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-07-20 20:48:21 UTC (rev 807) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-07-20 22:12:04 UTC (rev 808) @@ -40,9 +40,24 @@ import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitelogo.SiteLogo; import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitelogo.SiteLogoPanel; import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitelogo.SiteLogoPresenter; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitenewgroup.SiteNewGroupLink; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitenewgroup.SiteNewGroupLinkPanel; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitenewgroup.SiteNewGroupLinkPresenter; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.siteoptions.SiteOptions; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.siteoptions.SiteOptionsPanel; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.siteoptions.SiteOptionsPresenter; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitepublic.SitePublicSpaceLinkPanel; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitepublic.SitePublicSpaceLinkPresenter; import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitesearch.SiteSearch; import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitesearch.SiteSearchPanel; import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitesearch.SiteSearchPresenter; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitesign.SiteSignInLink; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitesign.SiteSignInLinkPanel; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitesign.SiteSignInLinkPresenter; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitesign.SiteSignOutLink; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitesign.SiteSignOutLinkPanel; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitesign.SiteSignOutLinkPresenter; import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsThemePanel; import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsThemePresenter; @@ -99,6 +114,12 @@ } }, SingletonScope.class); + builder.registerProvider(Images.class, new Provider<Images>() { + public Images get() { + return Images.App.getInstance(); + } + }, SingletonScope.class); + builder.registerProvider(ImageUtils.class, new Provider<ImageUtils>() { public ImageUtils get() { return new ImageUtils(); @@ -152,6 +173,52 @@ final WorkspaceSkeleton ws = builder.getInstance(WorkspaceSkeleton.class); + builder.registerProvider(SitePublicSpaceLink.class, new Provider<SitePublicSpaceLink>() { + public SitePublicSpaceLink get() { + final SitePublicSpaceLinkPresenter presenter = new SitePublicSpaceLinkPresenter(); + final SitePublicSpaceLinkPanel panel = new SitePublicSpaceLinkPanel(presenter, ws, i18n, builder + .getInstance(Images.class)); + presenter.init(panel); + return presenter; + } + }, SingletonScope.class); + + builder.registerProvider(SiteSignInLink.class, new Provider<SiteSignInLink>() { + public SiteSignInLink get() { + final SiteSignInLinkPresenter presenter = new SiteSignInLinkPresenter(); + final SiteSignInLinkPanel panel = new SiteSignInLinkPanel(presenter, ws); + presenter.init(panel); + return presenter; + } + }, SingletonScope.class); + + builder.registerProvider(SiteSignOutLink.class, new Provider<SiteSignOutLink>() { + public SiteSignOutLink get() { + final SiteSignOutLinkPresenter presenter = new SiteSignOutLinkPresenter(); + final SiteSignOutLinkPanel panel = new SiteSignOutLinkPanel(presenter, ws); + presenter.init(panel); + return presenter; + } + }, SingletonScope.class); + + builder.registerProvider(SiteNewGroupLink.class, new Provider<SiteNewGroupLink>() { + public SiteNewGroupLink get() { + final SiteNewGroupLinkPresenter presenter = new SiteNewGroupLinkPresenter(); + final SiteNewGroupLinkPanel panel = new SiteNewGroupLinkPanel(presenter, ws); + presenter.init(panel); + return presenter; + } + }, SingletonScope.class); + + builder.registerProvider(SiteOptions.class, new Provider<SiteOptions>() { + public SiteOptions get() { + final SiteOptionsPresenter presenter = new SiteOptionsPresenter(); + final SiteOptionsPanel panel = new SiteOptionsPanel(presenter, ws); + presenter.init(panel); + return presenter; + } + }, SingletonScope.class); + builder.registerProvider(SiteLogo.class, new Provider<SiteLogo>() { public SiteLogo get() { final SiteLogoPresenter presenter = new SiteLogoPresenter(builder.getInstance(Session.class)); @@ -179,6 +246,10 @@ } }, SingletonScope.class); + builder.getInstance(SitePublicSpaceLink.class); + builder.getInstance(SiteSignInLink.class); + builder.getInstance(SiteSignOutLink.class); + builder.getInstance(SiteNewGroupLink.class); builder.getInstance(SiteSearch.class); builder.getInstance(SiteLogo.class); @@ -227,11 +298,13 @@ builder.registerProvider(WorkspaceManager.class, new Provider<WorkspaceManager>() { public WorkspaceManager get() { - final WorkspaceManager presenter = new WorkspaceManager(builder.getInstance(EntityLogo.class), builder - .getInstance(EntityTitlePresenter.class), builder.getInstance(EntitySubTitlePresenter.class), - builder.getInstance(WsThemePresenter.class), builder.getInstance(EntityLicensePresenter.class), - builder.getProvider(GroupMembersSummary.class), - builder.getProvider(ParticipationSummary.class), builder.getProvider(TagsSummary.class), + final WorkspaceManager presenter = new WorkspaceManager(builder.getInstance(SitePublicSpaceLink.class), + builder.getInstance(EntityLogo.class), builder.getInstance(EntityTitlePresenter.class), builder + .getInstance(EntitySubTitlePresenter.class), builder + .getInstance(WsThemePresenter.class), + builder.getInstance(EntityLicensePresenter.class), builder + .getProvider(GroupMembersSummary.class), builder + .getProvider(ParticipationSummary.class), builder.getProvider(TagsSummary.class), builder.getProvider(GroupSummary.class)); return presenter; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/WorkspaceManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/WorkspaceManager.java 2008-07-20 20:48:21 UTC (rev 807) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/WorkspaceManager.java 2008-07-20 22:12:04 UTC (rev 808) @@ -3,6 +3,7 @@ import org.ourproject.kune.platf.client.dto.GroupDTO; import org.ourproject.kune.platf.client.dto.StateDTO; import org.ourproject.kune.workspace.client.ui.newtmp.licensefoot.EntityLicensePresenter; +import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsTheme; import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsThemePresenter; import org.ourproject.kune.workspace.client.ui.newtmp.title.EntitySubTitlePresenter; @@ -27,13 +28,15 @@ private final Provider<GroupMembersSummary> groupMembersSummaryProvider; private final Provider<ParticipationSummary> participationSummaryProvider; private final Provider<GroupSummary> groupSummaryProvider; + private final SitePublicSpaceLink publicSpaceLink; - public WorkspaceManager(final EntityLogo entityLogo, final EntityTitlePresenter entityTitlePresenter, - final EntitySubTitlePresenter entitySubTitlePresenter, final WsThemePresenter wsThemePresenter, - final EntityLicensePresenter entityLicensePresenter, + public WorkspaceManager(final SitePublicSpaceLink publicSpaceLink, final EntityLogo entityLogo, + final EntityTitlePresenter entityTitlePresenter, final EntitySubTitlePresenter entitySubTitlePresenter, + final WsThemePresenter wsThemePresenter, final EntityLicensePresenter entityLicensePresenter, final Provider<GroupMembersSummary> groupMembersSummaryProvider, final Provider<ParticipationSummary> participationSummaryProvider, final Provider<TagsSummary> tagsSummaryProvider, final Provider<GroupSummary> groupSummaryProvider) { + this.publicSpaceLink = publicSpaceLink; this.entityLogo = entityLogo; this.entityTitlePresenter = entityTitlePresenter; this.entitySubTitlePresenter = entitySubTitlePresenter; @@ -60,6 +63,7 @@ } public void setState(final StateDTO state) { + publicSpaceLink.setState(state); final GroupDTO group = state.getGroup(); final boolean isAdmin = state.getGroupRights().isAdministrable(); entityLogo.setLogo(group.getLongName()); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitelogo/SiteLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitelogo/SiteLogoPanel.java 2008-07-20 20:48:21 UTC (rev 807) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitelogo/SiteLogoPanel.java 2008-07-20 22:12:04 UTC (rev 808) @@ -13,7 +13,6 @@ siteLogoImg = new Image(); final SiteBar siteBar = ws.getSiteBar(); siteBar.addSpacer(); - siteBar.addSpacer(); siteBar.add(siteLogoImg); }