Author: sletellier Date: 2009-01-12 18:05:58 +0000 (Mon, 12 Jan 2009) New Revision: 1732 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx Log: WizardGroupCreation work Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-01-12 18:05:16 UTC (rev 1731) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-01-12 18:05:58 UTC (rev 1732) @@ -86,6 +86,7 @@ if (selected != null){ editor.setText(selected.getContent()); } + f = selected; } protected Formule getFormule(){ Formule result = null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-01-12 18:05:16 UTC (rev 1731) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-01-12 18:05:58 UTC (rev 1732) @@ -92,7 +92,8 @@ protected void createClasses(){ JFrame wizardFrame = new JFrame(); wizardFrame.setLayout(new BorderLayout()); - WizardGroupCreationUI wizard = new WizardGroupCreationUI(getContextValue(InputAction.class), this); + WizardGroupCreationUI wizard = new WizardGroupCreationUI(this); + wizard.init(this); wizardFrame.add(wizard, BorderLayout.CENTER); wizardFrame.setTitle(_("isisfish.wizardGroupCreation.title")); wizardFrame.setVisible(true); @@ -134,7 +135,6 @@ } protected void create(){ Species species = getAction().getSpeciesByTopiaId(getVerifier().getIsisContext(), getVerifier().getCurrentNode().getParent().getNavigationPath()); - System.out.println(species); TopiaEntity topia = getContextValue(InputAction.class).createPopulation(getVerifier().getIsisContext(), species); getParentContainer(InputUI.class).setTreeModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-12 18:05:16 UTC (rev 1731) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-12 18:05:58 UTC (rev 1732) @@ -76,6 +76,7 @@ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null); + getVerifier().addCurrentEntity(getPopulationGroup()); } ]]> </script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-01-12 18:05:16 UTC (rev 1731) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-01-12 18:05:58 UTC (rev 1732) @@ -56,10 +56,8 @@ protected double step = 1; protected PopulationBasicsUI popBasic; -// setCard("endInputGroupLength"); - public WizardGroupCreationUI(InputAction action, PopulationBasicsUI p){ - - setContextValue(action); + + public void init(PopulationBasicsUI p){ popBasic = p; } @@ -334,7 +332,7 @@ } protected void cancel(){ - getParentContainer(JFrame.class).dispose(); + getParentContainer(JFrame.class).dispose(); } protected void refreshChoice(){ setInputType(beginGroupLengthTypeInput.isSelected());