Browse the code

Differences between 6 and 7 on /.

Number of edited files:

13 (4 added, 4 deleted and 5 modified)

Author:

dabou

Log message:

Renommage pour adaptation nomenclature

Date:

2010-02-08 18:15:29

Added file(s)	Deleted file(s)	Modified file(s)
/JTroupeauGest/src/troupeauGest/vue/window/panel/animal/menu/MenuAnimal1.form /JTroupeauGest/src/troupeauGest/vue/window/panel/animal/menu/MenuAnimal1.java /JTroupeauGest/src/troupeauGest/vue/window/winPrincipale/menu/MenuGeneral1.form /JTroupeauGest/src/troupeauGest/vue/window/winPrincipale/menu/MenuGeneral1.java	/JTroupeauGest/src/troupeauGest/vue/window/panel/animal/menu/menuAnimal.form /JTroupeauGest/src/troupeauGest/vue/window/panel/animal/menu/menuAnimal.java /JTroupeauGest/src/troupeauGest/vue/window/winPrincipale/menu/menuGeneral.form /JTroupeauGest/src/troupeauGest/vue/window/winPrincipale/menu/menuGeneral.java	/JTroupeauGest/src/troupeauGest/vue/window/panel/animal/PanelAnimal.java ↓ /JTroupeauGest/src/troupeauGest/vue/window/panel/animal/menu/EcouteurMenuAnimal.java ↓ /JTroupeauGest/src/troupeauGest/vue/window/winPrincipale/WinPrincipale.form ↓ /JTroupeauGest/src/troupeauGest/vue/window/winPrincipale/WinPrincipale.java ↓ /JTroupeauGest/src/troupeauGest/vue/window/winPrincipale/menu/EcouteurMenuGeneral.java ↓


package troupeauGest.vue.window.panel.animal;

import javax.swing.JOptionPane;
import troupeauGest.vue.window.panel.animal.menu.MenuAnimal;
import troupeauGest.vue.window.panel.animal.menu.MenuAnimal1;
import troupeauGest.vue.window.util.ImageFond;
import troupeauGest.vue.window.winPrincipale.WinPrincipale;
import util.Path;
    private WinPrincipale oWinPrincipale;
	private EcouteurAnimal ecouteur;
	private CtrlPanelAnimal oCtrlPanelAnimal;
    private MenuAnimal oMenuAnimal;
    private MenuAnimal1 oMenuAnimal;

    /** Creates new form PanelAnimal */
    public PanelAnimal(WinPrincipale p_oWinPrincipale) {
		this.setWinPrincipale(p_oWinPrincipale);
		this.setEcouteur(new EcouteurAnimal(this));
		this.setCtrlPanelAnimal(new CtrlPanelAnimal(this));
        this.setMenuContextuel(new MenuAnimal(p_oWinPrincipale));
        this.setMenuContextuel(new MenuAnimal1(p_oWinPrincipale));

        initComponents();
    }
		oCtrlPanelAnimal = p_oCtrlPanelAnimal;
	}

    public void setMenuContextuel(MenuAnimal p_oMenuAnimal)
    public void setMenuContextuel(MenuAnimal1 p_oMenuAnimal)
    {
        oMenuAnimal = p_oMenuAnimal;
    }


Old	New	Code
12	12	package troupeauGest.vue.window.panel.animal;
13	13
14	14	import javax.swing.JOptionPane;
15		import troupeauGest.vue.window.panel.animal.menu.MenuAnimal;
	15	import troupeauGest.vue.window.panel.animal.menu.MenuAnimal1;
16	16	import troupeauGest.vue.window.util.ImageFond;
17	17	import troupeauGest.vue.window.winPrincipale.WinPrincipale;
18	18	import util.Path;
26	26	private WinPrincipale oWinPrincipale;
27	27	private EcouteurAnimal ecouteur;
28	28	private CtrlPanelAnimal oCtrlPanelAnimal;
29		private MenuAnimal oMenuAnimal;
	29	private MenuAnimal1 oMenuAnimal;
30	30
31	31	/** Creates new form PanelAnimal */
32	32	public PanelAnimal(WinPrincipale p_oWinPrincipale) {
35	35	this.setWinPrincipale(p_oWinPrincipale);
36	36	this.setEcouteur(new EcouteurAnimal(this));
37	37	this.setCtrlPanelAnimal(new CtrlPanelAnimal(this));
38		this.setMenuContextuel(new MenuAnimal(p_oWinPrincipale));
	38	this.setMenuContextuel(new MenuAnimal1(p_oWinPrincipale));
39	39
40	40	initComponents();
41	41	}
65	65	oCtrlPanelAnimal = p_oCtrlPanelAnimal;
66	66	}
67	67
68		public void setMenuContextuel(MenuAnimal p_oMenuAnimal)
	68	public void setMenuContextuel(MenuAnimal1 p_oMenuAnimal)
69	69	{
70	70	oMenuAnimal = p_oMenuAnimal;
71	71	}
72	72


		public static final String ACTION_QUITTER = "Quitter";
		public static final String ACTION_ANIMAL = "Animal";
	    
		private MenuAnimal oMenuAnimal;
		private MenuAnimal1 oMenuAnimal;
		
		
		public EcouteurMenuAnimal(MenuAnimal p_oMenuAnimal) {
		public EcouteurMenuAnimal(MenuAnimal1 p_oMenuAnimal) {
			super();
			this.oMenuAnimal = p_oMenuAnimal;
		}


Old	New	Code
11	11	public static final String ACTION_QUITTER = "Quitter";
12	12	public static final String ACTION_ANIMAL = "Animal";
13	13
14		private MenuAnimal oMenuAnimal;
	14	private MenuAnimal1 oMenuAnimal;
15	15
16	16
17		public EcouteurMenuAnimal(MenuAnimal p_oMenuAnimal) {
	17	public EcouteurMenuAnimal(MenuAnimal1 p_oMenuAnimal) {
18	18	super();
19	19	this.oMenuAnimal = p_oMenuAnimal;
20	20	}
21	21


            </Property>
          </Properties>
          <AuxValues>
            <AuxValue name="JavaCodeGenerator_LayoutCodePre" type="java.lang.String" value="jPanelMenuGeneral.add(new troupeauGest.vue.window.winPrincipale.menu.MenuGeneral(this), java.awt.BorderLayout.CENTER);"/>
            <AuxValue name="JavaCodeGenerator_LayoutCodePre" type="java.lang.String" value="jPanelMenuGeneral.add(new troupeauGest.vue.window.winPrincipale.menu.MenuGeneral1(this), java.awt.BorderLayout.CENTER);"/>
          </AuxValues>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
      </SubComponents>
    </Container>
  </SubComponents>
</Form>
</Form>


Old	New	Code
121	121	</Property>
122	122	</Properties>
123	123	<AuxValues>
124		<AuxValue name="JavaCodeGenerator_LayoutCodePre" type="java.lang.String" value="jPanelMenuGeneral.add(new troupeauGest.vue.window.winPrincipale.menu.MenuGeneral(this), java.awt.BorderLayout.CENTER);"/>
	124	<AuxValue name="JavaCodeGenerator_LayoutCodePre" type="java.lang.String" value="jPanelMenuGeneral.add(new troupeauGest.vue.window.winPrincipale.menu.MenuGeneral1(this), java.awt.BorderLayout.CENTER);"/>
125	125	</AuxValues>
126	126	<Constraints>
127	127	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
195	195	</SubComponents>
196	196	</Container>
197	197	</SubComponents>
198		</Form>
	198	</Form>
199	199


import troupeauGest.vue.ctrl.principale.CtrlPrincipale;
import troupeauGest.vue.window.util.ImageFond;
import troupeauGest.vue.window.panel.accueil.PanelAccueil;
import troupeauGest.vue.window.winPrincipale.menu.MenuGeneral;
import troupeauGest.vue.window.winPrincipale.menu.MenuGeneral1;
import util.Path;

/**
        jPanelMenuGeneral.setOpaque(false);
        jPanelMenuGeneral.setPreferredSize(new java.awt.Dimension(2, 120));
        jPanelMenuGeneral.setLayout(new java.awt.BorderLayout());
        jPanelMenuGeneral.add(new troupeauGest.vue.window.winPrincipale.menu.MenuGeneral(this), java.awt.BorderLayout.CENTER);
        jPanelMenuGeneral.add(new troupeauGest.vue.window.winPrincipale.menu.MenuGeneral1(this), java.awt.BorderLayout.CENTER);
        jPanelPrincipale.add(jPanelMenuGeneral, java.awt.BorderLayout.NORTH);

        jPanelAide.setOpaque(false);


Old	New	Code
15	15	import troupeauGest.vue.ctrl.principale.CtrlPrincipale;
16	16	import troupeauGest.vue.window.util.ImageFond;
17	17	import troupeauGest.vue.window.panel.accueil.PanelAccueil;
18		import troupeauGest.vue.window.winPrincipale.menu.MenuGeneral;
	18	import troupeauGest.vue.window.winPrincipale.menu.MenuGeneral1;
19	19	import util.Path;
20	20
21	21	/**
169	169	jPanelMenuGeneral.setOpaque(false);
170	170	jPanelMenuGeneral.setPreferredSize(new java.awt.Dimension(2, 120));
171	171	jPanelMenuGeneral.setLayout(new java.awt.BorderLayout());
172		jPanelMenuGeneral.add(new troupeauGest.vue.window.winPrincipale.menu.MenuGeneral(this), java.awt.BorderLayout.CENTER);
	172	jPanelMenuGeneral.add(new troupeauGest.vue.window.winPrincipale.menu.MenuGeneral1(this), java.awt.BorderLayout.CENTER);
173	173	jPanelPrincipale.add(jPanelMenuGeneral, java.awt.BorderLayout.NORTH);
174	174
175	175	jPanelAide.setOpaque(false);
176	176


		public static final String ACTION_QUITTER = "Quitter";
		public static final String ACTION_ANIMAL = "Animal";
	    
		private MenuGeneral oMenuGeneral;
		private MenuGeneral1 oMenuGeneral;
		
		
		public EcouteurMenuGeneral(MenuGeneral p_oMenuGeneral) {
		public EcouteurMenuGeneral(MenuGeneral1 p_oMenuGeneral) {
			super();
			this.oMenuGeneral = p_oMenuGeneral;
		}


Old	New	Code
11	11	public static final String ACTION_QUITTER = "Quitter";
12	12	public static final String ACTION_ANIMAL = "Animal";
13	13
14		private MenuGeneral oMenuGeneral;
	14	private MenuGeneral1 oMenuGeneral;
15	15
16	16
17		public EcouteurMenuGeneral(MenuGeneral p_oMenuGeneral) {
	17	public EcouteurMenuGeneral(MenuGeneral1 p_oMenuGeneral) {
18	18	super();
19	19	this.oMenuGeneral = p_oMenuGeneral;
20	20	}
21	21

Logiciel libre. Free software.

Browse the code