Author: sletellier Date: 2009-04-23 16:08:14 +0000 (Thu, 23 Apr 2009) New Revision: 2142 Removed: isis-fish/trunk/src/main/resources/log4j.properties Modified: isis-fish/trunk/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx Log: bug fixed Property changes on: isis-fish/trunk ___________________________________________________________________ Name: svn:ignore - maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-04-23 15:47:53 UTC (rev 2141) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-04-23 16:08:14 UTC (rev 2142) @@ -100,25 +100,23 @@ } } - protected void accept(ActionEvent e) { - JComponent source = (JComponent) e.getSource(); - Class classBean = (Class)source.getClientProperty("bean"); - String beanID = (String)source.getClientProperty("beanID"); - TopiaEntity bean = null; - if(beanID == null){ - bean = getVerifier().getEntity(classBean); - } - else{ - System.out.println(beanID); - bean = getVerifier().getEntity(classBean, beanID); - } - if (bean != null){ - FactorWizard wizard = new FactorWizard(this); +protected void accept(ActionEvent e) { + JComponent source = (JComponent) e.getSource(); + Class classBean = (Class)source.getClientProperty("bean"); + String beanID = (String)source.getClientProperty("beanID"); + TopiaEntity bean = null; + if (beanID == null){ + bean = getVerifier().getEntity(classBean); + } + else{ + bean = getVerifier().getEntity(classBean, beanID); + } + if (bean != null){ + FactorWizard wizard = new FactorWizard(this); - wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); - wizard.pack(); - wizard.setVisible(true); - } + wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); + wizard.pack(); + wizard.setVisible(true); } } Deleted: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2009-04-23 15:47:53 UTC (rev 2141) +++ isis-fish/trunk/src/main/resources/log4j.properties 2009-04-23 16:08:14 UTC (rev 2142) @@ -1,17 +0,0 @@ -# Global logging configuration -log4j.rootLogger=ERROR, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -# package level -log4j.logger.fr.ifremer.isisfish=INFO -log4j.logger.org.codelutin=INFO -log4j.logger.analyseplans=INFO -log4j.logger.exports=INFO -log4j.logger.formules=INFO -log4j.logger.rules=INFO -log4j.logger.scripts=INFO -log4j.logger.sensitivity=INFO -log4j.logger.simulators=INFO