diff --git a/l2jserver2-common/pom.xml b/l2jserver2-common/pom.xml
index b2db445b5..459e6acac 100644
--- a/l2jserver2-common/pom.xml
+++ b/l2jserver2-common/pom.xml
@@ -31,7 +31,7 @@
org.slf4j
slf4j-api
1.6.4
- runtime
+ compile
@@ -39,7 +39,7 @@
org.jboss.netty
netty
3.2.7.Final
- runtime
+ compile
@@ -47,19 +47,19 @@
com.google.inject
guice
3.0
- runtime
+ compile
com.google.inject.extensions
guice-assistedinject
3.0
- runtime
+ compile
com.google.inject.extensions
guice-multibindings
3.0
- runtime
+ compile
@@ -73,103 +73,103 @@
log4j
1.2.16
jar
- runtime
+ compile
commons-dbcp
commons-dbcp
1.4
- runtime
+ compile
net.sf.ehcache
ehcache-core
2.5.0
- runtime
+ compile
javolution
javolution
5.5.1
- runtime
+ compile
com.google.guava
guava
11.0
- runtime
+ compile
commons-io
commons-io
2.1
- runtime
+ compile
commons-pool
commons-pool
1.5.7
- runtime
+ compile
commons-collections
commons-collections
3.2.1
- runtime
+ compile
org.apache.commons
commons-math
2.2
- runtime
+ compile
com.mysema.querydsl
querydsl-sql
2.3.0
- runtime
+ compile
mysql
mysql-connector-java
5.1.18
jar
- runtime
+ compile
com.orientechnologies
orient-commons
1.0rc7
- runtime
+ compile
com.orientechnologies
orientdb-core
1.0rc7
- runtime
+ compile
com.h2database
h2
1.3.162
jar
- runtime
+ compile
org.apache.derby
derby
10.8.2.2
- runtime
+ compile
de.schlichtherle.truezip
truezip-kernel
7.4.3
- runtime
+ compile
de.schlichtherle.truezip
@@ -187,7 +187,7 @@
de.schlichtherle.truezip
truezip-path
7.4.3
- runtime
+ compile
\ No newline at end of file
diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ArrayTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ArrayTransformer.java
index 3b289a0b0..5dbf2287c 100644
--- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ArrayTransformer.java
+++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ArrayTransformer.java
@@ -36,8 +36,7 @@ public class ArrayTransformer implements Transformer {
/**
* This transformer shared instance
*/
- @SuppressWarnings("rawtypes")
- public static final ArrayTransformer SHARED_INSTANCE = new ArrayTransformer();
+ public static final ArrayTransformer SHARED_INSTANCE = new ArrayTransformer<>();
@Override
@SuppressWarnings("unchecked")
@@ -48,7 +47,7 @@ public class ArrayTransformer implements Transformer {
int i = 0;
for (final T item : value) {
values[i++] = transformer.transform(
- (Class) type.getComponentType(), item);
+ (Class) type.getComponentType(), item);
}
return StringUtils.join(values, '|');
}
@@ -59,14 +58,14 @@ public class ArrayTransformer implements Transformer {
final Transformer transformer = (Transformer) TransformerFactory
.getTransfromer(type.getComponentType());
final String[] stringValues = StringUtils.split(stringValue, '|');
- final T[] values = (T[]) Array.newInstance(type.getComponentType(),
+ final Object values = Array.newInstance(type.getComponentType(),
stringValues.length);
int i = 0;
for (final String value : stringValues) {
- values[i++] = transformer.untransform(
- (Class) type.getComponentType(), value);
+ Array.set(values, i++, transformer.untransform(
+ (Class) type.getComponentType(), value));
}
- return values;
+ return type.cast(values);
}
}
diff --git a/l2jserver2-common/src/test/java/com/l2jserver/util/transformer/impl/ArrayTransformerTest.java b/l2jserver2-common/src/test/java/com/l2jserver/util/transformer/impl/ArrayTransformerTest.java
index bfd02031a..93ff70e69 100644
--- a/l2jserver2-common/src/test/java/com/l2jserver/util/transformer/impl/ArrayTransformerTest.java
+++ b/l2jserver2-common/src/test/java/com/l2jserver/util/transformer/impl/ArrayTransformerTest.java
@@ -83,9 +83,10 @@ public class ArrayTransformerTest {
@Test
@SuppressWarnings("unchecked")
public void testClassTransforming() {
- final ArrayTransformer> transformer = new ArrayTransformer>();
+ @SuppressWarnings("rawtypes")
+ final ArrayTransformer transformer = new ArrayTransformer();
Assert.assertEquals(CLASS_ARRAY_STRING, transformer.transform(
- (Class[]>) Class[].class, CLASS_ARRAY));
+ Class[].class, CLASS_ARRAY));
Assert.assertArrayEquals(CLASS_ARRAY, transformer
.untransform((Class[]>) Class[].class,
CLASS_ARRAY_STRING));
diff --git a/l2jserver2-gameserver/data/sample/npc.xml b/l2jserver2-gameserver/data/sample/npc.xml
index d61c8c18f..548221f04 100644
--- a/l2jserver2-gameserver/data/sample/npc.xml
+++ b/l2jserver2-gameserver/data/sample/npc.xml
@@ -21,7 +21,7 @@
0
0
-