local package names

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>net.ranides</groupId>
     <artifactId>assira</artifactId>
-    <version>0.72.2</version>
+    <version>0.72.3</version>
     <packaging>jar</packaging>
 
     <name>assira</name>

src/main/java/net/ranides/assira/collection/set/IdentitySet.java

@@ -69,11 +69,11 @@ public final class IdentitySet<T> extends AbstractSet<T> {
 
     @Override
     public boolean add(T element) {
-        $add(element);
+        iadd(element);
         return true;
     }
     
-    private boolean $add(Object element) {
+    private boolean iadd(Object element) {
         if (element == null) {
             return false;
         }
@@ -143,7 +143,9 @@ public final class IdentitySet<T> extends AbstractSet<T> {
         final Object[] prev = table;
         initTable(table.length * 2);
         size = 0;
-        for (int i = 0; i < prev.length; i++) { $add(prev[i]); }
+        for (Object item : prev) {
+            iadd(item);
+        }
     }
 
     @Override

src/main/java/net/ranides/assira/events/EventBinding.java

@@ -31,7 +31,7 @@ public abstract class EventBinding<T extends Event> {
 
     @Meta.Unsafe
     @SuppressWarnings("unchecked")
-    public static EventBinding<?> $make(Object event, Object listener) {
+    static EventBinding<?> $make(Object event, Object listener) {
         assert event instanceof Class;
         assert listener instanceof EventListener;
         return new Simple((Class)event, (EventListener)listener);

src/main/java/net/ranides/assira/reflection/ClassInspector.java

@@ -324,13 +324,30 @@ public final class ClassInspector {
         return types;
     }
 
+    /**
+     * Zwraca wszystkie metody zadeklarowane i/lub odziedziczone przez klasę, łącznie
+     * z chronionymi i prywatnymi. Jeśli jakaś metoda jest override'wana, to jest
+     * zwracana wersja najbardziej "oryginalna".
+     * @param clazz
+     * @return
+     */
+    public static Method[] getDeepMethods(Class<?> clazz) {
+        Set<MethodWrapper> found = igetDeepMethods(clazz);
+        Method[] result = new Method[found.size()];
+        int i=0;
+        for(MethodWrapper item : found) {
+            result[i++] = item.get();
+        }
+        return result;
+    }
+
     /**
      * Zwraca wszystkie metody zadeklarowane i/lub odziedziczone przez klasę, łącznie
      * z chronionymi i prywatnymi.
      * @param clazz
      * @return
      */
-    static Set<MethodWrapper> $getDeepMethods(Class<?> clazz) {
+    private static Set<MethodWrapper> igetDeepMethods(Class<?> clazz) {
         assert clazz != null;
 
         Set<MethodWrapper> found = new LinkedHashSet<>();
@@ -346,24 +363,7 @@ public final class ClassInspector {
         }
         return found;
     }
-
-    /**
-     * Zwraca wszystkie metody zadeklarowane i/lub odziedziczone przez klasę, łącznie
-     * z chronionymi i prywatnymi. Jeśli jakaś metoda jest override'wana, to jest
-     * zwracana wersja najbardziej "oryginalna".
-     * @param clazz
-     * @return
-     */
-    public static Method[] getDeepMethods(Class<?> clazz) {
-        Set<MethodWrapper> found = $getDeepMethods(clazz);
-        Method[] result = new Method[found.size()];
-        int i=0;
-        for(MethodWrapper item : found) {
-            result[i++] = item.get();
-        }
-        return result;
-    }
-
+    
     /**
      * Zwraca <b>zadeklarowaną</b> metodę o podanej nazwie bez względu na pobierane
      * argumenty. Metoda może być zadeklarowana przez dowolną klasę w hierarchii

src/test/java/net/ranides/assira/asm/MethodInspectorTest.java

@@ -35,7 +35,7 @@ public class MethodInspectorTest {
     public MethodInspectorTest() {
     }
 
-    private Method $fm(Class<?> clazz, String name) {
+    private Method fm(Class<?> clazz, String name) {
         return ClassInspector.findMethod(clazz, name);
     }
 
@@ -71,23 +71,23 @@ public class MethodInspectorTest {
     public void testGetVMReturn( ) {
         assertEquals(
             "Lnet/ranides/assira/collection/map/CrossMap<Ljava/util/Set<[Ljava/lang/Character;>;Ljava/lang/Float;Ljava/util/List<Lnet/ranides/assira/generic/Function<Ljava/lang/Integer;Ljava/lang/Long;>;>;>;",
-            MethodInspector.getVMReturn($fm(A.class, "map1"))
+            MethodInspector.getVMReturn(fm(A.class, "map1"))
         );
         assertEquals(
             "Lnet/ranides/assira/collection/map/CrossMap<***>;",
-            MethodInspector.getVMReturn($fm(A.class, "map2"))
+            MethodInspector.getVMReturn(fm(A.class, "map2"))
         );
         assertEquals(
             "Lnet/ranides/assira/collection/map/CrossMap<*Ljava/lang/Byte;*>;",
-            MethodInspector.getVMReturn($fm(A.class, "map3"))
+            MethodInspector.getVMReturn(fm(A.class, "map3"))
         );
         assertEquals(
             "Lnet/ranides/assira/collection/map/CrossMap<-Ljava/lang/Byte;Ljava/lang/Byte;+Ljava/lang/Byte;>;",
-            MethodInspector.getVMReturn($fm(A.class, "map4"))
+            MethodInspector.getVMReturn(fm(A.class, "map4"))
         );
         assertEquals(
             "Ljava/util/Map<TArg;TRet;>;",
-            MethodInspector.getVMReturn($fm(A.class, "map5"))
+            MethodInspector.getVMReturn(fm(A.class, "map5"))
         );
     }
 
@@ -95,49 +95,49 @@ public class MethodInspectorTest {
     public void testGetReturnType() throws IOException {
         assertEquals(
             "CrossMap<Set<Character[]>, Float, List<Function<Integer, Long>>>",
-            MethodInspector.getReturnType($fm(A.class, "map1")).toString()
+            MethodInspector.getReturnType(fm(A.class, "map1")).toString()
         );
         assertEquals(
             "CrossMap<?, ?, ?>",
-            MethodInspector.getReturnType($fm(A.class, "map2")).toString()
+            MethodInspector.getReturnType(fm(A.class, "map2")).toString()
         );
         assertEquals(
             "CrossMap<?, Byte, ?>",
-            MethodInspector.getReturnType($fm(A.class, "map3")).toString()
+            MethodInspector.getReturnType(fm(A.class, "map3")).toString()
         );
         assertEquals(
             "CrossMap<Byte, Byte, Byte>",
-            MethodInspector.getReturnType($fm(A.class, "map4")).toString()
+            MethodInspector.getReturnType(fm(A.class, "map4")).toString()
         );
         assertEquals(
             "Map<Arg, Ret>",
-            MethodInspector.getReturnType($fm(A.class, "map5")).toString()
+            MethodInspector.getReturnType(fm(A.class, "map5")).toString()
         );
     }
 
     @Test
     public void testGetArguments() throws IOException {
-        assertArgs($fm(A.class, "params1"), new String[]{
+        assertArgs(fm(A.class, "params1"), new String[]{
             "String name",
             "int size",
             "long maxtime",
             "A<?, ?> joiner"
         });
-        assertArgs($fm(A.class, "params2"), new String[]{
+        assertArgs(fm(A.class, "params2"), new String[]{
             "Class<T> event",
             "Ort<T> listener"
         });
-        assertArgs($fm(A.class, "params3"), new String[]{
+        assertArgs(fm(A.class, "params3"), new String[]{
             "Norm value"
         });
-        assertArgs($fm(A.class, "params4"), new String[]{
+        assertArgs(fm(A.class, "params4"), new String[]{
         });
-        assertArgs($fm(A.class, "params5"), new String[]{
+        assertArgs(fm(A.class, "params5"), new String[]{
             "Collection<S> content",
             "Function<T, Ret> function",
             "Ort<Arg> extra"
         });
-        assertArgs($fm(A.class, "dec1"), new String[]{
+        assertArgs(fm(A.class, "dec1"), new String[]{
             "int a",
             "float b"
         });
@@ -145,13 +145,13 @@ public class MethodInspectorTest {
 
     @Test
     public void testGetVariables() throws IOException {
-        assertVars($fm(A.class, "dec1"), new String[]{
+        assertVars(fm(A.class, "dec1"), new String[]{
             "CrossMap<Set<Character[]>, Float, List<Function<Integer, Long>>> map1",
             "CrossMap<?, ?, ?> map2",
             "CrossMap<?, Byte, ?> map3",
             "CrossMap<Byte, Byte, Byte> map4"
         });
-        assertVars($fm(A.class, "dec2"), new String[]{
+        assertVars(fm(A.class, "dec2"), new String[]{
             "int x",
             "int y",
             "int z"

src/test/java/net/ranides/assira/reflection/GenericClassTest.java

@@ -29,7 +29,7 @@ public class GenericClassTest {
     public GenericClassTest() {
     }
     
-    private static GenericClass $(Class<?> clazz, GenericClass... params) {
+    private static GenericClass cc(Class<?> clazz, GenericClass... params) {
         return GenericFactory.construct(clazz, params);
     }
 
@@ -39,8 +39,8 @@ public class GenericClassTest {
         final TypeFactory TYPE_FACTORY = TypeFactory.defaultInstance();
         final ObjectMapper MAPPER = new ObjectMapper();
         
-        GenericClass gen1 = $(Map.class, $(String.class), $(ArrayList.class, $(Float.class)) );
-        GenericClass gen2 = $(Map.class, $(String.class), $(LinkedList.class, $(Double.class)) );
+        GenericClass gen1 = cc(Map.class, cc(String.class), cc(ArrayList.class, cc(Float.class)) );
+        GenericClass gen2 = cc(Map.class, cc(String.class), cc(LinkedList.class, cc(Double.class)) );
         
         JavaType jtype1 = TYPE_FACTORY.constructType(gen1.type());
         JavaType jtype2 = TYPE_FACTORY.constructType(gen2.type());