Ranides Atterwim 11 anni fa
parent
commit
5c0f89b929

+ 2 - 2
assira.common/pom.xml

@@ -11,8 +11,8 @@
     
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <netbeans.hint.license>WTFPL</netbeans.hint.license>
         <project.argLine></project.argLine>
         <project.test.memory>512m</project.test.memory>

+ 3 - 2
assira/pom.xml

@@ -6,12 +6,13 @@
         <artifactId>assira.common</artifactId>
         <version>2.0.0</version>
     </parent>
+    <name>assira</name>
     <groupId>net.ranides</groupId>
     <artifactId>assira</artifactId>
     <version>2.0.0</version>
     <packaging>jar</packaging>
-	
-	<repositories>
+
+    <repositories>
         <repository>
             <id>ranides.net</id>
             <name>ranides.net</name>

+ 1 - 6
assira/src/main/java/net/ranides/assira/collection/maps/ASortedMap.java

@@ -304,12 +304,7 @@ public abstract class ASortedMap<K, V> extends AMap<K, V> implements SortedMap<K
     protected class EntrySet extends ASortedSet<Entry<K, V>> {
 
         public EntrySet() {
-			super(new Comparator<Entry<K, V>>() {
-				@Override
-				public int compare(Entry<K, V> entry1, Entry<K, V> entry2) {
-					return ValueUtils.cmp(acmp, entry1.getKey(), entry2.getKey());
-				}
-			});
+			super((entry1, entry2) -> ValueUtils.cmp(acmp, entry1.getKey(), entry2.getKey()));
 		}
         
         @Override

+ 2 - 7
assira/src/main/java/net/ranides/assira/collection/maps/IntSortedMap.java

@@ -274,7 +274,7 @@ public abstract class IntSortedMap<V> extends IntMap<V> implements SortedMap<Int
 
         @Override
         public IntIterator iterator(int from) {
-            return new KeySetIterator<>(entrySet().iterator(new BasicEntry<V>(from, null)));
+            return new KeySetIterator<>(entrySet().iterator(new BasicEntry<>(from, null)));
         }
 
         @Override
@@ -398,12 +398,7 @@ public abstract class IntSortedMap<V> extends IntMap<V> implements SortedMap<Int
     protected class EntrySet extends ASortedSet<IntEntry<V>> {
 
 		public EntrySet() {
-			super(new Comparator<IntEntry<V>>() {
-				@Override
-				public int compare(IntEntry<V> entry1, IntEntry<V> entry2) {
-					return IntSortedMap.this.compare(entry1.getIntKey(), entry2.getIntKey());
-				}
-			});
+			super((entry1, entry2) -> IntSortedMap.this.compare(entry1.getIntKey(), entry2.getIntKey()));
 		}
 
         @Override