Skip to content

Commit

Permalink
Merge pull request #19 from izio7/MaurizioTesting
Browse files Browse the repository at this point in the history
Maurizio testing
  • Loading branch information
MaurizioCasciano committed Jan 24, 2016
2 parents 2af3011 + af8c9a8 commit 85a7544
Show file tree
Hide file tree
Showing 7 changed files with 229 additions and 232 deletions.
Binary file modified PROGETTO 2015-16/Struttura Sportiva.ser
Binary file not shown.
7 changes: 6 additions & 1 deletion PROGETTO 2015-16/src/calendar/Week.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package calendar;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;

public class Week {
public class Week implements Serializable{

/**
* Crea un oggetto Week rappresentante una settimana.
Expand Down Expand Up @@ -97,6 +98,10 @@ public String toString() {
return DATE_FORMAT.format(start.getTime()) + " - " + DATE_FORMAT.format(end.getTime());
}

/**
* @author Maurizio
*/
private static final long serialVersionUID = 3468338459207003613L;
public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("E dd/MM/yyyy HH:mm:ss:SS");
private GregorianCalendar start, end;

Expand Down
10 changes: 9 additions & 1 deletion PROGETTO 2015-16/src/calendar/WeekBounds.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package calendar;

import java.io.Serializable;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;

public class WeekBounds {
public class WeekBounds implements Serializable{

/**
* Restituisce l'oggetto GregorianCalendar corrispondente all'istante in cui
Expand Down Expand Up @@ -77,6 +78,13 @@ public static GregorianCalendar getWeekEnd(GregorianCalendar date) {
return weekEnd;
}

/**
* @author Maurizio
*/
private static final long serialVersionUID = -3430620484153690897L;

/*********************************************************************/

public static void main(String[] args) {
GregorianCalendar date = new GregorianCalendar();
date.setTimeZone(TimeZone.getTimeZone("Europe/Rome"));
Expand Down
4 changes: 3 additions & 1 deletion PROGETTO 2015-16/src/graphics/ClosableTabbedPane.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import java.awt.Rectangle;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.Serializable;

import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
Expand All @@ -18,7 +20,7 @@
*
* @author Maurizio
*/
public class ClosableTabbedPane extends JTabbedPane {
public class ClosableTabbedPane extends JTabbedPane implements Serializable{

/**
* Crea un {@link JTabbedPane} vuoto con un posizionamento delle tab di
Expand Down
13 changes: 6 additions & 7 deletions PROGETTO 2015-16/src/graphics/StadiumSeatButton.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,12 @@ public void actionPerformed(ActionEvent e) {
break;
}

System.out.println("Struttura: " + strutturaSportiva.getNome());
System.out.println("Cliente: " + cliente.getNome());
System.out.println("Partita: " + partita);
System.out.println("NumeroFila: " + numeroFila);
System.out.println("NumeroPosto: " + numeroPosto);

System.out.println(cliente.getNome() + " CLICKED SEAT n° " + getToolTipText());
//System.out.println("Struttura: " + strutturaSportiva.getNome());
//System.out.println("Cliente: " + cliente.getNome());
//System.out.println("Partita: " + partita);
//System.out.println("NumeroFila: " + numeroFila);
//System.out.println("NumeroPosto: " + numeroPosto);
//System.out.println(cliente.getNome() + " CLICKED SEAT n° " + getToolTipText());
}
});
}
Expand Down
Loading

0 comments on commit 85a7544

Please sign in to comment.