Author: echatellier Date: 2011-12-20 11:09:45 +0100 (Tue, 20 Dec 2011) New Revision: 3575 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3575 Log: #572 : Effectifs initiaux discrets non remplissables Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-12-19 16:04:02 UTC (rev 3574) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-12-20 10:09:45 UTC (rev 3575) @@ -502,13 +502,11 @@ int nbTab = Integer.parseInt(discreteNumber); factorWizardUI.discretComponents.clear(); factorWizardUI.getTabPane().removeAll(); - for (int i = 0; i < nbTab ; i++) { + for (int i = 1; i <= nbTab ; i++) { JComponent c = getNewDiscreteComponent(factorWizardUI); - System.out.println(c); factorWizardUI.discretComponents.add(c); - JScrollPane js = new JScrollPane(c); - String tabName = _("isisfish.sensitivity.discretevaluelabel", (i+1)); - factorWizardUI.getTabPane().addTab(tabName, js); + String tabName = _("isisfish.sensitivity.discretevaluelabel", i); + factorWizardUI.getTabPane().addTab(tabName, c); } factorWizardUI.pack(); } @@ -920,6 +918,9 @@ * Get copy of component with original entity value as default value. * Used to add new tab to a new or existing factor. * + * Le composant retourné est inclut dans un jscrollpane (sauf pour les + * matrices qui contient deja un jscrollpane) + * * @param factorWizardUI factorWizardUI * @return component copy */ @@ -982,7 +983,8 @@ MatrixContinuousPanelUI currentPanel = (MatrixContinuousPanelUI)factorWizardUI.continuousPanel; // on copie une des matrices du composant MatrixND matrix = currentPanel.getReferenceValuePanel().getMatrix().copy(); - result = new MatrixPanelEditor(matrix, false); + result = new MatrixPanelEditor(); // bug in 2.2.x with matrix in constructor + ((MatrixPanelEditor)result).setMatrix(matrix); } else if (factorPath.startsWith("parameters.rule.")) { Pattern pattern = Pattern.compile("^parameters\\.rule\\.\\d+\\.parameter\\.\\w+\\.(.+)$"); Matcher matcher = pattern.matcher(factorPath); @@ -1014,6 +1016,11 @@ log.debug("Component for path " + factorPath + " is " + result); } + // hack : si on met 2 fois un jscrollpane, rien ne s'affiche + if (!(result instanceof MatrixPanelEditor)) { + result = new JScrollPane(result); + } + return result; }