First refactorings done

jlib-framework · May 16, 2016 · 86bb1f6 · 86bb1f6
1 parent ae272ba
commit 86bb1f6
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 17 deletions.
diff --git a/jlib-container.iml b/jlib-container.iml
@@ -19,7 +19,7 @@
     <orderEntry type="module" module-name="jlib-array" />
     <orderEntry type="module" module-name="jlib-operator" />
     <orderEntry type="module" module-name="jlib-value" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:1.8.10" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:1.7.1" level="project" />

diff --git a/src/main/java/org/jlib/container/operation/ForbiddenCastException.java b/src/main/java/org/jlib/container/operation/ForbiddenCastException.java
@@ -22,8 +22,7 @@
 package org.jlib.container.operation;
 
 import org.jlib.exception.InvalidStateException;
-
-import static org.jlib.message.MessageUtility.message;
+import static org.jlib.message.Messages.message;
 
 public class ForbiddenCastException
 extends InvalidStateException {

diff --git a/src/main/java/org/jlib/container/operation/InvalidContainerArgumentException.java b/src/main/java/org/jlib/container/operation/InvalidContainerArgumentException.java
@@ -23,8 +23,7 @@
 
 import org.jlib.exception.InvalidArgumentException;
 import org.jlib.message.Message;
-
-import static org.jlib.message.MessageUtility.message;
+import static org.jlib.message.Messages.message;
 
 public abstract class InvalidContainerArgumentException
 extends InvalidArgumentException {

diff --git a/src/main/java/org/jlib/container/operation/InvalidContainerStateException.java b/src/main/java/org/jlib/container/operation/InvalidContainerStateException.java
@@ -23,8 +23,7 @@
 
 import org.jlib.exception.InvalidStateException;
 import org.jlib.message.Message;
-
-import static org.jlib.message.MessageUtility.message;
+import static org.jlib.message.Messages.message;
 
 public abstract class InvalidContainerStateException
 extends InvalidStateException {

diff --git a/src/main/java/org/jlib/container/operation/ItemAlreadyContainedException.java b/src/main/java/org/jlib/container/operation/ItemAlreadyContainedException.java
@@ -21,8 +21,7 @@
 
 package org.jlib.container.operation;
 
-
-import static org.jlib.message.MessageUtility.message;
+import static org.jlib.message.Messages.message;
 
 /**
  * {@link InvalidContainerArgumentException} thrown when trying to invalidly add

diff --git a/src/main/java/org/jlib/container/operation/ItemToRemoveNotContainedException.java b/src/main/java/org/jlib/container/operation/ItemToRemoveNotContainedException.java
@@ -21,7 +21,7 @@
 
 package org.jlib.container.operation;
 
-import static org.jlib.message.MessageUtility.message;
+import static org.jlib.message.Messages.message;
 
 /**
  * {@link InvalidContainerArgumentException} thrown when a {@link RemoveSingleByValue} does not contain

diff --git a/src/main/java/org/jlib/container/storage/AbstractLinearIndexStorage.java b/src/main/java/org/jlib/container/storage/AbstractLinearIndexStorage.java
@@ -22,8 +22,7 @@
 package org.jlib.container.storage;
 
 import org.jlib.exception.UnexpectedStateException;
-
-import static org.jlib.message.MessageUtility.mfmessage;
+import static org.jlib.message.Messages.mfmessage;
 
 public abstract class AbstractLinearIndexStorage<Item>
 implements LinearIndexStorage<Item> {

diff --git a/src/main/java/org/jlib/container/storage/InvalidAdditionalCapacityException.java b/src/main/java/org/jlib/container/storage/InvalidAdditionalCapacityException.java
@@ -21,7 +21,7 @@
 
 package org.jlib.container.storage;
 
-import static org.jlib.message.MessageUtility.message;
+import static org.jlib.message.Messages.message;
 
 public class InvalidAdditionalCapacityException
 extends InvalidStorageArgumentException {

diff --git a/src/main/java/org/jlib/container/storage/InvalidStorageCapacityException.java b/src/main/java/org/jlib/container/storage/InvalidStorageCapacityException.java
@@ -21,7 +21,7 @@
 
 package org.jlib.container.storage;
 
-import static org.jlib.message.MessageUtility.message;
+import static org.jlib.message.Messages.message;
 
 /**
  * {@link InvalidStorageArgumentException} thrown when an invalid capacity of an {@link LinearIndexStorage} is

diff --git a/src/main/java/org/jlib/container/storage/capacity/AbstractCapacityStrategy.java b/src/main/java/org/jlib/container/storage/capacity/AbstractCapacityStrategy.java
@@ -27,7 +27,7 @@
 import org.jlib.container.storage.LinearIndexStorage;
 
 import org.jlib.basefunctions.ApplicationObject;
-import static org.jlib.message.MessageUtility.mfmessage;
+import static org.jlib.message.Messages.mfmessage;
 
 public abstract class AbstractCapacityStrategy
 extends ApplicationObject {

diff --git a/src/main/java/org/jlib/container/storage/capacity/InvalidCapacityException.java b/src/main/java/org/jlib/container/storage/capacity/InvalidCapacityException.java
@@ -21,10 +21,10 @@
 
 package org.jlib.container.storage.capacity;
 
-import org.jlib.container.storage.LinearIndexStorage;
 import org.jlib.container.storage.InvalidStorageArgumentException;
+import org.jlib.container.storage.LinearIndexStorage;
 
-import static org.jlib.message.MessageUtility.message;
+import static org.jlib.message.Messages.message;
 
 public class InvalidCapacityException
 extends InvalidStorageArgumentException {