r1751 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Author: tchemit Date: 2009-01-22 00:12:27 +0000 (Thu, 22 Jan 2009) New Revision: 1751 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.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/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.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/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: - generics on getVerifier().getEntity() - use Jaxx methods moved to JAXXList and JAXXComboBox Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -72,15 +72,15 @@ public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class); + SetOfVessels setOfVessels = getVerifier().getEntity(SetOfVessels.class); setBean((SetOfVesselsImpl) setOfVessels); if (getBean() != null){ - jaxx.runtime.swing.Utils.fillList(fieldEffortDescriptionMetierList,getRegion().getMetier(), null); + fieldEffortDescriptionMetierList.fillList(getRegion().getMetier(), null); setEffortDescriptionEffortDescriptionList(); } } protected void setEffortDescriptionEffortDescriptionList(){ - jaxx.runtime.swing.Utils.fillList(fieldEffortDescriptionEffortDescriptionList,getBean().getPossibleMetiers(), null); + fieldEffortDescriptionEffortDescriptionList.fillList(getBean().getPossibleMetiers(), null); } protected void add(){ Object value = fieldEffortDescriptionMetierList.getSelectedValue(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -53,7 +53,7 @@ getVerifier().setSaveButton(save, false); getVerifier().setCancelButton(cancel); setBean(null); - FisheryRegion region = (FisheryRegion) getVerifier().getEntity(FisheryRegion.class); + FisheryRegion region = getVerifier().getEntity(FisheryRegion.class); setBean((FisheryRegionImpl)region); if (region != null){ setFieldMapfilesModel(getBean()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -68,7 +68,7 @@ getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Gear"); getVerifier().setDeleteButton(remove); - Gear gear = (Gear)getVerifier().getEntity(Gear.class); + Gear gear = getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -59,7 +59,7 @@ public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - Metier metier = (Metier)getVerifier().getEntity(Metier.class); + Metier metier = getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); getVerifier().addCurrentPanel(targetFactor); if (getBean() != null){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -89,7 +89,7 @@ getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "MetierSeasonInfo"); getVerifier().setDeleteButton(remove); - Metier metier = (Metier)getVerifier().getEntity(Metier.class); + Metier metier = getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); if (metier != null){ if (seasonInit){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -54,7 +54,7 @@ getVerifier().setNewButton(create, "Metier"); getVerifier().setDeleteButton(remove); try { - Metier metier = (Metier)getVerifier().getEntity(Metier.class); + Metier metier = getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); DefaultComboBoxModel model = new DefaultComboBoxModel(getRegion().getGear().toArray()); fieldMetierGear.setModel(model); 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-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -72,7 +72,7 @@ getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Population", false); getVerifier().setDeleteButton(remove); - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); if (getBean() != null){ // TODO : Selection equation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -61,7 +61,7 @@ public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); fieldPopulationCapturability.addMatrixListener(new MatrixPanelListener() { @Override Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -46,7 +46,7 @@ public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); naturalDeathRate.init(_("isisfish.populationEquation.naturalDeathRate"), getBean(), "NaturalDeathRate", "PopulationNaturalDeathRate", fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class); meanWeight.init(_("isisfish.populationEquation.meanWeight"), getBean(), "MeanWeight", "PopulationMeanWeight", fr.ifremer.isisfish.equation.PopulationMeanWeight.class); 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-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -71,7 +71,7 @@ public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); getVerifier().addCurrentEntity(getPopulationGroup()); if (getBean() != null){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -71,7 +71,7 @@ setPopInfo((PopulationSeasonInfoImpl)pi); } public void refresh(){ - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); setFieldPopulationMigrationMigrationGroupChooserModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -50,7 +50,7 @@ setPopInfo((PopulationSeasonInfoImpl)pi); } public void refresh(){ - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); migrationEquation.init(_("isisfish.common.migration"), getPopInfo(), "MigrationEquation", "Migration", fr.ifremer.isisfish.equation.MigrationEquation.class); emigrationEquation.init(_("isisfish.common.emigration"), getPopInfo(), "EmigrationEquation", "Emigration", fr.ifremer.isisfish.equation.EmigrationEquation.class); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -71,7 +71,7 @@ this.popInfo = pi; } public void refresh(){ - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -71,7 +71,7 @@ } public void refresh(){ popInfo = pi; - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); setFieldPopulationMigrationMigrationGroupChooserModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -63,7 +63,7 @@ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI); - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); if (getBean() != null){ setFieldPopulationMigrationSeasonChooserModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -62,7 +62,7 @@ public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "ReproductionEquation", "PopulationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -88,7 +88,7 @@ getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "PopulationSeasonInfo"); getVerifier().setDeleteButton(remove); - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); if (getBean() != null){ jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -64,7 +64,7 @@ public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - Population population = (Population)getVerifier().getEntity(Population.class); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); setPopulationZonesPresenceModel(); setFieldPopulationZonesReproductionModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -79,7 +79,7 @@ getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Port"); getVerifier().setDeleteButton(remove); - Port port = (Port)getVerifier().getEntity(Port.class); + Port port = getVerifier().getEntity(Port.class); setBean((PortImpl) port); portMap.setFisheryRegion(getRegion()); if(mapListener == null){ @@ -91,7 +91,7 @@ } refreshMap(); if (getBean() != null){ - jaxx.runtime.swing.Utils.fillList(portCell, getRegion().getCell(), getBean().getCell()); + portCell.fillList(getRegion().getCell(), getBean().getCell()); } } protected void refreshMap(){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -70,10 +70,10 @@ getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "VesselType"); getVerifier().setDeleteButton(delete); - VesselType vesselType = (VesselType)getVerifier().getEntity(VesselType.class); + VesselType vesselType = getVerifier().getEntity(VesselType.class); setBean((VesselTypeImpl) vesselType); if (getBean() != null){ - jaxx.runtime.swing.Utils.fillList(vesselTypeTripType, getRegion().getTripType(), getBean().getTripType()); + vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType()); } } protected void tripTypeChanged(){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-01-20 17:54:50 UTC (rev 1750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-01-22 00:12:27 UTC (rev 1751) @@ -64,7 +64,7 @@ // jaxx.runtime.Util.removeDataBinding($InputContentUI0, "fieldZoneName.text", "fieldZoneComment.text"); fieldZoneName.setText(""); fieldZoneComment.setText(""); - //jaxx.runtime.swing.Utils.fillList(zoneCells, getRegion().getCell(), java.util.Collections.EMPTY_LIST); + //zoneCells.fillList(getRegion().getCell(), java.util.Collections.EMPTY_LIST); } if (evt.getNewValue() != null) { // add binding on getBean() @@ -83,7 +83,7 @@ if (log.isDebugEnabled()) { log.debug("zone nb cells : "+ ( zone==null ? 0 : zone.getCell().size() ) ); } - jaxx.runtime.swing.Utils.fillList(zoneCells, getRegion().getCell(), getBean() == null ? java.util.Collections.EMPTY_LIST : getBean().getCell()); + zoneCells.fillList(getRegion().getCell(), getBean() == null ? java.util.Collections.EMPTY_LIST : getBean().getCell()); zoneMap.setFisheryRegion(getRegion()); if (mapListener == null){ zoneMap.setActiveMouseMode(new SelectMouseMode(false));
participants (1)
-
tchemit@users.labs.libre-entreprise.org