maj almanach probleme compilation

web/src/main/java/com/silverpeas/mobile/client/apps/almanach/AlmanachController.java

@@ -5,22 +5,15 @@
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.silverpeas.mobile.client.apps.almanach.events.controller.AbstractAlmanachControllerEvent;
 import com.silverpeas.mobile.client.apps.almanach.events.controller.AlmanachControllerEventHandler;
-<<<<<<< HEAD
-import com.silverpeas.mobile.client.apps.almanach.events.controller.AlmanachLoadSettingsEvent;
 import com.silverpeas.mobile.client.apps.almanach.events.pages.AlmanachLoadedEvent;
 import com.silverpeas.mobile.client.apps.navigation.events.app.AbstractNavigationEvent;
 import com.silverpeas.mobile.client.apps.navigation.events.app.NavigationAppInstanceChangedEvent;
 import com.silverpeas.mobile.client.apps.navigation.events.app.NavigationEventHandler;
-=======
-import com.silverpeas.mobile.client.apps.almanach.events.controller.AlmanachLoadEvent;
-import com.silverpeas.mobile.client.apps.almanach.events.pages.AlmanachLoadedEvent;
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 import com.silverpeas.mobile.client.common.EventBus;
 import com.silverpeas.mobile.client.common.ServicesLocator;
 import com.silverpeas.mobile.client.common.app.Controller;
 import com.silverpeas.mobile.client.common.event.ErrorEvent;
 import com.silverpeas.mobile.shared.dto.EventDetailDTO;
-<<<<<<< HEAD
 import com.silverpeas.mobile.shared.dto.navigation.ApplicationInstanceDTO;
 
 public class AlmanachController implements Controller, AlmanachControllerEventHandler, NavigationEventHandler {
@@ -29,59 +22,27 @@ public AlmanachController() {
 		super();
 		EventBus.getInstance().addHandler(AbstractAlmanachControllerEvent.TYPE,this);
 		EventBus.getInstance().addHandler(AbstractNavigationEvent.TYPE, this);
-=======
-
-public class AlmanachController implements Controller,
-		AlmanachControllerEventHandler {
-
-	public AlmanachController() {
-		super();
-		EventBus.getInstance().addHandler(AbstractAlmanachControllerEvent.TYPE,
-				this);
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 	}
 
 	@Override
 	public void stop() {
-<<<<<<< HEAD
 		EventBus.getInstance().removeHandler(AbstractAlmanachControllerEvent.TYPE, this);
 		EventBus.getInstance().removeHandler(AbstractNavigationEvent.TYPE, this);
 	}
 
 	public void loadAlmanach(final ApplicationInstanceDTO instance) {
 		ServicesLocator.serviceAlmanach.getAlmanach(instance.getId(), new AsyncCallback<Collection<EventDetailDTO>>() {
-=======
-		EventBus.getInstance().removeHandler(
-				AbstractAlmanachControllerEvent.TYPE, this);
-	}
-
-	@Override
-	public void loadAlmanach(AlmanachLoadEvent event) {
-		ServicesLocator.serviceAlmanach.getAllRDV(event.getMonth(), new AsyncCallback<Collection<EventDetailDTO>>() {
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 			public void onFailure(Throwable caught) {
 				EventBus.getInstance().fireEvent(new ErrorEvent(caught));
 			}
 			public void onSuccess(Collection<EventDetailDTO> result) {
-<<<<<<< HEAD
 				EventBus.getInstance().fireEvent(new AlmanachLoadedEvent(instance, result));
 			}
 		});
 	}
 
-	@Override
-	public void loadSettings(AlmanachLoadSettingsEvent event) {
-
-	}
-
 	@Override
 	public void appInstanceChanged(NavigationAppInstanceChangedEvent event) {
 		loadAlmanach(event.getInstance());
 	}
-=======
-				EventBus.getInstance().fireEvent(new AlmanachLoadedEvent(result));
-			}
-		});
-	}
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 }

web/src/main/java/com/silverpeas/mobile/client/apps/almanach/events/controller/AlmanachControllerEventHandler.java

@@ -3,9 +3,4 @@
 import com.google.gwt.event.shared.EventHandler;
 
 public interface AlmanachControllerEventHandler extends EventHandler{
-<<<<<<< HEAD
-	void loadSettings(AlmanachLoadSettingsEvent event);
-=======
-	void loadAlmanach(AlmanachLoadEvent event);
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 }

web/src/main/java/com/silverpeas/mobile/client/apps/almanach/events/pages/AlmanachLoadedEvent.java

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package com.silverpeas.mobile.client.apps.almanach.events.pages;
 
 import java.util.Collection;
@@ -30,29 +29,3 @@ public ApplicationInstanceDTO getInstance(){
 		return instance;
 	}
 }
-=======
-package com.silverpeas.mobile.client.apps.almanach.events.pages;
-
-import java.util.Collection;
-
-import com.silverpeas.mobile.shared.dto.EventDetailDTO;
-
-public class AlmanachLoadedEvent extends AbstractAlmanachPagesEvent{
-
-	private Collection<EventDetailDTO> listEventDetailDTO;
-
-	public AlmanachLoadedEvent(Collection<EventDetailDTO> listEventDetailDTO){
-		super();
-		this.listEventDetailDTO = listEventDetailDTO;
-	}
-
-	@Override
-	protected void dispatch(AlmanachPagesEventHandler handler) {
-		handler.onAlmanachLoaded(this);
-	}
-
-	public Collection<EventDetailDTO> getListEventDetailDTO(){
-		return listEventDetailDTO;
-	}
-}
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f

web/src/main/java/com/silverpeas/mobile/client/apps/almanach/events/pages/AlmanachPagesEventHandler.java

@@ -3,9 +3,6 @@
 import com.google.gwt.event.shared.EventHandler;
 
 public interface AlmanachPagesEventHandler extends EventHandler{
-<<<<<<< HEAD
 	public void onLoadEventDetailDTOLoaded(LoadEventDetailDTOEvent event);
-=======
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 	public void onAlmanachLoaded(AlmanachLoadedEvent event);
 }

web/src/main/java/com/silverpeas/mobile/client/apps/almanach/pages/AlmanachPage.java

@@ -5,7 +5,6 @@
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
-<<<<<<< HEAD
 import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
@@ -24,26 +23,12 @@
 import com.silverpeas.mobile.client.common.EventBus;
 import com.silverpeas.mobile.client.common.app.View;
 import com.silverpeas.mobile.shared.dto.navigation.ApplicationInstanceDTO;
-=======
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Widget;
-import com.gwtmobile.ui.client.page.Page;
-import com.silverpeas.mobile.client.apps.almanach.events.controller.AlmanachLoadEvent;
-import com.silverpeas.mobile.client.apps.almanach.events.pages.AbstractAlmanachPagesEvent;
-import com.silverpeas.mobile.client.apps.almanach.events.pages.AlmanachLoadedEvent;
-import com.silverpeas.mobile.client.apps.almanach.events.pages.AlmanachPagesEventHandler;
-import com.silverpeas.mobile.client.apps.almanach.pages.widgets.AlmanachWidget;
-import com.silverpeas.mobile.client.common.EventBus;
-import com.silverpeas.mobile.client.common.app.View;
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 
-public class AlmanachPage extends Page implements AlmanachPagesEventHandler,
-		View {
+public class AlmanachPage extends Page implements AlmanachPagesEventHandler, View {
 
 	private static AlmanachPageUiBinder uiBinder = GWT
 			.create(AlmanachPageUiBinder.class);
 	@UiField
-<<<<<<< HEAD
 	HorizontalPanel panelAlmanachWidget;
 
 	@UiField(provided = true) protected AlmanachMessages msg = null;
@@ -59,20 +44,6 @@ public AlmanachPage() {
 		msg = GWT.create(AlmanachMessages.class);
 		initWidget(uiBinder.createAndBindUi(this));
 		EventBus.getInstance().addHandler(AbstractAlmanachPagesEvent.TYPE, this);
-=======
-	HorizontalPanel l;
-
-	interface AlmanachPageUiBinder extends UiBinder<Widget, AlmanachPage> {
-	}
-
-	@SuppressWarnings("deprecation")
-	public AlmanachPage() {
-		initWidget(uiBinder.createAndBindUi(this));
-		Date date = new Date();
-		EventBus.getInstance()
-				.addHandler(AbstractAlmanachPagesEvent.TYPE, this);
-		EventBus.getInstance().fireEvent(new AlmanachLoadEvent(date.getMonth()));
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 	}
 
 	@Override
@@ -82,7 +53,6 @@ public void stop() {
 	}
 
 	public void onAlmanachLoaded(AlmanachLoadedEvent event) {
-<<<<<<< HEAD
 		panelAlmanachWidget.clear();
 		AlmanachWidget almanachWidget = new AlmanachWidget(true, event.getListEventDetailDTO());
 		panelAlmanachWidget.add(almanachWidget);
@@ -108,9 +78,5 @@ public void displayPlace(ApplicationInstanceDTO appDTO){
 		instance.setText(appDTO.getLabel());
 		Date date = new Date();
 		monthLabel.setText(String.valueOf(date.getMonth()));
-=======
-		AlmanachWidget al = new AlmanachWidget(true, event.getListEventDetailDTO());
-		l.add(al);
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 	}
 }

web/src/main/java/com/silverpeas/mobile/client/apps/almanach/pages/AlmanachPage.ui.xml

@@ -3,8 +3,7 @@
 	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:m="urn:import:com.gwtmobile.ui.client.widgets"
 	xmlns:f="urn:import:com.silverpeas.mobile.client.components">
 
-    <ui:with field='msg' type='com.silverpeas.mobile.client.apps.almanach.resources.AlmanachMessages'/>
-<<<<<<< HEAD
+    <ui:with field='msg' type='com.silverpeas.mobile.client.apps.almanach.resources.AlmanachMessages'/>
     <ui:with field='ressources' type='com.silverpeas.mobile.client.apps.almanach.resources.AlmanachResources'/>
 
     <ui:style>
@@ -13,14 +12,11 @@
 			margin-right: 0.5em;
 		}
 	</ui:style>
-=======
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
-
+
 	<g:HTMLPanel>
 		<m:HeaderPanel leftButton="Back">
 			<g:Label horizontalAlignment="center" text="{msg.title}"></g:Label>
-		</m:HeaderPanel>
-<<<<<<< HEAD
+		</m:HeaderPanel>
 		<m:ListPanel selectable="true" ui:field="place">
 			<m:ListItem showArrow="true">				
 				<m:HorizontalPanel>
@@ -33,10 +29,8 @@
 		<g:HorizontalPanel>
 		    <g:Label horizontalAlignment="left" ui:field="monthLabel"></g:Label>
 		</g:HorizontalPanel>
-		<g:HorizontalPanel ui:field="panelAlmanachWidget"></g:HorizontalPanel>
-=======
-		<g:HorizontalPanel ui:field="l"></g:HorizontalPanel>
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
+		<g:HorizontalPanel ui:field="panelAlmanachWidget"></g:HorizontalPanel>
+		<g:HorizontalPanel ui:field="l"></g:HorizontalPanel>
 		<m:HeaderPanel>
 			<f:FooterBar />
 		</m:HeaderPanel>

web/src/main/java/com/silverpeas/mobile/client/apps/almanach/pages/EventDetailDTOPage.java

@@ -1,14 +1,10 @@
 package com.silverpeas.mobile.client.apps.almanach.pages;
 
-<<<<<<< HEAD
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-=======
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 import java.util.Iterator;
 import java.util.List;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Label;
@@ -28,29 +24,18 @@ public class EventDetailDTOPage extends Page implements EventDetailDTOPagesEvent
 
 	private static EventDetailDTOPageUiBinder uiBinder = GWT.create(EventDetailDTOPageUiBinder.class);
 	@UiField AccordionPanel accordionPanel;
-<<<<<<< HEAD
-	private DateFormat date = new SimpleDateFormat("MM/dd/yyyy");
-	private DateFormat hour = new SimpleDateFormat("HH");
-=======
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
+	private DateTimeFormat date = DateTimeFormat.getFormat("MM/dd/yyyy");
 
 	interface EventDetailDTOPageUiBinder extends UiBinder<Widget, EventDetailDTOPage>{
 	}
 
-<<<<<<< HEAD
-	public EventDetailDTOPage(List<EventDetailDTO> listEventDetailDTO){
-		initWidget(uiBinder.createAndBindUi(this));
-		EventBus.getInstance().addHandler(AbstractEventDetailDTOPagesEvent.TYPE, this);
-		Iterator<EventDetailDTO> i = listEventDetailDTO.iterator();
-		int count=0;
-=======
-	@SuppressWarnings("deprecation")
 	public EventDetailDTOPage(List<EventDetailDTO> listEventDetailDTO){
 		initWidget(uiBinder.createAndBindUi(this));
 		EventBus.getInstance().addHandler(AbstractEventDetailDTOPagesEvent.TYPE, this);
 		accordionPanel = new AccordionPanel();
+		int count = 0;
 		Iterator<EventDetailDTO> i = listEventDetailDTO.iterator();
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
+
 		while(i.hasNext()){
 			EventDetailDTO eventDetailDTO = i.next();
 			AccordionStack accordionStack = new AccordionStack();
@@ -59,31 +44,18 @@ public EventDetailDTOPage(List<EventDetailDTO> listEventDetailDTO){
 			Label nameEvent = new Label("Name : "+eventDetailDTO.get_name());
 			accordionHeader.add(nameEvent);
 			accordionStack.add(accordionHeader);
-<<<<<<< HEAD
-			StringBuilder startDate = new StringBuilder(date.format(eventDetailDTO.get_startDate()));
-			StringBuilder endDate = new StringBuilder(date.format(eventDetailDTO.get_endDate()));
-			StringBuilder startHour = new StringBuilder(hour.format(eventDetailDTO.getStartHour()));
-			StringBuilder endHour = new StringBuilder(hour.format(eventDetailDTO.getEndHour()));
-			Label startDateEvent = new Label("Date : "+startDate+" "+startHour);
-			Label endDateEvent = new Label("Date : "+endDate+" "+endHour);
+			Label startDateEvent = new Label("Date : "+date.format(eventDetailDTO.get_startDate(), null)+" "+eventDetailDTO.getStartHour());
+			Label endDateEvent = new Label("Date : "+date.format(eventDetailDTO.get_endDate(), null)+" "+eventDetailDTO.getEndHour());
 			Label placeEvent = new Label("Place : "+eventDetailDTO.getPlace());
-=======
-			Label startDateEvent = new Label("Date : "+String.valueOf(eventDetailDTO.get_startDate().getDay())+"/"+String.valueOf(eventDetailDTO.get_startDate().getMonth())+"/"+String.valueOf(eventDetailDTO.get_startDate().getYear())+" : "+eventDetailDTO.getStartHour());
-			Label endDateEvent = new Label("Date : "+String.valueOf(eventDetailDTO.get_endDate().getDay())+"/"+String.valueOf(eventDetailDTO.get_endDate().getMonth())+"/"+String.valueOf(eventDetailDTO.get_endDate().getYear())+" : "+eventDetailDTO.getEndHour());
-			Label placeEvent = new Label(eventDetailDTO.getPlace());
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 			accordionContent.add(startDateEvent);
 			accordionContent.add(endDateEvent);
 			accordionContent.add(placeEvent);
 			accordionStack.add(accordionContent);
 			accordionPanel.add(accordionStack);
-<<<<<<< HEAD
 			if(count==0){
 				accordionStack.expand();
 			}
 			count++;
-=======
->>>>>>> 09b477a4f719202ea331d7ac57a295f981f9520f
 		}
 	}