eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-04 11:23:50 +00:00
Code Activity

fixes for generics, avoiding warnings

Browse Source
This commit is contained in:
Axel Uhl committed 2012-01-18 17:43:28 +01:00
1 parent f546d6a9d4
commit b678f7a239
3 files changed
+18 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/CollapsableComponentViewer.java
+4 -4
View File
@@ -17,14 +17,14 @@ import com.sap.sailing.gwt.ui.shared.components.ComponentToolbar;
* @author Axel Uhl (d043530)
*
*/
public class CollapsableComponentViewer {
public class CollapsableComponentViewer<SettingsType> {
private final CollapsablePanel disclosurePanel;
private final Component<?> component;
private final Component<SettingsType> component;
private final StringMessages stringMessages;
public CollapsableComponentViewer(Component<?> component, StringMessages stringMessages) {
public CollapsableComponentViewer(Component<SettingsType> component, StringMessages stringMessages) {
this.component = component;
this.stringMessages = stringMessages;
@@ -46,7 +46,7 @@ public class CollapsableComponentViewer {
disclosurePanel.setSize("100%", "100%");
disclosurePanel.setOpen(true);
ComponentToolbar toolbar = new ComponentToolbar(component, stringMessages);
ComponentToolbar<SettingsType> toolbar = new ComponentToolbar<SettingsType>(component, stringMessages);
toolbar.addSettingsButton();
disclosurePanel.setHeaderToolbar(toolbar);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
+10 -18
View File
@@ -11,6 +11,7 @@ import com.sap.sailing.gwt.ui.client.ErrorReporter;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel;
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings;
import com.sap.sailing.gwt.ui.shared.components.Component;
import com.sap.sailing.gwt.ui.shared.components.SettingsDialogComponent;
import com.sap.sailing.server.api.DefaultLeaderboardName;
@@ -25,48 +26,39 @@ public class RaceBoardPanel extends FormPanel implements Component<RaceBoardSett
private String raceBoardName;
private final List<CollapsableComponentViewer> collapsableViewers;
private final List<CollapsableComponentViewer<?>> collapsableViewers;
public RaceBoardPanel(SailingServiceAsync sailingService, String raceBoardName, ErrorReporter errorReporter,
final StringMessages stringMessages) {
this.sailingService = sailingService;
this.setRaceBoardName(raceBoardName);
this.errorReporter = errorReporter;
// this.stringMessages = stringMessages;
VerticalPanel mainPanel = new VerticalPanel();
mainPanel.setSize("100%", "100%");
setWidget(mainPanel);
collapsableViewers = new ArrayList<CollapsableComponentViewer>();
for(int i = 0; i < 4; i++)
{
if(i == 0)
{
collapsableViewers = new ArrayList<CollapsableComponentViewer<?>>();
for(int i = 0; i < 4; i++) {
if(i == 0) {
CompetitorSelectionModel competitorSelectionModel = new CompetitorSelectionModel(/* hasMultiSelection */ true);
//final RaceMapPanel raceMapPanel = new RaceMapPanel(sailingService, competitorSelectionModel, this, this, stringMessages);
LeaderboardPanel defaultLeaderboardPanel = new LeaderboardPanel(sailingService, competitorSelectionModel,
DefaultLeaderboardName.DEFAULT_LEADERBOARD_NAME, errorReporter, stringMessages);
CollapsableComponentViewer viewer = new CollapsableComponentViewer(defaultLeaderboardPanel, stringMessages);
CollapsableComponentViewer<LeaderboardSettings> viewer = new CollapsableComponentViewer<LeaderboardSettings>(
defaultLeaderboardPanel, stringMessages);
collapsableViewers.add(viewer);
}
else
{
} else {
SimpleComponentGroup<Object> componentGroup = new SimpleComponentGroup<Object>("Component Group " + i);
componentGroup.addComponent(new SimpleComponent("My Component"));
componentGroup.addComponent(new SimpleComponent("My Component 2"));
componentGroup.addComponent(new SimpleComponent("My Component 3"));
//LeaderboardPanel leaderboardPanel = LeaderboardPanel();
CollapsableComponentViewer viewer = new CollapsableComponentViewer(componentGroup, stringMessages);
CollapsableComponentViewer<Object> viewer = new CollapsableComponentViewer<Object>(componentGroup, stringMessages);
collapsableViewers.add(viewer);
}
}
for (CollapsableComponentViewer viewer : collapsableViewers) {
for (CollapsableComponentViewer<?> viewer : collapsableViewers) {
mainPanel.add(viewer.getViewerWidget());
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/ComponentToolbar.java
+4 -4
View File
@@ -9,14 +9,14 @@ import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class ComponentToolbar extends HorizontalPanel {
public class ComponentToolbar<SettingsType> extends HorizontalPanel {
private static ComponentResources resources = GWT.create(ComponentResources.class);
private final Component<?> component;
private final Component<SettingsType> component;
final StringMessages stringMessages;
public ComponentToolbar(final Component<?> component, final StringMessages stringMessages) {
public ComponentToolbar(final Component<SettingsType> component, final StringMessages stringMessages) {
super();
this.setSpacing(10);
@@ -32,7 +32,7 @@ public class ComponentToolbar extends HorizontalPanel {
showConfigAnchor.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
new SettingsDialog(component, stringMessages).show();
new SettingsDialog<SettingsType>(component, stringMessages).show();
}
});