Mercurial > dive4elements > river
diff gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixationPanel.java @ 9256:6c24c857ccf9
fixation refactoring and inputItem behaviour to interfaces
author | gernotbelger |
---|---|
date | Fri, 13 Jul 2018 12:04:21 +0200 |
parents | 9be51f776798 |
children | 1a7cfeb1ff89 |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixationPanel.java Fri Jul 13 11:56:22 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixationPanel.java Fri Jul 13 12:04:21 2018 +0200 @@ -17,7 +17,6 @@ import org.dive4elements.river.client.client.services.FixingsOverviewServiceAsync; import org.dive4elements.river.client.client.ui.AbstractUIProvider; import org.dive4elements.river.client.shared.model.AbstractFixBunduArtifact; -import org.dive4elements.river.client.shared.model.Data; import org.dive4elements.river.client.shared.model.DataList; import org.dive4elements.river.client.shared.model.FixFilter; import org.dive4elements.river.client.shared.model.FixingsOverviewInfo; @@ -61,20 +60,20 @@ protected static HashMap<String, FixationPanel> instances = new HashMap<String, FixationPanel>(); /** The message class that provides i18n strings. */ - protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class); - - protected FixingsOverviewServiceAsync overviewService = GWT.create(FixingsOverviewService.class); + private final FLYSConstants MESSAGES = GWT.create(FLYSConstants.class); - protected String htmlOverview; - protected FixingsOverviewInfo fixInfo; - protected TabSet tabs; - protected Tab events; - protected Tab chart; - protected VLayout chartContainer; - protected Img chartImg; - protected TextItem kmText; + private final FixingsOverviewServiceAsync overviewService = GWT.create(FixingsOverviewService.class); - public static final DateTimeFormat DTF = DateTimeFormat.getFormat("dd.MM.yyyy"); + private String htmlOverview; + private FixingsOverviewInfo fixInfo; + private TabSet tabs; + private Tab events; + private Tab chart; + private VLayout chartContainer; + private Img chartImg; + private TextItem kmText; + + private static final DateTimeFormat DTF = DateTimeFormat.getFormat("dd.MM.yyyy"); public FixationPanel() { this.chartImg = new Img(); @@ -82,20 +81,12 @@ } /** Get the (master) artifact UUID. */ - protected String getArtifactUuid() { + private String getArtifactUuid() { return this.artifact.getUuid(); } - protected void init() { - } - @Override - public Data[] getData() { - return null; - } - - @Override - public Canvas create(final DataList list) { + public final Canvas create(final DataList list) { final VLayout layout = new VLayout(); final Canvas helper = createHelper(); @@ -109,12 +100,7 @@ return layout; } - @Override - public Canvas createOld(final DataList list) { - return new DynamicForm(); - } - - protected Canvas createHelper() { + private Canvas createHelper() { final Config config = Config.getInstance(); final String locale = config.getLocale(); @@ -134,7 +120,7 @@ final HTMLPane eventPane = new HTMLPane(); - final String river = this.artifact.getArtifactDescription().getRiver(); + // final String river = this.artifact.getArtifactDescription().getRiver(); createCallback(); final String callBack = "fixationCallback(this.checked, this.name)"; @@ -177,7 +163,7 @@ eventPane.setContents(FixationPanel.this.htmlOverview); updateChartTab(FixationPanel.this.fixInfo.getLowerKm()); FixationPanel.this.events.setPane(eventPane); - success(); + success(FixationPanel.this.fixInfo); } }); @@ -187,7 +173,7 @@ return this.tabs; } - protected Canvas createChartHelper() { + private Canvas createChartHelper() { final DynamicForm form = new DynamicForm(); final Button lower = new Button("<<"); lower.setWidth(30); @@ -255,7 +241,7 @@ return layout; } - protected void updateChartTab(double km) { + private void updateChartTab(double km) { final Config config = Config.getInstance(); final String locale = config.getLocale(); @@ -302,7 +288,7 @@ } } - protected FixFilter updateChartTabLow() { + private FixFilter updateChartTabLow() { final AbstractFixBunduArtifact art = (AbstractFixBunduArtifact) this.artifact; final FixFilter filter = art.getFilter(); @@ -316,7 +302,7 @@ return filter; } - protected FixFilter updateChartTabUp() { + private FixFilter updateChartTabUp() { final AbstractFixBunduArtifact art = (AbstractFixBunduArtifact) this.artifact; final FixFilter filter = art.getFilter(); @@ -331,7 +317,7 @@ } @Override - public void onResized(final ResizedEvent re) { + public final void onResized(final ResizedEvent re) { final AbstractFixBunduArtifact art = (AbstractFixBunduArtifact) this.artifact; updateChartTab(art.getFilter().getCurrentKm()); @@ -356,16 +342,16 @@ return instances.get(uuid); } - public abstract Canvas createWidget(DataList data); + protected abstract Canvas createWidget(DataList data); - public abstract void setValues(String cid, boolean checked); + protected abstract void setValues(String cid, boolean checked); - public abstract boolean renderCheckboxes(); + protected abstract boolean renderCheckboxes(); - public abstract void success(); + protected abstract void success(FixingsOverviewInfo fixInfo); /** Creates JSON string from filter. */ - public static String getOverviewFilter(final FixFilter filter) { + private static String getOverviewFilter(final FixFilter filter) { final String river = filter.getRiver(); if (river != null && river.length() > 0) { @@ -381,7 +367,7 @@ return ""; } - public String getChartFilter(final FixFilter filter, final int width, final int height) { + private String getChartFilter(final FixFilter filter, final int width, final int height) { final String river = filter.getRiver(); final double currentKm = filter.getCurrentKm(); final double fromKm = filter.getLowerKm(); @@ -411,7 +397,7 @@ return ""; } - protected static JSONObject createFilter(final FixFilter filter, final JSONObject root) { + private static JSONObject createFilter(final FixFilter filter, final JSONObject root) { final double fromKm = filter.getLowerKm(); final double toKm = filter.getUpperKm(); final boolean hasDate = filter.hasDate(); @@ -477,5 +463,4 @@ } return root; } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : +} \ No newline at end of file