Skip to content

Commit

Permalink
commented conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@nocs00
nocs00 committed Jul 21, 2016
1 parent c0710b4 commit e8f8d3f
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 43 deletions.
6 changes: 3 additions & 3 deletions ...r/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfActivity.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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();
}
}
Expand Down
18 changes: 9 additions & 9 deletions .../src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfSchemaActivity.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
}

Expand Down
18 changes: 9 additions & 9 deletions server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/DataSource.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand All @@ -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));
}
});
}
Expand Down
16 changes: 8 additions & 8 deletions ...src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/EcfSchemasDataProvider.java
View file
Expand Up @@ -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();
}
});
Expand Down
4 changes: 2 additions & 2 deletions server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/EcfView.java
View file
Expand Up @@ -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;
Expand All @@ -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();

Expand Down
20 changes: 10 additions & 10 deletions ...e/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/event/EcfSchemasGrid.java
View file
Expand Up @@ -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);
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/event/EcfViewImpl.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -80,7 +80,7 @@ public HasValue<String> getCreatedDateTime() {
}

@Override
public AbstractGrid<EventSchemaVersionDto, Integer> getEcfSchemasGrid() {
public AbstractGrid<EventClassFamilyVersionDto, Integer> getEcfSchemasGrid() {
return ecfSchemasGrid;
}

Expand Down

0 comments on commit e8f8d3f

Please sign in to comment.