Author: tchemit
Date: 2008-07-29 15:36:26 +0000 (Tue, 29 Jul 2008)
New Revision: 1270
Added:
branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/IsisFishException.java
branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java
branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/
branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/Formule.java
branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java
Removed:
branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/IsisFishException.java
branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/IsisFishRuntimeException.java
branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/entities/Formule.java
branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/entities/SeasonImpl.java
Log:
move from main
Copied: branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/IsisFishException.java (from rev 1266, branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/IsisFishException.java)
===================================================================
--- branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/IsisFishException.java (rev 0)
+++ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2008-07-29 15:36:26 UTC (rev 1270)
@@ -0,0 +1,28 @@
+package fr.ifremer.isisfish;
+
+
+
+public class IsisFishException extends Exception {
+
+ /** */
+ private static final long serialVersionUID = -9012018415761616627L;
+
+ public IsisFishException() {
+ super();
+ }
+
+ public IsisFishException(String message) {
+ super(message);
+ }
+
+ public IsisFishException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public IsisFishException(Throwable cause) {
+ super(cause);
+ }
+
+}
+
+
Property changes on: branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/IsisFishException.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java (from rev 1266, branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/IsisFishRuntimeException.java)
===================================================================
--- branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java (rev 0)
+++ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2008-07-29 15:36:26 UTC (rev 1270)
@@ -0,0 +1,76 @@
+/* *##%
+ * Copyright (C) 2006
+ * Code Lutin, Cédric Pineau, Benjamin Poussin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *##%*/
+
+/* *
+ * IsisFishRuntimeException.java
+ *
+ * Created: 21 janv. 2006 03:04:29
+ *
+ * @author poussin
+ * @version $Revision$
+ *
+ * Last update: $Date$
+ * by : $Author$
+ */
+
+package fr.ifremer.isisfish;
+
+
+/**
+ * @author poussin
+ *
+ */
+
+public class IsisFishRuntimeException extends RuntimeException {
+
+ /** */
+ private static final long serialVersionUID = 3388901195563202616L;
+
+ /**
+ *
+ */
+ public IsisFishRuntimeException() {
+ super();
+ }
+
+ /**
+ * @param message
+ */
+ public IsisFishRuntimeException(String message) {
+ super(message);
+ }
+
+ /**
+ * @param message
+ * @param cause
+ */
+ public IsisFishRuntimeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * @param cause
+ */
+ public IsisFishRuntimeException(Throwable cause) {
+ super(cause);
+ }
+
+}
+
+
Property changes on: branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/Formule.java (from rev 1266, branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/entities/Formule.java)
===================================================================
--- branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/Formule.java (rev 0)
+++ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/Formule.java 2008-07-29 15:36:26 UTC (rev 1270)
@@ -0,0 +1,46 @@
+/* *##%
+ * Copyright (C) 2006
+ * Code Lutin, Cédric Pineau, Benjamin Poussin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *##%*/
+
+/* *
+ * Formule.java
+ *
+ * Created: 14 févr. 2006 11:32:40
+ *
+ * @author poussin
+ * @version $Revision$
+ *
+ * Last update: $Date$
+ * by : $Author$
+ */
+
+package fr.ifremer.isisfish.entities;
+
+
+/**
+ * @author poussin
+ *
+ */
+
+public interface Formule {
+
+ public String getName();
+ public String getCategory();
+ public String getContent();
+
+}
Property changes on: branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/Formule.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java (from rev 1266, branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/entities/SeasonImpl.java)
===================================================================
--- branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java (rev 0)
+++ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2008-07-29 15:36:26 UTC (rev 1270)
@@ -0,0 +1,113 @@
+/* *##%
+ * Copyright (C) 2006
+ * Code Lutin, Cédric Pineau, Benjamin Poussin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *##%*/
+
+/* *
+ * SeasonImpl.java
+ *
+ * Created: 3 janv. 2006 18:28:19
+ *
+ * @author poussin
+ * @version $Revision$
+ *
+ * Last update: $Date$
+ * by : $Author$
+ */
+
+package fr.ifremer.isisfish.entities;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import fr.ifremer.isisfish.types.Month;
+import static org.codelutin.i18n.I18n._;
+
+
+/**
+ * @author poussin
+ *
+ */
+
+public class SeasonImpl extends SeasonAbstract {
+
+ /** */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ *
+ */
+ public SeasonImpl() {
+ super();
+ setFirstMonth(Month.JANUARY);
+ setLastMonth(Month.JANUARY);
+ }
+
+ /* (non-Javadoc)
+ * @see fr.ifremer.isisfish.entities.Season#getMonths()
+ */
+ public List<Month> getMonths() {
+ List<Month> result = new ArrayList<Month>();
+ Month m = getFirstMonth();
+ while (m.equals(getLastMonth()) == false) {
+ result.add(m);
+ m = m.next();
+ }
+ result.add(m); // add last month because we exit loop before
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see fr.ifremer.isisfish.entities.Season#setMonths(java.util.List)
+ */
+ public void setMonths(List<Month> listMonth) {
+ if (listMonth == null || listMonth.size() == 0) {
+ throw new IllegalArgumentException("listMonth must contains one month or more");
+ }
+ Month first = listMonth.get(0);
+ Month last = listMonth.get(listMonth.size());
+
+ setFirstMonth(first);
+ setLastMonth(last);
+ }
+
+ /* (non-Javadoc)
+ * @see fr.ifremer.isisfish.entities.Season#containsMonth(fr.ifremer.isisfish.types.Month)
+ */
+ public boolean containsMonth(Month month) {
+ boolean result = month.equals(getLastMonth()); // check first last month, because loop don't do that
+
+ Month m = getFirstMonth();
+ while (result == false && m.equals(getLastMonth()) == false) {
+ result = m.equals(month);
+ m = m.next();
+ }
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see fr.ifremer.isisfish.entities.SeasonAbstract#toString()
+ */
+ @Override
+ public String toString() {
+ String result = _("isisfish.season.toString", this.getFirstMonth(), this.getLastMonth());
+ return result;
+ }
+
+}
+
+
Property changes on: branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Deleted: branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/IsisFishException.java
===================================================================
--- branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/IsisFishException.java 2008-07-29 15:34:39 UTC (rev 1269)
+++ branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/IsisFishException.java 2008-07-29 15:36:26 UTC (rev 1270)
@@ -1,28 +0,0 @@
-package fr.ifremer.isisfish;
-
-
-
-public class IsisFishException extends Exception {
-
- /** */
- private static final long serialVersionUID = -9012018415761616627L;
-
- public IsisFishException() {
- super();
- }
-
- public IsisFishException(String message) {
- super(message);
- }
-
- public IsisFishException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public IsisFishException(Throwable cause) {
- super(cause);
- }
-
-}
-
-
Deleted: branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/IsisFishRuntimeException.java
===================================================================
--- branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2008-07-29 15:34:39 UTC (rev 1269)
+++ branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2008-07-29 15:36:26 UTC (rev 1270)
@@ -1,76 +0,0 @@
-/* *##%
- * Copyright (C) 2006
- * Code Lutin, Cédric Pineau, Benjamin Poussin
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *##%*/
-
-/* *
- * IsisFishRuntimeException.java
- *
- * Created: 21 janv. 2006 03:04:29
- *
- * @author poussin
- * @version $Revision$
- *
- * Last update: $Date$
- * by : $Author$
- */
-
-package fr.ifremer.isisfish;
-
-
-/**
- * @author poussin
- *
- */
-
-public class IsisFishRuntimeException extends RuntimeException {
-
- /** */
- private static final long serialVersionUID = 3388901195563202616L;
-
- /**
- *
- */
- public IsisFishRuntimeException() {
- super();
- }
-
- /**
- * @param message
- */
- public IsisFishRuntimeException(String message) {
- super(message);
- }
-
- /**
- * @param message
- * @param cause
- */
- public IsisFishRuntimeException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * @param cause
- */
- public IsisFishRuntimeException(Throwable cause) {
- super(cause);
- }
-
-}
-
-
Deleted: branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/entities/Formule.java
===================================================================
--- branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/entities/Formule.java 2008-07-29 15:34:39 UTC (rev 1269)
+++ branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/entities/Formule.java 2008-07-29 15:36:26 UTC (rev 1270)
@@ -1,46 +0,0 @@
-/* *##%
- * Copyright (C) 2006
- * Code Lutin, Cédric Pineau, Benjamin Poussin
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *##%*/
-
-/* *
- * Formule.java
- *
- * Created: 14 févr. 2006 11:32:40
- *
- * @author poussin
- * @version $Revision$
- *
- * Last update: $Date$
- * by : $Author$
- */
-
-package fr.ifremer.isisfish.entities;
-
-
-/**
- * @author poussin
- *
- */
-
-public interface Formule {
-
- public String getName();
- public String getCategory();
- public String getContent();
-
-}
Deleted: branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/entities/SeasonImpl.java
===================================================================
--- branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2008-07-29 15:34:39 UTC (rev 1269)
+++ branches/maven2_multimodule/isis-fish/src/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2008-07-29 15:36:26 UTC (rev 1270)
@@ -1,113 +0,0 @@
-/* *##%
- * Copyright (C) 2006
- * Code Lutin, Cédric Pineau, Benjamin Poussin
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *##%*/
-
-/* *
- * SeasonImpl.java
- *
- * Created: 3 janv. 2006 18:28:19
- *
- * @author poussin
- * @version $Revision$
- *
- * Last update: $Date$
- * by : $Author$
- */
-
-package fr.ifremer.isisfish.entities;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import fr.ifremer.isisfish.types.Month;
-import static org.codelutin.i18n.I18n._;
-
-
-/**
- * @author poussin
- *
- */
-
-public class SeasonImpl extends SeasonAbstract {
-
- /** */
- private static final long serialVersionUID = 1L;
-
- /**
- *
- */
- public SeasonImpl() {
- super();
- setFirstMonth(Month.JANUARY);
- setLastMonth(Month.JANUARY);
- }
-
- /* (non-Javadoc)
- * @see fr.ifremer.isisfish.entities.Season#getMonths()
- */
- public List<Month> getMonths() {
- List<Month> result = new ArrayList<Month>();
- Month m = getFirstMonth();
- while (m.equals(getLastMonth()) == false) {
- result.add(m);
- m = m.next();
- }
- result.add(m); // add last month because we exit loop before
- return result;
- }
-
- /* (non-Javadoc)
- * @see fr.ifremer.isisfish.entities.Season#setMonths(java.util.List)
- */
- public void setMonths(List<Month> listMonth) {
- if (listMonth == null || listMonth.size() == 0) {
- throw new IllegalArgumentException("listMonth must contains one month or more");
- }
- Month first = listMonth.get(0);
- Month last = listMonth.get(listMonth.size());
-
- setFirstMonth(first);
- setLastMonth(last);
- }
-
- /* (non-Javadoc)
- * @see fr.ifremer.isisfish.entities.Season#containsMonth(fr.ifremer.isisfish.types.Month)
- */
- public boolean containsMonth(Month month) {
- boolean result = month.equals(getLastMonth()); // check first last month, because loop don't do that
-
- Month m = getFirstMonth();
- while (result == false && m.equals(getLastMonth()) == false) {
- result = m.equals(month);
- m = m.next();
- }
- return result;
- }
-
- /* (non-Javadoc)
- * @see fr.ifremer.isisfish.entities.SeasonAbstract#toString()
- */
- @Override
- public String toString() {
- String result = _("isisfish.season.toString", this.getFirstMonth(), this.getLastMonth());
- return result;
- }
-
-}
-
-
