From 3969d6c6c59aacbcac99b04cbe3a5b1da74c3cf1 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 28 Aug 2015 12:12:53 +0200 Subject: [PATCH] =?utf8?q?More=20tpyos=20fixed=20...=20;-)=20+=20updated?= =?utf8?q?=20jcore.jar=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore.jar | Bin 119580 -> 120727 bytes .../category/BaseCategory.java | 4 +- .../pizzaapplication/category/Category.java | 4 +- .../basket/BasketDatabaseFrontend.java | 36 +++++++++--------- .../PizzaCategoryDatabaseFrontend.java | 28 +++++++------- .../product/PizzaProductDatabaseFrontend.java | 30 +++++++-------- .../item/AddableBasketItem.java | 4 +- .../pizzaapplication/item/BaseItem.java | 4 +- .../pizzaapplication/product/BaseProduct.java | 4 +- .../pizzaapplication/product/Product.java | 4 +- 10 files changed, 59 insertions(+), 59 deletions(-) diff --git a/lib/jcore.jar b/lib/jcore.jar index 1e78b3da00b81f1c3f568bd24878b282168385a0..adc5c6d62b12352d537c21cf4551a8411d51a901 100644 GIT binary patch delta 10223 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 bhh6N9sM*s3_`naQ(*LM_0FzHsPvL(678=qy delta 9232 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 { +public interface Category extends Storable, Comparable { /** * Id number of category diff --git a/src/java/org/mxchange/pizzaapplication/database/frontend/basket/BasketDatabaseFrontend.java b/src/java/org/mxchange/pizzaapplication/database/frontend/basket/BasketDatabaseFrontend.java index 28d4033b..9b7f6433 100644 --- a/src/java/org/mxchange/pizzaapplication/database/frontend/basket/BasketDatabaseFrontend.java +++ b/src/java/org/mxchange/pizzaapplication/database/frontend/basket/BasketDatabaseFrontend.java @@ -29,7 +29,7 @@ import org.mxchange.jcore.criteria.searchable.SearchCriteria; import org.mxchange.jcore.criteria.searchable.SearchableCriteria; import org.mxchange.jcore.database.frontend.BaseDatabaseFrontend; import org.mxchange.jcore.database.result.Result; -import org.mxchange.jcore.database.storage.Storeable; +import org.mxchange.jcore.database.storage.Storable; import org.mxchange.jcore.exceptions.BadTokenException; import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException; import org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException; @@ -89,7 +89,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask // Handle this over to the backend // @todo Nothing is done yet! - Result result = this.doInsertDataSet(); + Result result = this.doInsertDataSet(); // Debug message this.getLogger().debug(MessageFormat.format("result={0}", result)); //NOI18N @@ -157,7 +157,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask this.getLogger().trace(MessageFormat.format("product={0},sessionId={1} - CALLED!", product, sessionId)); //NOI18N // Now search for it - Result result = this.getResultFromProduct(product, sessionId); + Result result = this.getResultFromProduct(product, sessionId); // Debug message this.getLogger().debug(MessageFormat.format("result({0})={1}", result.size(), result)); //NOI18N @@ -168,7 +168,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask // Was an entry found? if (result.hasNext()) { // Found one entry - Storeable storeable = result.next(); + Storable storeable = result.next(); // Debug message this.getLogger().debug(MessageFormat.format("storeable={0}", storeable)); //NOI18N @@ -197,7 +197,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask */ @Override - public Storeable getStoreableAtRow (final int rowIndex) { + public Storable getStorableAtRow (final int rowIndex) { throw new UnsupportedOperationException(MessageFormat.format("Not supported yet: rowIndex={0}", rowIndex)); } @@ -220,7 +220,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask criteria.setLimit(1); // Get result back - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Is it empty? boolean isEmpty = (!result.hasNext()); @@ -238,7 +238,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask this.getLogger().trace(MessageFormat.format("item={0},sessionId={1} - CALLED!", item, sessionId)); //NOI18N // Get result back - Result result = this.getResultFromItem(item, sessionId); + Result result = this.getResultFromItem(item, sessionId); // Debug message this.getLogger().debug(MessageFormat.format("result={0}", result)); //NOI18N @@ -251,7 +251,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask } @Override - public Storeable toStoreable (final Map map) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { + public Storable toStorable (final Map map) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { // Trace message this.getLogger().trace(MessageFormat.format("map={0} - CALLED!", map)); //NOI18N @@ -271,7 +271,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask Iterator> iterator = map.entrySet().iterator(); // Init object instance - Storeable instance = new BasketItem(); + Storable instance = new BasketItem(); // Iterate over all while (iterator.hasNext()) { @@ -306,7 +306,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask * @throws java.lang.IllegalAccessException If the invoked method is not public * @throws java.lang.reflect.InvocationTargetException If anything else happened? */ - private Result getResultFromProduct (final Product product, final String sessionId) throws IOException, SQLException, BadTokenException, CorruptedDatabaseFileException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { + private Result getResultFromProduct (final Product product, final String sessionId) throws IOException, SQLException, BadTokenException, CorruptedDatabaseFileException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { // Trace message this.getLogger().trace(MessageFormat.format("product={0},sessionId={1} - CALLED!", product, sessionId)); //NOI18N @@ -343,7 +343,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask criteria.setLogical(new AndLogicalMatcher()); // Now search for it - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Trace message this.getLogger().debug(MessageFormat.format("result={0} - EXIT!", result)); //NOI18N @@ -366,7 +366,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask * @throws java.lang.IllegalAccessException If the invoked method is not public * @throws java.lang.reflect.InvocationTargetException If anything else happened? */ - private Result getResultFromItem (final AddableBasketItem item, final String sessionId) throws IOException, SQLException, BadTokenException, CorruptedDatabaseFileException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { + private Result getResultFromItem (final AddableBasketItem item, final String sessionId) throws IOException, SQLException, BadTokenException, CorruptedDatabaseFileException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { // Trace message this.getLogger().trace(MessageFormat.format("item={0},sessionId={1} - CALLED!", item, sessionId)); //NOI18N @@ -403,7 +403,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask criteria.setLogical(new AndLogicalMatcher()); // Now search for it - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Trace message this.getLogger().debug(MessageFormat.format("result={0} - EXIT!", result)); //NOI18N @@ -430,10 +430,10 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask criteria.addCriteria(BasketDatabaseConstants.COLUMN_SESSION_ID, this.getSessionId()); // Now run it on backend - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Now convert it to a map - Set set = result.resultSet(); + Set set = result.resultSet(); // Debug message this.getLogger().debug("set=" + set); @@ -442,7 +442,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask Map map = new LinkedHashMap<>(set.size()); // Add all entries - for (final Storeable storeable : set) { + for (final Storable storeable : set) { // Debug message this.getLogger().debug("storeable=" + storeable); @@ -512,7 +512,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask criteria.setLimit(1); // And run it ... - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Debug message this.getLogger().debug("result=" + result); @@ -527,7 +527,7 @@ public class BasketDatabaseFrontend extends BaseDatabaseFrontend implements Bask } // Get next element - Storeable storeable = result.next(); + Storable storeable = result.next(); // Is it still castable? if (!(storeable instanceof AddableBasketItem)) { diff --git a/src/java/org/mxchange/pizzaapplication/database/frontend/category/PizzaCategoryDatabaseFrontend.java b/src/java/org/mxchange/pizzaapplication/database/frontend/category/PizzaCategoryDatabaseFrontend.java index b0f84d49..0afecbc9 100644 --- a/src/java/org/mxchange/pizzaapplication/database/frontend/category/PizzaCategoryDatabaseFrontend.java +++ b/src/java/org/mxchange/pizzaapplication/database/frontend/category/PizzaCategoryDatabaseFrontend.java @@ -28,7 +28,7 @@ import org.mxchange.jcore.criteria.searchable.SearchableCriteria; import org.mxchange.jcore.database.frontend.BaseDatabaseFrontend; import org.mxchange.jcore.database.result.DatabaseResult; import org.mxchange.jcore.database.result.Result; -import org.mxchange.jcore.database.storage.Storeable; +import org.mxchange.jcore.database.storage.Storable; import org.mxchange.jcore.exceptions.BadTokenException; import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException; import org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException; @@ -87,7 +87,7 @@ public class PizzaCategoryDatabaseFrontend extends BaseDatabaseFrontend implemen // Handle this over to the backend // @todo Nothing is done yet! - Result result = this.doInsertDataSet(); + Result result = this.doInsertDataSet(); // Debug message this.getLogger().debug(MessageFormat.format("result={0}", result)); //NOI18N @@ -156,7 +156,7 @@ public class PizzaCategoryDatabaseFrontend extends BaseDatabaseFrontend implemen SearchableCriteria criteria = new SearchCriteria(); // Run the query - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Debug message this.getLogger().debug(MessageFormat.format("result={0}", result)); //NOI18N @@ -201,7 +201,7 @@ public class PizzaCategoryDatabaseFrontend extends BaseDatabaseFrontend implemen criteria.setLimit(1); // Run it on backend - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Debug log this.getLogger().debug(MessageFormat.format("result({0})={1}", result, result.size())); //NOI18N @@ -212,7 +212,7 @@ public class PizzaCategoryDatabaseFrontend extends BaseDatabaseFrontend implemen // Is there one entry? if (result.hasNext()) { // Read result from it - Storeable storeable = result.next(); + Storable storeable = result.next(); // Debug message this.getLogger().debug(MessageFormat.format("storeable={0}", storeable)); //NOI18N @@ -245,12 +245,12 @@ public class PizzaCategoryDatabaseFrontend extends BaseDatabaseFrontend implemen * @throws java.sql.SQLException If any SQL error occurs */ @Override - public Result getResultFromSet (final ResultSet resultSet) throws SQLException { + public Result getResultFromSet (final ResultSet resultSet) throws SQLException { // Trace message this.getLogger().trace(MessageFormat.format("resultSet={0} - CALLED!", resultSet)); //NOI18N // Init result instance - Result result = new DatabaseResult(); + Result result = new DatabaseResult(); // Reset result set before first row resultSet.beforeFirst(); @@ -283,7 +283,7 @@ public class PizzaCategoryDatabaseFrontend extends BaseDatabaseFrontend implemen } @Override - public Storeable getStoreableAtRow (final int rowIndex) { + public Storable getStorableAtRow (final int rowIndex) { throw new UnsupportedOperationException("Not supported yet: rowIndex=" + rowIndex); } @@ -308,7 +308,7 @@ public class PizzaCategoryDatabaseFrontend extends BaseDatabaseFrontend implemen criteria.setLimit(1); // Run it on backend - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Debug log this.getLogger().debug(MessageFormat.format("result({0})={1}", result, result.size())); //NOI18N @@ -324,17 +324,17 @@ public class PizzaCategoryDatabaseFrontend extends BaseDatabaseFrontend implemen } /** - * Converts the given map into a Storeable instance, depending on which + * Converts the given map into a Storable instance, depending on which * class implements it. All keys are being interpreted as class * fields/attributes and their respective setters are being searched for. As * this method may fail to find one or access it, this method throws some * exception. * - * @param map Map instance to convert to Storeable - * @return An instance of a Storeable implementation + * @param map Map instance to convert to Storable + * @return An instance of a Storable implementation */ @Override - public Storeable toStoreable (final Map map) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { + public Storable toStorable (final Map map) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { // Trace message this.getLogger().trace(MessageFormat.format("map={0} - CALLED!", map)); //NOI18N @@ -354,7 +354,7 @@ public class PizzaCategoryDatabaseFrontend extends BaseDatabaseFrontend implemen Iterator> iterator = map.entrySet().iterator(); // Init object instance - Storeable instance = new ProductCategory(); + Storable instance = new ProductCategory(); // Iterate over all while (iterator.hasNext()) { diff --git a/src/java/org/mxchange/pizzaapplication/database/frontend/product/PizzaProductDatabaseFrontend.java b/src/java/org/mxchange/pizzaapplication/database/frontend/product/PizzaProductDatabaseFrontend.java index 4c7dd442..207cfaa6 100644 --- a/src/java/org/mxchange/pizzaapplication/database/frontend/product/PizzaProductDatabaseFrontend.java +++ b/src/java/org/mxchange/pizzaapplication/database/frontend/product/PizzaProductDatabaseFrontend.java @@ -28,7 +28,7 @@ import org.mxchange.jcore.criteria.searchable.SearchableCriteria; import org.mxchange.jcore.database.frontend.BaseDatabaseFrontend; import org.mxchange.jcore.database.result.DatabaseResult; import org.mxchange.jcore.database.result.Result; -import org.mxchange.jcore.database.storage.Storeable; +import org.mxchange.jcore.database.storage.Storable; import org.mxchange.jcore.exceptions.BadTokenException; import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException; import org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException; @@ -101,7 +101,7 @@ public class PizzaProductDatabaseFrontend extends BaseDatabaseFrontend implement // Handle this over to the backend // @todo Nothing is done yet! - Result result = this.doInsertDataSet(); + Result result = this.doInsertDataSet(); // Debug message this.getLogger().debug(MessageFormat.format("result={0}", result)); //NOI18N @@ -176,7 +176,7 @@ public class PizzaProductDatabaseFrontend extends BaseDatabaseFrontend implement SearchableCriteria criteria = new SearchCriteria(); // Run the query - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Debug message this.getLogger().debug(MessageFormat.format("result={0}", result)); //NOI18N @@ -204,7 +204,7 @@ public class PizzaProductDatabaseFrontend extends BaseDatabaseFrontend implement criteria.addCriteria(ProductFrontend.COLUMN_AVAILABLE, Boolean.TRUE); // Run the query - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Debug message this.getLogger().debug(MessageFormat.format("result={0}", result)); //NOI18N @@ -233,12 +233,12 @@ public class PizzaProductDatabaseFrontend extends BaseDatabaseFrontend implement * @throws java.sql.SQLException If any SQL error occurs */ @Override - public Result getResultFromSet (final ResultSet resultSet) throws SQLException { + public Result getResultFromSet (final ResultSet resultSet) throws SQLException { // Trace message this.getLogger().trace(MessageFormat.format("resultSet={0} - CALLED!", resultSet)); //NOI18N // Init result instance - Result result = new DatabaseResult(); + Result result = new DatabaseResult(); // Reset result set before first row resultSet.beforeFirst(); @@ -273,7 +273,7 @@ public class PizzaProductDatabaseFrontend extends BaseDatabaseFrontend implement } @Override - public Storeable getStoreableAtRow (final int rowIndex) { + public Storable getStorableAtRow (final int rowIndex) { throw new UnsupportedOperationException("Not supported yet: rowIndex=" + rowIndex); } @@ -302,7 +302,7 @@ public class PizzaProductDatabaseFrontend extends BaseDatabaseFrontend implement criteria.setLimit(1); // Run it on backend - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Debug log this.getLogger().debug(MessageFormat.format("result({0}={1}", result, result.size())); //NOI18N @@ -318,17 +318,17 @@ public class PizzaProductDatabaseFrontend extends BaseDatabaseFrontend implement } /** - * Converts the given map into a Storeable instance, depending on which + * Converts the given map into a Storable instance, depending on which * class implements it. All keys are being interpreted as class * fields/attributes and their respective setters are being searched for. As * this method may fail to find one or access it, this method throws some * exception. * - * @param map Map instance to convert to Storeable - * @return An instance of a Storeable implementation + * @param map Map instance to convert to Storable + * @return An instance of a Storable implementation */ @Override - public Storeable toStoreable (final Map map) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { + public Storable toStorable (final Map map) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { // Trace message this.getLogger().trace(MessageFormat.format("map={0} - CALLED!", map)); //NOI18N @@ -348,7 +348,7 @@ public class PizzaProductDatabaseFrontend extends BaseDatabaseFrontend implement Iterator> iterator = map.entrySet().iterator(); // Init object instance - Storeable instance = new PizzaProduct(); + Storable instance = new PizzaProduct(); // Iterate over all while (iterator.hasNext()) { @@ -390,7 +390,7 @@ public class PizzaProductDatabaseFrontend extends BaseDatabaseFrontend implement criteria.setLimit(1); // Run it on backend - Result result = this.getBackend().doSelectByCriteria(criteria); + Result result = this.getBackend().doSelectByCriteria(criteria); // Debug log this.getLogger().debug(MessageFormat.format("result({0}={1}", result, result.size())); //NOI18N @@ -401,7 +401,7 @@ public class PizzaProductDatabaseFrontend extends BaseDatabaseFrontend implement // Is there one entry? if (result.hasNext()) { // Get item - Storeable storeable = result.next(); + Storable storeable = result.next(); // Is it Product? if (!(storeable instanceof Product)) { diff --git a/src/java/org/mxchange/pizzaapplication/item/AddableBasketItem.java b/src/java/org/mxchange/pizzaapplication/item/AddableBasketItem.java index a14b710a..53150794 100644 --- a/src/java/org/mxchange/pizzaapplication/item/AddableBasketItem.java +++ b/src/java/org/mxchange/pizzaapplication/item/AddableBasketItem.java @@ -16,14 +16,14 @@ */ package org.mxchange.pizzaapplication.item; -import org.mxchange.jcore.database.storage.Storeable; +import org.mxchange.jcore.database.storage.Storable; /** * An interface for addable basket items * * @author Roland Haeder */ -public interface AddableBasketItem extends Storeable, Comparable { +public interface AddableBasketItem extends Storable, Comparable { /** * Item amount diff --git a/src/java/org/mxchange/pizzaapplication/item/BaseItem.java b/src/java/org/mxchange/pizzaapplication/item/BaseItem.java index 73d512cf..ef12ca83 100644 --- a/src/java/org/mxchange/pizzaapplication/item/BaseItem.java +++ b/src/java/org/mxchange/pizzaapplication/item/BaseItem.java @@ -146,7 +146,7 @@ public class BaseItem extends BaseFrameworkSystem implements AddableBasketItem { this.getLogger().trace(MessageFormat.format("columnName={0} - CALLED!", columnName)); //NOI18N // Call super method - Object value = this.getValueInStoreableFromColumn(this, "BaseItem", columnName); //NOI18N + Object value = this.getValueInStorableFromColumn(this, "BaseItem", columnName); //NOI18N // Trace message this.getLogger().trace(MessageFormat.format("value={0} - EXIT!", value)); //NOI18N @@ -161,7 +161,7 @@ public class BaseItem extends BaseFrameworkSystem implements AddableBasketItem { this.getLogger().trace(MessageFormat.format("columnName={0},value={1} - CALLED!", columnName, value)); //NOI18N // Call super method - this.setValueInStoreableFromColumn(this, "BaseItem", columnName, value); //NOI18N + this.setValueInStorableFromColumn(this, "BaseItem", columnName, value); //NOI18N // Trace message this.getLogger().trace("EXIT!"); //NOI18N diff --git a/src/java/org/mxchange/pizzaapplication/product/BaseProduct.java b/src/java/org/mxchange/pizzaapplication/product/BaseProduct.java index 153dfd8a..47191a06 100644 --- a/src/java/org/mxchange/pizzaapplication/product/BaseProduct.java +++ b/src/java/org/mxchange/pizzaapplication/product/BaseProduct.java @@ -172,7 +172,7 @@ public class BaseProduct extends BaseFrameworkSystem implements Product { this.getLogger().trace(MessageFormat.format("columnName={0} - CALLED!", columnName)); //NOI18N // Call super method - Object value = this.getValueInStoreableFromColumn(this, "BaseProduct", columnName); //NOI18N + Object value = this.getValueInStorableFromColumn(this, "BaseProduct", columnName); //NOI18N // Trace message this.getLogger().trace(MessageFormat.format("value={0} - EXIT!", value)); //NOI18N @@ -187,7 +187,7 @@ public class BaseProduct extends BaseFrameworkSystem implements Product { this.getLogger().trace(MessageFormat.format("columnName={0},value={1} - CALLED!", columnName, value)); //NOI18N // Call super method - this.setValueInStoreableFromColumn(this, "BaseProduct", columnName, value); //NOI18N + this.setValueInStorableFromColumn(this, "BaseProduct", columnName, value); //NOI18N // Trace message this.getLogger().trace("EXIT!"); //NOI18N diff --git a/src/java/org/mxchange/pizzaapplication/product/Product.java b/src/java/org/mxchange/pizzaapplication/product/Product.java index c212df21..ee4620bf 100644 --- a/src/java/org/mxchange/pizzaapplication/product/Product.java +++ b/src/java/org/mxchange/pizzaapplication/product/Product.java @@ -16,14 +16,14 @@ */ package org.mxchange.pizzaapplication.product; -import org.mxchange.jcore.database.storage.Storeable; +import org.mxchange.jcore.database.storage.Storable; /** * An interface for in database storeable products * * @author Roland Haeder */ -public interface Product extends Storeable, Comparable { +public interface Product extends Storable, Comparable { /** * Getter for id number, suitable for form fields. * -- 2.39.5