pool/hamcrest
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=33

Browse Source
This commit is contained in:
Fridrich Strba 2019-01-01 15:19:14 +00:00 committed by Git OBS Bridge
parent 1bafc78fcc
commit c3e13147c4
1 changed files with 93 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
hamcrest-1.3-qdox-2.0.patch
View File

@ -1,39 +1,7 @@
From 6d7da5456a7458a249bed9c4c1e768cc7cc2fe40 Mon Sep 17 00:00:00 2001 diff -urEbwB hamcrest-1.3/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java hamcrest-1.3.new/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
From: Michael Simacek <msimacek@redhat.com> --- hamcrest-1.3/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java 2019-01-01 15:27:38.332599832 +0100
Date: Wed, 1 Feb 2017 12:57:14 +0100 +++ hamcrest-1.3.new/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java 2019-01-01 15:29:19.560043471 +0100
Subject: [PATCH] Port to qdox 2.0 @@ -4,8 +4,10 @@
---
.../src/main/java/org/hamcrest/generator/QDox.java | 4 ++--
.../org/hamcrest/generator/QDoxFactoryReader.java | 26 ++++++++++++----------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
index efaf615..338178d 100644
--- a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
+++ b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
@@ -1,6 +1,6 @@
package org.hamcrest.generator;
-import com.thoughtworks.qdox.JavaDocBuilder;
+import com.thoughtworks.qdox.JavaProjectBuilder;
import com.thoughtworks.qdox.model.JavaClass;
import java.io.File;
@@ -16,7 +16,7 @@ import java.io.Reader;
*/
public class QDox {
- private final JavaDocBuilder javaDocBuilder = new JavaDocBuilder();
+ private final JavaProjectBuilder javaDocBuilder = new JavaProjectBuilder();
public void addSourceTree(File sourceDir) {
javaDocBuilder.addSourceTree(sourceDir);
diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
index 5108140..97fce01 100644
--- a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
+++ b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
@@ -4,8 +4,10 @@ import com.thoughtworks.qdox.model.DocletTag;
import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaMethod; import com.thoughtworks.qdox.model.JavaMethod;
import com.thoughtworks.qdox.model.JavaParameter; import com.thoughtworks.qdox.model.JavaParameter;
@ -45,7 +13,7 @@ index 5108140..97fce01 100644
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -56,15 +58,15 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> { @@ -56,15 +58,15 @@
JavaMethod methodSource = findMethodInSource(factoryMethod); JavaMethod methodSource = findMethodInSource(factoryMethod);
if (methodSource != null) { if (methodSource != null) {
factoryMethod.setJavaDoc(createJavaDocComment(methodSource)); factoryMethod.setJavaDoc(createJavaDocComment(methodSource));
@ -65,7 +33,7 @@ index 5108140..97fce01 100644
} }
} }
} }
@@ -79,18 +81,18 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> { @@ -79,18 +81,18 @@
// Note, this doesn't always work - it struggles with some kinds of generics. // Note, this doesn't always work - it struggles with some kinds of generics.
// This seems to cover most cases though. // This seems to cover most cases though.
List<FactoryMethod.Parameter> params = factoryMethod.getParameters(); List<FactoryMethod.Parameter> params = factoryMethod.getParameters();
@ -89,7 +57,7 @@ index 5108140..97fce01 100644
} }
/** /**
@@ -98,8 +100,8 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> { @@ -98,8 +100,8 @@
*/ */
private static String createJavaDocComment(JavaMethod methodSource) { private static String createJavaDocComment(JavaMethod methodSource) {
String comment = methodSource.getComment(); String comment = methodSource.getComment();
@ -100,6 +68,27 @@ index 5108140..97fce01 100644
return null; return null;
} }
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
-- Only in hamcrest-1.3.new/hamcrest-generator/src/main/java/org/hamcrest/generator: QDoxFactoryReader.java.orig
2.9.3 Only in hamcrest-1.3.new/hamcrest-generator/src/main/java/org/hamcrest/generator: QDoxFactoryReader.java.rej
diff -urEbwB hamcrest-1.3/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java hamcrest-1.3.new/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
--- hamcrest-1.3/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java 2019-01-01 15:27:38.332599832 +0100
+++ hamcrest-1.3.new/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java 2019-01-01 15:29:19.556043651 +0100
@@ -1,6 +1,6 @@
package org.hamcrest.generator;
-import com.thoughtworks.qdox.JavaDocBuilder;
+import com.thoughtworks.qdox.JavaProjectBuilder;
import com.thoughtworks.qdox.model.JavaClass;
import java.io.File;
@@ -16,7 +16,7 @@
*/
public class QDox {
- private final JavaDocBuilder javaDocBuilder = new JavaDocBuilder();
+ private final JavaProjectBuilder javaDocBuilder = new JavaProjectBuilder();
public void addSourceTree(File sourceDir) {
javaDocBuilder.addSourceTree(sourceDir);
Only in hamcrest-1.3.new/hamcrest-generator/src/main/java/org/hamcrest/generator: QDox.java.orig
Only in hamcrest-1.3.new/hamcrest-generator/src/main/java/org/hamcrest/generator: QDox.java.rej