Merge branch 'develop'

# Conflicts: # .gitignore # README.md # build.gradle # gradle/artifactory.gradle # gradle/mavencentral.gradle # gradle/tasks.gradle # gradle/version.gradle # gradle/wrapper/gradle-wrapper.properties # src/main/java/de/uniks/networkparser/DateTimeEntity.java # src/main/java/de/uniks/networkparser/DotIdMap.java # src/main/java/de/uniks/networkparser/Tokener.java # src/main/java/de/uniks/networkparser/calculator/RegCalculator.java # src/main/java/de/uniks/networkparser/ext/javafx/component/TableFilterView.java # src/main/java/de/uniks/networkparser/ext/javafx/controls/ComboEditControl.java # src/main/java/de/uniks/networkparser/graph/Annotation.java # src/main/java/de/uniks/networkparser/json/JsonArray.java # src/main/java/de/uniks/networkparser/json/JsonIdMap.java # src/main/java/de/uniks/networkparser/xml/XMLEntity.java # src/main/java/de/uniks/networkparser/xml/XMLIdMap.java # src/main/java/de/uniks/networkparser/xml/XMLSimpleIdMap.java # src/main/java/de/uniks/networkparser/xml/XMLTokener.java # src/test/java/de/uniks/networkparser/test/JISMEngineTest.java # src/test/java/de/uniks/networkparser/test/JsonTest.java # src/test/java/de/uniks/networkparser/test/RegTest.java # src/test/java/de/uniks/networkparser/test/StringTokenerTest.java
fujaba · Mar 23, 2016 · 2481ff4 · 2481ff4
2 parents b3fee37 + f3e2901
commit 2481ff4
Show file tree

Hide file tree

Showing 548 changed files with 36,966 additions and 29,447 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@
 **/*.dvi
 **/*.synctex.gz
 **/*-eps-converted-to.pdf
+NetworkParserAnt.jar
 gradle.properties
diff --git a/.infinitest.settings b/.infinitest.settings
@@ -0,0 +1 @@
+org.infinitest.eclipse.slow-warning=20000
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE project>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.networkparser_android"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-    </application>
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.networkparser_android" android:versionCode="1" android:versionName="1.0" >
+	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17" />
+	<application android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/AppTheme" ></application>
 </manifest>
diff --git a/Copyright.xml b/Copyright.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project default="CopyRight" name="Create Jar for NetworkParser">
+<project default="AddCopyRightToSource" name="Create Jar for NetworkParser">
 	<!-- Change to JRE on Workspace -->
 	<import file="buildAnt.xml" as="Ant"/>
-	<target name="CopyRight" depends="Ant.buildAnt">
-		<taskdef name="CopyRightSetter" classname="de.uniks.networkparser.test.ant.CopyRightSetter"  classpath="src/Ant:bin:build/ant.jar"/>
+	<target name="AddCopyRightToSource" depends="Ant.buildAnt" description="Add Licencetext to Sourcecode-Files">
+		<taskdef name="CopyRightSetter" classname="de.uniks.networkparser.test.ant.CopyRightSetter"  classpath="src/Ant:bin:NetworkParserAnt.jar"/>
 		<CopyRightSetter projectName="NetworkParser" source="src/main/java/de/uniks/networkparser/" file="src/Ant/de/uniks/networkparser/test/ant/Licence.txt"/>
 	</target>
 </project>
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -4,32 +4,20 @@ Bundle-Name: NetworkParser
 Bundle-SymbolicName: NetworkParser;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Export-Package: de.uniks.networkparser,
+ de.uniks.networkparser.buffer,
  de.uniks.networkparser.bytes,
  de.uniks.networkparser.bytes.checksum,
- de.uniks.networkparser.bytes.converter,
- de.uniks.networkparser.bytes.util,
  de.uniks.networkparser.calculator,
- de.uniks.networkparser.date,
+ de.uniks.networkparser.converter,
  de.uniks.networkparser.event,
  de.uniks.networkparser.event.util,
  de.uniks.networkparser.graph,
  de.uniks.networkparser.gui,
- de.uniks.networkparser.gui.javafx,
- de.uniks.networkparser.gui.javafx.controller,
- de.uniks.networkparser.gui.javafx.controls,
- de.uniks.networkparser.gui.javafx.form,
- de.uniks.networkparser.gui.javafx.fxml,
- de.uniks.networkparser.gui.javafx.resource,
- de.uniks.networkparser.gui.javafx.table,
- de.uniks.networkparser.gui.javafx.test,
- de.uniks.networkparser.gui.javafx.test.model,
- de.uniks.networkparser.gui.javafx.test.model.util,
- de.uniks.networkparser.gui.javafx.window,
  de.uniks.networkparser.interfaces,
  de.uniks.networkparser.json,
  de.uniks.networkparser.json.util,
  de.uniks.networkparser.list,
  de.uniks.networkparser.logic,
+ de.uniks.networkparser.parser,
  de.uniks.networkparser.sort,
- de.uniks.networkparser.xml,
- de.uniks.networkparser.xml.util
+ de.uniks.networkparser.xml
diff --git a/NetworkParserFX/todo.txt → NetworkParserFX.txt b/NetworkParserFX/todo.txt → NetworkParserFX.txt
diff --git a/README.md b/README.md
@@ -23,10 +23,17 @@ The Framework have many other features like:
 - Logicstructure
 - SimpleList as universal solution for datamodels
 
-
 ## Current Status ##
-- Master: [![Build Status](https://se.cs.uni-kassel.de/jenkins/buildStatus/icon?job=NetworkParser)](https://se.cs.uni-kassel.de/jenkins/job/NetworkParser/)  [![Build Status](https://travis-ci.org/fujaba/NetworkParser.svg?branch=master)](https://travis-ci.org/fujaba/NetworkParser)  [![Coverage Status](https://coveralls.io/repos/fujaba/NetworkParser/badge.svg?branch=master&service=github)](https://coveralls.io/github/fujaba/NetworkParser?branch=master)
-- Develop: [![Build Status](https://travis-ci.org/fujaba/NetworkParser.svg?branch=develop)](https://travis-ci.org/fujaba/NetworkParser)
+- Master
+  - Jenkins: [![Build Status](https://se.cs.uni-kassel.de/jenkins/job/NetworkParser/badge/icon)](https://se.cs.uni-kassel.de/jenkins/Networkparser/)
+  - travis-ci: [![Build Status](https://travis-ci.org/fujaba/NetworkParser.svg?branch=master)](https://travis-ci.org/fujaba/NetworkParser)
+  - Maven: [![Maven](http://se.cs.uni-kassel.de/maven/icon?project=NetworkParser)](http://se.cs.uni-kassel.de/maven/de/uniks/NetworkParser/latest/NetworkParser.jar)
+
+- Develop
+  - travis-ci: [![Build Status](https://travis-ci.org/fujaba/NetworkParser.svg?branch=develop)](https://travis-ci.org/fujaba/NetworkParser)
+  - Maven: [![Maven](http://se.cs.uni-kassel.de/maven/icon?project=NetworkParser&type=snaphots)](http://se.cs.uni-kassel.de/maven/de/uniks/NetworkParser/latest-SNAPSHOT/NetworkParser-SNAPSHOT.jar)
+
+[![Open Hub](https://www.openhub.net/p/NetworkParser/widgets/project_partner_badge?format=gif&ref=Partner+Badge "Open Hub")](https://www.openhub.net/p/NetworkParser/)
 
 # Getting Started
 
@@ -44,7 +51,7 @@ Here are a simple Usage of JsonIdMap for serialization and deserialization and g
 	House house=new House();
 	house.setFloor(4);
 	house.setName("University");
-	JsonIdMap map=new JsonIdMap().withCreator(new House());
+	IdMap map=new IdMap().withCreator(new HouseCreator());
 	map.withUpdateListenerSend(new UpdateListener() {
 		@Override
 		public boolean update(String typ, BaseItem source, Object target, String property, Object oldValue,
@@ -54,10 +61,10 @@ Here are a simple Usage of JsonIdMap for serialization and deserialization and g
 		}
 	});
 
-	JsonObject json = map.encode(house);
+	JsonObject json = map.toJsonObject(house);
 	String string=json.toString();
 
-	JsonIdMap decodeMap=new JsonIdMap().withCreator(new House());
+	IdMap decodeMap=new IdMap().withCreator(new HouseCreator());
 	House newHouse = (House) decodeMap.decode(string);
 
 	house.setFloor(42);
@@ -66,25 +73,37 @@ Here are a simple Usage of JsonIdMap for serialization and deserialization and g
 ### pom.xml
 ```xml
 <dependency>
-	<groupId>com.github.fujaba</groupId>
+	<groupId>de.uniks</groupId>
 	<artifactId>NetworkParser</artifactId>
 	<version>4.2.*</version>
 </dependency>
 
 <repositories>
 	<repository>
-	    <releases><enabled>false</enabled></releases>
-        <snapshots><enabled>true</enabled></snapshots>
-	    <id>Sonatype Snapshots</id>
-	    <name>Sonatype Snapshots</name>
-	    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		<releases><enabled>false</enabled></releases>
+		<snapshots><enabled>true</enabled></snapshots>
+		<id>Sonatype Snapshots</id>
+		<name>Sonatype Snapshots</name>
+		<url>https://oss.sonatype.org/content/repositories/snapshots</url>
 	</repository>
 </repositories>
 ```
+#Building Jar
+| Gradle Command | Description |
+|:--:|:--:|
+| task | Show task to run |
+| clean | Deletes the build directory. |
+| buildAll | Build All Jars |
+| buildCoreJar | Build Jar with NetworkParser-Core without dependency of JavaFX and Reflection |
+| buildFullJar | Build FullJar with Class-Files, Source-Files and JavaDoc |
+| buildJavadoc | Build JavaDoc Jar |
+| buildSourceJar | Build Jar with class-Files and Source-Files |
+| jar | Assembles a jar archive containing the main classes.|
 
 ## Links
 - [SimpleJsonTest](src/test/java/de/uniks/networkparser/test/SimpleJsonTest.java "Sourcecode SimpleJsonTest.java")
 - [House](src/test/java/de/uniks/networkparser/test/model/House.java "Sourcecode House.java")
+- [HouseCreator](src/test/java/de/uniks/networkparser/test/model/util/HouseCreator.java "Sourcecode HouseCreator.java")
 - The issue list: Head straight to https://github.com/fujaba/NetworkParser/issues for a list of all issues or click `Issues` in the navigation bar on the right.
 - See also on Openhub https://www.openhub.net/p/NetworkParser
 

diff --git a/android.xml b/android.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE project>
+<project default="android-compile" name="Android Compiler">
+	<mkdir dir="build/" />
+	<property name="androidBat" value="build/android-sdk-windows/tools/android.bat" />
+	<property name="androidtarget" value="1" />
+
+	<target name="android-compile" description="Compile NetworkParser to Android">
+		<record name="build/android.txt" action="start" append="false" />
+		<!--<get description="get Android-SDK" src="http://dl.google.com/android/android-sdk_r24.4.1-windows.zip" dest="build/android.zip" />
+		<unzip src="build/android.zip" dest="build" />
+		-->
+		<!--<exec executable="cmd">
+			<arg value="/C"/>
+			<arg line="echo y | call ${androidBat} update sdk -u -s"/>
+		</exec>-->
+
+		<exec executable="${androidBat}">
+			<!--<arg line="list targets"/>-->
+			<arg line="create project -n NetworkParser -p build/NetworkParserAndroid -t android-23 -k de.uniks.networkparser -a NPApp"/>
+		</exec>
+		<copy todir="build/NetworkParserAndroid/src">
+			<fileset dir="src/main/java/">
+				<exclude name="**/javafx/**"/>
+			</fileset>
+		</copy>
+		<ant antfile="build.xml" target="debug" inheritrefs="true" dir="build/NetworkParserAndroid/" />
+	</target>
+</project>
+
diff --git a/build.gradle b/build.gradle
@@ -2,14 +2,24 @@
 // -PReleaseBuild 
 apply plugin: 'java'
 apply plugin: 'maven'
+
+ant.importBuild 'buildAnt.xml'
+ant.importBuild 'gource.xml'
+ant.importBuild 'Copyright.xml'
+ant.importBuild 'ikvm.xml'
+gource.group "Git"
+makefilm.group "Git"
+ikvm.group "Git"
+AddCopyRightToSource.group "Build"
+
 apply from: 'gradle/version.gradle'
 apply from: 'gradle/tasks.gradle'
 apply plugin: 'jacoco'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
+
 apply from: 'gradle/mavencentral.gradle'
 apply from: 'gradle/artifactory.gradle'
-apply plugin: 'com.github.kt3k.coveralls'
 
 idea {
 	project {
@@ -36,55 +46,56 @@ buildscript {
 	}
 	dependencies {
 		classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.2.4')
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0'
 	}
 }
 
 artifacts { 
-	archives coreJar
-	archives coreJar16
-	archives coreJar17
-	archives sourceJar
-	archives sourceJar16
-	archives sourceJar17
-	archives javadocJar
-	archives fullJar
+	archives buildCoreJar
+	archives buildCoreJar16
+	archives buildCoreJar17
+	archives buildSourceJar
+	archives buildJavadoc
+	archives buildFullJar
 }
 
 test {
-    testLogging {
-        events "failed"
-        exceptionFormat "short"
+	testLogging {
+		events "failed"
+		exceptionFormat "short"
 		showStackTraces	true
 		showStandardStreams true
 		showCauses true
-    }
+	}
 }
 jacoco {
-    toolVersion = "0.7.5.201505241946"
+	toolVersion = "0.7.6.201602180812"
 }
 jacocoTestReport {
-    group = "Reporting"
-    description = "Generate Jacoco coverage reports after running tests."
-    executionData = files("$buildDir/jacoco/test.exec")
-    reports {
-        xml {
-            enabled true
-            //Following value is a file
-            destination "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
-        }
-        csv.enabled false
-        html {
-            enabled true
-            //Following value is a folder
-            destination "${buildDir}/reports/jacoco"
-        }
-    }
+	group = "Reporting"
+	description = "Generate Jacoco coverage reports after running tests."
+	executionData = files("${buildDir}/jacoco/test.exec")
+	reports {
+		xml {
+			enabled = false
+			//Following value is a file
+			destination = new File("${buildDir}/jacoco/jacoco.xml")
+		}
+		csv{
+			destination = new File("${buildDir}/jacoco/report.csv")
+			enabled = true
+		}
+		html {
+			enabled = true
+			//Following value is a folder
+			destination = new File("build/jacoco/html")
+		}
+	}
 }
 
 sourceSets.main.output.classesDir 'build/classes/main'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-defaultTasks 'clean', 'test', 'all'
+defaultTasks 'clean', 'test', 'jacocoTestReport', 'buildAll'
+
diff --git a/build.xml b/build.xml
@@ -6,12 +6,12 @@
 		<mkdir dir="build/bin16" />
 		<mkdir dir="build/bin17" />
 		<javac destdir="build/bin16" srcdir="src/main/java"
-		           debug="${javac.debug}" nowarn="${javac.nowarn}" fork="true" verbose="${verbose}"
-		           deprecation="${javac.deprecation}" source="1.6" target="1.6" includeantruntime="false" />
+			debug="${javac.debug}" nowarn="${javac.nowarn}" fork="true" verbose="${verbose}"
+			deprecation="${javac.deprecation}" source="1.6" target="1.6" includeantruntime="false" />
 		<javac destdir="build/bin17" srcdir="src/main/java"
-		           debug="${javac.debug}" nowarn="${javac.nowarn}" fork="true" verbose="${verbose}"
-		           deprecation="${javac.deprecation}" source="1.7" target="1.7" includeantruntime="false"/>
-		<taskdef name="CopyRightSetter" classname="de.uniks.networkparser.test.ant.CopyRightSetter"  classpath="src/Ant:bin:build/ant.jar"/>
+			debug="${javac.debug}" nowarn="${javac.nowarn}" fork="true" verbose="${verbose}"
+			deprecation="${javac.deprecation}" source="1.7" target="1.7" includeantruntime="false"/>
+		<taskdef name="CopyRightSetter" classname="de.uniks.networkparser.test.ant.CopyRightSetter"  classpath="src/Ant:bin:NetworkParserAnt.jar"/>
 		<CopyRightSetter projectName="NetworkParser" source="src/main/java/de/uniks/networkparser/" file="src/Ant/de/uniks/networkparser/test/build/Licence.txt"/>
 
 		<jar destfile="./build/networkparser.jar" filesetmanifest="mergewithoutmain" manifest="build/MANIFEST.MF">

diff --git a/buildAnt.xml b/buildAnt.xml
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE project>
 <project default="buildAnt" name="NPAnt" basedir=".">
-	<target name="buildAnt">
-		<property name="gitjar" value="lib/git/org.eclipse.jgit-4.1.0.201509280440-r.jar" />
-		<mkdir dir="build/temp/" />
-		<javac srcdir="src/Ant" destdir="build/temp"  includeantruntime="true" debug="true" sourcepath="Ant" listfiles="true">
+	<available file="NetworkParserAnt.jar" property="AntJarExist" />
+	<property name="gitjar" value="lib/git/org.eclipse.jgit-4.2.0.201601211800-r.jar" />
+	<target name="buildAntCompile">
+		<mkdir dir="build/Ant/" />
+		<mkdir dir="bin" />
+		<javac srcdir="src/main/java" destdir="bin" includeantruntime="false" sourcepath="src/main/java" listfiles="true">
+		</javac>
+		<javac srcdir="src/Ant" destdir="build/Ant" includeantruntime="false" debug="true" sourcepath="src/Ant" listfiles="true">
 			<classpath>
 				<pathelement location="${gitjar}"/>
-				<pathelement location="bin"></pathelement>
+				<pathelement location="bin"/>
+				<pathelement location="lib\findbugs\ant.jar"/>
 			</classpath>
 		</javac>
-        <jar destfile="build/ant.jar">
-            <fileset dir="./build/temp"/>
-        </jar>
-		<taskdef name="GitRevision" classname="de.uniks.networkparser.test.ant.GitRevision" classpath="bin:build/temp/:build/ant.jar">
+		<jar destfile="NetworkParserAnt.jar">
+			<fileset dir="./build/Ant"/>
+		</jar>
+		<delete dir="build/Ant/" />
+	</target>
+	<target name="buildAnt" depends="buildAntCompile">
+		<taskdef name="GitRevision" classname="de.uniks.networkparser.test.ant.GitRevision" classpath="bin:build/temp/:NetworkParserAnt.jar">
 			<classpath>
 				<pathelement location="${gitjar}"/>
 				<pathelement location="lib/git/log4j-over-slf4j-1.7.12.jar"/>
@@ -31,12 +39,11 @@
 			project.setProperty("Branchname", System.getProperty("Branchname"));
 			project.setProperty("LastCommit", System.getProperty("LastCommit"));
 			project.setProperty("Revisionnumber", System.getProperty("Revisionnumber"));
+			project.setProperty("GitTag", System.getProperty("GitTag"));
 		</script>
-		<echo>${Revisionnumber}</echo>
 		<tstamp><format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss" /></tstamp>
-        <property name="version" value="${revisionVersion}" />
-   		<property name="file.encoding" value="utf-8"/>
-		<delete dir="build/temp/" />
+		<property name="version" value="${revisionVersion}" />
+		<property name="file.encoding" value="utf-8"/>
 		<echo file="build/MANIFEST.MF">Manifest-Version: 1.0
 Specification-Version: 4.2.23.${Revisionnumber} ${TODAY}
 Implementation-Title: Networkparser