Merge branch 'gwt' of ssh://kielweek.web4sap.com/home/trac/git into gwt

This commit is contained in:
Marcus Kammer committed 2012-02-06 11:42:10 +01:00
commit 8138a78141
12 files changed
+7 -54

No files matched your search

@@ -10,11 +10,6 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.tractracadapter,
com.sap.sailing.mongodb,
com.mongodb.driver;bundle-version="2.6.2",
com.sap.ui5.commons,
com.sap.ui5.core,
com.sap.ui5.resource,
com.sap.ui5.gwt.commons,
com.sap.ui5.gwt.core,
com.sap.sailing.domain.swisstimingadapter,
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.swisstimingadapter.persistence,
@@ -114,7 +114,7 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
return;
}
createRaceBoardPanel(selectedRace, events, leaderboardGroup);
createRaceBoardPanel(selectedRace, events);
}
private RaceDTO findRace(String eventName, String raceName, List<EventDTO> events) {
@@ -132,13 +132,13 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
return null;
}
private void createRaceBoardPanel(RaceDTO selectedRace, List<EventDTO> events, LeaderboardGroupDTO leaderboardGroup) {
private void createRaceBoardPanel(RaceDTO selectedRace, List<EventDTO> events) {
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(stringMessages);
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
RaceSelectionModel raceSelectionModel = new RaceSelectionModel();
List<RaceIdentifier> singletonList = Collections.singletonList(selectedRace.getRaceIdentifier());
raceSelectionModel.setSelection(singletonList);
raceBoardPanel = new RaceBoardPanel(sailingService, raceSelectionModel, leaderboardName, leaderboardGroup.name,
raceBoardPanel = new RaceBoardPanel(sailingService, raceSelectionModel, leaderboardName, leaderboardGroupName,
RaceBoardEntryPoint.this, stringMessages);
raceBoardPanel.fillEvents(events);
@@ -21,9 +21,6 @@
<inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
<inherits name='ca.nanometrics.gflot.GFlot'/>
<!-- Phoenix Stuff -->
<inherits name='com.sap.ui.commons.Module' />
<inherits name="com.google.gwt.resources.Resources" />
<inherits name="com.google.gwt.logging.Logging"/>
@@ -22,9 +22,6 @@
<inherits name='ca.nanometrics.gflot.GFlot'/>
<inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
<!-- Phoenix Stuff -->
<inherits name='com.sap.ui.commons.Module' />
<!-- Other module inherits -->
<inherits name="com.sap.sailing.domain.SailingDomain" />
@@ -21,9 +21,6 @@
<inherits name='ca.nanometrics.gflot.GFlot'/>
<inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
<!-- Phoenix Stuff -->
<inherits name='com.sap.ui.commons.Module' />
<!-- Other module inherits -->
<inherits name="com.sap.sailing.domain.SailingDomain" />
@@ -22,9 +22,6 @@
<inherits name='ca.nanometrics.gflot.GFlot'/>
<inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
<!-- Phoenix Stuff -->
<inherits name='com.sap.ui.commons.Module' />
<!-- Other module inherits -->
<inherits name="com.sap.sailing.domain.SailingDomain" />
@@ -22,9 +22,6 @@
<inherits name='ca.nanometrics.gflot.GFlot'/>
<inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
<!-- Phoenix Stuff -->
<inherits name='com.sap.ui.commons.Module' />
<inherits name="com.google.gwt.resources.Resources" />
<!-- Other module inherits -->
@@ -21,9 +21,6 @@
<inherits name='ca.nanometrics.gflot.GFlot'/>
<inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
<!-- Phoenix Stuff -->
<inherits name='com.sap.ui.commons.Module' />
<!-- Other module inherits -->
<inherits name="com.sap.sailing.domain.SailingDomain" />
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.6"?>
<target name="Race Analysis Target (IDE external)" sequenceNumber="49">
<target name="Race Analysis Target (IDE external)" sequenceNumber="50">
<locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
<repository location="http://sapcoe-app01.pironet-ndh.com/p2/sap/com.sap.ui5.updatesite-1.1.0-assembly"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.1.R37x_v20110907-7uF9LFpFFSuN6-tKJIXPMYaq7NTP"/>
<repository location="http://download.eclipse.org/releases/indigo"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.bundles.f.feature.group" version="7.5.4"/>
@@ -18,9 +16,5 @@
<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
<repository location="http://sapcoe-app01.pironet-ndh.com/p2/sailing/"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.1.R37x_v20110907-7uF9LFpFFSuN6-tKJIXPMYaq7NTP"/>
<repository location="http://download.eclipse.org/releases/indigo"/>
</location>
</locations>
</target>
@@ -4,12 +4,6 @@
<target name="Race Analysis Target (IDE - with local p2 repositories)" sequenceNumber="45">
<locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
<repository location="http://nexus.wdf.sap.corp:8081/nexus/content/repositories/build.snapshots.unzip/com/sap/ui5/com.sap.ui5.updatesite/1.1.0/com.sap.ui5.updatesite-1.1.0-assembly.zip-unzip/"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.bundles.f.feature.group" version="7.5.4"/>
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.5.4.v20111024/"/>
</location>
@@ -8,12 +8,6 @@
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.5.4.v20111024/"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
<repository location="http://sapcoe-app01.pironet-ndh.com/p2/sap/com.sap.ui5.updatesite-1.1.0-assembly"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
<repository location="http://sapcoe-app01.pironet-ndh.com/p2/sailing/"/>
@@ -1,15 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.6"?>
<target name="Race Analysis Target (Maven - local build)" sequenceNumber="31">
<locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
<repository location="http://nexus.wdf.sap.corp:8081/nexus/content/repositories/build.snapshots.unzip/com/sap/ui5/com.sap.ui5.updatesite/1.1.0/com.sap.ui5.updatesite-1.1.0-assembly.zip-unzip/"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
<repository location="http://sapcoe-app01.pironet-ndh.com/p2/sailing/"/>