Merge branch 'master' of github.com:openremote/openremote

# Conflicts: # manager/client/src/main/java/org/openremote/manager/client/admin/agent/AdminAgent.java
openremote · Aug 31, 2016 · db25d83 · db25d83
2 parents 00488c5 + ee66adb
commit db25d83
Show file tree

Hide file tree

Showing 54 changed files with 1,345 additions and 891 deletions.
diff --git a/manager/client/src/main/java/org/openremote/manager/client/admin/agent/AdminAgent.java b/manager/client/src/main/java/org/openremote/manager/client/admin/agent/AdminAgent.java
@@ -20,10 +20,11 @@
 package org.openremote.manager.client.admin.agent;
 
 import org.openremote.manager.client.admin.AdminContent;
+import org.openremote.manager.client.widget.FormView;
 import org.openremote.manager.shared.connector.Connector;
 import org.openremote.manager.shared.connector.ConnectorImpl;
 
-public interface AdminAgent extends AdminContent {
+public interface AdminAgent extends AdminContent, FormView {
 
     interface Presenter {
 
@@ -40,16 +41,6 @@ interface Presenter {
 
     void setPresenter(Presenter presenter);
 
-    void setFormBusy(boolean busy);
-
-    void addFormMessageError(String message);
-
-    void addFormMessageSuccess(String message);
-
-    void clearFormMessagesError();
-
-    void clearFormMessagesSuccess();
-
     void setConnectors(ConnectorImpl[] connectors);
 
     void setAssignedConnector(ConnectorImpl connector);

diff --git a/...er/client/src/main/java/org/openremote/manager/client/admin/agent/AdminAgentActivity.java b/...er/client/src/main/java/org/openremote/manager/client/admin/agent/AdminAgentActivity.java
@@ -114,8 +114,7 @@ public void start(AcceptsOneWidget container, EventBus eventBus, Collection<Even
 
         adminContent.setPresenter(this);
 
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         adminContent.enableCreate(false);
         adminContent.enableUpdate(false);
@@ -144,16 +143,14 @@ public void start(AcceptsOneWidget container, EventBus eventBus, Collection<Even
     public void onStop() {
         super.onStop();
         adminContent.setPresenter(null);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
     }
 
     @Override
     public void create() {
         adminContent.setFormBusy(true);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         readFromView();
         requestService.execute(
@@ -176,8 +173,7 @@ public void create() {
     @Override
     public void update() {
         adminContent.setFormBusy(true);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         readFromView();
         requestService.execute(
@@ -197,8 +193,7 @@ public void update() {
     @Override
     public void delete() {
         adminContent.setFormBusy(true);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         requestService.execute(
             requestParams -> {

diff --git a/manager/client/src/main/java/org/openremote/manager/client/admin/agent/AdminAgentImpl.java b/manager/client/src/main/java/org/openremote/manager/client/admin/agent/AdminAgentImpl.java
@@ -28,7 +28,7 @@
 import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.user.client.ui.*;
 import org.openremote.manager.client.i18n.ManagerMessages;
-import org.openremote.manager.client.widget.AttributesFormView;
+import org.openremote.manager.client.widget.AttributesFormViewImpl;
 import org.openremote.manager.client.widget.FormGroup;
 import org.openremote.manager.client.widget.PushButton;
 import org.openremote.manager.shared.attribute.Attributes;
@@ -40,7 +40,7 @@
 import java.util.Arrays;
 import java.util.logging.Logger;
 
-public class AdminAgentImpl extends AttributesFormView implements AdminAgent {
+public class AdminAgentImpl extends AttributesFormViewImpl implements AdminAgent {
 
     private static final Logger LOG = Logger.getLogger(AdminAgentImpl.class.getName());
 

diff --git a/...ger/client/src/main/java/org/openremote/manager/client/admin/agent/AdminAgentsImpl.ui.xml b/...ger/client/src/main/java/org/openremote/manager/client/admin/agent/AdminAgentsImpl.ui.xml
@@ -37,7 +37,7 @@
                         <w:PushButton ui:field="createButton"
                                       addStyleNames="{widgetStyle.FormControl} {themeStyle.FormControl} {widgetStyle.FormButtonPrimary} {themeStyle.FormButtonPrimary} {widgetStyle.PushButton} {themeStyle.PushButton}"
                                       text="{managerMessages.newAgent}"
-                                      icon="gear"/>
+                                      icon="plus-square"/>
                     </w:FormField>
                 </w:field>
             </w:FormGroup>

diff --git a/manager/client/src/main/java/org/openremote/manager/client/admin/tenant/AdminTenant.java b/manager/client/src/main/java/org/openremote/manager/client/admin/tenant/AdminTenant.java
@@ -20,8 +20,9 @@
 package org.openremote.manager.client.admin.tenant;
 
 import org.openremote.manager.client.admin.AdminContent;
+import org.openremote.manager.client.widget.FormView;
 
-public interface AdminTenant extends AdminContent {
+public interface AdminTenant extends AdminContent, FormView {
 
     interface Presenter {
 
@@ -36,16 +37,6 @@ interface Presenter {
 
     void setPresenter(Presenter presenter);
 
-    void setFormBusy(boolean busy);
-
-    void addFormMessageError(String message);
-
-    void addFormMessageSuccess(String message);
-
-    void clearFormMessagesError();
-
-    void clearFormMessagesSuccess();
-
     void setTenantDisplayName(String displayName);
 
     String getTenantDisplayName();

diff --git a/.../client/src/main/java/org/openremote/manager/client/admin/tenant/AdminTenantActivity.java b/.../client/src/main/java/org/openremote/manager/client/admin/tenant/AdminTenantActivity.java
@@ -116,8 +116,7 @@ public void start(AcceptsOneWidget container, EventBus eventBus, Collection<Even
 
         adminContent.setPresenter(this);
 
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         adminContent.enableCreate(false);
         adminContent.enableUpdate(false);
@@ -136,16 +135,14 @@ public void start(AcceptsOneWidget container, EventBus eventBus, Collection<Even
     public void onStop() {
         super.onStop();
         adminContent.setPresenter(null);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
     }
 
     @Override
     public void create() {
         adminContent.setFormBusy(true);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         readFromView();
         requestService.execute(
@@ -168,8 +165,7 @@ public void create() {
     @Override
     public void update() {
         adminContent.setFormBusy(true);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         readFromView();
         requestService.execute(
@@ -190,8 +186,7 @@ public void update() {
     @Override
     public void delete() {
         adminContent.setFormBusy(true);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         requestService.execute(
             requestParams -> {

diff --git a/manager/client/src/main/java/org/openremote/manager/client/admin/tenant/AdminTenantImpl.java b/manager/client/src/main/java/org/openremote/manager/client/admin/tenant/AdminTenantImpl.java
@@ -28,12 +28,12 @@
 import com.google.gwt.user.client.ui.SimpleCheckBox;
 import com.google.gwt.user.client.ui.TextBox;
 import org.openremote.manager.client.widget.FormGroup;
-import org.openremote.manager.client.widget.FormView;
+import org.openremote.manager.client.widget.FormViewImpl;
 import org.openremote.manager.client.widget.PushButton;
 
 import javax.inject.Inject;
 
-public class AdminTenantImpl extends FormView implements AdminTenant {
+public class AdminTenantImpl extends FormViewImpl implements AdminTenant {
 
     interface UI extends UiBinder<HTMLPanel, AdminTenantImpl> {
     }

diff --git a/...r/client/src/main/java/org/openremote/manager/client/admin/tenant/AdminTenantsImpl.ui.xml b/...r/client/src/main/java/org/openremote/manager/client/admin/tenant/AdminTenantsImpl.ui.xml
@@ -33,7 +33,7 @@
                         <w:PushButton ui:field="createButton"
                                       addStyleNames="{widgetStyle.FormControl} {themeStyle.FormControl} {widgetStyle.FormButtonPrimary} {themeStyle.FormButtonPrimary} {widgetStyle.PushButton} {themeStyle.PushButton}"
                                       text="{managerMessages.newTenant}"
-                                      icon="group"/>
+                                      icon="plus-square"/>
                     </w:FormField>
                 </w:field>
             </w:FormGroup>

diff --git a/manager/client/src/main/java/org/openremote/manager/client/admin/users/AdminUser.java b/manager/client/src/main/java/org/openremote/manager/client/admin/users/AdminUser.java
@@ -20,8 +20,9 @@
 package org.openremote.manager.client.admin.users;
 
 import org.openremote.manager.client.admin.AdminContent;
+import org.openremote.manager.client.widget.FormView;
 
-public interface AdminUser extends AdminContent {
+public interface AdminUser extends AdminContent, FormView {
 
     interface Presenter {
 
@@ -38,16 +39,6 @@ interface Presenter {
 
     void setPresenter(Presenter presenter);
 
-    void setFormBusy(boolean busy);
-
-    void addFormMessageError(String message);
-
-    void addFormMessageSuccess(String message);
-
-    void clearFormMessagesError();
-
-    void clearFormMessagesSuccess();
-
     void setUsername(String username);
 
     String getUsername();

diff --git a/...ger/client/src/main/java/org/openremote/manager/client/admin/users/AdminUserActivity.java b/...ger/client/src/main/java/org/openremote/manager/client/admin/users/AdminUserActivity.java
@@ -133,8 +133,7 @@ public void start(AcceptsOneWidget container, EventBus eventBus, Collection<Even
         adminContent.setPresenter(this);
 
         adminContent.clearRoles();
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         adminContent.enableCreate(false);
         adminContent.enableUpdate(false);
@@ -159,8 +158,7 @@ public void onStop() {
         super.onStop();
         adminContent.setPresenter(null);
         adminContent.clearRoles();
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
     }
 
@@ -197,8 +195,7 @@ public void onRoleAssigned(String id, boolean assigned) {
     @Override
     public void create() {
         adminContent.setFormBusy(true);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         readFromView();
         requestService.execute(
@@ -221,8 +218,7 @@ public void create() {
     @Override
     public void update() {
         adminContent.setFormBusy(true);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         readFromView();
         handlePasswordReset();
@@ -290,8 +286,7 @@ protected void updateRoles(Runnable onComplete) {
     @Override
     public void delete() {
         adminContent.setFormBusy(true);
-        adminContent.clearFormMessagesSuccess();
-        adminContent.clearFormMessagesError();
+        adminContent.clearFormMessages();
         clearViewFieldErrors();
         requestService.execute(
             requestParams -> {

diff --git a/manager/client/src/main/java/org/openremote/manager/client/admin/users/AdminUserImpl.java b/manager/client/src/main/java/org/openremote/manager/client/admin/users/AdminUserImpl.java
@@ -27,7 +27,7 @@
 import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.user.client.ui.*;
 import org.openremote.manager.client.widget.FormGroup;
-import org.openremote.manager.client.widget.FormView;
+import org.openremote.manager.client.widget.FormViewImpl;
 import org.openremote.manager.client.widget.PushButton;
 
 import javax.inject.Inject;
@@ -36,7 +36,7 @@
 
 import static com.google.gwt.dom.client.Style.Display.NONE;
 
-public class AdminUserImpl extends FormView implements AdminUser {
+public class AdminUserImpl extends FormViewImpl implements AdminUser {
 
     interface UI extends UiBinder<HTMLPanel, AdminUserImpl> {
     }

diff --git a/manager/client/src/main/java/org/openremote/manager/client/assets/AssetMapper.java b/manager/client/src/main/java/org/openremote/manager/client/assets/AssetMapper.java
@@ -24,9 +24,11 @@
 import org.openremote.manager.client.interop.jackson.DefaultJsonMixin;
 import org.openremote.manager.shared.asset.Asset;
 import org.openremote.manager.shared.http.EntityReader;
+import org.openremote.manager.shared.http.EntityWriter;
 
 @JsonMixIns({@JsonMixIns.JsonMixIn(target = Asset.class, mixIn = DefaultJsonMixin.class)})
 public interface AssetMapper
     extends ObjectMapper<Asset>,
-    EntityReader<Asset> {
+    EntityReader<Asset>,
+    EntityWriter<Asset> {
 }
diff --git a/manager/client/src/main/java/org/openremote/manager/client/assets/AssetsDashboardImpl.ui.xml b/manager/client/src/main/java/org/openremote/manager/client/assets/AssetsDashboardImpl.ui.xml
@@ -30,23 +30,17 @@
                 <g:HTMLPanel
                         styleName="layout horizontal center end-justified {style.assetsControls} {widgetStyle.SecondaryNavHorizontal} {themeStyle.SecondaryNavHorizontal}">
 
-                    <w:Hyperlink
-                            addStyleNames="{style.navItem} {widgetStyle.SecondaryNavItem} {themeStyle.SecondaryNavItem} active"
-                            icon="dashboard"
-                            targetHistoryToken="assets:"
-                            text="Dashboard"/>
-
                     <w:Hyperlink
                             addStyleNames="{style.navItem} {widgetStyle.SecondaryNavItem} {themeStyle.SecondaryNavItem}"
                             icon="edit"
                             targetHistoryToken="assets:"
-                            text="Edit Dashboard"/>
+                            text="{managerMessages.editDashboard}"/>
 
                     <w:Hyperlink
                             addStyleNames="{style.navItem} {widgetStyle.SecondaryNavItem} {themeStyle.SecondaryNavItem}"
-                            icon="copy"
-                            targetHistoryToken="assets:"
-                            text="Copy/Create Asset"/>
+                            icon="plus-square"
+                            targetHistoryToken="asset:"
+                            text="{managerMessages.createAsset}"/>
 
                 </g:HTMLPanel>