From 31ab5c03965831820f1c495aa1c2b345b3441f44 Mon Sep 17 00:00:00 2001 From: Simon Harrer Date: Wed, 12 Mar 2014 16:18:50 +0100 Subject: [PATCH 1/2] Add intellij idea files to gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 39e400a4fd0..7924439c9e9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,7 @@ src/windows/nsis/dist/ .gradle jabref-launch4j.tmp user.properties +out/ +*.iws +*.ipr +*.iml \ No newline at end of file From a66468793a5dcba41f0f9307f8d762baecc7f331 Mon Sep 17 00:00:00 2001 From: Simon Harrer Date: Wed, 12 Mar 2014 18:20:08 +0100 Subject: [PATCH 2/2] Gradle build works basically. Reuses existing folder structure. --- build-wrapper.xml | 3 ++ build.gradle | 61 +++++++++++++++++++++++++++ src/extensions/SimpleCsvImporter.java | 10 ++++- 3 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 build-wrapper.xml create mode 100644 build.gradle diff --git a/build-wrapper.xml b/build-wrapper.xml new file mode 100644 index 00000000000..5bd3edba14d --- /dev/null +++ b/build-wrapper.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000000..4a2a0225b52 --- /dev/null +++ b/build.gradle @@ -0,0 +1,61 @@ +apply plugin: "java" +apply plugin: "eclipse" +apply plugin: "idea" +apply plugin: "application" + +repositories { + mavenCentral() +} + +sourceSets { + main { + java { + srcDir "src/java" + } + resources { + srcDirs = ["src"] + } + } +} + +dependencies { + + // jgoodies + compile 'com.jgoodies:jgoodies-common:1.4.0' + compile 'com.jgoodies:jgoodies-forms:1.6.0' + compile 'com.jgoodies:jgoodies-looks:2.5.2' + + compile 'org.apache.pdfbox:pdfbox:1.7.1' + compile 'org.apache.pdfbox:fontbox:1.7.1' + compile 'org.apache.pdfbox:jempbox:1.7.1' + + + compile 'org.openoffice:juh:3.2.1' + compile 'org.openoffice:jurt:3.2.1' + compile 'org.openoffice:ridl:3.2.1' + compile 'org.openoffice:unoil:3.2.1' + + compile 'org.antlr:antlr:3.4' + + compile 'mysql:mysql-connector-java:5.0.7' + compile 'org.postgresql:postgresql:9.2-1002-jdbc4' + + compile fileTree(dir: 'lib', includes: ['glazedlists-1.8.0_java15.jar', 'jayatana-1.2.4.jar', 'microba.jar', 'spin.jar']) + + // not available in maven repository + compile fileTree(dir: 'lib/plugin', includes: ['jpf.jar', 'jpf-boot.jar', 'commons-logging.jar', 'JPFCodeGenerator-rt.jar']) + + compile fileTree(dir: 'lib/spl/jersey', includes: ['*.jar']) + compile fileTree(dir: 'lib/spl/sciplore', includes: ['*.jar']) + + compile 'junit:junit:3.8.2' +} + +// use ant targets with prefix antTargets.XXXXX +ant.importBuild "build-wrapper.xml" + +compileJava.dependsOn "antTargets.generate" + +task wrapper(type: Wrapper) { + gradleVersion = '1.11' +} \ No newline at end of file diff --git a/src/extensions/SimpleCsvImporter.java b/src/extensions/SimpleCsvImporter.java index 3b4ee400c09..e674bb71d43 100644 --- a/src/extensions/SimpleCsvImporter.java +++ b/src/extensions/SimpleCsvImporter.java @@ -13,8 +13,14 @@ public String getFormatName() { public boolean isRecognizedFormat(InputStream stream) throws IOException { return true; // this is discouraged except for demonstration purposes } - - public List importEntries(InputStream stream) throws IOException { + + @Override + public List importEntries(InputStream in, OutputPrinter status) throws IOException { + // MUST BE IMPLEMENTED + return null; + } + + public List importEntries(InputStream stream) throws IOException { ArrayList bibitems = new ArrayList(); BufferedReader in = new BufferedReader(ImportFormatReader.getReaderDefaultEncoding(stream));