Syntax improvements for richtext APIs, e.g. for chaining

klehmann · Jan 5, 2021 · 892dd22 · 892dd22
1 parent edb75c2
commit 892dd22
Show file tree

Hide file tree

Showing 17 changed files with 577 additions and 438 deletions.
diff --git a/...me-jakartamail/src/test/java/com/mindoo/domino/jna/mime/TestJakartaMimeDataReadWrite.java b/...me-jakartamail/src/test/java/com/mindoo/domino/jna/mime/TestJakartaMimeDataReadWrite.java
@@ -72,15 +72,11 @@ public Object call(Session session) throws Exception {
 				}
 
 				//now we create formatted richtext content
-				RichTextBuilder rtBuilder = note.createRichTextItem("Body");
-				try {
+				try (RichTextBuilder rtBuilder = note.createRichTextItem("Body");) {
 					rtBuilder.addText("Hello World.",
 							new TextStyle("MyStyle").setAlign(Justify.RIGHT),
 							new FontStyle().setBold(true));
 				}
-				finally {
-					rtBuilder.close();
-				}
 
 				NotesItem itm = note.getFirstItem("Body");
 				Assert.assertNotNull(itm);

diff --git a/...vaxmail/src/test/java/com/mindoo/domino/jna/mime/test/TestJavaxMailMimeDataReadWrite.java b/...vaxmail/src/test/java/com/mindoo/domino/jna/mime/test/TestJavaxMailMimeDataReadWrite.java
@@ -75,15 +75,11 @@ public Object call(Session session) throws Exception {
 				}
 
 				//now we create formatted richtext content
-				RichTextBuilder rtBuilder = note.createRichTextItem("Body");
-				try {
+				try (RichTextBuilder rtBuilder = note.createRichTextItem("Body");) {
 					rtBuilder.addText("Hello World.",
 							new TextStyle("MyStyle").setAlign(Justify.RIGHT),
 							new FontStyle().setBold(true));
 				}
-				finally {
-					rtBuilder.close();
-				}
 
 				NotesItem itm = note.getFirstItem("Body");
 				Assert.assertNotNull(itm);

diff --git a/domino-jna/src/main/java/com/mindoo/domino/jna/NotesNote.java b/domino-jna/src/main/java/com/mindoo/domino/jna/NotesNote.java
@@ -6430,7 +6430,7 @@ public int getCurrentRecordTotalLength() {
 		}
 
 		@Override
-		public void copyCurrentRecordTo(ICompoundText ct) {
+		public void copyCurrentRecordTo(ICompoundText<?> ct) {
 			if (ct.isRecycled())
 				throw new NotesError(0, "ICompoundText already recycled");
 

diff --git a/domino-jna/src/main/java/com/mindoo/domino/jna/internal/CDFileRichTextNavigator.java b/domino-jna/src/main/java/com/mindoo/domino/jna/internal/CDFileRichTextNavigator.java
@@ -328,7 +328,7 @@ public void restoreCurrentRecordPosition(RichTextNavPosition pos) {
 	}
 
 	@Override
-	public void copyCurrentRecordTo(ICompoundText target) {
+	public void copyCurrentRecordTo(ICompoundText<?> target) {
 		if (m_currentCDRecord==null)
 			throw new IllegalStateException("Current CD record is null");