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

05 Nov '10

Author: jcouteau Date: 2010-11-05 17:06:09 +0100 (Fri, 05 Nov 2010) New Revision: 17 Url: http://chorem.org/repositories/revision/incubator/17 Log: Huge refactoring : try using wikitty in gwt rename packages to org.chorem.bonzoms.skills use correct modules names Added: refComp/skills-client/ refComp/skills-client/pom.xml refComp/skills-client/src/main/java/org/ refComp/skills-client/src/main/java/org/chorem/ refComp/skills-client/src/main/java/org/chorem/bonzoms/ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/RefComp.gwt.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.ui.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.ui.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/MySkills.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/MySkills.ui.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/RefComp.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Search.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Search.ui.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SearchResults.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SearchResults.ui.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SkillEditionRow.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SkillEditionRow.ui.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Footer.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Footer.ui.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Header.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Header.ui.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/Level.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/LoginService.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/LoginServiceAsync.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/SearchService.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/SearchServiceAsync.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/Skill.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/UserService.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/UserServiceAsync.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/LoginServiceImpl.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/SearchServiceImpl.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/UserServiceImpl.java refComp/skills-client/src/main/resources/org/ refComp/skills-client/src/main/resources/org/chorem/ refComp/skills-client/src/main/resources/org/chorem/bonzoms/ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/client/ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/client/refcomp.css refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/public/ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/public/RefComp.html refComp/skills-client/src/main/webapp/ refComp/skills-client/src/main/webapp/WEB-INF/web.xml refComp/skills-client/src/main/webapp/index.html refComp/skills-client/src/test/java/org/ refComp/skills-client/src/test/java/org/chorem/ refComp/skills-client/src/test/java/org/chorem/bonzoms/ refComp/skills-client/src/test/java/org/chorem/bonzoms/skills/ refComp/skills-client/src/test/java/org/chorem/bonzoms/skills/client/ refComp/skills-entities/ refComp/skills-entities/src/main/java/ refComp/skills-entities/src/main/java/org/ refComp/skills-entities/src/main/java/org/chorem/ refComp/skills-entities/src/main/java/org/chorem/bonzoms/ refComp/skills-entities/src/main/java/org/chorem/bonzoms/skills/ refComp/skills-entities/src/main/java/org/chorem/bonzoms/skills/Entities.gwt.xml refComp/skills-entities/src/main/java/org/chorem/bonzoms/skills/entities/ refComp/skills-services/ refComp/skills-services/LICENSE.txt refComp/skills-services/README.txt refComp/skills-services/changelog.txt refComp/skills-services/pom.xml refComp/skills-services/skills-services.iml refComp/skills-services/src/ refComp/skills-services/src/main/ refComp/skills-services/src/main/java/ refComp/skills-services/src/main/java/org/ refComp/skills-services/src/main/java/org/chorem/ refComp/skills-services/src/main/java/org/chorem/bonzoms/ refComp/skills-services/src/main/java/org/chorem/bonzoms/skills/ refComp/skills-services/src/main/java/org/chorem/bonzoms/skills/services/ refComp/skills-services/src/main/resources/ refComp/skills-services/src/main/resources/org/ refComp/skills-services/src/main/resources/org/chorem/ refComp/skills-services/src/main/resources/org/chorem/bonzoms/ refComp/skills-services/src/main/resources/org/chorem/bonzoms/skills/ refComp/skills-services/src/main/resources/org/chorem/bonzoms/skills/client/ refComp/skills-services/src/test/ refComp/skills-services/src/test/java/ refComp/skills-services/src/test/java/org/ refComp/skills-services/src/test/java/org/chorem/ refComp/skills-services/src/test/java/org/chorem/bonzoms/ refComp/skills-services/src/test/java/org/chorem/bonzoms/skills/ refComp/skills-services/src/test/java/org/chorem/bonzoms/skills/client/ refComp/skills-services/src/test/java/org/chorem/bonzoms/skills/client/client/ Removed: refComp/client/ refComp/entities/ refComp/services/src/main/java/fr/inra/Services.gwt.xml refComp/services/src/test/java/fr/inra/refcomp/client/GwtTestSample.java refComp/skills-client/pom.xml refComp/skills-client/src/main/java/fr/ refComp/skills-client/src/main/resources/fr/ refComp/skills-client/src/main/webapp/ refComp/skills-client/src/main/webapp/WEB-INF/web.xml refComp/skills-client/src/main/webapp/index.html refComp/skills-client/src/test/java/fr/ Modified: refComp/pom.xml refComp/skills-entities/pom.xml refComp/skills-entities/src/main/xmi/UseCaseINRA-RefComp.zargo Modified: refComp/pom.xml =================================================================== --- refComp/pom.xml 2010-11-05 12:49:52 UTC (rev 16) +++ refComp/pom.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -16,14 +16,14 @@ <version>2.4</version> </parent> - <groupId>fr.inra</groupId> - <artifactId>refcomp</artifactId> + <groupId>org.chorem.bonzoms</groupId> + <artifactId>skills</artifactId> <version>0.1-SNAPSHOT</version> <modules> - <module>client</module> - <module>services</module> - <module>entities</module> + <module>skills-client</module> + <module>skills-services</module> + <module>skills-entities</module> </modules> @@ -31,7 +31,7 @@   - <name>RefComp</name> + <name>Bonzoms - Skills</name> <description> Software to create a knowledge database about people skills. @@ -63,10 +63,8 @@ <properties> - <projectId>Ref Comp</projectId> + <projectId>skills</projectId> - <labs.id>---</labs.id> -  <gwtVersion>2.0.3</gwtVersion> <wikittyVersion>3.0-SNAPSHOT</wikittyVersion> @@ -154,7 +152,7 @@ </executions> <configuration> <hostedWebapp>src/main/webapp</hostedWebapp> - <runTarget>fr.inra.refcomp.RefComp/RefComp.html</runTarget> + <runTarget>org.chorem.bonzoms.skills.client.RefComp/RefComp.html</runTarget> <noServer>false</noServer> <gwtVersion>${gwtVersion}</gwtVersion> </configuration> @@ -172,7 +170,7 @@ <directory>src/main/webapp/WEB-INF/classes</directory> </fileset> <fileset> - <directory>src/main/webapp/fr.inra.refcomp.RefComp</directory> + <directory>src/main/webapp/org.chorem.bonzoms.skills.client.RefComp</directory> </fileset> </filesets> </configuration> Deleted: refComp/services/src/main/java/fr/inra/Services.gwt.xml =================================================================== --- refComp/services/src/main/java/fr/inra/Services.gwt.xml 2010-11-05 12:49:52 UTC (rev 16) +++ refComp/services/src/main/java/fr/inra/Services.gwt.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -1,7 +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'/> - -</module> Deleted: refComp/services/src/test/java/fr/inra/refcomp/client/GwtTestSample.java =================================================================== --- refComp/services/src/test/java/fr/inra/refcomp/client/GwtTestSample.java 2010-11-05 12:49:52 UTC (rev 16) +++ refComp/services/src/test/java/fr/inra/refcomp/client/GwtTestSample.java 2010-11-05 16:06:09 UTC (rev 17) @@ -1,23 +0,0 @@ -package fr.inra.refcomp.client; - -import junit.framework.Assert; - -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) - Assert.assertTrue( true ); - } -} \ No newline at end of file Deleted: refComp/skills-client/pom.xml =================================================================== --- refComp/client/pom.xml 2010-11-04 08:31:02 UTC (rev 6) +++ refComp/skills-client/pom.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -1,79 +0,0 @@ -<?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>client</artifactId> - - <dependencies> - -  - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - </dependency> - - <dependency> - <groupId>com.google.gwt</groupId> - <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> - -  -  -  - - <name>${project.artifactId}</name> - <description>RefComp Client interfaces module</description> - -  -  -  - - <packaging>war</packaging> - - <build> - - <outputDirectory>war/WEB-INF/classes</outputDirectory> - - <plugins> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - </plugin> - - <plugin> - <artifactId>maven-clean-plugin</artifactId> - </plugin> - - </plugins> - </build> - -</project> \ No newline at end of file Copied: refComp/skills-client/pom.xml (from rev 14, refComp/client/pom.xml) =================================================================== --- refComp/skills-client/pom.xml (rev 0) +++ refComp/skills-client/pom.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,96 @@ +<?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>org.chorem.bonzoms</groupId> + <artifactId>skills</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.bonzoms.skills</groupId> + <artifactId>skills-client</artifactId> + + <dependencies> + +  + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + </dependency> + + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + </dependency> + + <dependency> + <groupId>org.chorem.bonzoms.skills</groupId> + <artifactId>skills-entities</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.chorem.bonzoms.skills</groupId> + <artifactId>skills-entities</artifactId> + <version>${project.version}</version> + <classifier>sources</classifier> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${wikittyVersion}</version> + <classifier>sources</classifier> + </dependency> + + </dependencies> + +  +  +  + + <name>${project.artifactId}</name> + <description>Bonzoms - Skills Client interfaces module</description> + +  +  +  + + <packaging>war</packaging> + + <build> + + <outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory> + +  + + <plugins> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + </plugin> + + <plugin> + <artifactId>maven-clean-plugin</artifactId> + </plugin> + + </plugins> + </build> + +</project> \ No newline at end of file Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/RefComp.gwt.xml =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/RefComp.gwt.xml (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/RefComp.gwt.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,23 @@ +<!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="org.chorem.bonzoms.skills.Entities"/> + <inherits name="org.nuiton.WikittyAPI"/> + +  + <inherits name='com.google.gwt.user.theme.standard.Standard'/> + +  + <entry-point class='org.chorem.bonzoms.skills.client.RefComp'/> + + <source path="client"/> + <source path="service"/> + + <public path="public"/> + <public path="client"/> + +</module> \ No newline at end of file Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,49 @@ +package org.chorem.bonzoms.skills.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.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.Composite; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Panel; +import org.chorem.bonzoms.skills.client.services.UserService; +import org.chorem.bonzoms.skills.client.services.UserServiceAsync; +import org.chorem.bonzoms.skills.entities.User; + +/** + * User: couteau + * Date: 5 nov. 2010 + */ +public class AdminUsers extends Composite { + + private final UserServiceAsync userService = GWT + .create(UserService.class); + + @UiTemplate("Login.ui.xml") + interface MyUiBinder extends UiBinder<Panel, AdminUsers> { + } + + @UiField + Label userName; + + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + public AdminUsers() { + initWidget(binder.createAndBindUi(this)); + + userService.getUser(new AsyncCallback<User>() { + @Override + public void onFailure(Throwable caught) { + Window.alert("Server communication error"); + } + + @Override + public void onSuccess(User result) { + userName.setText(result.getNom()); + } + }); + } +} Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.ui.xml =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.ui.xml (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.ui.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,13 @@ +<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + xmlns:gwt='urn:import:com.google.gwt.user.client.ui'> + + <ui:style src="refcomp.css"/> + + <gwt:HTMLPanel> + <div align="center"> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Label ui:field="userName" styleName="{style.greyText}"/> + </gwt:HorizontalPanel> + </div> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,115 @@ +package org.chorem.bonzoms.skills.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ClickEvent; +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.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.PasswordTextBox; +import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.TextBox; +import org.chorem.bonzoms.skills.client.constants.Header; +import org.chorem.bonzoms.skills.client.services.LoginService; +import org.chorem.bonzoms.skills.client.services.LoginServiceAsync; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class Login extends Composite { + + private final LoginServiceAsync loginService = GWT + .create(LoginService.class); + + @UiTemplate("Login.ui.xml") + interface MyUiBinder extends UiBinder<Panel, Login> { + } + + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + public Login() { + initWidget(binder.createAndBindUi(this)); + } + + @UiField + TextBox loginBox; + + @UiField + PasswordTextBox 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(); + + content.add(new Search()); + 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/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.ui.xml =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.ui.xml (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.ui.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -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:style src="refcomp.css"/> + + <gwt:HTMLPanel> + <div align="center"> + <gwt:VerticalPanel styleName="{style.background}"> + <gwt:Label text="Login" styleName="{style.greyText}"/> + <gwt:TextBox ui:field="loginBox" + styleName="{style.box}"/> + <gwt:Label text="Password" styleName="{style.greyText}"/> + <gwt:PasswordTextBox ui:field="passwordBox" styleName="{style.box}"/> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Button ui:field="buttonSubmit" text="Submit" + styleName="{style.loginButton}"/> + <gwt:CheckBox ui:field="myCheckBox"/> + <gwt:Label ui:field="myLabel" text="Remember me" + styleName="{style.greyText}"/> + </gwt:HorizontalPanel> + <gwt:Label ui:field="completionLabel1" + styleName="{style.greyText}"/> + <gwt:Label ui:field="completionLabel2" + styleName="{style.greyText}"/> + </gwt:VerticalPanel> + </div> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/MySkills.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/MySkills.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/MySkills.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,83 @@ +package org.chorem.bonzoms.skills.client; + +import com.google.gwt.core.client.GWT; +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 org.chorem.bonzoms.skills.client.services.Skill; +import org.chorem.bonzoms.skills.client.services.SearchServiceAsync; +import org.chorem.bonzoms.skills.client.services.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 + VerticalPanel skillsList; + + public MySkills() { + + initWidget(binder.createAndBindUi(this)); + + //Use here the searchService that return a skill. Replace this with + //a real server. + 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/skills-client/src/main/java/org/chorem/bonzoms/skills/client/MySkills.ui.xml =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/MySkills.ui.xml (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/MySkills.ui.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -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:style src="refcomp.css"/> + + <gwt:HTMLPanel> + + <div align="center"> + <gwt:VerticalPanel styleName="{style.background}"> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Label text="My Skills : " + styleName="{style.greyText}"/> + <gwt:Label ui:field="searchedLabel" text="Hervé Richard" + styleName="{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 Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/RefComp.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/RefComp.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/RefComp.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,18 @@ +package org.chorem.bonzoms.skills.client; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.user.client.ui.RootPanel; +import org.chorem.bonzoms.skills.client.constants.Footer; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class RefComp implements EntryPoint { + public void onModuleLoad() { + + RootPanel.get("content").add(new Login()); + RootPanel.get("footer").add(new Footer()); + + } +} Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Search.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Search.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Search.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,69 @@ +package org.chorem.bonzoms.skills.client; + +import com.google.gwt.core.client.GWT; +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.Composite; +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 org.chorem.bonzoms.skills.client.services.SearchService; +import org.chorem.bonzoms.skills.client.services.SearchServiceAsync; +import org.chorem.bonzoms.skills.client.services.Skill; +import java.util.List; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class Search extends Composite { + + private final SearchServiceAsync searchService = GWT + .create(SearchService.class); + + @UiTemplate("Search.ui.xml") + interface MyUiBinder extends UiBinder<Panel, Search> { + } + + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + @UiField + TextBox searchBox; + + public Search() { + 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); + } + }); + } + + + + +} Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Search.ui.xml =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Search.ui.xml (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Search.ui.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -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:style src="refcomp.css"/> + + <gwt:HTMLPanel> + <div align="center"> + <gwt:VerticalPanel styleName="{style.background}"> + <gwt:Label text="RefComp Search" styleName="{style.greyText}"/> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:TextBox ui:field="searchBox" + styleName="{style.box}"/> + <gwt:Button ui:field="buttonSearch" text="Search" + styleName="{style.loginButton}"/> + </gwt:HorizontalPanel> + </gwt:VerticalPanel> + </div> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SearchResults.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SearchResults.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SearchResults.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,63 @@ +package org.chorem.bonzoms.skills.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.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 org.chorem.bonzoms.skills.client.services.Skill; +import java.util.List; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class SearchResults extends Composite { + + @UiTemplate("SearchResults.ui.xml") + interface MyUiBinder extends UiBinder<Panel, SearchResults> { + } + + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + @UiField + Grid resultsGrid; + + public SearchResults() { + 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/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SearchResults.ui.xml =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SearchResults.ui.xml (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SearchResults.ui.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -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:style src="refcomp.css"/> + + <gwt:HTMLPanel> + <div id="facets"> + <gwt:VerticalPanel styleName="{style.background}"> + + </gwt:VerticalPanel> + </div> + + <div align="center"> + <gwt:VerticalPanel styleName="{style.background}"> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Label text="Search : " + styleName="{style.greyText}"/> + <gwt:Label ui:field="searchedLabel" text="Toto" + styleName="{style.greyText}"/> + </gwt:HorizontalPanel> + + <gwt:Grid ui:field="resultsGrid"/> + + </gwt:VerticalPanel> + </div> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SkillEditionRow.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SkillEditionRow.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SkillEditionRow.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,83 @@ +package org.chorem.bonzoms.skills.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.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 org.chorem.bonzoms.skills.client.services.Level; +import org.chorem.bonzoms.skills.client.services.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); + + private Skill editedSkill; + + @UiField + Label skill; + + @UiField + Label linkedSkill; + + @UiField + ListBox levelListBox; + + @UiField + TextBox commentBox; + + @UiField + Label rightLabel; + + public SkillEditionRow() { + init(); + } + + public SkillEditionRow(Skill skill) { + init(); + setSkill(skill); + } + + protected void init(){ + 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/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SkillEditionRow.ui.xml =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SkillEditionRow.ui.xml (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/SkillEditionRow.ui.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -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:style src="refcomp.css"/> + + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Label ui:field="skill" styleName="{style.greyText}"/> + <gwt:Label text="Linked skill : " styleName="{style.greyText}"/> + <gwt:Label ui:field="linkedSkill" styleName="{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 Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Footer.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Footer.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Footer.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,25 @@ +package org.chorem.bonzoms.skills.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; + +/** + * User: couteau + * Date: 3 nov. 2010 + */ +public class Footer extends Composite { + @UiTemplate("Footer.ui.xml") + interface MyUiBinder extends UiBinder<Panel, Footer> { + } + + private static final MyUiBinder binder = GWT.create(MyUiBinder.class); + + public Footer() { + initWidget(binder.createAndBindUi(this)); + } +} Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Footer.ui.xml =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Footer.ui.xml (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Footer.ui.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -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:style src="../refcomp.css"/> + + + + <gwt:HTMLPanel> + <span class="{style.greyText}">Footer</span> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Header.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Header.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Header.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,85 @@ +package org.chorem.bonzoms.skills.client.constants; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.uibinder.client.UiBinder; +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.Composite; +import com.google.gwt.user.client.ui.Panel; +import com.google.gwt.user.client.ui.RootPanel; +import org.chorem.bonzoms.skills.client.AdminUsers; +import org.chorem.bonzoms.skills.client.Login; +import org.chorem.bonzoms.skills.client.MySkills; + +/** + * 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); + + private static boolean stylesInjected = false; + + public Header() { + 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) { + + + RootPanel content = RootPanel.get("content"); + + content.clear(); + + content.add(new MySkills()); + } + + @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) { + + RootPanel content = RootPanel.get("content"); + + content.clear(); + + content.add(new AdminUsers()); + } +} Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Header.ui.xml =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Header.ui.xml (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/constants/Header.ui.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -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:style src="../refcomp.css"/> + + <gwt:HTMLPanel> + <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> + <gwt:Button ui:field="buttonLogout" text="Logout" + styleName="{style.loginButton}"/> + <gwt:Button ui:field="buttonMySkills" text="My Skills" + styleName="{style.loginButton}"/> + <gwt:Button ui:field="buttonAdminSkills" text="Admin. Skills" + styleName="{style.loginButton}"/> + <gwt:Button ui:field="buttonAdminCati" text="Admin. Cati" + styleName="{style.loginButton}"/> + <gwt:Button ui:field="buttonAdminServices" text="Admin. Services" + styleName="{style.loginButton}"/> + <gwt:Button ui:field="buttonAdminUsers" text="Admin. Users" + styleName="{style.loginButton}"/> + </gwt:HorizontalPanel> + </gwt:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/Level.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/Level.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/Level.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,22 @@ +package org.chorem.bonzoms.skills.client.services; + +/** + * 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/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/LoginService.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/LoginService.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/LoginService.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,15 @@ +package org.chorem.bonzoms.skills.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/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/LoginServiceAsync.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/LoginServiceAsync.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/LoginServiceAsync.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,12 @@ +package org.chorem.bonzoms.skills.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/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/SearchService.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/SearchService.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/SearchService.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,15 @@ +package org.chorem.bonzoms.skills.client.services; + +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/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/SearchServiceAsync.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/SearchServiceAsync.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/SearchServiceAsync.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,12 @@ +package org.chorem.bonzoms.skills.client.services; + +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/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/Skill.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/Skill.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/Skill.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,77 @@ +package org.chorem.bonzoms.skills.client.services; + +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; + } +} Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/UserService.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/UserService.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/UserService.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,13 @@ +package org.chorem.bonzoms.skills.client.services; + +import com.google.gwt.user.client.rpc.RemoteService; +import org.chorem.bonzoms.skills.entities.User; + +/** + * User: couteau + * Date: 5 nov. 2010 + */ +public interface UserService extends RemoteService { + + User getUser(); +} Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/UserServiceAsync.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/UserServiceAsync.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/services/UserServiceAsync.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,14 @@ +package org.chorem.bonzoms.skills.client.services; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import org.chorem.bonzoms.skills.entities.User; + +/** + * User: couteau + * Date: 5 nov. 2010 + */ +public interface UserServiceAsync { + + void getUser(AsyncCallback<User> user); + +} Added: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/LoginServiceImpl.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/LoginServiceImpl.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/LoginServiceImpl.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,20 @@ +package org.chorem.bonzoms.skills.server; + +import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import org.chorem.bonzoms.skills.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/skills-client/src/main/java/org/chorem/bonzoms/skills/server/SearchServiceImpl.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/SearchServiceImpl.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/SearchServiceImpl.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,29 @@ +package org.chorem.bonzoms.skills.server; + +import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import org.chorem.bonzoms.skills.client.services.Level; +import org.chorem.bonzoms.skills.client.services.SearchService; +import org.chorem.bonzoms.skills.client.services.Skill; +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/skills-client/src/main/java/org/chorem/bonzoms/skills/server/UserServiceImpl.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/UserServiceImpl.java (rev 0) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/server/UserServiceImpl.java 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,22 @@ +package org.chorem.bonzoms.skills.server; + +import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import org.chorem.bonzoms.skills.client.services.UserService; +import org.chorem.bonzoms.skills.entities.User; +import org.chorem.bonzoms.skills.entities.UserImpl; + +/** + * User: couteau + * Date: 5 nov. 2010 + */ +public class UserServiceImpl extends RemoteServiceServlet implements UserService{ + + public User getUser(){ + User testUser = new UserImpl(); + + testUser.setNom("Couteau"); + testUser.setPrenom("Jean"); + + return testUser; + } +} Added: refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/client/refcomp.css =================================================================== --- refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/client/refcomp.css (rev 0) +++ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/client/refcomp.css 2010-11-05 16:06:09 UTC (rev 17) @@ -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/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/public/RefComp.html =================================================================== --- refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/public/RefComp.html (rev 0) +++ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/public/RefComp.html 2010-11-05 16:06:09 UTC (rev 17) @@ -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='org.chorem.bonzoms.skills.client.SearchResults'> + +  +  +  +  +  + <script type="text/javascript" language="javascript" src="org.chorem.bonzoms.skills.client.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 Property changes on: refComp/skills-client/src/main/webapp ___________________________________________________________________ Added: svn:ignore + org.chorem.* Deleted: refComp/skills-client/src/main/webapp/WEB-INF/web.xml =================================================================== --- refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-04 08:37:47 UTC (rev 7) +++ refComp/skills-client/src/main/webapp/WEB-INF/web.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -1,32 +0,0 @@ -<!DOCTYPE web-app PUBLIC - "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd" > - -<web-app> - <display-name>GWT-Maven-Archetype</display-name> - - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - -  - - <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/login</url-pattern> - </servlet-mapping> - -</web-app> Copied: refComp/skills-client/src/main/webapp/WEB-INF/web.xml (from rev 14, refComp/client/src/main/webapp/WEB-INF/web.xml) =================================================================== --- refComp/skills-client/src/main/webapp/WEB-INF/web.xml (rev 0) +++ refComp/skills-client/src/main/webapp/WEB-INF/web.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,32 @@ +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd" > + +<web-app> + <display-name>GWT-Maven-Archetype</display-name> + + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + + <servlet> + <servlet-name>LoginService</servlet-name> + <servlet-class>org.chorem.bonzoms.skills.server.LoginServiceImpl + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>LoginService</servlet-name> + <url-pattern>/org.chorem.bonzoms.skills.client.RefComp/login</url-pattern> + </servlet-mapping> + + <servlet> + <servlet-name>SearchService</servlet-name> + <servlet-class>org.chorem.bonzoms.skills.server.SearchServiceImpl + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>SearchService</servlet-name> + <url-pattern>/org.chorem.bonzoms.skills.client.RefComp/search</url-pattern> + </servlet-mapping> + +</web-app> Deleted: refComp/skills-client/src/main/webapp/index.html =================================================================== --- refComp/client/src/main/webapp/index.html 2010-11-04 08:37:47 UTC (rev 7) +++ refComp/skills-client/src/main/webapp/index.html 2010-11-05 16:06:09 UTC (rev 17) @@ -1,8 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - -<meta http-equiv="REFRESH" - content="0;url=fr.inra.refcomp.Login/Login.html"> -</HEAD> -</HTML> \ No newline at end of file Copied: refComp/skills-client/src/main/webapp/index.html (from rev 14, refComp/client/src/main/webapp/index.html) =================================================================== --- refComp/skills-client/src/main/webapp/index.html (rev 0) +++ refComp/skills-client/src/main/webapp/index.html 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,8 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + +<meta http-equiv="REFRESH" + content="0;url=org.chorem.bonzoms.skills.client.RefComp/RefComp.html"> +</HEAD> +</HTML> \ No newline at end of file Modified: refComp/skills-entities/pom.xml =================================================================== --- refComp/entities/pom.xml 2010-11-05 09:05:34 UTC (rev 12) +++ refComp/skills-entities/pom.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -10,20 +10,20 @@  <parent> - <groupId>fr.inra</groupId> - <artifactId>refcomp</artifactId> + <groupId>org.chorem.bonzoms</groupId> + <artifactId>skills</artifactId> <version>0.1-SNAPSHOT</version> </parent> - <groupId>fr.inra.refcomp</groupId> - <artifactId>entities</artifactId> + <groupId>org.chorem.bonzoms.skills</groupId> + <artifactId>skills-entities</artifactId>    <name>${project.artifactId}</name> - <description>RefComp Client entities module</description> + <description>Bonzoms - Skills entities module</description> <dependencies> <dependency> @@ -59,12 +59,12 @@ <input>classpath:model:/:wikitty.objectmodel </input> </inputs> - <fullPackagePath>fr.inra.refcomp</fullPackagePath> - <defaultPackage>fr.inra.refcomp</defaultPackage> + <fullPackagePath>org.chorem.bonzoms.skills.client</fullPackagePath> + <defaultPackage>org.chorem.bonzoms.skills.client</defaultPackage> <extractedPackages> - fr.inra.refcomp.entities,org.nuiton.wikitty + org.chorem.bonzoms.skills.entities,org.nuiton.wikitty </extractedPackages> - <generatedPackages>fr.inra.refcomp.entities + <generatedPackages>org.chorem.bonzoms.skills.entities </generatedPackages> <templates> org.nuiton.wikitty.generator.WikittyMetaGenerator @@ -77,6 +77,19 @@ </executions> </plugin> +  + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> Added: refComp/skills-entities/src/main/java/org/chorem/bonzoms/skills/Entities.gwt.xml =================================================================== --- refComp/skills-entities/src/main/java/org/chorem/bonzoms/skills/Entities.gwt.xml (rev 0) +++ refComp/skills-entities/src/main/java/org/chorem/bonzoms/skills/Entities.gwt.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,9 @@ +<!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'/> + + <source path="entities"/> +</module> \ No newline at end of file Modified: refComp/skills-entities/src/main/xmi/UseCaseINRA-RefComp.zargo =================================================================== (Binary files differ) Property changes on: refComp/skills-services ___________________________________________________________________ Added: svn:ignore + *.iml *.ipr target Added: refComp/skills-services/pom.xml =================================================================== --- refComp/skills-services/pom.xml (rev 0) +++ refComp/skills-services/pom.xml 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,65 @@ +<?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>org.chorem.bonzoms</groupId> + <artifactId>skills</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.bonzoms.skills</groupId> + <artifactId>skills-services</artifactId> + + <dependencies> + +  + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + </dependency> + + </dependencies> + +  +  +  + + <name>${project.artifactId}</name> + <description>Bonzoms - Skills services module</description> + +  +  +  + + <packaging>jar</packaging> + + <build> + + <plugins> + +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>resources</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> \ No newline at end of file Added: refComp/skills-services/skills-services.iml =================================================================== --- refComp/skills-services/skills-services.iml (rev 0) +++ refComp/skills-services/skills-services.iml 2010-11-05 16:06:09 UTC (rev 17) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/.svn" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/target/.svn" /> + <excludeFolder url="file://$MODULE_DIR$/target/classes" /> + <excludeFolder url="file://$MODULE_DIR$/target/extra" /> + <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" /> + <excludeFolder url="file://$MODULE_DIR$/target/services-0.1-SNAPSHOT" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.gwt:gwt-user:2.0.3" level="project" /> + </component> +</module> +

1 0

r16 - refComp
by tchemit＠users.chorem.org 05 Nov '10

05 Nov '10

Author: tchemit Date: 2010-11-05 13:49:52 +0100 (Fri, 05 Nov 2010) New Revision: 16 Url: http://chorem.org/repositories/revision/incubator/16 Log: test commit Modified: refComp/pom.xml Modified: refComp/pom.xml =================================================================== --- refComp/pom.xml 2010-11-05 10:29:13 UTC (rev 15) +++ refComp/pom.xml 2010-11-05 12:49:52 UTC (rev 16) @@ -119,8 +119,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> -  +  <version>1.2.127</version> <scope>runtime</scope> </dependency>

1 0

r432 - sandbox-test/trunk
by tchemit＠users.nuiton.org 05 Nov '10

05 Nov '10

Author: tchemit Date: 2010-11-05 13:45:44 +0100 (Fri, 05 Nov 2010) New Revision: 432 Url: http://nuiton.org/repositories/revision/sandbox/432 Log: test commit :) Modified: sandbox-test/trunk/pom.xml Modified: sandbox-test/trunk/pom.xml =================================================================== --- sandbox-test/trunk/pom.xml 2010-11-03 12:05:07 UTC (rev 431) +++ sandbox-test/trunk/pom.xml 2010-11-05 12:45:44 UTC (rev 432) @@ -71,5 +71,4 @@ <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/sandbox-test/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/sandbox-test/trunk</url> </scm> - </project>

1 0

r15 - refComp
by jcouteau＠users.chorem.org 05 Nov '10

05 Nov '10

Author: jcouteau Date: 2010-11-05 11:29:13 +0100 (Fri, 05 Nov 2010) New Revision: 15 Url: http://chorem.org/repositories/revision/incubator/15 Log: Update clean plugin config Modified: refComp/pom.xml Modified: refComp/pom.xml =================================================================== --- refComp/pom.xml 2010-11-05 10:27:59 UTC (rev 14) +++ refComp/pom.xml 2010-11-05 10:29:13 UTC (rev 15) @@ -167,9 +167,14 @@ <configuration> <filesets> <fileset> -  - <directory>war</directory> + <directory>src/main/webapp/WEB-INF/lib</directory> </fileset> + <fileset> + <directory>src/main/webapp/WEB-INF/classes</directory> + </fileset> + <fileset> + <directory>src/main/webapp/fr.inra.refcomp.RefComp</directory> + </fileset> </filesets> </configuration> </plugin>

1 0

r14 - 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/services src/main/java/fr/inra/refcomp/server src/main/resources/fr/inra/refcomp src/main/resources/fr/inra/refcomp/client src/main/resources/fr/inra/refcomp/public src/main/webapp src/main/webapp/WEB-INF
by jcouteau＠users.chorem.org 05 Nov '10

05 Nov '10

Author: jcouteau Date: 2010-11-05 11:27:59 +0100 (Fri, 05 Nov 2010) New Revision: 14 Url: http://chorem.org/repositories/revision/incubator/14 Log: Improve css management Added: refComp/client/src/main/java/fr/inra/refcomp/client/services/ refComp/client/src/main/java/fr/inra/refcomp/client/services/Level.java 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/client/services/SearchService.java refComp/client/src/main/java/fr/inra/refcomp/client/services/SearchServiceAsync.java refComp/client/src/main/java/fr/inra/refcomp/client/services/Skill.java refComp/client/src/main/java/fr/inra/refcomp/server/ refComp/client/src/main/java/fr/inra/refcomp/server/LoginServiceImpl.java refComp/client/src/main/java/fr/inra/refcomp/server/SearchServiceImpl.java refComp/client/src/main/resources/fr/inra/refcomp/client/ refComp/client/src/main/resources/fr/inra/refcomp/client/refcomp.css Removed: refComp/client/src/main/java/fr/inra/refcomp/client/resources/ refComp/client/src/main/java/fr/inra/refcomp/client/service/ refComp/client/src/main/resources/fr/inra/refcomp/public/Application.css refComp/client/src/main/resources/fr/inra/refcomp/public/Search.html refComp/client/src/main/resources/fr/inra/refcomp/public/SearchResults.html refComp/client/src/main/resources/fr/inra/refcomp/resources/ 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/Login.ui.xml 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/Search.java refComp/client/src/main/java/fr/inra/refcomp/client/Search.ui.xml refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.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/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/webapp/WEB-INF/web.xml refComp/client/src/main/webapp/index.html Modified: refComp/client/pom.xml =================================================================== --- refComp/client/pom.xml 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/pom.xml 2010-11-05 10:27:59 UTC (rev 14) @@ -31,12 +31,6 @@ <artifactId>gwt-servlet</artifactId> </dependency> - <dependency> - <groupId>fr.inra.refcomp</groupId> - <artifactId>services</artifactId> - <version>0.1-SNAPSHOT</version> - </dependency> - </dependencies>  @@ -56,6 +50,15 @@ <outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory> +  + <plugins> <plugin> 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-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/RefComp.gwt.xml 2010-11-05 10:27:59 UTC (rev 14) @@ -12,10 +12,10 @@  <entry-point class='fr.inra.refcomp.client.RefComp'/> -  - <stylesheet src='Application.css'/> - <source path="client"/> <source path="service"/> + <public path="public"/> + <public path="client"/> + </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-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Login.java 2010-11-05 10:27:59 UTC (rev 14) @@ -1,7 +1,6 @@ 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.logical.shared.ValueChangeEvent; import com.google.gwt.uibinder.client.UiBinder; @@ -17,9 +16,8 @@ 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.service.LoginService; -import fr.inra.refcomp.client.service.LoginServiceAsync; +import fr.inra.refcomp.client.services.LoginService; +import fr.inra.refcomp.client.services.LoginServiceAsync; /** * User: couteau @@ -36,20 +34,7 @@ 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)); } 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-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Login.ui.xml 2010-11-05 10:27:59 UTC (rev 14) @@ -1,27 +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'/> + <ui:style src="refcomp.css"/> <gwt:HTMLPanel> <div align="center"> - <gwt:VerticalPanel styleName="{res.style.background}"> - <gwt:Label text="Login" styleName="{res.style.greyText}"/> + <gwt:VerticalPanel styleName="{style.background}"> + <gwt:Label text="Login" styleName="{style.greyText}"/> <gwt:TextBox ui:field="loginBox" - styleName="{res.style.box}"/> - <gwt:Label text="Password" styleName="{res.style.greyText}"/> - <gwt:PasswordTextBox ui:field="passwordBox" styleName="{res.style.box}"/> + styleName="{style.box}"/> + <gwt:Label text="Password" styleName="{style.greyText}"/> + <gwt:PasswordTextBox ui:field="passwordBox" styleName="{style.box}"/> <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> <gwt:Button ui:field="buttonSubmit" text="Submit" - styleName="{res.style.loginButton}"/> + styleName="{style.loginButton}"/> <gwt:CheckBox ui:field="myCheckBox"/> <gwt:Label ui:field="myLabel" text="Remember me" - styleName="{res.style.greyText}"/> + styleName="{style.greyText}"/> </gwt:HorizontalPanel> <gwt:Label ui:field="completionLabel1" - styleName="{res.style.greyText}"/> + styleName="{style.greyText}"/> <gwt:Label ui:field="completionLabel2" - styleName="{res.style.greyText}"/> + styleName="{style.greyText}"/> </gwt:VerticalPanel> </div> </gwt:HTMLPanel> Modified: refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.java 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.java 2010-11-05 10:27:59 UTC (rev 14) @@ -1,7 +1,6 @@ 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; @@ -14,10 +13,9 @@ 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 fr.inra.refcomp.client.services.Skill; +import fr.inra.refcomp.client.services.SearchServiceAsync; +import fr.inra.refcomp.client.services.SearchService; import java.util.List; /** @@ -35,27 +33,15 @@ 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. + //a real server. searchService.search("toto", new AsyncCallback<List<Skill>>() { @Override Modified: refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.ui.xml 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/MySkills.ui.xml 2010-11-05 10:27:59 UTC (rev 14) @@ -1,17 +1,17 @@ <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'/> + <ui:style src="refcomp.css"/> <gwt:HTMLPanel> <div align="center"> - <gwt:VerticalPanel styleName="{res.style.background}"> + <gwt:VerticalPanel styleName="{style.background}"> <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> <gwt:Label text="My Skills : " - styleName="{res.style.greyText}"/> + styleName="{style.greyText}"/> <gwt:Label ui:field="searchedLabel" text="Hervé Richard" - styleName="{res.style.greyText}"/> + styleName="{style.greyText}"/> </gwt:HorizontalPanel> <gwt:VerticalPanel ui:field="skillsList"/> 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-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Search.java 2010-11-05 10:27:59 UTC (rev 14) @@ -1,7 +1,6 @@ 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.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -13,10 +12,9 @@ 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 fr.inra.refcomp.client.service.SearchService; -import fr.inra.refcomp.client.service.SearchServiceAsync; -import fr.inra.refcomp.client.service.Skill; +import fr.inra.refcomp.client.services.SearchService; +import fr.inra.refcomp.client.services.SearchServiceAsync; +import fr.inra.refcomp.client.services.Skill; import java.util.List; /** @@ -34,23 +32,10 @@ private static final MyUiBinder binder = GWT.create(MyUiBinder.class); - @UiField(provided = true) - final Style res; - - private static boolean stylesInjected = false; - @UiField TextBox searchBox; public Search() { - 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/Search.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/Search.ui.xml 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/Search.ui.xml 2010-11-05 10:27:59 UTC (rev 14) @@ -1,17 +1,17 @@ <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'/> + <ui:style src="refcomp.css"/> <gwt:HTMLPanel> <div align="center"> - <gwt:VerticalPanel styleName="{res.style.background}"> - <gwt:Label text="RefComp Search" styleName="{res.style.greyText}"/> + <gwt:VerticalPanel styleName="{style.background}"> + <gwt:Label text="RefComp Search" styleName="{style.greyText}"/> <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> <gwt:TextBox ui:field="searchBox" - styleName="{res.style.box}"/> + styleName="{style.box}"/> <gwt:Button ui:field="buttonSearch" text="Search" - styleName="{res.style.loginButton}"/> + styleName="{style.loginButton}"/> </gwt:HorizontalPanel> </gwt:VerticalPanel> </div> 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-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.java 2010-11-05 10:27:59 UTC (rev 14) @@ -1,15 +1,13 @@ 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.Grid; import com.google.gwt.user.client.ui.Panel; -import fr.inra.refcomp.client.resources.Style; -import fr.inra.refcomp.client.service.Skill; +import fr.inra.refcomp.client.services.Skill; import java.util.List; /** @@ -24,23 +22,10 @@ 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)); } Modified: refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.ui.xml 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/SearchResults.ui.xml 2010-11-05 10:27:59 UTC (rev 14) @@ -1,22 +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'/> + <ui:style src="refcomp.css"/> <gwt:HTMLPanel> <div id="facets"> - <gwt:VerticalPanel styleName="{res.style.background}"> + <gwt:VerticalPanel styleName="{style.background}"> </gwt:VerticalPanel> </div> <div align="center"> - <gwt:VerticalPanel styleName="{res.style.background}"> + <gwt:VerticalPanel styleName="{style.background}"> <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> <gwt:Label text="Search : " - styleName="{res.style.greyText}"/> + styleName="{style.greyText}"/> <gwt:Label ui:field="searchedLabel" text="Toto" - styleName="{res.style.greyText}"/> + styleName="{style.greyText}"/> </gwt:HorizontalPanel> <gwt:Grid ui:field="resultsGrid"/> Modified: refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.java 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.java 2010-11-05 10:27:59 UTC (rev 14) @@ -1,7 +1,6 @@ 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; @@ -10,9 +9,8 @@ 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 fr.inra.refcomp.client.services.Level; +import fr.inra.refcomp.client.services.Skill; import java.util.ArrayList; import java.util.List; @@ -30,11 +28,6 @@ private static final MyUiBinder binder = GWT.create(MyUiBinder.class); - @UiField(provided = true) - final Style res; - - private static boolean stylesInjected = false; - private Skill editedSkill; @UiField @@ -53,29 +46,16 @@ 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(); } Modified: refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.ui.xml =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.ui.xml 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/SkillEditionRow.ui.xml 2010-11-05 10:27:59 UTC (rev 14) @@ -1,12 +1,12 @@ <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'/> + <ui:style src="refcomp.css"/> <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:Label ui:field="skill" styleName="{style.greyText}"/> + <gwt:Label text="Linked skill : " styleName="{style.greyText}"/> + <gwt:Label ui:field="linkedSkill" styleName="{style.greyText}"/> <gwt:Button ui:field="editLinkedSkill" text="Edit"/> <gwt:Label text="Level : "/> <gwt:ListBox ui:field="levelListBox" visibleItemCount="1"/> 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-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.java 2010-11-05 10:27:59 UTC (rev 14) @@ -7,7 +7,6 @@ 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 @@ -20,20 +19,7 @@ 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-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Footer.ui.xml 2010-11-05 10:27:59 UTC (rev 14) @@ -1,11 +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'/> + <ui:style src="../refcomp.css"/> + + <gwt:HTMLPanel> - <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> - <gwt:Label text="Footer" styleName="{res.style.greyText}"/> - </gwt:HorizontalPanel> + <span class="{style.greyText}">Footer</span> </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-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.java 2010-11-05 10:27:59 UTC (rev 14) @@ -13,7 +13,6 @@ 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; /** * User: couteau @@ -26,20 +25,9 @@ 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)); } Modified: 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 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/java/fr/inra/refcomp/client/constants/Header.ui.xml 2010-11-05 10:27:59 UTC (rev 14) @@ -1,22 +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'/> + <ui:style src="../refcomp.css"/> <gwt:HTMLPanel> <gwt:HorizontalPanel verticalAlignment="ALIGN_MIDDLE"> <gwt:Button ui:field="buttonLogout" text="Logout" - styleName="{res.style.loginButton}"/> + styleName="{style.loginButton}"/> <gwt:Button ui:field="buttonMySkills" text="My Skills" - styleName="{res.style.loginButton}"/> + styleName="{style.loginButton}"/> <gwt:Button ui:field="buttonAdminSkills" text="Admin. Skills" - styleName="{res.style.loginButton}"/> + styleName="{style.loginButton}"/> <gwt:Button ui:field="buttonAdminCati" text="Admin. Cati" - styleName="{res.style.loginButton}"/> + styleName="{style.loginButton}"/> <gwt:Button ui:field="buttonAdminServices" text="Admin. Services" - styleName="{res.style.loginButton}"/> + styleName="{style.loginButton}"/> <gwt:Button ui:field="buttonAdminUsers" text="Admin. Users" - styleName="{res.style.loginButton}"/> + styleName="{style.loginButton}"/> </gwt:HorizontalPanel> </gwt:HTMLPanel> </ui:UiBinder> \ No newline at end of file Added: refComp/client/src/main/java/fr/inra/refcomp/client/services/Level.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/services/Level.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/services/Level.java 2010-11-05 10:27:59 UTC (rev 14) @@ -0,0 +1,22 @@ +package fr.inra.refcomp.client.services; + +/** + * 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/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-05 10:27:59 UTC (rev 14) @@ -0,0 +1,15 @@ +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-05 10:27:59 UTC (rev 14) @@ -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/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-05 10:27:59 UTC (rev 14) @@ -0,0 +1,15 @@ +package fr.inra.refcomp.client.services; + +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/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-05 10:27:59 UTC (rev 14) @@ -0,0 +1,12 @@ +package fr.inra.refcomp.client.services; + +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/services/Skill.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/client/services/Skill.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/client/services/Skill.java 2010-11-05 10:27:59 UTC (rev 14) @@ -0,0 +1,77 @@ +package fr.inra.refcomp.client.services; + +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; + } +} Added: refComp/client/src/main/java/fr/inra/refcomp/server/LoginServiceImpl.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/server/LoginServiceImpl.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/server/LoginServiceImpl.java 2010-11-05 10:27:59 UTC (rev 14) @@ -0,0 +1,20 @@ +package fr.inra.refcomp.server; + +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/server/SearchServiceImpl.java =================================================================== --- refComp/client/src/main/java/fr/inra/refcomp/server/SearchServiceImpl.java (rev 0) +++ refComp/client/src/main/java/fr/inra/refcomp/server/SearchServiceImpl.java 2010-11-05 10:27:59 UTC (rev 14) @@ -0,0 +1,29 @@ +package fr.inra.refcomp.server; + +import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import fr.inra.refcomp.client.services.Level; +import fr.inra.refcomp.client.services.SearchService; +import fr.inra.refcomp.client.services.Skill; +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/resources/fr/inra/refcomp/client/refcomp.css =================================================================== --- refComp/client/src/main/resources/fr/inra/refcomp/client/refcomp.css (rev 0) +++ refComp/client/src/main/resources/fr/inra/refcomp/client/refcomp.css 2010-11-05 10:27:59 UTC (rev 14) @@ -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; +} Deleted: refComp/client/src/main/resources/fr/inra/refcomp/public/Application.css =================================================================== --- refComp/client/src/main/resources/fr/inra/refcomp/public/Application.css 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/resources/fr/inra/refcomp/public/Application.css 2010-11-05 10:27:59 UTC (rev 14) @@ -1,14 +0,0 @@ -/** Add css rules here for your application. */ - -button { - display: block; - font-size: 16pt -} - -.widePanel { - width: 100% -} - -img { - margin-top: 20px; -} \ No newline at end of file Deleted: refComp/client/src/main/resources/fr/inra/refcomp/public/Search.html =================================================================== --- refComp/client/src/main/resources/fr/inra/refcomp/public/Search.html 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/resources/fr/inra/refcomp/public/Search.html 2010-11-05 10:27:59 UTC (rev 14) @@ -1,41 +0,0 @@ -<!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.Search'> - -  -  -  -  -  - <script type="text/javascript" language="javascript" src="fr.inra.refcomp.Search.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="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> -</html> \ No newline at end of file Deleted: refComp/client/src/main/resources/fr/inra/refcomp/public/SearchResults.html =================================================================== --- refComp/client/src/main/resources/fr/inra/refcomp/public/SearchResults.html 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/resources/fr/inra/refcomp/public/SearchResults.html 2010-11-05 10:27:59 UTC (rev 14) @@ -1,43 +0,0 @@ -<!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 Modified: refComp/client/src/main/webapp/WEB-INF/web.xml =================================================================== --- refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/webapp/WEB-INF/web.xml 2010-11-05 10:27:59 UTC (rev 14) @@ -11,7 +11,7 @@ <servlet> <servlet-name>LoginService</servlet-name> - <servlet-class>fr.inra.refcomp.client.service.LoginServiceImpl + <servlet-class>fr.inra.refcomp.server.LoginServiceImpl </servlet-class> </servlet> <servlet-mapping> @@ -21,7 +21,7 @@ <servlet> <servlet-name>SearchService</servlet-name> - <servlet-class>fr.inra.refcomp.client.service.SearchServiceImpl + <servlet-class>fr.inra.refcomp.server.SearchServiceImpl </servlet-class> </servlet> <servlet-mapping> Modified: refComp/client/src/main/webapp/index.html =================================================================== --- refComp/client/src/main/webapp/index.html 2010-11-05 09:05:49 UTC (rev 13) +++ refComp/client/src/main/webapp/index.html 2010-11-05 10:27:59 UTC (rev 14) @@ -3,6 +3,6 @@ <head>  <meta http-equiv="REFRESH" - content="0;url=fr.inra.refcomp.Login/Login.html"> + content="0;url=fr.inra.refcomp.RefComp/RefComp.html"> </HEAD> </HTML> \ No newline at end of file

1 0

r13 - refComp
by jcouteau＠users.chorem.org 05 Nov '10

05 Nov '10

Author: jcouteau Date: 2010-11-05 10:05:49 +0100 (Fri, 05 Nov 2010) New Revision: 13 Url: http://chorem.org/repositories/revision/incubator/13 Log: Add entities module Modified: refComp/pom.xml Modified: refComp/pom.xml =================================================================== --- refComp/pom.xml 2010-11-05 09:05:34 UTC (rev 12) +++ refComp/pom.xml 2010-11-05 09:05:49 UTC (rev 13) @@ -23,6 +23,7 @@ <modules> <module>client</module> <module>services</module> + <module>entities</module> </modules> @@ -33,7 +34,7 @@ <name>RefComp</name> <description> - Software to create a knowledge database about people competences. + Software to create a knowledge database about people skills. </description> <inceptionYear>2010</inceptionYear> @@ -62,12 +63,14 @@ <properties> - <projectId>Episodes Manager</projectId> + <projectId>Ref Comp</projectId> <labs.id>---</labs.id>  <gwtVersion>2.0.3</gwtVersion> + <wikittyVersion>3.0-SNAPSHOT</wikittyVersion> + <generatorPluginVersion>2.2</generatorPluginVersion> </properties> <dependencyManagement> @@ -86,6 +89,50 @@ <version>${gwtVersion}</version> <scope>provided</scope> </dependency> + +  + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${wikittyVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <version>${wikittyVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <version>${wikittyVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>2.9.3</version> + <scope>compile</scope> + </dependency> + + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> +  + <version>1.2.127</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-701.jdbc4</version> + <scope>runtime</scope> + </dependency> + </dependencies> </dependencyManagement> @@ -102,12 +149,13 @@ <execution> <goals> <goal>compile</goal> -  +  </goals> </execution> </executions> <configuration> - <runTarget>fr.inra.refcomp.Login/Login.html</runTarget> + <hostedWebapp>src/main/webapp</hostedWebapp> + <runTarget>fr.inra.refcomp.RefComp/RefComp.html</runTarget> <noServer>false</noServer> <gwtVersion>${gwtVersion}</gwtVersion> </configuration> @@ -119,6 +167,7 @@ <configuration> <filesets> <fileset> +  <directory>war</directory> </fileset> </filesets> @@ -126,6 +175,32 @@ </plugin> +  + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${generatorPluginVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${wikittyVersion}</version> + </dependency> + </dependencies> + </plugin> + +  + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + </plugins> </pluginManagement>

1 0

r12 - in refComp: . entities entities/src entities/src/main entities/src/main/xmi
by jcouteau＠users.chorem.org 05 Nov '10

05 Nov '10

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 04 Nov '10

04 Nov '10

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 04 Nov '10

04 Nov '10

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 04 Nov '10

04 Nov '10

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