Commit 5e3d31e1 authored by Guillaume Surrel's avatar Guillaume Surrel
Browse files

Simplify engine framework.

parent 01e88f29
......@@ -35,7 +35,7 @@
<!-- Other module inherits -->
<inherits name='com.smartgwt.SmartGwt'/>
<inherits name='com.google.gwt.visualization.Visualization'/> <!-- Logging section --> <inherits name="com.allen_sauer.gwt.log.gwt-log-OFF" /> <!-- inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" /> <set-property name="log_WindowLogger" value="ENABLED" /> <set-property name="log_DivLogger" value="DISABLED" /> <set-property name="compiler.emulatedStack" value="true" /> <set-configuration-property name="compiler.emulatedStack.recordLineNumbers" value="true"/> <set-configuration-property name="compiler.emulatedStack.recordFileNames" value="true"/-->
<inherits name='com.google.gwt.visualization.Visualization'/> <!-- Logging section --> <!-- name="com.allen_sauer.gwt.log.gwt-log-OFF" /--> <inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" /> <set-property name="log_WindowLogger" value="ENABLED" /> <set-property name="log_DivLogger" value="DISABLED" /> <set-property name="compiler.emulatedStack" value="true" /> <set-configuration-property name="compiler.emulatedStack.recordLineNumbers" value="true"/> <set-configuration-property name="compiler.emulatedStack.recordFileNames" value="true"/>
<!-- Specify the app entry point class. -->
<entry-point class='com.scalagent.appli.client.Application'/>
......@@ -43,7 +43,5 @@
<source path='appli/client'/>
<source path='appli/shared'/>
<source path='engine/client'/>
<source path='engine/shared'/>
<!-- set-property name="user.agent" value="gecko1_8"></set-property-->
<source path='engine/shared'/> <set-property name="user.agent" value="gecko1_8"></set-property>
</module>
......
......@@ -23,6 +23,7 @@
package com.scalagent.appli.client;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.user.client.Command;
......@@ -54,19 +55,20 @@ import com.scalagent.appli.client.presenter.SubscriptionListPresenter;
import com.scalagent.appli.client.presenter.TopicListPresenter;
import com.scalagent.appli.client.presenter.UserListPresenter;
import com.scalagent.appli.client.widget.MainWidget;
import com.scalagent.engine.client.BaseEntryPoint;
import com.scalagent.engine.client.BaseRPCService;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.event.SystemErrorEvent;
import com.smartgwt.client.widgets.Canvas;
/**
* @author Yohann CINTRE
*/
public class Application implements BaseEntryPoint {
public class Application implements EntryPoint {
public static final ApplicationMessages messages = (ApplicationMessages) GWT
.create(ApplicationMessages.class);
private RPCServiceAsync serviceAsync;
private BaseRPCServiceAsync serviceAsync;
private RPCServiceCacheClient serviceCache;
private HandlerManager eventBus;
......@@ -88,7 +90,7 @@ public class Application implements BaseEntryPoint {
Runnable onLoadCallback = new Runnable() {
public void run() {
serviceAsync = GWT.create(RPCService.class);
serviceAsync = GWT.create(BaseRPCService.class);
eventBus = new HandlerManager(null);
serviceCache = new RPCServiceCacheClient(serviceAsync, eventBus, -1);
......
......@@ -2326,6 +2326,24 @@ public interface ApplicationMessages extends com.google.gwt.i18n.client.Messages
*/
@DefaultMessage("Subscription Count")
@Key("common_subscription")
String common_subscription();
String common_subscription();
/**
* Translated "true".
*
* @return translated "true"
*/
@DefaultMessage("true")
@Key("main_true")
String main_true();
/**
* Translated "false".
*
* @return translated "false"
*/
@DefaultMessage("false")
@Key("main_false")
String main_false();
}
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2010 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Initial developer(s): ScalAgent Distributed Technologies
* Contributor(s):
*/
package com.scalagent.appli.client;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
import com.scalagent.engine.client.BaseRPCService;
import com.scalagent.engine.client.command.Action;
import com.scalagent.engine.client.command.Response;
/**
* The client side stub for the RPC service.
*
* @author Yohann CINTRE
*/
@RemoteServiceRelativePath("RPCService")
public interface RPCService extends BaseRPCService {
public <R extends Response> R execute(Action<R> action);
}
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2010 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Initial developer(s): ScalAgent Distributed Technologies
* Contributor(s):
*/
package com.scalagent.appli.client;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.command.Action;
import com.scalagent.engine.client.command.Response;
/**
* @author Yohann CINTRE
*/
public interface RPCServiceAsync extends BaseRPCServiceAsync {
public <R extends Response> void execute(Action<R> action, AsyncCallback<R> callback);
}
......@@ -73,6 +73,7 @@ import com.scalagent.appli.shared.QueueWTO;
import com.scalagent.appli.shared.SubscriptionWTO;
import com.scalagent.appli.shared.TopicWTO;
import com.scalagent.appli.shared.UserWTO;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.BaseRPCServiceCacheClient;
import com.scalagent.engine.shared.BaseWTO;
......@@ -126,7 +127,7 @@ public class RPCServiceCacheClient implements BaseRPCServiceCacheClient {
private Map<String, List<HistoryData>> globalHistory = new HashMap<String, List<HistoryData>>();
private List<FloatHistoryData> serverHistory = new ArrayList<FloatHistoryData>();
private RPCServiceAsync RPCService;
private BaseRPCServiceAsync RPCService;
private HandlerManager eventBus;
private boolean topicRequest = true;
......@@ -135,7 +136,7 @@ public class RPCServiceCacheClient implements BaseRPCServiceCacheClient {
private boolean subRequest = true;
private boolean servRequest = true;
public RPCServiceCacheClient(RPCServiceAsync RPCService, HandlerManager eventBus, int updatePeriod) {
public RPCServiceCacheClient(BaseRPCServiceAsync RPCService, HandlerManager eventBus, int updatePeriod) {
Log.debug("RPCServiceCacheClient start.");
......
......@@ -22,16 +22,16 @@
*/
package com.scalagent.appli.client.presenter;
import com.google.gwt.event.shared.HandlerManager;
import com.scalagent.appli.client.RPCServiceAsync;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.command.session.LoginAction;
import com.scalagent.appli.client.command.session.LoginHandler;
import com.scalagent.appli.client.command.session.LoginResponse;
import com.scalagent.appli.client.event.session.LoginValidEvent;
import com.scalagent.appli.client.widget.LoginWidget;
import com.scalagent.engine.client.presenter.BasePresenter;
import com.smartgwt.client.util.SC;
import com.google.gwt.event.shared.HandlerManager;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.command.session.LoginAction;
import com.scalagent.appli.client.command.session.LoginHandler;
import com.scalagent.appli.client.command.session.LoginResponse;
import com.scalagent.appli.client.event.session.LoginValidEvent;
import com.scalagent.appli.client.widget.LoginWidget;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.presenter.BasePresenter;
import com.smartgwt.client.util.SC;
/**
* This class is the presenter associated to the login screen.
......@@ -39,8 +39,9 @@ import com.smartgwt.client.util.SC;
*
* @author Yohann CINTRE
*/
public class LoginPresenter extends BasePresenter<LoginWidget, RPCServiceAsync, RPCServiceCacheClient> {
public LoginPresenter(RPCServiceAsync testService, HandlerManager eventBus, RPCServiceCacheClient cache) {
public class LoginPresenter extends BasePresenter<LoginWidget, BaseRPCServiceAsync, RPCServiceCacheClient> {
public LoginPresenter(BaseRPCServiceAsync testService, HandlerManager eventBus, RPCServiceCacheClient cache) {
super(testService, cache, eventBus);
this.widget = new LoginWidget(this);
}
......
......@@ -30,7 +30,6 @@ import java.util.Map;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.user.client.ui.Widget;
import com.scalagent.appli.client.RPCServiceAsync;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.event.common.UpdateCompleteEvent;
import com.scalagent.appli.client.event.message.DeletedMessageEvent;
......@@ -52,6 +51,7 @@ import com.scalagent.appli.client.widget.MainWidget;
import com.scalagent.appli.shared.QueueWTO;
import com.scalagent.appli.shared.SubscriptionWTO;
import com.scalagent.appli.shared.UserWTO;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.event.SystemErrorHandler;
import com.scalagent.engine.client.presenter.BasePresenter;
import com.smartgwt.client.util.SC;
......@@ -64,7 +64,7 @@ import com.smartgwt.client.widgets.tab.Tab;
*
* @author Yohann CINTRE
*/
public class MainPresenter extends BasePresenter<MainWidget, RPCServiceAsync, RPCServiceCacheClient>
public class MainPresenter extends BasePresenter<MainWidget, BaseRPCServiceAsync, RPCServiceCacheClient>
implements SystemErrorHandler, QueueDetailClickHandler, UserDetailClickHandler,
SubscriptionDetailClickHandler, LoginValidHandler {
......@@ -73,7 +73,7 @@ public class MainPresenter extends BasePresenter<MainWidget, RPCServiceAsync, RP
private Map<String, UserDetailPresenter> openedUserList = new HashMap<String, UserDetailPresenter>();
private Map<String, SubscriptionDetailPresenter> openedSubList = new HashMap<String, SubscriptionDetailPresenter>();
public MainPresenter(RPCServiceAsync testService, RPCServiceCacheClient cache, HandlerManager eventBus,
public MainPresenter(BaseRPCServiceAsync testService, RPCServiceCacheClient cache, HandlerManager eventBus,
LoginPresenter loginPresenter, ServerPresenter serverPresenter, TopicListPresenter topicPresenter,
QueueListPresenter queuePresenter, UserListPresenter userPresenter,
SubscriptionListPresenter subscriptionPresenter) {
......
......@@ -28,7 +28,6 @@ import java.util.Map;
import com.google.gwt.event.shared.HandlerManager;
import com.scalagent.appli.client.Application;
import com.scalagent.appli.client.RPCServiceAsync;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.RPCServiceCacheClient.HistoryData;
import com.scalagent.appli.client.command.message.DeleteMessageAction;
......@@ -52,6 +51,7 @@ import com.scalagent.appli.client.widget.QueueDetailWidget;
import com.scalagent.appli.client.widget.record.MessageListRecord;
import com.scalagent.appli.shared.MessageWTO;
import com.scalagent.appli.shared.QueueWTO;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.presenter.BasePresenter;
import com.smartgwt.client.util.SC;
......@@ -62,13 +62,13 @@ import com.smartgwt.client.util.SC;
* @author Yohann CINTRE
*/
public class QueueDetailPresenter extends
BasePresenter<QueueDetailWidget, RPCServiceAsync, RPCServiceCacheClient> implements NewMessageHandler,
DeletedMessageHandler, UpdatedMessageHandler, UpdateCompleteHandler, QueueNotFoundHandler,
DeletedQueueHandler, UpdatedQueueHandler {
BasePresenter<QueueDetailWidget, BaseRPCServiceAsync, RPCServiceCacheClient> implements
NewMessageHandler, DeletedMessageHandler, UpdatedMessageHandler, UpdateCompleteHandler,
QueueNotFoundHandler, DeletedQueueHandler, UpdatedQueueHandler {
private QueueWTO queue;
public QueueDetailPresenter(RPCServiceAsync serviceRPC, HandlerManager eventBus,
public QueueDetailPresenter(BaseRPCServiceAsync serviceRPC, HandlerManager eventBus,
RPCServiceCacheClient cache, QueueWTO queue) {
super(serviceRPC, cache, eventBus);
......
......@@ -25,7 +25,6 @@ package com.scalagent.appli.client.presenter;
import java.util.List;
import com.google.gwt.event.shared.HandlerManager;
import com.scalagent.appli.client.RPCServiceAsync;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.RPCServiceCacheClient.HistoryData;
import com.scalagent.appli.client.command.queue.ClearPendingMessageAction;
......@@ -52,6 +51,7 @@ import com.scalagent.appli.client.event.queue.UpdatedQueueHandler;
import com.scalagent.appli.client.widget.QueueListWidget;
import com.scalagent.appli.client.widget.record.QueueListRecord;
import com.scalagent.appli.shared.QueueWTO;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.presenter.BasePresenter;
import com.smartgwt.client.util.SC;
......@@ -62,10 +62,11 @@ import com.smartgwt.client.util.SC;
* @author Yohann CINTRE
*/
public class QueueListPresenter extends
BasePresenter<QueueListWidget, RPCServiceAsync, RPCServiceCacheClient> implements NewQueueHandler,
BasePresenter<QueueListWidget, BaseRPCServiceAsync, RPCServiceCacheClient> implements NewQueueHandler,
DeletedQueueHandler, UpdatedQueueHandler, UpdateCompleteHandler {
public QueueListPresenter(RPCServiceAsync testService, HandlerManager eventBus, RPCServiceCacheClient cache) {
public QueueListPresenter(BaseRPCServiceAsync testService, HandlerManager eventBus,
RPCServiceCacheClient cache) {
super(testService, cache, eventBus);
......
......@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import com.google.gwt.event.shared.HandlerManager;
import com.scalagent.appli.client.RPCServiceAsync;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.RPCServiceCacheClient.FloatHistoryData;
import com.scalagent.appli.client.RPCServiceCacheClient.HistoryData;
......@@ -37,6 +36,7 @@ import com.scalagent.appli.shared.QueueWTO;
import com.scalagent.appli.shared.SubscriptionWTO;
import com.scalagent.appli.shared.TopicWTO;
import com.scalagent.appli.shared.UserWTO;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.presenter.BasePresenter;
/**
......@@ -45,9 +45,10 @@ import com.scalagent.engine.client.presenter.BasePresenter;
*
* @author Yohann CINTRE
*/
public class ServerPresenter extends BasePresenter<ServerWidget, RPCServiceAsync, RPCServiceCacheClient>
public class ServerPresenter extends BasePresenter<ServerWidget, BaseRPCServiceAsync, RPCServiceCacheClient>
implements UpdateCompleteHandler {
public ServerPresenter(RPCServiceAsync serviceRPC, HandlerManager eventBus, RPCServiceCacheClient cache) {
public ServerPresenter(BaseRPCServiceAsync serviceRPC, HandlerManager eventBus, RPCServiceCacheClient cache) {
super(serviceRPC, cache, eventBus);
this.eventBus = eventBus;
widget = new ServerWidget(this);
......
......@@ -28,7 +28,6 @@ import java.util.Map;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.event.shared.HandlerManager;
import com.scalagent.appli.client.RPCServiceAsync;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.RPCServiceCacheClient.HistoryData;
import com.scalagent.appli.client.command.message.DeleteMessageAction;
......@@ -51,6 +50,7 @@ import com.scalagent.appli.client.widget.SubscriptionDetailWidget;
import com.scalagent.appli.client.widget.record.MessageListRecord;
import com.scalagent.appli.shared.MessageWTO;
import com.scalagent.appli.shared.SubscriptionWTO;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.presenter.BasePresenter;
import com.smartgwt.client.util.SC;
......@@ -61,7 +61,7 @@ import com.smartgwt.client.util.SC;
* @author Yohann CINTRE
*/
public class SubscriptionDetailPresenter extends
BasePresenter<SubscriptionDetailWidget, RPCServiceAsync, RPCServiceCacheClient> implements
BasePresenter<SubscriptionDetailWidget, BaseRPCServiceAsync, RPCServiceCacheClient> implements
NewMessageHandler, DeletedMessageHandler, UpdatedMessageHandler, UpdateCompleteHandler,
DeletedSubscriptionHandler, UpdatedSubscriptionHandler {
......@@ -69,7 +69,7 @@ public class SubscriptionDetailPresenter extends
private SubscriptionWTO sub;
public SubscriptionDetailPresenter(RPCServiceAsync serviceRPC, HandlerManager eventBus,
public SubscriptionDetailPresenter(BaseRPCServiceAsync serviceRPC, HandlerManager eventBus,
RPCServiceCacheClient cache, SubscriptionWTO sub) {
super(serviceRPC, cache, eventBus);
......
......@@ -25,7 +25,6 @@ package com.scalagent.appli.client.presenter;
import java.util.List;
import com.google.gwt.event.shared.HandlerManager;
import com.scalagent.appli.client.RPCServiceAsync;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.RPCServiceCacheClient.HistoryData;
import com.scalagent.appli.client.command.subscription.DeleteSubscriptionAction;
......@@ -46,6 +45,7 @@ import com.scalagent.appli.client.event.subscription.UpdatedSubscriptionHandler;
import com.scalagent.appli.client.widget.SubscriptionListWidget;
import com.scalagent.appli.client.widget.record.SubscriptionListRecord;
import com.scalagent.appli.shared.SubscriptionWTO;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.presenter.BasePresenter;
import com.smartgwt.client.util.SC;
......@@ -56,9 +56,10 @@ import com.smartgwt.client.util.SC;
* @author Yohann CINTRE
*/
public class SubscriptionListPresenter extends
BasePresenter<SubscriptionListWidget, RPCServiceAsync, RPCServiceCacheClient> implements
BasePresenter<SubscriptionListWidget, BaseRPCServiceAsync, RPCServiceCacheClient> implements
NewSubscriptionHandler, DeletedSubscriptionHandler, UpdatedSubscriptionHandler, UpdateCompleteHandler {
public SubscriptionListPresenter(RPCServiceAsync testService, HandlerManager eventBus,
public SubscriptionListPresenter(BaseRPCServiceAsync testService, HandlerManager eventBus,
RPCServiceCacheClient cache) {
super(testService, cache, eventBus);
this.eventBus = eventBus;
......
......@@ -25,7 +25,6 @@ package com.scalagent.appli.client.presenter;
import java.util.List;
import com.google.gwt.event.shared.HandlerManager;
import com.scalagent.appli.client.RPCServiceAsync;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.RPCServiceCacheClient.HistoryData;
import com.scalagent.appli.client.command.topic.DeleteTopicAction;
......@@ -45,6 +44,7 @@ import com.scalagent.appli.client.event.topic.UpdatedTopicHandler;
import com.scalagent.appli.client.widget.TopicListWidget;
import com.scalagent.appli.client.widget.record.TopicListRecord;
import com.scalagent.appli.shared.TopicWTO;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.presenter.BasePresenter;
import com.smartgwt.client.util.SC;
......@@ -55,9 +55,11 @@ import com.smartgwt.client.util.SC;
* @author Yohann CINTRE
*/
public class TopicListPresenter extends
BasePresenter<TopicListWidget, RPCServiceAsync, RPCServiceCacheClient> implements NewTopicHandler,
BasePresenter<TopicListWidget, BaseRPCServiceAsync, RPCServiceCacheClient> implements NewTopicHandler,
DeletedTopicHandler, UpdatedTopicHandler, UpdateCompleteHandler {
public TopicListPresenter(RPCServiceAsync testService, HandlerManager eventBus, RPCServiceCacheClient cache) {
public TopicListPresenter(BaseRPCServiceAsync testService, HandlerManager eventBus,
RPCServiceCacheClient cache) {
super(testService, cache, eventBus);
......
......@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import com.google.gwt.event.shared.HandlerManager;
import com.scalagent.appli.client.RPCServiceAsync;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.RPCServiceCacheClient.HistoryData;
import com.scalagent.appli.client.command.subscription.DeleteSubscriptionAction;
......@@ -50,6 +49,7 @@ import com.scalagent.appli.client.widget.UserDetailWidget;
import com.scalagent.appli.client.widget.record.SubscriptionListRecord;
import com.scalagent.appli.shared.SubscriptionWTO;
import com.scalagent.appli.shared.UserWTO;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.presenter.BasePresenter;
import com.smartgwt.client.util.SC;
......@@ -60,12 +60,13 @@ import com.smartgwt.client.util.SC;
* @author Yohann CINTRE
*/
public class UserDetailPresenter extends
BasePresenter<UserDetailWidget, RPCServiceAsync, RPCServiceCacheClient> implements
BasePresenter<UserDetailWidget, BaseRPCServiceAsync, RPCServiceCacheClient> implements
NewSubscriptionHandler, DeletedSubscriptionHandler, UpdatedSubscriptionHandler, UpdateCompleteHandler,
DeletedUserHandler, UpdatedUserHandler {
private UserWTO user;
public UserDetailPresenter(RPCServiceAsync serviceRPC, HandlerManager eventBus,
public UserDetailPresenter(BaseRPCServiceAsync serviceRPC, HandlerManager eventBus,
RPCServiceCacheClient cache, UserWTO user) {
super(serviceRPC, cache, eventBus);
......
......@@ -25,7 +25,6 @@ package com.scalagent.appli.client.presenter;
import java.util.List;
import com.google.gwt.event.shared.HandlerManager;
import com.scalagent.appli.client.RPCServiceAsync;
import com.scalagent.appli.client.RPCServiceCacheClient;
import com.scalagent.appli.client.RPCServiceCacheClient.HistoryData;
import com.scalagent.appli.client.command.user.DeleteUserAction;
......@@ -46,6 +45,7 @@ import com.scalagent.appli.client.event.user.UserDetailClickEvent;
import com.scalagent.appli.client.widget.UserListWidget;
import com.scalagent.appli.client.widget.record.UserListRecord;
import com.scalagent.appli.shared.UserWTO;
import com.scalagent.engine.client.BaseRPCServiceAsync;
import com.scalagent.engine.client.presenter.BasePresenter;
import com.smartgwt.client.util.SC;
......@@ -55,9 +55,12 @@ import com.smartgwt.client.util.SC;
*
* @author Yohann CINTRE
*/
public class UserListPresenter extends BasePresenter<UserListWidget, RPCServiceAsync, RPCServiceCacheClient>
implements NewUserHandler, DeletedUserHandler, UpdatedUserHandler, UpdateCompleteHandler {
public UserListPresenter(RPCServiceAsync testService, HandlerManager eventBus, RPCServiceCacheClient cache) {
public class UserListPresenter extends
BasePresenter<UserListWidget, BaseRPCServiceAsync, RPCServiceCacheClient> implements NewUserHandler,
DeletedUserHandler, UpdatedUserHandler, UpdateCompleteHandler {
public UserListPresenter(BaseRPCServiceAsync testService, HandlerManager eventBus,
RPCServiceCacheClient cache) {
super(testService, cache, eventBus);
......
......@@ -130,8 +130,8 @@ public class QueueDetailWidget extends BaseWidget<QueueDetailPresenter> {
public QueueDetailWidget(QueueDetailPresenter queueDetailsPresenter) {
super(queueDetailsPresenter);
etat.put("true", Application.baseMessages.main_true());
etat.put("false", Application.baseMessages.main_false());
etat.put("true", Application.messages.main_true());
etat.put("false", Application.messages.main_false());
}
public IButton getRefreshButton() {
......
......@@ -129,8 +129,8 @@ public class QueueListWidget extends BaseWidget<QueueListPresenter> {
public QueueListWidget(QueueListPresenter queuePresenter) {
super(queuePresenter);
etat.put("true", Application.baseMessages.main_true());
etat.put("false", Application.baseMessages.main_false());
etat.put("true", Application.messages.main_true());
etat.put("false", Application.messages.main_false());
}
public IButton getRefreshButton() {
......
......@@ -117,8 +117,8 @@ public class TopicListWidget extends BaseWidget<TopicListPresenter> {
public TopicListWidget(TopicListPresenter topicPresenter) {
super(topicPresenter);
etat.put("true", Application.baseMessages.main_true());
etat.put("false", Application.baseMessages.main_false());
etat.put("true", Application.messages.main_true());
etat.put("false", Application.messages.main_false());
}
public IButton getRefreshButton() {
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2010 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or any later version.