Alexander Wels has uploaded a new change for review.
Change subject: webadmin: readonly label editors
......................................................................
webadmin: readonly label editors
- Modified readonly label editors to not use a parser as they
are readonly. This fixes potential issues different locales
as the values in different locales will not properly parse
back into their original values.
Change-Id: I5d485f40d574df26ab4b4a0f6f60679e2c2b2506
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ManageGlusterSwiftPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/BrickAdvancedDetailsPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
4 files changed, 5 insertions(+), 54 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/34615/1
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java
index e18ac14..320acde 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java
@@ -1,6 +1,5 @@
package org.ovirt.engine.ui.webadmin.section.main.view.popup.cluster;
-import com.google.gwt.text.shared.Parser;
import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookStatus;
import org.ovirt.engine.core.common.businessentities.gluster.GlusterServerHook;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
@@ -9,10 +8,10 @@
import org.ovirt.engine.ui.common.widget.Align;
import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel;
import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable;
+import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor;
import
org.ovirt.engine.ui.common.widget.editor.generic.EntityModelCheckBoxEditor;
import org.ovirt.engine.ui.common.widget.editor.generic.EntityModelLabelEditor;
import
org.ovirt.engine.ui.common.widget.editor.generic.EntityModelRadioButtonEditor;
-import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor;
import
org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelLabelEditor;
import
org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextAreaLabelEditor;
import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer;
@@ -34,8 +33,6 @@
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.inject.Inject;
-
-import java.text.ParseException;
public class GlusterHookResolveConflictsPopupView extends
AbstractModelBoundPopupView<GlusterHookResolveConflictsModel> implements
GlusterHookResolveConflictsPopupPresenterWidget.ViewDef {
@@ -183,17 +180,7 @@
private void initEditors() {
contentSourcesTable = new EntityModelCellTable<ListModel>(false, true);
- statusEditor = new EntityModelLabelEditor<GlusterHookStatus>(new
EnumRenderer<GlusterHookStatus>(), new Parser<GlusterHookStatus>() {
- @Override
- public GlusterHookStatus parse(CharSequence text) throws
ParseException {
- if(text == null || text.toString().isEmpty()) {
- return null;
- }
- else {
- return
GlusterHookStatus.valueOf(text.toString().toUpperCase());
- }
- }
- });
+ statusEditor = new EntityModelLabelEditor<GlusterHookStatus>(new
EnumRenderer<GlusterHookStatus>());
resolveContentConflict = new EntityModelCheckBoxEditor(Align.RIGHT);
useContentSourceEditor = new
ListModelListBoxEditor<GlusterServerHook>(new
NullSafeRenderer<GlusterServerHook>() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ManageGlusterSwiftPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ManageGlusterSwiftPopupView.java
index 33bb5da..44285b5 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ManageGlusterSwiftPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ManageGlusterSwiftPopupView.java
@@ -1,10 +1,8 @@
package org.ovirt.engine.ui.webadmin.section.main.view.popup.cluster;
-import com.google.gwt.text.shared.Parser;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterServerService;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterServiceStatus;
import org.ovirt.engine.core.common.businessentities.gluster.ServiceType;
-import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView;
import org.ovirt.engine.ui.common.widget.Align;
@@ -37,8 +35,6 @@
import com.google.gwt.user.cellview.client.Column;
import com.google.gwt.user.client.ui.Label;
import com.google.inject.Inject;
-
-import java.text.ParseException;
public class ManageGlusterSwiftPopupView extends
AbstractModelBoundPopupView<ManageGlusterSwiftModel> implements
ManageGlusterSwiftPopupPresenterWidget.ViewDef {
@@ -98,15 +94,7 @@
}
private void initEditors(ApplicationConstants constants) {
- swiftStatusEditor = new
EntityModelLabelEditor<GlusterServiceStatus>(new
EnumRenderer<GlusterServiceStatus>(), new Parser<GlusterServiceStatus>() {
- @Override
- public GlusterServiceStatus parse(CharSequence text) throws
ParseException {
- if (StringHelper.isNullOrEmpty(text.toString())) {
- return null;
- }
- return
GlusterServiceStatus.valueOf(text.toString().toUpperCase());
- }
- });
+ swiftStatusEditor = new
EntityModelLabelEditor<GlusterServiceStatus>(new
EnumRenderer<GlusterServiceStatus>());
startSwift = new EntityModelRadioButtonEditor("swift_action",
Align.RIGHT); //$NON-NLS-1$
stopSwift = new EntityModelRadioButtonEditor("swift_action",
Align.RIGHT); //$NON-NLS-1$
restartSwift = new EntityModelRadioButtonEditor("swift_action",
Align.RIGHT); //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/BrickAdvancedDetailsPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/BrickAdvancedDetailsPopupView.java
index 9791546..f7aa714 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/BrickAdvancedDetailsPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/BrickAdvancedDetailsPopupView.java
@@ -1,10 +1,8 @@
package org.ovirt.engine.ui.webadmin.section.main.view.popup.gluster;
-import com.google.gwt.text.shared.Parser;
import org.ovirt.engine.core.common.businessentities.gluster.GlusterClientInfo;
import org.ovirt.engine.core.common.businessentities.gluster.GlusterStatus;
import org.ovirt.engine.core.common.businessentities.gluster.Mempool;
-import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.idhandler.WithElementId;
import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView;
@@ -32,8 +30,6 @@
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Label;
import com.google.inject.Inject;
-
-import java.text.ParseException;
public class BrickAdvancedDetailsPopupView extends
AbstractModelBoundPopupView<BrickAdvancedDetailsModel> implements
BrickAdvancedDetailsPopupPresenterWidget.ViewDef {
@@ -196,15 +192,7 @@
}
private void initEditors() {
- statusEditor = new EntityModelLabelEditor<GlusterStatus>(new
EnumRenderer<GlusterStatus>(), new Parser<GlusterStatus>() {
- @Override
- public GlusterStatus parse(CharSequence text) throws
ParseException {
- if (StringHelper.isNullOrEmpty(text.toString())) {
- return null;
- }
- return GlusterStatus.valueOf(text.toString().toUpperCase());
- }
- });
+ statusEditor = new EntityModelLabelEditor<GlusterStatus>(new
EnumRenderer<GlusterStatus>());
clientsTable = new EntityModelCellTable<ListModel>(false, true);
memoryPoolsTable = new EntityModelCellTable<ListModel>(false, true);
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
index 02f906d..c64ce9c 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
@@ -1,10 +1,7 @@
package org.ovirt.engine.ui.webadmin.section.main.view.popup.gluster;
-import java.text.ParseException;
import java.util.Date;
-import com.google.gwt.text.shared.AbstractRenderer;
-import com.google.gwt.text.shared.Parser;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeTaskStatusForHost;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.idhandler.WithElementId;
@@ -31,6 +28,7 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.editor.client.SimpleBeanEditorDriver;
import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.text.shared.AbstractRenderer;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Label;
@@ -232,16 +230,6 @@
return constants.unAvailablePropertyLabel();
}
return
GlusterRebalanceDateTimeRenderer.getLocalizedDateTimeFormat().format(entity);
- }
- }, new Parser<Date>() {
- @Override
- public Date parse(CharSequence text) throws ParseException {
- if(text == null || text.toString().isEmpty()) {
- return null;
- }
- else {
- return new Date(Date.parse(text.toString()));
- }
}
});
}
--
To view, visit http://gerrit.ovirt.org/34615
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d485f40d574df26ab4b4a0f6f60679e2c2b2506
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
