From 5d77e62c750634db7c476f1411effca653a60bf8 Mon Sep 17 00:00:00 2001 From: vchizhevsky Date: Thu, 21 Jul 2016 10:19:29 +0300 Subject: [PATCH] KAA-1146: Admin-ui small fixed --- .../client/mvp/activity/EcfActivity.java | 6 +++--- .../mvp/activity/EcfSchemaActivity.java | 18 ++++++++--------- .../admin/client/mvp/data/DataSource.java | 4 ++-- .../mvp/data/EcfSchemasDataProvider.java | 16 +++++++-------- .../server/admin/client/mvp/view/EcfView.java | 4 ++-- .../client/mvp/view/event/EcfSchemasGrid.java | 20 +++++++++---------- .../client/mvp/view/event/EcfViewImpl.java | 4 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfActivity.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfActivity.java index dec07880a9..2f26dad725 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfActivity.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfActivity.java @@ -21,7 +21,7 @@ import org.kaaproject.avro.ui.gwt.client.widget.grid.event.RowActionEvent; import org.kaaproject.avro.ui.gwt.client.widget.grid.event.RowActionEventHandler; import org.kaaproject.kaa.common.dto.event.EventClassFamilyDto; -import org.kaaproject.kaa.common.dto.event.EventSchemaVersionDto; +import org.kaaproject.kaa.common.dto.event.EventClassFamilyVersionDto; import org.kaaproject.kaa.server.admin.client.KaaAdmin; import org.kaaproject.kaa.server.admin.client.mvp.ClientFactory; import org.kaaproject.kaa.server.admin.client.mvp.data.EcfSchemasDataProvider; @@ -51,7 +51,7 @@ public EcfActivity(EcfPlace place, public void start(AcceptsOneWidget containerWidget, EventBus eventBus) { super.start(containerWidget, eventBus); if (!create) { - AbstractGrid ecfSchemasGrid = detailsView.getEcfSchemasGrid(); + AbstractGrid ecfSchemasGrid = detailsView.getEcfSchemasGrid(); ecfSchemasDataProvider = new EcfSchemasDataProvider(ecfSchemasGrid, detailsView); } } @@ -107,7 +107,7 @@ protected void onEntityRetrieved() { detailsView.getCreatedUsername().setValue(entity.getCreatedUsername()); detailsView.getCreatedDateTime().setValue(Utils.millisecondsToDateTimeString(entity.getCreatedTime())); if (!create) { - ecfSchemasDataProvider.setSchemas(entity.getSchemas()); + //ecfSchemasDataProvider.setSchemas(entity.getSchemas()); ecfSchemasDataProvider.reload(); } } diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfSchemaActivity.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfSchemaActivity.java index 8eb5e2f23c..e879aa2565 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfSchemaActivity.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfSchemaActivity.java @@ -19,7 +19,7 @@ import org.kaaproject.avro.ui.gwt.client.util.BusyAsyncCallback; import org.kaaproject.avro.ui.shared.RecordField; import org.kaaproject.kaa.common.dto.event.EventClassFamilyDto; -import org.kaaproject.kaa.common.dto.event.EventSchemaVersionDto; +import org.kaaproject.kaa.common.dto.event.EventClassFamilyVersionDto; import org.kaaproject.kaa.server.admin.client.KaaAdmin; import org.kaaproject.kaa.server.admin.client.mvp.ClientFactory; import org.kaaproject.kaa.server.admin.client.mvp.place.EcfSchemaPlace; @@ -87,17 +87,17 @@ public void onFailureImpl(Throwable caught) { }); detailsView.getEcfSchemaForm().setFormDataLoader(this); } else { - EventSchemaVersionDto schema = null; - for (EventSchemaVersionDto schemaVersion : entity.getSchemas()) { - if (schemaVersion.getVersion()==place.getVersion()) { - schema = schemaVersion; - break; - } - } + EventClassFamilyVersionDto schema = null; +// for (EventClassFamilyVersionDto schemaVersion : entity.getSchemas()) { +// if (schemaVersion.getVersion()==place.getVersion()) { +// schema = schemaVersion; +// break; +// } +// } detailsView.getVersion().setValue(""+schema.getVersion()); detailsView.getCreatedUsername().setValue(schema.getCreatedUsername()); detailsView.getCreatedDateTime().setValue(Utils.millisecondsToDateTimeString(schema.getCreatedTime())); - detailsView.getEcfSchemaForm().setValue(schema.getSchemaForm()); +// detailsView.getEcfSchemaForm().setValue(schema.getSchemaForm()); } } diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/DataSource.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/DataSource.java index b7ae44caef..4500e7bae3 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/DataSource.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/DataSource.java @@ -53,7 +53,7 @@ import org.kaaproject.kaa.common.dto.event.EventClassDto; import org.kaaproject.kaa.common.dto.event.EventClassFamilyDto; import org.kaaproject.kaa.common.dto.event.EventClassType; -import org.kaaproject.kaa.common.dto.event.EventSchemaVersionDto; +import org.kaaproject.kaa.common.dto.event.EventClassFamilyVersionDto; import org.kaaproject.kaa.common.dto.logs.LogAppenderDto; import org.kaaproject.kaa.common.dto.logs.LogSchemaDto; import org.kaaproject.kaa.common.dto.user.UserVerifierDto; @@ -490,7 +490,7 @@ public void addEcfSchema(String ecfId, RecordField schemaForm, new DataCallback(callback) { @Override protected void onResult(Void result) { - eventBus.fireEvent(new DataEvent(EventSchemaVersionDto.class)); + eventBus.fireEvent(new DataEvent(EventClassFamilyVersionDto.class)); } }); } diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/EcfSchemasDataProvider.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/EcfSchemasDataProvider.java index 2a9725f5d4..8edcdef81a 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/EcfSchemasDataProvider.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/EcfSchemasDataProvider.java @@ -22,27 +22,27 @@ import java.util.List; import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid; -import org.kaaproject.kaa.common.dto.event.EventSchemaVersionDto; +import org.kaaproject.kaa.common.dto.event.EventClassFamilyVersionDto; import org.kaaproject.kaa.server.admin.client.mvp.activity.grid.AbstractDataProvider; import org.kaaproject.kaa.server.admin.client.util.HasErrorMessage; -public class EcfSchemasDataProvider extends AbstractDataProvider{ +public class EcfSchemasDataProvider extends AbstractDataProvider{ - private List schemas = new ArrayList<>(); + private List schemas = new ArrayList<>(); - public EcfSchemasDataProvider(AbstractGrid dataGrid, + public EcfSchemasDataProvider(AbstractGrid dataGrid, HasErrorMessage hasErrorMessage) { super(dataGrid, hasErrorMessage); } - public void setSchemas(List schemas) { + public void setSchemas(List schemas) { this.schemas.clear(); if (schemas != null) { this.schemas.addAll(schemas); - Collections.sort(schemas, new Comparator() { + Collections.sort(schemas, new Comparator() { @Override - public int compare(EventSchemaVersionDto o1, - EventSchemaVersionDto o2) { + public int compare(EventClassFamilyVersionDto o1, + EventClassFamilyVersionDto o2) { return o1.getVersion() - o2.getVersion(); } }); diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/EcfView.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/EcfView.java index 0b9b08397f..26910b2e63 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/EcfView.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/EcfView.java @@ -17,7 +17,7 @@ package org.kaaproject.kaa.server.admin.client.mvp.view; import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid; -import org.kaaproject.kaa.common.dto.event.EventSchemaVersionDto; +import org.kaaproject.kaa.common.dto.event.EventClassFamilyVersionDto; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.user.client.ui.HasValue; @@ -36,7 +36,7 @@ public interface EcfView extends BaseDetailsView { public HasValue getCreatedDateTime(); - public AbstractGrid getEcfSchemasGrid(); + public AbstractGrid getEcfSchemasGrid(); public HasClickHandlers getAddEcfSchemaButton(); diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/event/EcfSchemasGrid.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/event/EcfSchemasGrid.java index 2efa8fe54c..ba59a58180 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/event/EcfSchemasGrid.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/event/EcfSchemasGrid.java @@ -16,46 +16,46 @@ package org.kaaproject.kaa.server.admin.client.mvp.view.event; -import org.kaaproject.kaa.common.dto.event.EventSchemaVersionDto; +import org.kaaproject.kaa.common.dto.event.EventClassFamilyVersionDto; import org.kaaproject.kaa.server.admin.client.mvp.view.grid.AbstractKaaGrid; import org.kaaproject.kaa.server.admin.client.util.Utils; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.cellview.client.DataGrid; -public class EcfSchemasGrid extends AbstractKaaGrid { +public class EcfSchemasGrid extends AbstractKaaGrid { public EcfSchemasGrid() { super(Unit.PX, false, true); } @Override - protected float constructColumnsImpl(DataGrid table) { + protected float constructColumnsImpl(DataGrid table) { float prefWidth = 0; prefWidth += constructStringColumn(table, Utils.constants.schemaVersion(), - new StringValueProvider() { + new StringValueProvider() { @Override - public String getValue(EventSchemaVersionDto item) { + public String getValue(EventClassFamilyVersionDto item) { return item.getVersion() + ""; } }, 80); prefWidth += constructStringColumn(table, Utils.constants.author(), - new StringValueProvider() { + new StringValueProvider() { @Override - public String getValue(EventSchemaVersionDto item) { + public String getValue(EventClassFamilyVersionDto item) { return item.getCreatedUsername(); } }, 80); prefWidth += constructStringColumn(table, Utils.constants.dateCreated(), - new StringValueProvider() { + new StringValueProvider() { @Override - public String getValue(EventSchemaVersionDto item) { + public String getValue(EventClassFamilyVersionDto item) { return Utils.millisecondsToDateString(item.getCreatedTime()); } }, 80); @@ -64,7 +64,7 @@ public String getValue(EventSchemaVersionDto item) { } @Override - protected Integer getObjectId(EventSchemaVersionDto value) { + protected Integer getObjectId(EventClassFamilyVersionDto value) { if (value != null) { return value.getVersion(); } else { diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/event/EcfViewImpl.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/event/EcfViewImpl.java index 0039846092..e36926a96c 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/event/EcfViewImpl.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/event/EcfViewImpl.java @@ -19,7 +19,7 @@ import org.kaaproject.avro.ui.gwt.client.widget.SizedTextArea; import org.kaaproject.avro.ui.gwt.client.widget.SizedTextBox; import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid; -import org.kaaproject.kaa.common.dto.event.EventSchemaVersionDto; +import org.kaaproject.kaa.common.dto.event.EventClassFamilyVersionDto; import org.kaaproject.kaa.server.admin.client.mvp.view.EcfView; import org.kaaproject.kaa.server.admin.client.mvp.view.base.BaseDetailsViewImpl; import org.kaaproject.kaa.server.admin.client.mvp.view.widget.KaaAdminSizedTextBox; @@ -80,7 +80,7 @@ public HasValue getCreatedDateTime() { } @Override - public AbstractGrid getEcfSchemasGrid() { + public AbstractGrid getEcfSchemasGrid() { return ecfSchemasGrid; }