added generic types for new generic Swing type parameters in SwissTiming race editor implementation

This commit is contained in:
Axel Uhl committed 2012-01-19 10:30:05 +01:00
1 parent 1ba40b63bd
commit ab948972fe
7 files changed
+87 -66

No files matched your search

@@ -16,6 +16,7 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.swing.JOptionPane;
@@ -42,7 +43,7 @@ public class EditCAM extends javax.swing.JDialog {
else
cam = new CAMMessage("",new ArrayList<ClockAtMarkElement>());
marks = cam.getMarkList();
jMarkList.setListData(marks.toArray());
jMarkList.setListData(marks.toArray(new ClockAtMarkElement[0]));
jRaceID.setText(cam.getRaceId());
}
@@ -69,7 +70,7 @@ public class EditCAM extends javax.swing.JDialog {
jButton2 = new javax.swing.JButton();
jButton3 = new javax.swing.JButton();
jScrollPane1 = new javax.swing.JScrollPane();
jMarkList = new javax.swing.JList();
jMarkList = new javax.swing.JList<ClockAtMarkElement>();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -110,10 +111,12 @@ public class EditCAM extends javax.swing.JDialog {
}
});
jMarkList.setModel(new javax.swing.AbstractListModel() {
String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
public int getSize() { return strings.length; }
public Object getElementAt(int i) { return strings[i]; }
jMarkList.setModel(new javax.swing.AbstractListModel<ClockAtMarkElement>() {
ClockAtMarkElement[] clockAtMarkElements = { new ClockAtMarkElement(1, new Date(), "Item 1"),
new ClockAtMarkElement(1, new Date(), "Item 2"), new ClockAtMarkElement(1, new Date(), "Item 3"),
new ClockAtMarkElement(1, new Date(), "Item 4"), new ClockAtMarkElement(1, new Date(), "Item 5") };
public int getSize() { return clockAtMarkElements.length; }
public ClockAtMarkElement getElementAt(int i) { return clockAtMarkElements[i]; }
});
jScrollPane1.setViewportView(jMarkList);
@@ -198,14 +201,14 @@ public class EditCAM extends javax.swing.JDialog {
} catch (ParseException ex) {
JOptionPane.showMessageDialog(this, "Invalid input parameters.");
}
jMarkList.setListData(marks.toArray());
jMarkList.setListData(marks.toArray(new ClockAtMarkElement[0]));
}//GEN-LAST:event_jButton3ActionPerformed
private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
// TODO add your handling code here:
for (Object o : jMarkList.getSelectedValues())
for (Object o : jMarkList.getSelectedValuesList())
marks.remove(o);
jMarkList.setListData(marks.toArray());
jMarkList.setListData(marks.toArray(new ClockAtMarkElement[0]));
}//GEN-LAST:event_jButton2ActionPerformed
public CAMMessage getMessage(){
@@ -221,7 +224,7 @@ public class EditCAM extends javax.swing.JDialog {
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
private javax.swing.JTextField jMarkIndex;
private javax.swing.JList jMarkList;
private javax.swing.JList<ClockAtMarkElement> jMarkList;
private javax.swing.JTextField jMarkTime;
private javax.swing.JTextField jRaceID;
private javax.swing.JTextField jSailNumber;
@@ -10,11 +10,12 @@
*/
package com.sap.sailing.domain.swisstimingadapter.test.ui;
import java.util.ArrayList;
import java.util.List;
import com.sap.sailing.domain.swisstimingadapter.Mark;
import com.sap.sailing.domain.swisstimingadapter.classes.messages.CCGMessage;
import com.sap.sailing.domain.swisstimingadapter.impl.MarkImpl;
import java.util.ArrayList;
import java.util.List;
/**
*
@@ -39,7 +40,7 @@ public class EditCCG extends javax.swing.JDialog {
ccg = new CCGMessage();
marks = ccg.getMarkList();
jRaceID.setText(ccg.getRaceId());
jMarkList.setListData(marks.toArray());
jMarkList.setListData(marks.toArray(new CCGMessage[0]));
}
/** This method is called from within the constructor to
@@ -69,7 +70,7 @@ public class EditCCG extends javax.swing.JDialog {
jButton2 = new javax.swing.JButton();
jButton3 = new javax.swing.JButton();
jScrollPane1 = new javax.swing.JScrollPane();
jMarkList = new javax.swing.JList();
jMarkList = new javax.swing.JList<CCGMessage>();
jButton1 = new javax.swing.JButton();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -127,10 +128,14 @@ public class EditCCG extends javax.swing.JDialog {
}
});
jMarkList.setModel(new javax.swing.AbstractListModel() {
String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
public int getSize() { return strings.length; }
public Object getElementAt(int i) { return strings[i]; }
jMarkList.setModel(new javax.swing.AbstractListModel<CCGMessage>() {
CCGMessage[] ccgMessages = { new CCGMessage("Item 1", new ArrayList<Mark>()),
new CCGMessage("Item 2", new ArrayList<Mark>()),
new CCGMessage("Item 3", new ArrayList<Mark>()),
new CCGMessage("Item 4", new ArrayList<Mark>()),
new CCGMessage("Item 5", new ArrayList<Mark>()) };
public int getSize() { return ccgMessages.length; }
public CCGMessage getElementAt(int i) { return ccgMessages[i]; }
});
jScrollPane1.setViewportView(jMarkList);
@@ -248,14 +253,14 @@ public class EditCCG extends javax.swing.JDialog {
if (jRadioButton2.isSelected())
devices.add(jSailNumber2.getText());
marks.add(new MarkWithDesc(jMarkDescription.getText(), Integer.parseInt(jMarkIndex.getText()),devices));
jMarkList.setListData(marks.toArray());
jMarkList.setListData(marks.toArray(new CCGMessage[0]));
}//GEN-LAST:event_jButton2ActionPerformed
private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed
// TODO add your handling code here:
for (Object o : jMarkList.getSelectedValues())
for (CCGMessage o : jMarkList.getSelectedValuesList())
marks.remove(o);
jMarkList.setListData(marks.toArray());
jMarkList.setListData(marks.toArray(new CCGMessage[0]));
}//GEN-LAST:event_jButton3ActionPerformed
public CCGMessage getMessage(){
@@ -286,7 +291,7 @@ public class EditCCG extends javax.swing.JDialog {
private javax.swing.JLabel jLabelSailNumber2;
private javax.swing.JTextField jMarkDescription;
private javax.swing.JTextField jMarkIndex;
private javax.swing.JList jMarkList;
private javax.swing.JList<CCGMessage> jMarkList;
private javax.swing.JTextField jRaceID;
private javax.swing.JRadioButton jRadioButton1;
private javax.swing.JRadioButton jRadioButton2;
@@ -10,11 +10,12 @@
*/
package com.sap.sailing.domain.swisstimingadapter.test.ui;
import java.util.ArrayList;
import java.util.List;
import com.sap.sailing.domain.swisstimingadapter.Race;
import com.sap.sailing.domain.swisstimingadapter.classes.messages.RACMessage;
import com.sap.sailing.domain.swisstimingadapter.impl.RaceImpl;
import java.util.ArrayList;
import java.util.List;
/**
*
@@ -41,7 +42,7 @@ public class EditRAC extends javax.swing.JDialog {
this.races = new ArrayList<Race>();
this.rac = new RACMessage(races);
}
jRaceList.setListData(races.toArray());
jRaceList.setListData(races.toArray(new Race[0]));
}
/** This method is called from within the constructor to
@@ -61,7 +62,7 @@ public class EditRAC extends javax.swing.JDialog {
jAdd = new javax.swing.JButton();
jRemove = new javax.swing.JButton();
jScrollPane1 = new javax.swing.JScrollPane();
jRaceList = new javax.swing.JList();
jRaceList = new javax.swing.JList<Race>();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -149,16 +150,16 @@ public class EditRAC extends javax.swing.JDialog {
private void jAddActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jAddActionPerformed
// TODO add your handling code here:
races.add(new DescriptionRace(jRaceID.getText(), jRaceDesc.getText()));
jRaceList.setListData(races.toArray());
jRaceList.setListData(races.toArray(new Race[0]));
}//GEN-LAST:event_jAddActionPerformed
private void jRemoveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jRemoveActionPerformed
// TODO add your handling code here:
for (Object o : jRaceList.getSelectedValues()){
for (Object o : jRaceList.getSelectedValuesList()){
if (o instanceof Race)
races.remove((Race) o);
}
jRaceList.setListData(races.toArray());
jRaceList.setListData(races.toArray(new Race[0]));
}//GEN-LAST:event_jRemoveActionPerformed
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
@@ -189,7 +190,7 @@ public class EditRAC extends javax.swing.JDialog {
private javax.swing.JLabel jLabel2;
private javax.swing.JTextField jRaceDesc;
private javax.swing.JTextField jRaceID;
private javax.swing.JList jRaceList;
private javax.swing.JList<Race> jRaceList;
private javax.swing.JButton jRemove;
private javax.swing.JScrollPane jScrollPane1;
// End of variables declaration//GEN-END:variables
@@ -10,13 +10,15 @@
*/
package com.sap.sailing.domain.swisstimingadapter.test.ui;
import com.sap.sailing.domain.swisstimingadapter.classes.messages.RPDMessage;
import com.sap.sailing.domain.swisstimingadapter.classes.messages.RacePositionDataElement;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.List;
import javax.swing.JOptionPane;
import com.sap.sailing.domain.swisstimingadapter.classes.messages.RPDMessage;
import com.sap.sailing.domain.swisstimingadapter.classes.messages.RacePositionDataElement;
/**
*
* @author D056866
@@ -52,7 +54,7 @@ public class EditRPD extends javax.swing.JDialog {
}
}
rpdData = rpd.getRacePositionElements();
jRPDData.setListData(rpdData.toArray());
jRPDData.setListData(rpdData.toArray(new RacePositionDataElement[0]));
setValuesInUI();
}
@@ -130,7 +132,7 @@ public class EditRPD extends javax.swing.JDialog {
jButton1 = new javax.swing.JButton();
jButton2 = new javax.swing.JButton();
jScrollPane1 = new javax.swing.JScrollPane();
jRPDData = new javax.swing.JList();
jRPDData = new javax.swing.JList<RacePositionDataElement>();
jButton3 = new javax.swing.JButton();
jLabel19 = new javax.swing.JLabel();
jALS = new javax.swing.JTextField();
@@ -434,14 +436,14 @@ public class EditRPD extends javax.swing.JDialog {
catch(Exception e){
JOptionPane.showMessageDialog(this, "Invalid input paramters!", "Invalid input", JOptionPane.ERROR_MESSAGE);
}
jRPDData.setListData(rpdData.toArray());
jRPDData.setListData(rpdData.toArray(new RacePositionDataElement[0]));
}//GEN-LAST:event_jButton1ActionPerformed
private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
// TODO add your handling code here:
for (Object o : jRPDData.getSelectedValues())
for (RacePositionDataElement o : jRPDData.getSelectedValuesList())
rpdData.remove(o);
jRPDData.setListData(rpdData.toArray());
jRPDData.setListData(rpdData.toArray(new RacePositionDataElement[0]));
}//GEN-LAST:event_jButton2ActionPerformed
@@ -491,7 +493,7 @@ public class EditRPD extends javax.swing.JDialog {
private javax.swing.JTextField jLongitude;
private javax.swing.JTextField jNextMark;
private javax.swing.JTextField jNextMarkLeader;
private javax.swing.JList jRPDData;
private javax.swing.JList<RacePositionDataElement> jRPDData;
private javax.swing.JTextField jRaceID;
private javax.swing.JTextField jRaceTime;
private javax.swing.JTextField jRank;
@@ -38,7 +38,7 @@ public class EditSTL extends javax.swing.JDialog {
stl = new STLMessage();
competitors = stl.getCompetitorList();
jRaceID.setText(stl.getRaceId());
jCompetitorList.setListData(competitors.toArray());
jCompetitorList.setListData(competitors.toArray(new Competitor[0]));
}
/** This method is called from within the constructor to
@@ -57,14 +57,14 @@ public class EditSTL extends javax.swing.JDialog {
jLabel2 = new javax.swing.JLabel();
jSailNumber = new javax.swing.JTextField();
jLabel3 = new javax.swing.JLabel();
jNOC = new javax.swing.JComboBox();
jNOC = new javax.swing.JComboBox<String>();
jLabel4 = new javax.swing.JLabel();
jName = new javax.swing.JTextField();
jButton1 = new javax.swing.JButton();
jRemove = new javax.swing.JButton();
jButton2 = new javax.swing.JButton();
jScrollPane1 = new javax.swing.JScrollPane();
jCompetitorList = new javax.swing.JList();
jCompetitorList = new javax.swing.JList<Competitor>();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -78,7 +78,7 @@ public class EditSTL extends javax.swing.JDialog {
jLabel3.setText("NOC:");
jNOC.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "AUS", "FRA", "GBR", "GER", "ITA", "USA" }));
jNOC.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "AUS", "FRA", "GBR", "GER", "ITA", "USA" }));
jNOC.setSelectedIndex(2);
jLabel4.setText("Name:");
@@ -106,10 +106,14 @@ public class EditSTL extends javax.swing.JDialog {
}
});
jCompetitorList.setModel(new javax.swing.AbstractListModel() {
String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
public int getSize() { return strings.length; }
public Object getElementAt(int i) { return strings[i]; }
jCompetitorList.setModel(new javax.swing.AbstractListModel<Competitor>() {
Competitor[] competitors = { new CompetitorImpl("Item 1", "DEU", "Item 1"),
new CompetitorImpl("Item 2", "DEU", "Item 2"),
new CompetitorImpl("Item 3", "DEU", "Item 3"),
new CompetitorImpl("Item 4", "DEU", "Item 4"),
new CompetitorImpl("Item 5", "DEU", "Item 5") };
public int getSize() { return competitors.length; }
public Competitor getElementAt(int i) { return competitors[i]; }
});
jScrollPane1.setViewportView(jCompetitorList);
@@ -191,14 +195,14 @@ public class EditSTL extends javax.swing.JDialog {
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
// TODO add your handling code here:
competitors.add(new CompetitorWithDesc(jSailNumber.getText(), jNOC.getSelectedItem().toString(), jName.getText()));
jCompetitorList.setListData(competitors.toArray());
jCompetitorList.setListData(competitors.toArray(new Competitor[0]));
}//GEN-LAST:event_jButton1ActionPerformed
private void jRemoveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jRemoveActionPerformed
// TODO add your handling code here:
for (Object o : jCompetitorList.getSelectedValues())
for (Competitor o : jCompetitorList.getSelectedValuesList())
competitors.remove(o);
jCompetitorList.setListData(competitors.toArray());
jCompetitorList.setListData(competitors.toArray(new Competitor[0]));
}//GEN-LAST:event_jRemoveActionPerformed
public STLMessage getMessage(){
@@ -220,12 +224,12 @@ public class EditSTL extends javax.swing.JDialog {
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
private javax.swing.JButton jButton2;
private javax.swing.JList jCompetitorList;
private javax.swing.JList<Competitor> jCompetitorList;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
private javax.swing.JComboBox jNOC;
private javax.swing.JComboBox<String> jNOC;
private javax.swing.JTextField jName;
private javax.swing.JTextField jRaceID;
private javax.swing.JButton jRemove;
@@ -10,12 +10,14 @@
*/
package com.sap.sailing.domain.swisstimingadapter.test.ui;
import com.sap.sailing.domain.swisstimingadapter.classes.messages.TMDMessage;
import com.sap.sailing.domain.swisstimingadapter.classes.messages.TimingDataElement;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import com.sap.sailing.domain.swisstimingadapter.classes.messages.TMDMessage;
import com.sap.sailing.domain.swisstimingadapter.classes.messages.TimingDataElement;
/**
*
* @author D056866
@@ -40,7 +42,7 @@ public class EditTMD extends javax.swing.JDialog {
else
tmd = new TMDMessage();
tmdData = tmd.getList();
jTmdData.setListData(tmdData.toArray());
jTmdData.setListData(tmdData.toArray(new TimingDataElement[0]));
jRaceId.setText(tmd.getRaceId());
jSailNumber.setText(tmd.getSailNumber());
}
@@ -70,7 +72,7 @@ public class EditTMD extends javax.swing.JDialog {
jButton2 = new javax.swing.JButton();
jButton3 = new javax.swing.JButton();
jScrollPane1 = new javax.swing.JScrollPane();
jTmdData = new javax.swing.JList();
jTmdData = new javax.swing.JList<TimingDataElement>();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -115,10 +117,14 @@ public class EditTMD extends javax.swing.JDialog {
}
});
jTmdData.setModel(new javax.swing.AbstractListModel() {
String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
jTmdData.setModel(new javax.swing.AbstractListModel<TimingDataElement>() {
TimingDataElement[] strings = { new TimingDataElement(1, 1, new Date()),
new TimingDataElement(2, 2, new Date()),
new TimingDataElement(3, 3, new Date()),
new TimingDataElement(4, 4, new Date()),
new TimingDataElement(5, 5, new Date()) };
public int getSize() { return strings.length; }
public Object getElementAt(int i) { return strings[i]; }
public TimingDataElement getElementAt(int i) { return strings[i]; }
});
jScrollPane1.setViewportView(jTmdData);
@@ -210,14 +216,14 @@ public class EditTMD extends javax.swing.JDialog {
catch (Exception e){
}
jTmdData.setListData(tmdData.toArray());
jTmdData.setListData(tmdData.toArray(new TimingDataElement[0]));
}//GEN-LAST:event_jButton2ActionPerformed
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
// TODO add your handling code here:
for (Object o : jTmdData.getSelectedValues())
for (Object o : jTmdData.getSelectedValuesList())
tmdData.remove(o);
jTmdData.setListData(tmdData.toArray());
jTmdData.setListData(tmdData.toArray(new TimingDataElement[0]));
}//GEN-LAST:event_jButton1ActionPerformed
public TMDMessage getMessage(){
@@ -240,6 +246,6 @@ public class EditTMD extends javax.swing.JDialog {
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JSeparator jSeparator1;
private javax.swing.JTextField jTimeSinceStart;
private javax.swing.JList jTmdData;
private javax.swing.JList<TimingDataElement> jTmdData;
// End of variables declaration//GEN-END:variables
}
@@ -74,7 +74,7 @@ public class SwissTimingRaceEditor extends javax.swing.JFrame {
private void initComponents() {
jScrollPane1 = new javax.swing.JScrollPane();
jCommandList = new javax.swing.JList();
jCommandList = new javax.swing.JList<Object>();
jAdd = new javax.swing.JButton();
jRemove = new javax.swing.JButton();
jEdit = new javax.swing.JButton();
@@ -89,7 +89,7 @@ public class SwissTimingRaceEditor extends javax.swing.JFrame {
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setTitle("SwissTiming-Sample-Race Editor");
jCommandList.setModel(new javax.swing.AbstractListModel() {
jCommandList.setModel(new javax.swing.AbstractListModel<Object>() {
String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
public int getSize() { return strings.length; }
public Object getElementAt(int i) { return strings[i]; }
@@ -285,7 +285,7 @@ public class SwissTimingRaceEditor extends javax.swing.JFrame {
private void jRemoveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jRemoveActionPerformed
// TODO add your handling code here:
for (Object o : jCommandList.getSelectedValues())
for (Object o : jCommandList.getSelectedValuesList())
commands.remove(o);
jCommandList.setListData(getArrayOfList(commands));
}//GEN-LAST:event_jRemoveActionPerformed
@@ -411,7 +411,7 @@ public class SwissTimingRaceEditor extends javax.swing.JFrame {
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jAdd;
private javax.swing.JList jCommandList;
private javax.swing.JList<Object> jCommandList;
private javax.swing.JButton jEdit;
private javax.swing.JMenuItem jExport;
private javax.swing.JMenuItem jImport;