flavien/Projet_JAVA_PMT_STRI1A
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

derniere modfi

Browse Source
This commit is contained in:
NicolasFau 2019-05-28 17:39:53 +02:00
parent 92c3b7d56a
commit c5ba647f68
2 changed files with 16 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
JAVA/PROJET-PMT_STRI1A/src/gui/JeuSalle.java
View File

@ -32,13 +32,12 @@ public class JeuSalle extends JFrame implements KeyListener,ActionListener{
setLocationRelativeTo(null); setLocationRelativeTo(null);
setResizable(false); setResizable(false);
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
//setContentPane(ecrire("test"));
//JScrollPane test = new JScrollPane();
//setContentPane(test);
this.setVisible(true); this.setVisible(true);
} }
/*Méthode permettant d'écrire du texte dans la fenetre de jeu*/
public JPanel ecrire(String str) { public JPanel ecrire(String str) {
JPanel panel = new JPanel(); JPanel panel = new JPanel();
panel.setLayout(new FlowLayout()); panel.setLayout(new FlowLayout());
@ -48,7 +47,6 @@ public class JeuSalle extends JFrame implements KeyListener,ActionListener{
this.setContentPane(panel); this.setContentPane(panel);
this.addKeyListener(this); this.addKeyListener(this);
this.requestFocus(); this.requestFocus();
//this.menu = new Menu();
this.setVisible(true); this.setVisible(true);
return panel; return panel;
} }
@ -57,14 +55,8 @@ public class JeuSalle extends JFrame implements KeyListener,ActionListener{
*/ */
@Override @Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
//System.out.println("keyPressed");
int codeint =e.getKeyCode();
//int codeint=Character.getNumericValue(e.getKeyText(code));
//System.out.println(codeint);
//String key =e.getKeyText(code);
//System.out.println(key);
} }
@ -78,13 +70,13 @@ public class JeuSalle extends JFrame implements KeyListener,ActionListener{
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see java.awt.event.KeyListener#keyTyped(java.awt.event.KeyEvent) * @see java.awt.event.KeyListener#keyTyped(java.awt.event.KeyEvent)
Entrer du clavier
*/ */
@Override @Override
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e) {
// TODO Auto-generated method stub
nb = e.getKeyChar(); nb = e.getKeyChar();
System.out.println(nb); System.out.println(nb);
//System.out.println(nb);
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -97,10 +89,12 @@ public class JeuSalle extends JFrame implements KeyListener,ActionListener{
} }
/*Méthode qui récupère les entrés de type int du clavier*/
public int toucheint() { public int toucheint() {
System.out.println("sortie"+nb); System.out.println("sortie"+nb);
return nb; return nb;
} }
/*Méthode que permet de cacher un texte affiché dans la fenetre*/
public void cacher(JPanel panel) { public void cacher(JPanel panel) {
panel.setVisible(false); panel.setVisible(false);
} }

52
JAVA/PROJET-PMT_STRI1A/src/gui/jeu.java
View File

@ -49,7 +49,6 @@ public class jeu extends JFrame implements ActionListener {
public jeu() throws IOException { public jeu() throws IOException {
super(); super();
build(); build();
this.menu=new Menu(); this.menu=new Menu();
} }
@ -61,10 +60,10 @@ public class jeu extends JFrame implements ActionListener {
setResizable(false); setResizable(false);
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
//Création du JLabel pour l'image
JLabel container = new JLabel(new ImageIcon(this.image())); JLabel container = new JLabel(new ImageIcon(this.image()));
//Création du layout des boutons
container.setLayout(new GridBagLayout()); container.setLayout(new GridBagLayout());
@ -91,6 +90,7 @@ public class jeu extends JFrame implements ActionListener {
/* (non-Javadoc) /* (non-Javadoc)
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
Récupération des évènements des boutons Nouvelle Partie et Contnuer
*/ */
@Override @Override
@ -98,52 +98,21 @@ public class jeu extends JFrame implements ActionListener {
Object source=arg0.getSource(); Object source=arg0.getSource();
choix(source); choix(source);
//if(source==nouvelle) {
//JPanel panel = new JPanel();
/*Menu menu = new Menu();
Labyrinthe lab=menu.nouvellePartie();
JeuSalle salle = new JeuSalle();
repaint();
Personnage perso = menu.menuSelection(lab, salle);
panel =salle.ecrire(menu.textePerso(lab));
int test =1;
if(perso!=null) {
panel.setVisible(false);
repaint();
System.out.println("test");
Marche marche= (Marche) lab.listePorte.get(0).getSalle1();
panel =salle.ecrire(marche.creerObjetsAVendre(lab));
}
//menu.Menu_Marche(marche, perso, lab);
/*
//Bug
//System.out.println();
//salle.cacher(panel);
//menu.menuSelection(lab);
}
if(source==continuer) {
Menu menu = new Menu();
Labyrinthe lab = menu.continuer();
}*/
} }
/*Méthode de traitement des actions sur les boutons*/
public void choix(Object source) { public void choix(Object source) {
if(source==nouvelle) { if(source==nouvelle) {
System.out.println("1"); System.out.println("1");
//menu =new Menu(); //menu =new Menu();
//Création du Labyrinthe
Labyrinthe lab =new Labyrinthe(); Labyrinthe lab =new Labyrinthe();
//
this.menu.getJs().setLab(lab) ; this.menu.getJs().setLab(lab);
//Appel de la méthode menuSelection()
this.menu.menuSelection(this.menu.getJs().getLab()); this.menu.menuSelection(this.menu.getJs().getLab());
} }
if(source==continuer) { if(source==continuer) {
@ -156,10 +125,7 @@ public class jeu extends JFrame implements ActionListener {
} }
/* public Menu creersalle() {
salle = new Menu();
return salle;
}*/
public Menu getMenu() { public Menu getMenu() {
return menu; return menu;
} }