November 2010 - Sandbox-commits - mailman.cloud.codelutin.com

r12 - in refComp: . entities entities/src entities/src/main entities/src/main/xmi
by jcouteau＠users.chorem.org Nov. 5, 2010

Nov. 5, 2010

Author: jcouteau Date: 2010-11-05 10:05:34 +0100 (Fri, 05 Nov 2010) New Revision: 12 Url: http://chorem.org/repositories/revision/incubator/12 Log: Add entities module Added: refComp/entities/ refComp/entities/LICENSE.txt refComp/entities/README.txt refComp/entities/changelog.txt refComp/entities/pom.xml refComp/entities/src/ refComp/entities/src/main/ refComp/entities/src/main/xmi/ refComp/entities/src/main/xmi/UseCaseINRA-RefComp.zargo Property changes on: refComp/entities ___________________________________________________________________ Added: svn:ignore + *.iml *.ipr target Added: refComp/entities/pom.xml =================================================================== --- refComp/entities/pom.xml (rev 0) +++ refComp/entities/pom.xml 2010-11-05 09:05:34 UTC (rev 12) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + +  +  +  + + <parent> + <groupId>fr.inra</groupId> + <artifactId>refcomp</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <groupId>fr.inra.refcomp</groupId> + <artifactId>entities</artifactId> + +  +  +  + + <name>${project.artifactId}</name> + <description>RefComp Client entities module</description> + + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> + </dependencies> + +  +  +  + + <packaging>jar</packaging> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api generator</id> +  + <phase>process-sources</phase> + <configuration> + <inputs> + <input>zargo:src/main/xmi/:*.zargo</input> + <input>classpath:model:/:wikitty.objectmodel + </input> + </inputs> + <fullPackagePath>fr.inra.refcomp</fullPackagePath> + <defaultPackage>fr.inra.refcomp</defaultPackage> + <extractedPackages> + fr.inra.refcomp.entities,org.nuiton.wikitty + </extractedPackages> + <generatedPackages>fr.inra.refcomp.entities + </generatedPackages> + <templates> + org.nuiton.wikitty.generator.WikittyMetaGenerator + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> \ No newline at end of file Added: refComp/entities/src/main/xmi/UseCaseINRA-RefComp.zargo =================================================================== (Binary files differ) Property changes on: refComp/entities/src/main/xmi/UseCaseINRA-RefComp.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r11 - refComp/client/src/main/java/fr/inra/refcomp
by jcouteau＠users.chorem.org Nov. 4, 2010

Nov. 4, 2010

Author: jcouteau Date: 2010-11-04 16:44:05 +0100 (Thu, 04 Nov 2010) New Revision: 11 Url: http://chorem.org/repositories/revision/incubator/11 Log: Remove wrong inherits Modified: refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml Modified: refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml 2010-11-04 15:31:32 UTC (rev 10) +++ refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml 2010-11-04 15:44:05 UTC (rev 11) @@ -6,8 +6,6 @@ <inherits name='com.google.gwt.user.User'/> <inherits name="com.google.gwt.uibinder.UiBinder"/> - <inherits name="fr.inra.refcomp.Services"/> -  <inherits name='com.google.gwt.user.theme.standard.Standard'/>

1 0

r10 - in refComp/client: . src/main/java/fr/inra/refcomp src/main/java/fr/inra/refcomp/client src/main/java/fr/inra/refcomp/client/constants src/main/java/fr/inra/refcomp/client/service src/main/webapp/WEB-INF
by jcouteau＠users.chorem.org Nov. 4, 2010

Nov. 4, 2010

Author: jcouteau Date: 2010-11-04 16:31:32 +0100 (Thu, 04 Nov 2010) New Revision: 10 Url: http://chorem.org/repositories/revision/incubator/10 Log: Add edition of my skills Added: refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.java refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.ui.xml refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.java refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.ui.xml refComp/client/src/main/java/fr/inra/refcomp/client/service/ refComp/client/src/main/java/fr/inra/refcomp/client/service/Level.java refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginService.java refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginServiceAsync.java refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginServiceImpl.java refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchService.java refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchServiceAsync.java refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchServiceImpl.java refComp/client/src/main/java/fr/inra/refcomp/client/service/Skill.java Removed: refComp/client/src/main/java/fr/inra/refcomp/client/example1/ refComp/client/src/main/java/fr/inra/refcomp/client/services/ refComp/client/src/main/java/fr/inra/refcomp/service/ Modified: refComp/client/pom.xml refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml refComp/client/src/main/java/fr/inra/refcomp/client/Login.java refComp/client/src/main/java/fr/inra/refcomp/client/Search.java refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java refComp/client/src/main/webapp/WEB-INF/web.xml Modified: refComp/client/pom.xml =================================================================== --- refComp/client/pom.xml 2010-11-04 10:57:18 UTC (rev 9) +++ refComp/client/pom.xml 2010-11-04 15:31:32 UTC (rev 10) @@ -32,12 +32,6 @@ </dependency> <dependency> - <groupId>org.gwtmultipage</groupId> - <artifactId>gwtmultipage-core</artifactId> - <version>1.0.0.Beta5</version> - </dependency> - - <dependency> <groupId>fr.inra.refcomp</groupId> <artifactId>services</artifactId> <version>0.1-SNAPSHOT</version> Modified: refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml 2010-11-04 10:57:18 UTC (rev 9) +++ refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml 2010-11-04 15:31:32 UTC (rev 10) @@ -6,6 +6,8 @@ <inherits name='com.google.gwt.user.User'/> <inherits name="com.google.gwt.uibinder.UiBinder"/> + <inherits name="fr.inra.refcomp.Services"/> +  <inherits name='com.google.gwt.user.theme.standard.Standard'/> Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Login.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Login.java 2010-11-04 10:57:18 UTC (rev 9) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Login.java 2010-11-04 15:31:32 UTC (rev 10) @@ -18,8 +18,8 @@ import com.google.gwt.user.client.ui.TextBox; import fr.inra.refcomp.client.constants.Header; import fr.inra.refcomp.client.resources.Style; -import fr.inra.refcomp.client.services.LoginService; -import fr.inra.refcomp.client.services.LoginServiceAsync; +import fr.inra.refcomp.client.service.LoginService; +import fr.inra.refcomp.client.service.LoginServiceAsync; /** * User: couteau Added: refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.java 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,97 @@ +package fr.inra.refcomp.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.StyleInjector; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiTemplate; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Panel; +import com.google.gwt.user.client.ui.VerticalPanel; +import fr.inra.refcomp.client.resources.Style; +import fr.inra.refcomp.client.service.SearchServiceAsync; +import fr.inra.refcomp.client.service.Skill; +import fr.inra.refcomp.client.service.SearchService; +import java.util.List; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public class MySkills extends Composite { + + private final SearchServiceAsync searchService = GWT + .create(SearchService.class); + + @UiTemplate("MySkills.ui.xml") + interface MyUiBinder extends UiBinder<Panel, MySkills> { + } + + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + @UiField(provided = true) + final Style res; + + private static boolean stylesInjected = false; + + @UiField + VerticalPanel skillsList; + + public MySkills() { + this.res = GWT.create(Style.class); + + // Inject only once. + if (!stylesInjected) { + StyleInjector.injectStylesheet(res.style().getText()); + stylesInjected = true; + } + + initWidget(binder.createAndBindUi(this)); + + //Use here the searchService that return a skill. Replace this with + //a real service. + searchService.search("toto", + new AsyncCallback<List<Skill>>() { + @Override + public void onFailure(Throwable caught) { + Window.alert("Server communication error"); + } + + @Override + public void onSuccess(List<Skill> result) { + + skillsList.clear(); + + for(Skill skill:result){ + + final HorizontalPanel skillPanel = new HorizontalPanel(); + + final SkillEditionRow row = new SkillEditionRow(skill); + + skillPanel.add(row); + + final Button removeButton = new Button("Remove"); + + removeButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent event) { + skillPanel.remove(row); + skillPanel.remove(removeButton); + } + }); + + skillPanel.add(removeButton); + + skillsList.add(skillPanel); + } + } + }); + + } + +} \ No newline at end of file Added: refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.ui.xml (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.ui.xml 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,24 @@ +<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + xmlns:gwt='urn:import:com.google.gwt.user.client.ui'> + + <ui:with field='res' type='fr.inra.refcomp.client.resources.Style'/> + + <gwt:HTMLPanel> + + <div align="center"> + <gwt:VerticalPanel styleName="{res.style.background}"> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Label text="My Skills : " + styleName="{res.style.greyText}"/> + <gwt:Label ui:field="searchedLabel" text="Hervé Richard" + styleName="{res.style.greyText}"/> + </gwt:HorizontalPanel> + + <gwt:VerticalPanel ui:field="skillsList"/> + + <gwt:Button ui:field="addButton" text="Add a skill"/> + + </gwt:VerticalPanel> + </div> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Search.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Search.java 2010-11-04 10:57:18 UTC (rev 9) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Search.java 2010-11-04 15:31:32 UTC (rev 10) @@ -13,11 +13,10 @@ import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.TextBox; -import fr.inra.refcomp.client.constants.Header; import fr.inra.refcomp.client.resources.Style; -import fr.inra.refcomp.client.services.SearchService; -import fr.inra.refcomp.client.services.SearchServiceAsync; -import fr.inra.refcomp.service.Skill; +import fr.inra.refcomp.client.service.SearchService; +import fr.inra.refcomp.client.service.SearchServiceAsync; +import fr.inra.refcomp.client.service.Skill; import java.util.List; /** Modified: refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java 2010-11-04 10:57:18 UTC (rev 9) +++ refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java 2010-11-04 15:31:32 UTC (rev 10) @@ -9,7 +9,7 @@ import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.Panel; import fr.inra.refcomp.client.resources.Style; -import fr.inra.refcomp.service.Skill; +import fr.inra.refcomp.client.service.Skill; import java.util.List; /** Added: refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.java 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,103 @@ +package fr.inra.refcomp.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.StyleInjector; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiTemplate; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.ListBox; +import com.google.gwt.user.client.ui.Panel; +import com.google.gwt.user.client.ui.TextBox; +import fr.inra.refcomp.client.resources.Style; +import fr.inra.refcomp.client.service.Level; +import fr.inra.refcomp.client.service.Skill; +import java.util.ArrayList; +import java.util.List; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public class SkillEditionRow extends Composite { + + List<String> levels = new ArrayList<String>(); + + @UiTemplate("SkillEditionRow.ui.xml") + interface MyUiBinder extends UiBinder<Panel, SkillEditionRow> { + } + + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + @UiField(provided = true) + final Style res; + + private static boolean stylesInjected = false; + + private Skill editedSkill; + + @UiField + Label skill; + + @UiField + Label linkedSkill; + + @UiField + ListBox levelListBox; + + @UiField + TextBox commentBox; + + @UiField + Label rightLabel; + + public SkillEditionRow() { + this.res = GWT.create(Style.class); + + init(); + } + + public SkillEditionRow(Skill skill) { + this.res = GWT.create(Style.class); + + init(); + + setSkill(skill); + } + + protected void init(){ + + // Inject only once. + if (!stylesInjected) { + StyleInjector.injectStylesheet(res.style().getText()); + stylesInjected = true; + } + + initWidget(binder.createAndBindUi(this)); + + populateLevelList(); + } + + public void setSkill(Skill skill){ + + editedSkill = skill; + + this.skill.setText(editedSkill.getSkill()); + this.linkedSkill.setText(editedSkill.getLinkedSkill()); + this.levelListBox.setSelectedIndex(levels.indexOf(editedSkill.getLevel())); + this.commentBox.setText(editedSkill.getComment()); + this.rightLabel.setText(editedSkill.getRight()); + + } + + protected void populateLevelList(){ + levels = new ArrayList<String>(); + + for (Level level: Level.values()){ + levels.add(level.getLabel()); + levelListBox.addItem(level.getLabel()); + } + + } +} Added: refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.ui.xml (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.ui.xml 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,18 @@ +<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + xmlns:gwt='urn:import:com.google.gwt.user.client.ui'> + + <ui:with field='res' type='fr.inra.refcomp.client.resources.Style'/> + + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Label ui:field="skill" styleName="{res.style.greyText}"/> + <gwt:Label text="Linked skill : " styleName="{res.style.greyText}"/> + <gwt:Label ui:field="linkedSkill" styleName="{res.style.greyText}"/> + <gwt:Button ui:field="editLinkedSkill" text="Edit"/> + <gwt:Label text="Level : "/> + <gwt:ListBox ui:field="levelListBox" visibleItemCount="1"/> + <gwt:Label text="Comment : "/> + <gwt:TextBox ui:field="commentBox"/> + <gwt:Label text="Right : "/> + <gwt:Label ui:field="rightLabel"/> + </gwt:HorizontalPanel> +</ui:UiBinder> \ No newline at end of file Modified: refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java 2010-11-04 10:57:18 UTC (rev 9) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java 2010-11-04 15:31:32 UTC (rev 10) @@ -12,6 +12,7 @@ import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RootPanel; import fr.inra.refcomp.client.Login; +import fr.inra.refcomp.client.MySkills; import fr.inra.refcomp.client.resources.Style; /** @@ -59,7 +60,12 @@ @UiHandler("buttonMySkills") void doClickMySkills(ClickEvent event) { - Window.alert("Not implemented yet"); + + RootPanel content = RootPanel.get("content"); + + content.clear(); + + content.add(new MySkills()); } @UiHandler("buttonAdminSkills") Added: refComp/client/src/main/java/fr/inra/refcomp/client/service/Level.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/service/Level.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/service/Level.java 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,22 @@ +package fr.inra.refcomp.client.service; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public enum Level { + HELP("I need help"), + ALONE("I can be alone"), + CANHELP("I can help"), + CANFORM("I can teach others"); + + private final String label; + + Level(String label){ + this.label=label; + } + + public String getLabel(){ + return label; + } +} Added: refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginService.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginService.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginService.java 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,14 @@ +package fr.inra.refcomp.client.service; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +@RemoteServiceRelativePath("login") +public interface LoginService extends RemoteService { + Boolean login(String login, String password); +} + Added: refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginServiceAsync.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginServiceAsync.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginServiceAsync.java 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,12 @@ +package fr.inra.refcomp.client.service; + +import com.google.gwt.user.client.rpc.AsyncCallback; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public interface LoginServiceAsync { + void login(String login, String password, AsyncCallback<Boolean> callback); +} + Added: refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginServiceImpl.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginServiceImpl.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/service/LoginServiceImpl.java 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,19 @@ +package fr.inra.refcomp.client.service; + +import com.google.gwt.user.server.rpc.RemoteServiceServlet; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public class LoginServiceImpl extends RemoteServiceServlet implements + LoginService { + + public Boolean login(String login, String password) { + if (login.equals("admin") && password.equals("admin")) + return true; + else + return false; + } +} + Added: refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchService.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchService.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchService.java 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,15 @@ +package fr.inra.refcomp.client.service; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; +import java.util.List; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +@RemoteServiceRelativePath("search") +public interface SearchService extends RemoteService { + + List<Skill> search(String searchSentence); +} Added: refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchServiceAsync.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchServiceAsync.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchServiceAsync.java 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,12 @@ +package fr.inra.refcomp.client.service; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import java.util.List; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public interface SearchServiceAsync { + void search(String searchSentence, AsyncCallback<List<Skill>> callback); +} Added: refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchServiceImpl.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchServiceImpl.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/service/SearchServiceImpl.java 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,26 @@ +package fr.inra.refcomp.client.service; + +import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import java.util.ArrayList; +import java.util.List; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public class SearchServiceImpl extends RemoteServiceServlet implements + SearchService { + + List<Skill> searchResults; + + public List<Skill> search(String searchSentence) { + + searchResults = new ArrayList<Skill>(); + + searchResults.add(new Skill("Hervé Richard", "Java",Level.CANFORM.getLabel(), "Enfin pas trop quand même", "R", "CIAM")); + + return searchResults; + } + + +} \ No newline at end of file Added: refComp/client/src/main/java/fr/inra/refcomp/client/service/Skill.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/service/Skill.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/service/Skill.java 2010-11-04 15:31:32 UTC (rev 10) @@ -0,0 +1,77 @@ +package fr.inra.refcomp.client.service; + +import java.io.Serializable; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class Skill implements Serializable { + + public Skill(){} + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getLinkedSkill() { + return linkedSkill; + } + + public void setLinkedSkill(String linkedSkill) { + this.linkedSkill = linkedSkill; + } + + public String getRight() { + return right; + } + + public void setRight(String right) { + this.right = right; + } + + protected String name; + + public String getSkill() { + return skill; + } + + public void setSkill(String skill) { + this.skill = skill; + } + + protected String skill; + protected String level; + protected String comment; + protected String linkedSkill; + protected String right; + + public Skill(String name, String skill, String level, String comment, String linkedSkill, String right){ + this.skill=skill; + this.name=name; + this.level=level; + this.comment=comment; + this.linkedSkill=linkedSkill; + this.right=right; + } +} Modified: refComp/client/src/main/webapp/WEB-INF/web.xml =================================================================== --- refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-04 10:57:18 UTC (rev 9) +++ refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-04 15:31:32 UTC (rev 10) @@ -9,28 +9,19 @@ <welcome-file>index.html</welcome-file> </welcome-file-list> -  - <servlet> <servlet-name>LoginService</servlet-name> - <servlet-class>fr.inra.refcomp.service.LoginServiceImpl + <servlet-class>fr.inra.refcomp.client.service.LoginServiceImpl </servlet-class> </servlet> <servlet-mapping> <servlet-name>LoginService</servlet-name> <url-pattern>/fr.inra.refcomp.RefComp/login</url-pattern> </servlet-mapping> + <servlet> <servlet-name>SearchService</servlet-name> - <servlet-class>fr.inra.refcomp.service.SearchServiceImpl + <servlet-class>fr.inra.refcomp.client.service.SearchServiceImpl </servlet-class> </servlet> <servlet-mapping>

1 0

r9 - in refComp/client/src/main: java/fr/inra/refcomp java/fr/inra/refcomp/client java/fr/inra/refcomp/client/services java/fr/inra/refcomp/service webapp/WEB-INF
by jcouteau＠users.chorem.org Nov. 4, 2010

Nov. 4, 2010

Author: jcouteau Date: 2010-11-04 11:57:18 +0100 (Thu, 04 Nov 2010) New Revision: 9 Url: http://chorem.org/repositories/revision/incubator/9 Log: Ugly search results (with no facets) Added: refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.ui.xml refComp/client/src/main/java/fr/inra/refcomp/client/services/SearchService.java refComp/client/src/main/java/fr/inra/refcomp/client/services/SearchServiceAsync.java refComp/client/src/main/java/fr/inra/refcomp/service/SearchServiceImpl.java Modified: refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml refComp/client/src/main/java/fr/inra/refcomp/client/Search.java refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java refComp/client/src/main/java/fr/inra/refcomp/service/Skill.java refComp/client/src/main/webapp/WEB-INF/web.xml Modified: refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml 2010-11-04 09:40:42 UTC (rev 8) +++ refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml 2010-11-04 10:57:18 UTC (rev 9) @@ -15,4 +15,7 @@  <stylesheet src='Application.css'/> + <source path="client"/> + <source path="service"/> + </module> \ No newline at end of file Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Search.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Search.java 2010-11-04 09:40:42 UTC (rev 8) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Search.java 2010-11-04 10:57:18 UTC (rev 9) @@ -1,19 +1,24 @@ package fr.inra.refcomp.client; -import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.StyleInjector; +import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.uibinder.client.UiTemplate; -import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.TextBox; +import fr.inra.refcomp.client.constants.Header; import fr.inra.refcomp.client.resources.Style; -import org.gwtmultipage.client.UrlPatternEntryPoint; +import fr.inra.refcomp.client.services.SearchService; +import fr.inra.refcomp.client.services.SearchServiceAsync; +import fr.inra.refcomp.service.Skill; +import java.util.List; /** * User: couteau @@ -21,6 +26,9 @@ */ public class Search extends Composite { + private final SearchServiceAsync searchService = GWT + .create(SearchService.class); + @UiTemplate("Search.ui.xml") interface MyUiBinder extends UiBinder<Panel, Search> { } @@ -32,6 +40,9 @@ private static boolean stylesInjected = false; + @UiField + TextBox searchBox; + public Search() { this.res = GWT.create(Style.class); @@ -44,6 +55,30 @@ initWidget(binder.createAndBindUi(this)); } + @UiHandler("buttonSearch") + void doClickSubmit(ClickEvent event) { + searchService.search(searchBox.getValue(), + new AsyncCallback<List<Skill>>() { + @Override + public void onFailure(Throwable caught) { + Window.alert("Server communication error"); + } + + @Override + public void onSuccess(List<Skill> result) { + RootPanel content = RootPanel.get("content"); + + content.clear(); + + SearchResults resultPanel = new SearchResults(); + + content.add(resultPanel); + + resultPanel.setResults(result); + } + }); + } + Modified: refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java 2010-11-04 09:40:42 UTC (rev 8) +++ refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java 2010-11-04 10:57:18 UTC (rev 9) @@ -1,22 +1,78 @@ package fr.inra.refcomp.client; -import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.StyleInjector; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiTemplate; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Grid; +import com.google.gwt.user.client.ui.Panel; +import fr.inra.refcomp.client.resources.Style; +import fr.inra.refcomp.service.Skill; +import java.util.List; /** * User: couteau * Date: 3 nov. 2010 */ -public class SearchResults implements EntryPoint { +public class SearchResults extends Composite { - public void onModuleLoad(){ - Label searchLabel = new Label("Search"); - Label searchedText = new Label("Java"); + @UiTemplate("SearchResults.ui.xml") + interface MyUiBinder extends UiBinder<Panel, SearchResults> { + } - RootPanel.get("searchLabel").add(searchLabel); - RootPanel.get("searchedText").add(searchedText); - + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + @UiField(provided = true) + final Style res; + + private static boolean stylesInjected = false; + + @UiField + Grid resultsGrid; + + public SearchResults() { + this.res = GWT.create(Style.class); + + // Inject only once. + if (!stylesInjected) { + StyleInjector.injectStylesheet(res.style().getText()); + stylesInjected = true; + } + + initWidget(binder.createAndBindUi(this)); } + public void setResults(List<Skill> skills){ + + resultsGrid.resize(skills.size() + 1, 6); + + //Set grid title + resultsGrid.setText(0,0,"Name"); + resultsGrid.setText(0,1,"Skill"); + resultsGrid.setText(0,2,"Linked Skill"); + resultsGrid.setText(0,3,"Level"); + resultsGrid.setText(0,4,"Comment"); + resultsGrid.setText(0,5,"Right"); + + + for (int i=0;i<skills.size();i++){ + + //The skill to put in row + Skill skill = skills.get(i); + + resultsGrid.setText(i+1,0,skill.getName()); + resultsGrid.setText(i+1,1,skill.getSkill()); + resultsGrid.setText(i+1,2,skill.getLinkedSkill()); + resultsGrid.setText(i+1,3,skill.getLevel()); + resultsGrid.setText(i+1,4,skill.getComment()); + resultsGrid.setText(i+1,5,skill.getRight()); + + } + + } + + + } Added: refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.ui.xml (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.ui.xml 2010-11-04 10:57:18 UTC (rev 9) @@ -0,0 +1,27 @@ +<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + xmlns:gwt='urn:import:com.google.gwt.user.client.ui'> + + <ui:with field='res' type='fr.inra.refcomp.client.resources.Style'/> + + <gwt:HTMLPanel> + <div id="facets"> + <gwt:VerticalPanel styleName="{res.style.background}"> + + </gwt:VerticalPanel> + </div> + + <div align="center"> + <gwt:VerticalPanel styleName="{res.style.background}"> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Label text="Search : " + styleName="{res.style.greyText}"/> + <gwt:Label ui:field="searchedLabel" text="Toto" + styleName="{res.style.greyText}"/> + </gwt:HorizontalPanel> + + <gwt:Grid ui:field="resultsGrid"/> + + </gwt:VerticalPanel> + </div> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Added: refComp/client/src/main/java/fr/inra/refcomp/client/services/SearchService.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/services/SearchService.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/services/SearchService.java 2010-11-04 10:57:18 UTC (rev 9) @@ -0,0 +1,16 @@ +package fr.inra.refcomp.client.services; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; +import fr.inra.refcomp.service.Skill; +import java.util.List; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +@RemoteServiceRelativePath("search") +public interface SearchService extends RemoteService { + + List<Skill> search(String searchSentence); +} Added: refComp/client/src/main/java/fr/inra/refcomp/client/services/SearchServiceAsync.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/services/SearchServiceAsync.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/services/SearchServiceAsync.java 2010-11-04 10:57:18 UTC (rev 9) @@ -0,0 +1,13 @@ +package fr.inra.refcomp.client.services; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import fr.inra.refcomp.service.Skill; +import java.util.List; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public interface SearchServiceAsync { + void search(String searchSentence, AsyncCallback<List<Skill>> callback); +} Added: refComp/client/src/main/java/fr/inra/refcomp/service/SearchServiceImpl.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/service/SearchServiceImpl.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/service/SearchServiceImpl.java 2010-11-04 10:57:18 UTC (rev 9) @@ -0,0 +1,25 @@ +package fr.inra.refcomp.service; + +import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import fr.inra.refcomp.client.services.SearchService; +import java.util.ArrayList; +import java.util.List; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public class SearchServiceImpl extends RemoteServiceServlet implements + SearchService { + + List<Skill> searchResults; + + public List<Skill> search(String searchSentence) { + + searchResults = new ArrayList<Skill>(); + + searchResults.add(new Skill("Hervé Richard", "Java","Maîtrise", "Enfin pas trop quand même", "R", "CIAM")); + + return searchResults; + } +} \ No newline at end of file Modified: refComp/client/src/main/java/fr/inra/refcomp/service/Skill.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/service/Skill.java 2010-11-04 09:40:42 UTC (rev 8) +++ refComp/client/src/main/java/fr/inra/refcomp/service/Skill.java 2010-11-04 10:57:18 UTC (rev 9) @@ -1,11 +1,15 @@ package fr.inra.refcomp.service; +import java.io.Serializable; + /** * User: couteau * Date: 3 nov. 2010 */ -public class Skill { +public class Skill implements Serializable { + public Skill(){} + public String getName() { return name; } @@ -47,12 +51,23 @@ } protected String name; + + public String getSkill() { + return skill; + } + + public void setSkill(String skill) { + this.skill = skill; + } + + protected String skill; protected String level; protected String comment; protected String linkedSkill; protected String right; - public Skill(String name, String level, String comment, String linkedSkill, String right){ + public Skill(String name, String skill, String level, String comment, String linkedSkill, String right){ + this.skill=skill; this.name=name; this.level=level; this.comment=comment; Modified: refComp/client/src/main/webapp/WEB-INF/web.xml =================================================================== --- refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-04 09:40:42 UTC (rev 8) +++ refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-04 10:57:18 UTC (rev 9) @@ -28,5 +28,14 @@ <servlet-name>LoginService</servlet-name> <url-pattern>/fr.inra.refcomp.RefComp/login</url-pattern> </servlet-mapping> + <servlet> + <servlet-name>SearchService</servlet-name> + <servlet-class>fr.inra.refcomp.service.SearchServiceImpl + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>SearchService</servlet-name> + <url-pattern>/fr.inra.refcomp.RefComp/search</url-pattern> + </servlet-mapping> </web-app>

1 0

r8 - refComp/client/src/main/java/fr/inra/refcomp/client
by jcouteau＠users.chorem.org Nov. 4, 2010

Nov. 4, 2010

Author: jcouteau Date: 2010-11-04 10:40:42 +0100 (Thu, 04 Nov 2010) New Revision: 8 Url: http://chorem.org/repositories/revision/incubator/8 Log: Put a passwordBox to enter password Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Login.java refComp/client/src/main/java/fr/inra/refcomp/client/Login.ui.xml Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Login.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Login.java 2010-11-04 08:37:47 UTC (rev 7) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Login.java 2010-11-04 09:40:42 UTC (rev 8) @@ -13,6 +13,7 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Panel; +import com.google.gwt.user.client.ui.PasswordTextBox; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.TextBox; import fr.inra.refcomp.client.constants.Header; @@ -56,7 +57,7 @@ TextBox loginBox; @UiField - TextBox passwordBox; + PasswordTextBox passwordBox; @UiField Label completionLabel1; Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Login.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Login.ui.xml 2010-11-04 08:37:47 UTC (rev 7) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Login.ui.xml 2010-11-04 09:40:42 UTC (rev 8) @@ -10,7 +10,7 @@ <gwt:TextBox ui:field="loginBox" styleName="{res.style.box}"/> <gwt:Label text="Password" styleName="{res.style.greyText}"/> - <gwt:TextBox ui:field="passwordBox" styleName="{res.style.box}"/> + <gwt:PasswordTextBox ui:field="passwordBox" styleName="{res.style.box}"/> <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> <gwt:Button ui:field="buttonSubmit" text="Submit" styleName="{res.style.loginButton}"/>

1 0

r7 - in refComp/client: . src/main/java/fr/inra/refcomp/service src/main/webapp src/main/webapp/WEB-INF
by jcouteau＠users.chorem.org Nov. 4, 2010

Nov. 4, 2010

Author: jcouteau Date: 2010-11-04 09:37:47 +0100 (Thu, 04 Nov 2010) New Revision: 7 Url: http://chorem.org/repositories/revision/incubator/7 Log: Change conf Modified: refComp/client/pom.xml refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceAsync.java refComp/client/src/main/webapp/ refComp/client/src/main/webapp/WEB-INF/ refComp/client/src/main/webapp/WEB-INF/web.xml Modified: refComp/client/pom.xml =================================================================== --- refComp/client/pom.xml 2010-11-04 08:31:02 UTC (rev 6) +++ refComp/client/pom.xml 2010-11-04 08:37:47 UTC (rev 7) @@ -60,7 +60,7 @@ <build> - <outputDirectory>war/WEB-INF/classes</outputDirectory> + <outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory> <plugins> Modified: refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceAsync.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceAsync.java 2010-11-04 08:31:02 UTC (rev 6) +++ refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceAsync.java 2010-11-04 08:37:47 UTC (rev 7) @@ -1,6 +1,7 @@ package fr.inra.refcomp.service; import com.google.gwt.user.client.rpc.AsyncCallback; +import java.util.List; /** * User: couteau @@ -8,7 +9,7 @@ */ public interface SkillServiceAsync { - void getAllSkills(AsyncCallback callback); + void getAllSkills(AsyncCallback<List<Skill>> callback); - void addSkill(AsyncCallback callback); + void addSkill(Skill skill, AsyncCallback callback); } Property changes on: refComp/client/src/main/webapp ___________________________________________________________________ Added: svn:ignore + fr.inra.* Property changes on: refComp/client/src/main/webapp/WEB-INF ___________________________________________________________________ Added: svn:ignore + lib classes Modified: refComp/client/src/main/webapp/WEB-INF/web.xml =================================================================== --- refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-04 08:31:02 UTC (rev 6) +++ refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-04 08:37:47 UTC (rev 7) @@ -9,7 +9,7 @@ <welcome-file>index.html</welcome-file> </welcome-file-list> - <servlet> +  <servlet> <servlet-name>LoginService</servlet-name> @@ -26,7 +26,7 @@ </servlet> <servlet-mapping> <servlet-name>LoginService</servlet-name> - <url-pattern>/fr.inra.refcomp.RefComp/loginService</url-pattern> + <url-pattern>/fr.inra.refcomp.RefComp/login</url-pattern> </servlet-mapping> </web-app>

1 0

r6 - refComp/client/src/main/java/fr/inra/refcomp/client
by jcouteau＠users.chorem.org Nov. 4, 2010

Nov. 4, 2010

Author: jcouteau Date: 2010-11-04 09:31:02 +0100 (Thu, 04 Nov 2010) New Revision: 6 Url: http://chorem.org/repositories/revision/incubator/6 Log: Add Search screen (no functionnality) Added: refComp/client/src/main/java/fr/inra/refcomp/client/Search.ui.xml Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Login.java refComp/client/src/main/java/fr/inra/refcomp/client/Search.java Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Login.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Login.java 2010-11-04 08:22:03 UTC (rev 5) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Login.java 2010-11-04 08:31:02 UTC (rev 6) @@ -88,8 +88,9 @@ RootPanel header = RootPanel.get("header"); content.clear(); + header.clear(); - header.clear(); + content.add(new Search()); header.add(new Header()); } else { Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Search.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Search.java 2010-11-04 08:22:03 UTC (rev 5) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Search.java 2010-11-04 08:31:02 UTC (rev 6) @@ -2,25 +2,49 @@ import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.StyleInjector; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiTemplate; import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.TextBox; +import fr.inra.refcomp.client.resources.Style; import org.gwtmultipage.client.UrlPatternEntryPoint; /** * User: couteau * Date: 3 nov. 2010 */ -public class Search implements EntryPoint { +public class Search extends Composite { - Label searchLabel = new Label("Search"); - TextBox searchBox = new TextBox(); - Button searchButton = new Button("Search"); + @UiTemplate("Search.ui.xml") + interface MyUiBinder extends UiBinder<Panel, Search> { + } - public void onModuleLoad(){ - RootPanel.get("searchLabel").add(searchLabel); - RootPanel.get("searchBox").add(searchBox); - RootPanel.get("searchButton").add(searchButton); + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + @UiField(provided = true) + final Style res; + + private static boolean stylesInjected = false; + + public Search() { + this.res = GWT.create(Style.class); + + // Inject only once. + if (!stylesInjected) { + StyleInjector.injectStylesheet(res.style().getText()); + stylesInjected = true; + } + + initWidget(binder.createAndBindUi(this)); } + + + + } Added: refComp/client/src/main/java/fr/inra/refcomp/client/Search.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Search.ui.xml (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Search.ui.xml 2010-11-04 08:31:02 UTC (rev 6) @@ -0,0 +1,19 @@ +<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + xmlns:gwt='urn:import:com.google.gwt.user.client.ui'> + + <ui:with field='res' type='fr.inra.refcomp.client.resources.Style'/> + + <gwt:HTMLPanel> + <div align="center"> + <gwt:VerticalPanel styleName="{res.style.background}"> + <gwt:Label text="RefComp Search" styleName="{res.style.greyText}"/> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:TextBox ui:field="searchBox" + styleName="{res.style.box}"/> + <gwt:Button ui:field="buttonSearch" text="Search" + styleName="{res.style.loginButton}"/> + </gwt:HorizontalPanel> + </gwt:VerticalPanel> + </div> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file

1 0

r5 - in refComp/client/src/main/java/fr/inra/refcomp/client: . constants
by jcouteau＠users.chorem.org Nov. 4, 2010

Nov. 4, 2010

Author: jcouteau Date: 2010-11-04 09:22:03 +0100 (Thu, 04 Nov 2010) New Revision: 5 Url: http://chorem.org/repositories/revision/incubator/5 Log: Add footer Modified: refComp/client/src/main/java/fr/inra/refcomp/client/RefComp.java refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.java refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.ui.xml refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java Modified: refComp/client/src/main/java/fr/inra/refcomp/client/RefComp.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/RefComp.java 2010-11-04 08:13:00 UTC (rev 4) +++ refComp/client/src/main/java/fr/inra/refcomp/client/RefComp.java 2010-11-04 08:22:03 UTC (rev 5) @@ -2,6 +2,7 @@ import com.google.gwt.core.client.EntryPoint; import com.google.gwt.user.client.ui.RootPanel; +import fr.inra.refcomp.client.constants.Footer; /** * User: couteau @@ -11,6 +12,7 @@ public void onModuleLoad() { RootPanel.get("content").add(new Login()); + RootPanel.get("footer").add(new Footer()); } } Modified: refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.java 2010-11-04 08:13:00 UTC (rev 4) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.java 2010-11-04 08:22:03 UTC (rev 5) @@ -1,8 +1,39 @@ package fr.inra.refcomp.client.constants; +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.StyleInjector; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiTemplate; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Panel; +import fr.inra.refcomp.client.resources.Style; + /** * User: couteau * Date: 3 nov. 2010 */ -public class Footer { +public class Footer extends Composite { + @UiTemplate("Footer.ui.xml") + interface MyUiBinder extends UiBinder<Panel, Footer> { + } + + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + @UiField(provided = true) + final Style res; + + private static boolean stylesInjected = false; + + public Footer() { + this.res = GWT.create(Style.class); + + // Inject only once. + if (!stylesInjected) { + StyleInjector.injectStylesheet(res.style().getText()); + stylesInjected = true; + } + + initWidget(binder.createAndBindUi(this)); + } } Modified: refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.ui.xml 2010-11-04 08:13:00 UTC (rev 4) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.ui.xml 2010-11-04 08:22:03 UTC (rev 5) @@ -0,0 +1,11 @@ +<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + xmlns:gwt='urn:import:com.google.gwt.user.client.ui'> + + <ui:with field='res' type='fr.inra.refcomp.client.resources.Style'/> + + <gwt:HTMLPanel> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Label text="Footer" styleName="{res.style.greyText}"/> + </gwt:HorizontalPanel> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Modified: refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java 2010-11-04 08:13:00 UTC (rev 4) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java 2010-11-04 08:22:03 UTC (rev 5) @@ -8,8 +8,6 @@ import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.uibinder.client.UiTemplate; import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RootPanel;

1 0

r4 - in refComp/client: . src/main/java/fr/inra/refcomp src/main/java/fr/inra/refcomp/client src/main/java/fr/inra/refcomp/client/constants src/main/java/fr/inra/refcomp/client/resources src/main/java/fr/inra/refcomp/client/services src/main/java/fr/inra/refcomp/service src/main/resources/fr/inra/refcomp src/main/resources/fr/inra/refcomp/public src/main/resources/fr/inra/refcomp/resources src/main/webapp/WEB-INF src/test/java/fr/inra/refcomp/client
by jcouteau＠users.chorem.org Nov. 4, 2010

Nov. 4, 2010

Author: jcouteau Date: 2010-11-04 09:13:00 +0100 (Thu, 04 Nov 2010) New Revision: 4 Url: http://chorem.org/repositories/revision/incubator/4 Log: Nice login page + header for next pages Added: refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml refComp/client/src/main/java/fr/inra/refcomp/client/Login.ui.xml refComp/client/src/main/java/fr/inra/refcomp/client/RefComp.java refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java refComp/client/src/main/java/fr/inra/refcomp/client/constants/ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.java refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.ui.xml refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.ui.xml refComp/client/src/main/java/fr/inra/refcomp/client/resources/ refComp/client/src/main/java/fr/inra/refcomp/client/resources/Style.java refComp/client/src/main/java/fr/inra/refcomp/client/resources/refcomp.css refComp/client/src/main/java/fr/inra/refcomp/client/services/ refComp/client/src/main/java/fr/inra/refcomp/client/services/LoginService.java refComp/client/src/main/java/fr/inra/refcomp/client/services/LoginServiceAsync.java refComp/client/src/main/java/fr/inra/refcomp/service/ refComp/client/src/main/java/fr/inra/refcomp/service/LoginServiceImpl.java refComp/client/src/main/java/fr/inra/refcomp/service/Skill.java refComp/client/src/main/java/fr/inra/refcomp/service/SkillService.java refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceAsync.java refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceImpl.java refComp/client/src/main/resources/fr/inra/refcomp/public/RefComp.html refComp/client/src/main/resources/fr/inra/refcomp/public/SearchResults.html refComp/client/src/main/resources/fr/inra/refcomp/resources/ refComp/client/src/main/resources/fr/inra/refcomp/resources/refcomp.css Removed: refComp/client/src/main/java/fr/inra/refcomp/Login.gwt.xml refComp/client/src/main/java/fr/inra/refcomp/Search.gwt.xml refComp/client/src/main/resources/fr/inra/refcomp/public/Login.html refComp/client/src/test/java/fr/inra/refcomp/client/GwtTestSample.java Modified: refComp/client/pom.xml refComp/client/src/main/java/fr/inra/refcomp/client/Login.java refComp/client/src/main/java/fr/inra/refcomp/client/Search.java refComp/client/src/main/resources/fr/inra/refcomp/public/Search.html refComp/client/src/main/webapp/WEB-INF/web.xml Modified: refComp/client/pom.xml =================================================================== --- refComp/client/pom.xml 2010-11-03 15:15:50 UTC (rev 3) +++ refComp/client/pom.xml 2010-11-04 08:13:00 UTC (rev 4) @@ -31,6 +31,18 @@ <artifactId>gwt-servlet</artifactId> </dependency> + <dependency> + <groupId>org.gwtmultipage</groupId> + <artifactId>gwtmultipage-core</artifactId> + <version>1.0.0.Beta5</version> + </dependency> + + <dependency> + <groupId>fr.inra.refcomp</groupId> + <artifactId>services</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + </dependencies>  Deleted: refComp/client/src/main/java/fr/inra/refcomp/Login.gwt.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/Login.gwt.xml 2010-11-03 15:15:50 UTC (rev 3) +++ refComp/client/src/main/java/fr/inra/refcomp/Login.gwt.xml 2010-11-04 08:13:00 UTC (rev 4) @@ -1,16 +0,0 @@ -<!DOCTYPE module PUBLIC "//gwt-module/" "http://google-web-toolkit.googlecode.com/svn/tags/1.6.2/distro-source/core/…"> -<module> - -  - <inherits name='com.google.gwt.user.User'/> - -  - <inherits name='com.google.gwt.user.theme.standard.Standard'/> - -  - <entry-point class='fr.inra.refcomp.client.Login'/> - -  - <stylesheet src='Application.css' /> - -</module> Added: refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,18 @@ +<!DOCTYPE module PUBLIC "//gwt-module/" + "http://google-web-toolkit.googlecode.com/svn/tags/1.6.2/distro-source/core/…"> +<module> + +  + <inherits name='com.google.gwt.user.User'/> + <inherits name="com.google.gwt.uibinder.UiBinder"/> + +  + <inherits name='com.google.gwt.user.theme.standard.Standard'/> + +  + <entry-point class='fr.inra.refcomp.client.RefComp'/> + +  + <stylesheet src='Application.css'/> + +</module> \ No newline at end of file Deleted: refComp/client/src/main/java/fr/inra/refcomp/Search.gwt.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/Search.gwt.xml 2010-11-03 15:15:50 UTC (rev 3) +++ refComp/client/src/main/java/fr/inra/refcomp/Search.gwt.xml 2010-11-04 08:13:00 UTC (rev 4) @@ -1,17 +0,0 @@ -<!DOCTYPE module PUBLIC "//gwt-module/" - "http://google-web-toolkit.googlecode.com/svn/tags/1.6.2/distro-source/core/…"> -<module> - -  - <inherits name='com.google.gwt.user.User'/> - -  - <inherits name='com.google.gwt.user.theme.standard.Standard'/> - -  - <entry-point class='fr.inra.refcomp.client.Search'/> - -  - <stylesheet src='Application.css'/> - -</module> \ No newline at end of file Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Login.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Login.java 2010-11-03 15:15:50 UTC (rev 3) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Login.java 2010-11-04 08:13:00 UTC (rev 4) @@ -1,41 +1,128 @@ package fr.inra.refcomp.client; -import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.StyleInjector; import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.logical.shared.ValueChangeEvent; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.uibinder.client.UiTemplate; import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.TextBox; +import fr.inra.refcomp.client.constants.Header; +import fr.inra.refcomp.client.resources.Style; +import fr.inra.refcomp.client.services.LoginService; +import fr.inra.refcomp.client.services.LoginServiceAsync; /** * User: couteau * Date: 3 nov. 2010 */ -public class Login implements EntryPoint { +public class Login extends Composite { - Label loginLabel = new Label("Login : "); - TextBox loginBox = new TextBox(); - Label pwdLabel = new Label("Password : "); - TextBox pwdBox = new TextBox(); - Button button = new Button("Submit"); - - public void onModuleLoad() { - RootPanel.get("loginLabel").add(loginLabel); - RootPanel.get("loginBox").add(loginBox); - RootPanel.get("pwdLabel").add(pwdLabel); - RootPanel.get("pwdBox").add(pwdBox); - RootPanel.get("submitButton").add(button); + private final LoginServiceAsync loginService = GWT + .create(LoginService.class); - button.addClickHandler(new ClickHandler(){ - public void onClick(ClickEvent event) { - //Window.Location.assign("Search/Search.html"); - Window.Location.replace("../fr.inra.refcomp.Search/Search.html"); - //Window.open("Search.html", "_self", ""); - } - }); + @UiTemplate("Login.ui.xml") + interface MyUiBinder extends UiBinder<Panel, Login> { + } + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + @UiField(provided = true) + final Style res; + + private static boolean stylesInjected = false; + + public Login() { + this.res = GWT.create(Style.class); + + // Inject only once. + if (!stylesInjected) { + StyleInjector.injectStylesheet(res.style().getText()); + stylesInjected = true; + } + + initWidget(binder.createAndBindUi(this)); } + @UiField + TextBox loginBox; + + @UiField + TextBox passwordBox; + + @UiField + Label completionLabel1; + + @UiField + Label completionLabel2; + + private Boolean tooShort = false; + + /* + * Method name is not relevant, the binding is done according to the class + * of the parameter. + */ + + @UiHandler("buttonSubmit") + void doClickSubmit(ClickEvent event) { + if (tooShort) { + loginService.login(loginBox.getValue(), passwordBox.getValue(), + new AsyncCallback<Boolean>() { + @Override + public void onFailure(Throwable caught) { + Window.alert("Server communication error"); + } + + @Override + public void onSuccess(Boolean result) { + if (result){ + RootPanel content = RootPanel.get("content"); + RootPanel header = RootPanel.get("header"); + + content.clear(); + + header.clear(); + header.add(new Header()); + + } else { + Window.alert("Login failed, try with admin/admin"); + } + } + }); + } else { + Window.alert("Login or Password is too short"); + } + } + + @UiHandler("loginBox") + void loginBoxValueChanged(ValueChangeEvent<String> event) { + if (event.getValue().length() < 3) { + completionLabel1.setText("Login too short (Size must be >3)"); + tooShort = false; + } else { + tooShort = true; + completionLabel1.setText(""); + } + } + + @UiHandler("passwordBox") + void passwordBoxValueChanged(ValueChangeEvent<String> event) { + if (event.getValue().length() < 3) { + tooShort = false; + completionLabel2.setText("Password too short (Size must be >3)"); + } else { + tooShort = true; + completionLabel2.setText(""); + } + } + + } Added: refComp/client/src/main/java/fr/inra/refcomp/client/Login.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Login.ui.xml (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Login.ui.xml 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,28 @@ +<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + xmlns:gwt='urn:import:com.google.gwt.user.client.ui'> + + <ui:with field='res' type='fr.inra.refcomp.client.resources.Style'/> + + <gwt:HTMLPanel> + <div align="center"> + <gwt:VerticalPanel styleName="{res.style.background}"> + <gwt:Label text="Login" styleName="{res.style.greyText}"/> + <gwt:TextBox ui:field="loginBox" + styleName="{res.style.box}"/> + <gwt:Label text="Password" styleName="{res.style.greyText}"/> + <gwt:TextBox ui:field="passwordBox" styleName="{res.style.box}"/> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Button ui:field="buttonSubmit" text="Submit" + styleName="{res.style.loginButton}"/> + <gwt:CheckBox ui:field="myCheckBox"/> + <gwt:Label ui:field="myLabel" text="Remember me" + styleName="{res.style.greyText}"/> + </gwt:HorizontalPanel> + <gwt:Label ui:field="completionLabel1" + styleName="{res.style.greyText}"/> + <gwt:Label ui:field="completionLabel2" + styleName="{res.style.greyText}"/> + </gwt:VerticalPanel> + </div> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Added: refComp/client/src/main/java/fr/inra/refcomp/client/RefComp.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/RefComp.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/RefComp.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,16 @@ +package fr.inra.refcomp.client; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.user.client.ui.RootPanel; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class RefComp implements EntryPoint { + public void onModuleLoad() { + + RootPanel.get("content").add(new Login()); + + } +} Modified: refComp/client/src/main/java/fr/inra/refcomp/client/Search.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Search.java 2010-11-03 15:15:50 UTC (rev 3) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Search.java 2010-11-04 08:13:00 UTC (rev 4) @@ -2,8 +2,11 @@ import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.TextBox; +import org.gwtmultipage.client.UrlPatternEntryPoint; /** * User: couteau @@ -12,11 +15,12 @@ public class Search implements EntryPoint { Label searchLabel = new Label("Search"); + TextBox searchBox = new TextBox(); + Button searchButton = new Button("Search"); public void onModuleLoad(){ - GWT.log("Hello World!", null); - - RootPanel.get("test").add(searchLabel); - + RootPanel.get("searchLabel").add(searchLabel); + RootPanel.get("searchBox").add(searchBox); + RootPanel.get("searchButton").add(searchButton); } } Added: refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,22 @@ +package fr.inra.refcomp.client; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.RootPanel; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class SearchResults implements EntryPoint { + + public void onModuleLoad(){ + Label searchLabel = new Label("Search"); + Label searchedText = new Label("Java"); + + RootPanel.get("searchLabel").add(searchLabel); + RootPanel.get("searchedText").add(searchedText); + + } + +} Added: refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,8 @@ +package fr.inra.refcomp.client.constants; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class Footer { +} Added: refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,90 @@ +package fr.inra.refcomp.client.constants; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.StyleInjector; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.uibinder.client.UiTemplate; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Panel; +import com.google.gwt.user.client.ui.RootPanel; +import fr.inra.refcomp.client.Login; +import fr.inra.refcomp.client.resources.Style; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class Header extends Composite { + @UiTemplate("Header.ui.xml") + interface MyUiBinder extends UiBinder<Panel, Header> { + } + + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + @UiField(provided = true) + final Style res; + + private static boolean stylesInjected = false; + + public Header() { + this.res = GWT.create(Style.class); + + // Inject only once. + if (!stylesInjected) { + StyleInjector.injectStylesheet(res.style().getText()); + stylesInjected = true; + } + + initWidget(binder.createAndBindUi(this)); + } + + @UiHandler("buttonLogout") + void doClickLogout(ClickEvent event) { + + RootPanel content = RootPanel.get("content"); + RootPanel header = RootPanel.get("header"); + RootPanel footer = RootPanel.get("footer"); + + content.clear(); + header.clear(); + footer.clear(); + + content.add(new Login()); + } + + @UiHandler("buttonMySkills") + void doClickMySkills(ClickEvent event) { + + Window.alert("Not implemented yet"); + } + + @UiHandler("buttonAdminSkills") + void doClickAdminSkills(ClickEvent event) { + + Window.alert("Not implemented yet"); + } + + @UiHandler("buttonAdminCati") + void doClickAdminCati(ClickEvent event) { + + Window.alert("Not implemented yet"); + } + + @UiHandler("buttonAdminServices") + void doClickAdminServices(ClickEvent event) { + + Window.alert("Not implemented yet"); + } + + @UiHandler("buttonAdminUsers") + void doClickAdminUsers(ClickEvent event) { + + Window.alert("Not implemented yet"); + } +} Added: refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.ui.xml (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.ui.xml 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,22 @@ +<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + xmlns:gwt='urn:import:com.google.gwt.user.client.ui'> + + <ui:with field='res' type='fr.inra.refcomp.client.resources.Style'/> + + <gwt:HTMLPanel> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Button ui:field="buttonLogout" text="Logout" + styleName="{res.style.loginButton}"/> + <gwt:Button ui:field="buttonMySkills" text="My Skills" + styleName="{res.style.loginButton}"/> + <gwt:Button ui:field="buttonAdminSkills" text="Admin. Skills" + styleName="{res.style.loginButton}"/> + <gwt:Button ui:field="buttonAdminCati" text="Admin. Cati" + styleName="{res.style.loginButton}"/> + <gwt:Button ui:field="buttonAdminServices" text="Admin. Services" + styleName="{res.style.loginButton}"/> + <gwt:Button ui:field="buttonAdminUsers" text="Admin. Users" + styleName="{res.style.loginButton}"/> + </gwt:HorizontalPanel> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Added: refComp/client/src/main/java/fr/inra/refcomp/client/resources/Style.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/resources/Style.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/resources/Style.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,28 @@ +package fr.inra.refcomp.client.resources; + +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public interface Style extends ClientBundle{ + + /** + * Sample CssResource. + */ + public interface MyCss extends CssResource { + String greyText(); + + String loginButton(); + + String box(); + + String background(); + } + + @ClientBundle.Source("refcomp.css") + MyCss style(); + +} Added: refComp/client/src/main/java/fr/inra/refcomp/client/resources/refcomp.css =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/resources/refcomp.css (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/resources/refcomp.css 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,36 @@ +.greyText { + font-family: "Lucida Grande", Arial, Sans-serif; + color: #778899; + font-size: 11px; + text-align: left; +} + +.loginButton { + border: 1px solid #3399DD; + color: #FFFFFF; + background: #3322DD; + font-size: 11px; + font-weight: bold; + margin: 0 5px 0 0; + padding: 4px 10px 5px; + text-shadow: 0 -1px 0 #3399DD; +} + +.box { + border: 1px solid #AACCEE; + display: block; + font-size: 12px; + margin: 0 0 5px; + padding: 3px; + width: 203px; +} + +.background { + background-color: #DDEEF6; + border: 1px none transparent; + color: #778899; + font-size: 11px; + margin-left: -8px; + margin-top: 5px; + padding: 6px; +} Added: refComp/client/src/main/java/fr/inra/refcomp/client/services/LoginService.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/services/LoginService.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/services/LoginService.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,14 @@ +package fr.inra.refcomp.client.services; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +@RemoteServiceRelativePath("login") +public interface LoginService extends RemoteService { + Boolean login(String login, String password); +} + Added: refComp/client/src/main/java/fr/inra/refcomp/client/services/LoginServiceAsync.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/services/LoginServiceAsync.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/services/LoginServiceAsync.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,12 @@ +package fr.inra.refcomp.client.services; + +import com.google.gwt.user.client.rpc.AsyncCallback; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public interface LoginServiceAsync { + void login(String login, String password, AsyncCallback<Boolean> callback); +} + Added: refComp/client/src/main/java/fr/inra/refcomp/service/LoginServiceImpl.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/service/LoginServiceImpl.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/service/LoginServiceImpl.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,20 @@ +package fr.inra.refcomp.service; + +import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import fr.inra.refcomp.client.services.LoginService; + +/** + * User: couteau + * Date: 4 nov. 2010 + */ +public class LoginServiceImpl extends RemoteServiceServlet implements + LoginService { + + public Boolean login(String login, String password) { + if (login.equals("admin") && password.equals("admin")) + return true; + else + return false; + } +} + Added: refComp/client/src/main/java/fr/inra/refcomp/service/Skill.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/service/Skill.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/service/Skill.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,62 @@ +package fr.inra.refcomp.service; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class Skill { + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getLinkedSkill() { + return linkedSkill; + } + + public void setLinkedSkill(String linkedSkill) { + this.linkedSkill = linkedSkill; + } + + public String getRight() { + return right; + } + + public void setRight(String right) { + this.right = right; + } + + protected String name; + protected String level; + protected String comment; + protected String linkedSkill; + protected String right; + + public Skill(String name, String level, String comment, String linkedSkill, String right){ + this.name=name; + this.level=level; + this.comment=comment; + this.linkedSkill=linkedSkill; + this.right=right; + } +} Added: refComp/client/src/main/java/fr/inra/refcomp/service/SkillService.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/service/SkillService.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/service/SkillService.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,15 @@ +package fr.inra.refcomp.service; + +import com.google.gwt.user.client.rpc.RemoteService; +import java.util.List; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public interface SkillService extends RemoteService { + + List<Skill> getAllSkills(); + + void addSkill(Skill skill); +} Added: refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceAsync.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceAsync.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceAsync.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,14 @@ +package fr.inra.refcomp.service; + +import com.google.gwt.user.client.rpc.AsyncCallback; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public interface SkillServiceAsync { + + void getAllSkills(AsyncCallback callback); + + void addSkill(AsyncCallback callback); +} Added: refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceImpl.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceImpl.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/service/SkillServiceImpl.java 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,25 @@ +package fr.inra.refcomp.service; + +import java.util.ArrayList; +import java.util.List; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class SkillServiceImpl implements SkillService { + protected List<Skill> skills; + + public SkillServiceImpl(){ + skills = new ArrayList<Skill>(); + skills.add(new Skill("Hervé Richard", "Maîtrise", "Enfin pas trop quand même", "R","CIAM")); + } + + public List<Skill> getAllSkills(){ + return skills; + } + + public void addSkill(Skill skill){ + skills.add(skill); + } +} Deleted: refComp/client/src/main/resources/fr/inra/refcomp/public/Login.html =================================================================== --- refComp/client/src/main/resources/fr/inra/refcomp/public/Login.html 2010-11-03 15:15:50 UTC (rev 3) +++ refComp/client/src/main/resources/fr/inra/refcomp/public/Login.html 2010-11-04 08:13:00 UTC (rev 4) @@ -1,43 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> - - - - - - - -<html> - <head> - <meta http-equiv="content-type" content="text/html; charset=UTF-8"> - - <title>RefComp - Login</title> - - <meta name='gwt:module' content='fr.inra.refcomp.client.Login'> - -  -  -  -  -  - <script type="text/javascript" language="javascript" src="fr.inra.refcomp.Login.nocache.js"></script> - </head> - - <body> - - <div id="login"> - <div id="loginForm"> - <span id="loginLabel"></span> - <span id="loginBox"></span> - <span id="pwdLabel"></span> - <span id="pwdBox"></span> - <div id="submitButton"></div> - </div> - <div id="register"></div> - <div id="forgot"></div> - </div> - -  - <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe> - - </body> -</html> \ No newline at end of file Added: refComp/client/src/main/resources/fr/inra/refcomp/public/RefComp.html =================================================================== --- refComp/client/src/main/resources/fr/inra/refcomp/public/RefComp.html (rev 0) +++ refComp/client/src/main/resources/fr/inra/refcomp/public/RefComp.html 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,30 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=UTF-8"> + + <title>RefComp - Search</title> + + <meta name='gwt:module' content='fr.inra.refcomp.client.SearchResults'> + +  +  +  +  +  + <script type="text/javascript" language="javascript" src="fr.inra.refcomp.RefComp.nocache.js"></script> +</head> +<body> + +<div id="header"></div> + +<div id="content"></div> + +<div id="footer"></div> + + +  + <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe> +</body> +</html> \ No newline at end of file Modified: refComp/client/src/main/resources/fr/inra/refcomp/public/Search.html =================================================================== --- refComp/client/src/main/resources/fr/inra/refcomp/public/Search.html 2010-11-03 15:15:50 UTC (rev 3) +++ refComp/client/src/main/resources/fr/inra/refcomp/public/Search.html 2010-11-04 08:13:00 UTC (rev 4) @@ -16,11 +16,25 @@ <script type="text/javascript" language="javascript" src="fr.inra.refcomp.Search.nocache.js"></script> </head> <body> -<div id="test"> +<div id="header"> + <span id="Logout"></span> + <span id="mySkills"></span> + <span id="adminSkills"></span> + <span id="adminCati"></span> + <span id="adminServices"></span> + <span id="adminUsers"></span> </div> +<div id="content"> + <span id="searchLabel"></span> + <span id="searchBox"></span> + <span id="searchButton"></span> +</div> +<div id="footer"></div> + +  <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe> </body> Added: refComp/client/src/main/resources/fr/inra/refcomp/public/SearchResults.html =================================================================== --- refComp/client/src/main/resources/fr/inra/refcomp/public/SearchResults.html (rev 0) +++ refComp/client/src/main/resources/fr/inra/refcomp/public/SearchResults.html 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,43 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=UTF-8"> + + <title>RefComp - Search</title> + + <meta name='gwt:module' content='fr.inra.refcomp.client.SearchResults'> + +  +  +  +  +  + <script type="text/javascript" language="javascript" src="fr.inra.refcomp.SearchResults.nocache.js"></script> +</head> +<body> +<div id="header"> + <span id="Logout"></span> + <span id="mySkills"></span> + <span id="adminSkills"></span> + <span id="adminCati"></span> + <span id="adminServices"></span> + <span id="adminUsers"></span> + +</div> + +<div id="facets"></div> + +<div id="content"> + <span id="searchLabel"></span> + <span id="searchedText"></span> + <div id="searchResults"></div> +</div> + +<div id="footer"></div> + + +  + <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe> +</body> +</html> \ No newline at end of file Added: refComp/client/src/main/resources/fr/inra/refcomp/resources/refcomp.css =================================================================== --- refComp/client/src/main/resources/fr/inra/refcomp/resources/refcomp.css (rev 0) +++ refComp/client/src/main/resources/fr/inra/refcomp/resources/refcomp.css 2010-11-04 08:13:00 UTC (rev 4) @@ -0,0 +1,36 @@ +.greyText { + font-family: "Lucida Grande", Arial, Sans-serif; + color: #778899; + font-size: 11px; + text-align: left; +} + +.loginButton { + border: 1px solid #3399DD; + color: #FFFFFF; + background: #3322DD; + font-size: 11px; + font-weight: bold; + margin: 0 5px 0 0; + padding: 4px 10px 5px; + text-shadow: 0 -1px 0 #3399DD; +} + +.box { + border: 1px solid #AACCEE; + display: block; + font-size: 12px; + margin: 0 0 5px; + padding: 3px; + width: 203px; +} + +.background { + background-color: #DDEEF6; + border: 1px none transparent; + color: #778899; + font-size: 11px; + margin-left: -8px; + margin-top: 5px; + padding: 6px; +} Modified: refComp/client/src/main/webapp/WEB-INF/web.xml =================================================================== --- refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-03 15:15:50 UTC (rev 3) +++ refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-04 08:13:00 UTC (rev 4) @@ -8,4 +8,25 @@ <welcome-file-list> <welcome-file>index.html</welcome-file> </welcome-file-list> + + <servlet> + <servlet-name>SkillService</servlet-name> + <servlet-class>fr.inra.refcomp.service.SkillServiceImpl + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>SkillService</servlet-name> + <url-pattern>/fr.inra.refcomp.RefComp/skillService</url-pattern> + </servlet-mapping> + + <servlet> + <servlet-name>LoginService</servlet-name> + <servlet-class>fr.inra.refcomp.service.LoginServiceImpl + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>LoginService</servlet-name> + <url-pattern>/fr.inra.refcomp.RefComp/loginService</url-pattern> + </servlet-mapping> + </web-app> Deleted: refComp/client/src/test/java/fr/inra/refcomp/client/GwtTestSample.java =================================================================== --- refComp/client/src/test/java/fr/inra/refcomp/client/GwtTestSample.java 2010-11-03 15:15:50 UTC (rev 3) +++ refComp/client/src/test/java/fr/inra/refcomp/client/GwtTestSample.java 2010-11-04 08:13:00 UTC (rev 4) @@ -1,20 +0,0 @@ -package fr.inra.refcomp.client; - -import com.google.gwt.junit.client.GWTTestCase; - -public class GwtTestSample - extends GWTTestCase -{ - - public String getModuleName() - { - return "fr.inra.Application"; - } - - public void testSomething() - { - // Not much to actually test in this sample app - // Ideally you would test your Controller here (NOT YOUR UI) - // (Make calls to RPC services, test client side model objects, test client side logic, etc) - } -} \ No newline at end of file

1 0

r3 - in refComp/client/src/main/java/fr/inra/refcomp/client: . example1
by athimel＠users.chorem.org Nov. 3, 2010

Nov. 3, 2010

Author: athimel Date: 2010-11-03 16:15:50 +0100 (Wed, 03 Nov 2010) New Revision: 3 Url: http://chorem.org/repositories/revision/incubator/3 Log: Add an example with LazyInstantiation Added: refComp/client/src/main/java/fr/inra/refcomp/client/example1/ refComp/client/src/main/java/fr/inra/refcomp/client/example1/LoginExampleLazyInstantiation.java Added: refComp/client/src/main/java/fr/inra/refcomp/client/example1/LoginExampleLazyInstantiation.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/example1/LoginExampleLazyInstantiation.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/example1/LoginExampleLazyInstantiation.java 2010-11-03 15:15:50 UTC (rev 3) @@ -0,0 +1,76 @@ +package fr.inra.refcomp.client.example1; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.TextBox; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class LoginExampleLazyInstantiation implements EntryPoint { + + Label loginLabel; + TextBox loginBox; + Label pwdLabel; + TextBox pwdBox; + Button button; + + public void onModuleLoad() { + RootPanel.get("loginLabel").add(getLoginLabel()); + RootPanel.get("loginBox").add(getLoginBox()); + RootPanel.get("pwdLabel").add(getPwdLabel()); + RootPanel.get("pwdBox").add(getPwdBox()); + RootPanel.get("submitButton").add(getButton()); + + getButton().addClickHandler(new ClickHandler(){ + public void onClick(ClickEvent event) { + //Window.Location.assign("Search/Search.html"); + Window.Location.replace("../fr.inra.refcomp.Search/Search.html"); + //Window.open("Search.html", "_self", ""); + } + }); + + } + + protected Label getLoginLabel() { + if (loginLabel == null) { + loginLabel = new Label("Login : "); + } + return loginLabel; + } + + protected TextBox getLoginBox() { + if (loginBox == null) { + loginBox = new TextBox(); + } + return loginBox; + } + + public Label getPwdLabel() { + if (pwdLabel == null) { + pwdLabel = new Label("Password : "); + } + return pwdLabel; + } + + public TextBox getPwdBox() { + if (pwdBox == null) { + pwdBox = new TextBox(); + } + return pwdBox; + } + + public Button getButton() { + if (button == null) { + button = new Button("Submit"); + } + return button; + } + +}

1 0