commented conflicts

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<EventSchemaVersionDto, Integer> ecfSchemasGrid = detailsView.getEcfSchemasGrid();
+            AbstractGrid<EventClassFamilyVersionDto, Integer> 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();
         }
     }

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());
         }
     }
 

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;
@@ -465,13 +465,13 @@ private void refreshEcfs() {
 
     public void editEcf(EventClassFamilyDto ecf,
             final AsyncCallback<EventClassFamilyDto> callback) {
-        rpcService.editEventClassFamily(ecf,
-                new DataCallback<EventClassFamilyDto>(callback) {
-                    @Override
-                    protected void onResult(EventClassFamilyDto result) {
-                        refreshEcfs();
-                    }
-                });
+//        rpcService.editEventClassFamily(ecf,
+//                new DataCallback<EventClassFamilyDto>(callback) {
+//                    @Override
+//                    protected void onResult(EventClassFamilyDto result) {
+//                        refreshEcfs();
+//                    }
+//                });
     }
 
     public void getEcf(String ecfId,
@@ -490,7 +490,7 @@ public void addEcfSchema(String ecfId, RecordField schemaForm,
                 new DataCallback<Void>(callback) {
                     @Override
                     protected void onResult(Void result) {
-                        eventBus.fireEvent(new DataEvent(EventSchemaVersionDto.class));
+                        eventBus.fireEvent(new DataEvent(EventClassFamilyVersionDto.class));
                     }
                 });
     }

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<EventSchemaVersionDto, Integer>{
+public class EcfSchemasDataProvider extends AbstractDataProvider<EventClassFamilyVersionDto, Integer>{
 
-    private List<EventSchemaVersionDto> schemas = new ArrayList<>();
+    private List<EventClassFamilyVersionDto> schemas = new ArrayList<>();
 
-    public EcfSchemasDataProvider(AbstractGrid<EventSchemaVersionDto, Integer> dataGrid,
+    public EcfSchemasDataProvider(AbstractGrid<EventClassFamilyVersionDto, Integer> dataGrid,
                                   HasErrorMessage hasErrorMessage) {
         super(dataGrid, hasErrorMessage);
     }
 
-    public void setSchemas(List<EventSchemaVersionDto> schemas) {
+    public void setSchemas(List<EventClassFamilyVersionDto> schemas) {
         this.schemas.clear();
         if (schemas != null) {
             this.schemas.addAll(schemas);
-            Collections.sort(schemas, new Comparator<EventSchemaVersionDto>() {
+            Collections.sort(schemas, new Comparator<EventClassFamilyVersionDto>() {
                 @Override
-                public int compare(EventSchemaVersionDto o1,
-                        EventSchemaVersionDto o2) {
+                public int compare(EventClassFamilyVersionDto o1,
+                        EventClassFamilyVersionDto o2) {
                     return o1.getVersion() - o2.getVersion();
                 }
             });

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<String> getCreatedDateTime();
 
-    public AbstractGrid<EventSchemaVersionDto, Integer> getEcfSchemasGrid();
+    public AbstractGrid<EventClassFamilyVersionDto, Integer> getEcfSchemasGrid();
 
     public HasClickHandlers getAddEcfSchemaButton();
 

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<EventSchemaVersionDto, Integer> {
+public class EcfSchemasGrid extends AbstractKaaGrid<EventClassFamilyVersionDto, Integer> {
 
     public EcfSchemasGrid() {
         super(Unit.PX, false, true);
     }
 
     @Override
-    protected float constructColumnsImpl(DataGrid<EventSchemaVersionDto> table) {
+    protected float constructColumnsImpl(DataGrid<EventClassFamilyVersionDto> table) {
         float prefWidth = 0;
 
         prefWidth += constructStringColumn(table,
                 Utils.constants.schemaVersion(),
-                new StringValueProvider<EventSchemaVersionDto>() {
+                new StringValueProvider<EventClassFamilyVersionDto>() {
                     @Override
-                    public String getValue(EventSchemaVersionDto item) {
+                    public String getValue(EventClassFamilyVersionDto item) {
                         return item.getVersion() + "";
                     }
                 }, 80);
 
         prefWidth += constructStringColumn(table,
                 Utils.constants.author(),
-                new StringValueProvider<EventSchemaVersionDto>() {
+                new StringValueProvider<EventClassFamilyVersionDto>() {
                     @Override
-                    public String getValue(EventSchemaVersionDto item) {
+                    public String getValue(EventClassFamilyVersionDto item) {
                         return item.getCreatedUsername();
                     }
                 }, 80);
 
         prefWidth += constructStringColumn(table,
                 Utils.constants.dateCreated(),
-                new StringValueProvider<EventSchemaVersionDto>() {
+                new StringValueProvider<EventClassFamilyVersionDto>() {
                     @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 {

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<String> getCreatedDateTime() {
     }
 
     @Override
-    public AbstractGrid<EventSchemaVersionDto, Integer> getEcfSchemasGrid() {
+    public AbstractGrid<EventClassFamilyVersionDto, Integer> getEcfSchemasGrid() {
         return ecfSchemasGrid;
     }