Depend on Jalico (migrated com.ochafik.util.listenable to its own repo / renamed to com.nativelibs4java.jalico)

Author: ochafik

jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Element.java

@@ -39,7 +39,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.ObjCppParser.Language;
 import com.ochafik.lang.reflect.GettersAndSettersHelper;
 import com.ochafik.lang.reflect.GettersAndSettersHelper.GetterAndSetterInfo;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 import java.util.Collections;
 

jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Expression.java

@@ -25,7 +25,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import java.util.Map;
 
 import com.ochafik.lang.jnaerator.parser.Identifier.SimpleIdentifier;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import java.math.BigInteger;
 import java.util.Collections;
 

jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Printer.java

@@ -66,9 +66,9 @@
 import com.ochafik.lang.jnaerator.parser.TypeRef.Primitive;
 import com.ochafik.lang.jnaerator.parser.TypeRef.SimpleTypeRef;
 import com.ochafik.lang.jnaerator.parser.TypeRef.TaggedTypeRef;
-import com.ochafik.util.listenable.Adapter;
-import com.ochafik.util.listenable.ListenableCollections;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Adapter;
+import com.nativelibs4java.jalico.ListenableCollections;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 
 /**

jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Scanner.java

@@ -68,7 +68,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.TypeRef.SimpleTypeRef;
 import com.ochafik.lang.jnaerator.parser.TypeRef.TaggedTypeRef;
 import com.ochafik.lang.jnaerator.parser.TypeRef.TargettedTypeRef;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import java.util.List;
 import java.util.Map;
 

jnaerator-parser/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppElementsTest.java

@@ -49,7 +49,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 //import com.ochafik.lang.jnaerator.parser.Expression.FunctionCall;
 import com.ochafik.lang.reflect.GettersAndSettersHelper;
 import com.ochafik.lang.reflect.GettersAndSettersHelper.GetterAndSetterInfo;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 
 @SuppressWarnings("unused")
 //@RunWith(Parameterized.class)

jnaerator-runtime/src/main/java/com/ochafik/net/URLUtils.java

@@ -9,7 +9,7 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 
-import com.ochafik.util.listenable.Filter;
+import com.nativelibs4java.jalico.Filter;
 
 public class URLUtils {
 

jnaerator/pom.xml

@@ -41,6 +41,10 @@ Users who are looking for ready-to-use libraries should check the NativeLibs4Jav
 			<groupId>com.nativelibs4java</groupId>
 			<artifactId>ochafik-swing</artifactId>
 		</dependency>
+    <dependency>
+      <groupId>com.nativelibs4java</groupId>
+      <artifactId>jalico</artifactId>
+    </dependency>
 		<dependency>
 			<groupId>com.nativelibs4java</groupId>
 			<artifactId>jnaerator-rococoa-runtime</artifactId>

jnaerator/src/main/java/com/ochafik/admin/visualstudio/VisualStudioUtils.java

@@ -25,7 +25,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
-import com.ochafik.util.listenable.Adapter;
+import com.nativelibs4java.jalico.Adapter;
 import com.ochafik.util.string.RegexUtils;
 
 public class VisualStudioUtils {

jnaerator/src/main/java/com/ochafik/lang/compiler/CompilerUtils.java

@@ -30,7 +30,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import javax.tools.Diagnostic.Kind;
 
 import com.ochafik.io.IOUtils;
-import com.ochafik.util.listenable.Adapter;
+import com.nativelibs4java.jalico.Adapter;
 import com.ochafik.util.string.RegexUtils;
 import com.ochafik.util.string.StringUtils;
 

jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJDeclarationsConverter.java

@@ -45,7 +45,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.Function.Type;
 import com.ochafik.lang.jnaerator.parser.DeclarationsHolder.ListWrapper;
 import com.ochafik.lang.jnaerator.parser.Declarator.*;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 
 import static com.ochafik.lang.jnaerator.parser.ElementsHelper.*;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJTypeConversion.java

@@ -13,7 +13,7 @@
 import com.ochafik.lang.jnaerator.parser.TypeRef.SimpleTypeRef;
 import com.ochafik.lang.jnaerator.parser.TypeRef.TaggedTypeRef;
 import com.ochafik.lang.jnaerator.runtime.NativeSize;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 import java.nio.charset.Charset;
 import java.util.ArrayList;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJer.java

@@ -37,7 +37,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.TypeRef.*;
 import com.ochafik.lang.jnaerator.parser.Expression.*;
 import com.ochafik.lang.jnaerator.parser.Declarator.*;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 
 import static com.ochafik.lang.jnaerator.parser.ElementsHelper.*;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/DeclarationsConverter.java

@@ -34,7 +34,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.Function.Type;
 import com.ochafik.lang.jnaerator.parser.Declarator.*;
 import com.ochafik.lang.jnaerator.runtime.VirtualTablePointer;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import static com.ochafik.lang.jnaerator.parser.ElementsHelper.*;
 import static com.ochafik.lang.jnaerator.TypeConversion.*;
 import com.ochafik.lang.jnaerator.parser.Function.SignatureType;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNADeclarationsConverter.java

@@ -37,7 +37,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.DeclarationsHolder.ListWrapper;
 import com.ochafik.lang.jnaerator.parser.Declarator.*;
 import com.ochafik.util.CompoundCollection;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 
 import java.net.URL;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNATypeConversion.java

@@ -12,7 +12,7 @@
 
 import static com.ochafik.lang.jnaerator.parser.ElementsHelper.*;
 import com.ochafik.lang.jnaerator.runtime.NativeSize;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.sun.jna.WString;
 import com.sun.jna.ptr.ByReference;
 import com.sun.jna.ptr.PointerByReference;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java

@@ -73,8 +73,8 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.ObjCppLexer;
 import com.ochafik.lang.jnaerator.runtime.Mangling;
 import com.ochafik.lang.jnaerator.studio.JNAeratorStudio;
-import com.ochafik.util.listenable.Adapter;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Adapter;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.RegexUtils;
 import com.ochafik.util.string.StringUtils;
 import java.io.BufferedReader;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorCommandLineArgs.java

@@ -2,7 +2,7 @@
 
 import com.ochafik.lang.jnaerator.JNAeratorConfig.OutputMode;
 import com.ochafik.lang.jnaerator.JNAeratorConfig.Runtime;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfig.java

@@ -43,9 +43,9 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.TypeRef;
 import com.ochafik.lang.jnaerator.parser.TypeRef.SimpleTypeRef;
 import com.ochafik.util.CompoundCollection;
-import com.ochafik.util.listenable.Adapter;
-import com.ochafik.util.listenable.Filter;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Adapter;
+import com.nativelibs4java.jalico.Filter;
+import com.nativelibs4java.jalico.Pair;
 import java.lang.annotation.Annotation;
 import java.text.MessageFormat;
 import java.util.Arrays;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfigUtils.java

@@ -40,7 +40,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.Modifier;
 import com.ochafik.lang.jnaerator.parser.ModifierType;
 import com.ochafik.util.SystemUtils;
-import com.ochafik.util.listenable.Adapter;
+import com.nativelibs4java.jalico.Adapter;
 import com.ochafik.util.string.RegexUtils;
 import com.ochafik.util.string.StringUtils;
 

jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorParser.java

@@ -51,7 +51,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.SourceFile;
 import com.ochafik.lang.jnaerator.parser.StoredDeclarations.TypeDef;
 import com.ochafik.lang.reflect.DebugUtils;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.RegexUtils;
 import java.util.Collection;
 import java.util.Map;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/MatchingUtils.java

@@ -9,7 +9,7 @@
 import com.ochafik.lang.jnaerator.parser.TypeRef.*;
 import com.ochafik.lang.jnaerator.parser.Expression.*;
 import com.ochafik.lang.jnaerator.parser.Declarator.*;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import static com.ochafik.lang.jnaerator.parser.ElementsHelper.*;
 
 public class MatchingUtils {

jnaerator/src/main/java/com/ochafik/lang/jnaerator/MissingNamesChooser.java

@@ -31,7 +31,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.StoredDeclarations.TypeDef;
 import com.ochafik.lang.jnaerator.parser.TypeRef.FunctionSignature;
 import com.ochafik.lang.jnaerator.parser.TypeRef.TaggedTypeRef;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 
 import static com.ochafik.lang.jnaerator.parser.ElementsHelper.*;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/NodeJSDeclarationsConverter.java

@@ -38,7 +38,7 @@
 import com.ochafik.lang.jnaerator.parser.Statement.Block;
 import com.ochafik.lang.jnaerator.parser.Statement.If;
 import com.ochafik.lang.jnaerator.parser.Statement.Return;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import java.io.File;
 import org.bridj.demangling.Demangler;
 

jnaerator/src/main/java/com/ochafik/lang/jnaerator/Reifier.java

@@ -8,7 +8,7 @@
 import static com.ochafik.lang.jnaerator.parser.ElementsHelper.*;
 import static com.ochafik.lang.jnaerator.TypeConversion.*;
 import com.ochafik.lang.jnaerator.parser.Function.SignatureType;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 import java.util.ArrayList;
 import java.util.Arrays;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java

@@ -60,7 +60,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.parser.TypeRef.FunctionSignature;
 import com.ochafik.lang.jnaerator.parser.TypeRef.TaggedTypeRef;
 import com.ochafik.util.SystemUtils;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 import java.util.LinkedHashMap;
 

jnaerator/src/main/java/com/ochafik/lang/jnaerator/TypeConversion.java

@@ -56,7 +56,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.runtime.globals.GlobalNativeLong;
 import com.ochafik.lang.jnaerator.runtime.globals.GlobalNativeSize;
 import com.ochafik.lang.jnaerator.runtime.globals.GlobalShort;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 import com.ochafik.util.string.StringUtils;
 import com.sun.jna.Native;
 import com.sun.jna.WString;

jnaerator/src/main/java/com/ochafik/lang/jnaerator/UniversalReconciliator.java

@@ -14,7 +14,7 @@
 import com.ochafik.lang.jnaerator.parser.Scanner;
 import com.ochafik.lang.jnaerator.parser.TypeRef;
 import com.ochafik.lang.jnaerator.parser.TypeRef.SimpleTypeRef;
-import com.ochafik.util.listenable.Pair;
+import com.nativelibs4java.jalico.Pair;
 
 public class UniversalReconciliator {
 

jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/JNAeratorStudio.java

@@ -91,9 +91,9 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.swing.syntaxcoloring.JavaTokenMarker;
 import com.ochafik.swing.syntaxcoloring.TokenMarker;
 import com.ochafik.util.SystemUtils;
-import com.ochafik.util.listenable.ListenableCollections;
-import com.ochafik.util.listenable.ListenableComboModel;
-import com.ochafik.util.listenable.ListenableList;
+import com.nativelibs4java.jalico.ListenableCollections;
+import com.nativelibs4java.jalico.ListenableComboModel;
+import com.nativelibs4java.jalico.ListenableList;
 import com.ochafik.util.string.StringUtils;
 import java.util.List;
 

jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAerationTest.java

@@ -46,8 +46,8 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.JNAeratorConfig.OutputMode;
 import com.ochafik.lang.jnaerator.studio.JNAeratorStudio.SyntaxException;
 import com.ochafik.net.URLUtils;
-import com.ochafik.util.listenable.Adapter;
-import com.ochafik.util.listenable.Filter;
+import com.nativelibs4java.jalico.Adapter;
+import com.nativelibs4java.jalico.Filter;
 import com.ochafik.util.string.RegexUtils;
 import com.ochafik.util.string.StringUtils;
 

jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAeratorTest.java

@@ -49,8 +49,8 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import com.ochafik.lang.jnaerator.JNAerator.Feedback;
 import com.ochafik.lang.jnaerator.studio.JNAeratorStudio.SyntaxException;
 import com.ochafik.net.URLUtils;
-import com.ochafik.util.listenable.Adapter;
-import com.ochafik.util.listenable.Filter;
+import com.nativelibs4java.jalico.Adapter;
+import com.nativelibs4java.jalico.Filter;
 import com.ochafik.util.string.RegexUtils;
 import com.ochafik.util.string.StringUtils;
 import org.junit.runners.Parameterized;

ochafik-util/src/main/java/com/ochafik/util/DefaultAdapter.java

@@ -18,7 +18,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 */
 package com.ochafik.util;
 
-public class DefaultAdapter<U,V> implements Adapter<U, V>, com.ochafik.util.listenable.Adapter<U, V> {
+public class DefaultAdapter<U,V> implements Adapter<U, V>, com.nativelibs4java.jalico.Adapter<U, V> {
 	public V adapt(U value) {
 		throw new UnsupportedOperationException();
 	}

ochafik-util/src/main/java/com/ochafik/util/listenable/AdaptedCollection.java

@@ -17,7 +17,7 @@ This file comes from the Jalico project (Java Listenable Collections)
 
 	  http://jalico.googlecode.com/
 */
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 import java.util.AbstractCollection;
 import java.util.ArrayList;

ochafik-util/src/main/java/com/ochafik/util/listenable/Adapter.java

@@ -17,7 +17,7 @@ This file comes from the Jalico project (Java Listenable Collections)
 
        http://jalico.googlecode.com/.
 */
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 public interface Adapter<U,V> {
 	public V adapt(U value);

ochafik-util/src/main/java/com/ochafik/util/listenable/CollectionEvent.java

@@ -17,7 +17,7 @@ This file comes from the Jalico project (Java Listenable Collections)
 
        http://jalico.googlecode.com/.
 */
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 import java.util.Collection;
 import java.util.EventObject;

ochafik-util/src/main/java/com/ochafik/util/listenable/CollectionListener.java

@@ -17,7 +17,7 @@ This file comes from the Jalico project (Java Listenable Collections)
 
        http://jalico.googlecode.com/.
 */
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 import java.util.EventListener;
 

ochafik-util/src/main/java/com/ochafik/util/listenable/DefaultListenableCollection.java

@@ -17,7 +17,7 @@ This file comes from the Jalico project (Java Listenable Collections)
 
        http://jalico.googlecode.com/.
 */
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 import java.util.ArrayList;
 import java.util.Collection;

ochafik-util/src/main/java/com/ochafik/util/listenable/DefaultListenableList.java

@@ -17,7 +17,7 @@ This file comes from the Jalico project (Java Listenable Collections)
 
        http://jalico.googlecode.com/.
 */
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 import java.util.ArrayList;
 import java.util.Collection;

ochafik-util/src/main/java/com/ochafik/util/listenable/DefaultListenableMap.java

@@ -1,4 +1,4 @@
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 import java.util.ArrayList;
 import java.util.Collection;

ochafik-util/src/main/java/com/ochafik/util/listenable/DefaultListenableSet.java

@@ -17,7 +17,7 @@ This file comes from the Jalico project (Java Listenable Collections)
 
        http://jalico.googlecode.com/.
 */
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 import java.util.Set;
 

ochafik-util/src/main/java/com/ochafik/util/listenable/DefaultListenableSortedSet.java

@@ -17,7 +17,7 @@ This file comes from the Jalico project (Java Listenable Collections)
 
        http://jalico.googlecode.com/.
 */
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 import java.util.Comparator;
 import java.util.SortedSet;

ochafik-util/src/main/java/com/ochafik/util/listenable/Filter.java

@@ -1,4 +1,4 @@
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 public interface Filter<V> {
 	public boolean accept(V value);

ochafik-util/src/main/java/com/ochafik/util/listenable/FilteredListenableCollection.java

@@ -17,7 +17,7 @@ This file comes from the Jalico project (Java Listenable Collections)
 
        http://jalico.googlecode.com/.
 */
-package com.ochafik.util.listenable;
+package com.nativelibs4java.jalico;
 
 import java.util.ArrayList;
 import java.util.Collection;