Author: echatellier Date: 2014-04-06 11:34:58 +0200 (Sun, 06 Apr 2014) New Revision: 3935 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3935 Log: Fix build Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-04-04 16:47:29 UTC (rev 3934) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-04-06 09:34:58 UTC (rev 3935) @@ -35,24 +35,19 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.SessionFactory; +import org.hibernate.internal.SessionFactoryImpl; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.service.spi.Stoppable; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.framework.TopiaContextImpl; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; -import org.hibernate.SessionFactory; -import org.hibernate.internal.SessionFactoryImpl; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.spi.Stoppable; -import org.nuiton.topia.framework.TopiaContextImpl; -//import org.hibernate.SessionFactory; -//import org.hibernate.internal.SessionFactoryImpl; -//import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -//import org.hibernate.service.spi.Stoppable; -//import org.nuiton.topia.framework.TopiaContextImpl; /** * Class abstraite dont herite tous les storages qui on besoin d'un TopiaContext @@ -246,6 +241,7 @@ } } + @Deprecated protected Stoppable getHibernatePool() throws TopiaException { Stoppable result = null; if (storage instanceof TopiaContextImpl) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2014-04-04 16:47:29 UTC (rev 3934) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2014-04-06 09:34:58 UTC (rev 3935) @@ -108,7 +108,7 @@ */ public void refreshFactorTree() { - }*/ + } ]]></script> <JMenuBar constraints='BorderLayout.NORTH'> <JMenu text="isisfish.simulation.menu.simulation">