Fix annotations

@@ -26,7 +26,7 @@ class PdfAnnot extends PdfObject {
   final PdfRect srcRect;
   final PdfRect srcRect;
 
 
   /// The text of a text annotation
   /// The text of a text annotation
-  final String s;
+  final String content;
 
 
   /// Link to the Destination page
   /// Link to the Destination page
   final PdfObject dest;
   final PdfObject dest;
@@ -36,58 +36,46 @@ class PdfAnnot extends PdfObject {
   final PdfRect destRect;
   final PdfRect destRect;
 
 
   /// the border for this annotation
   /// the border for this annotation
-  PdfBorder border;
+  final PdfBorder border;
 
 
-  PdfAnnot(PdfPage pdfPage,
+  PdfAnnot._create(PdfPage pdfPage,
       {String type,
       {String type,
-      this.s,
+      this.content,
       this.srcRect,
       this.srcRect,
-      this.subtype,
+      @required this.subtype,
       this.dest,
       this.dest,
-      this.destRect})
-      : super(pdfPage.pdfDocument, type) {
+      this.destRect,
+      this.border})
+      : super(pdfPage.pdfDocument, type ?? '/Annot') {
     pdfPage.annotations.add(this);
     pdfPage.annotations.add(this);
   }
   }
 
 
-  /// This is used to create an annotation.
-  /// @param s Subtype for this annotation
-  /// @param rect coordinates
-  factory PdfAnnot.annotation(PdfPage pdfPage, String s, PdfRect rect) =>
-      PdfAnnot(pdfPage, type: "/Annot", s: s, srcRect: rect);
-
   /// Creates a text annotation
   /// Creates a text annotation
   /// @param rect coordinates
   /// @param rect coordinates
   /// @param s Text for this annotation
   /// @param s Text for this annotation
-  factory PdfAnnot.text(PdfPage pdfPage, PdfRect rect, String s) =>
-      PdfAnnot(pdfPage, type: "/Text", srcRect: rect, s: s);
+  factory PdfAnnot.text(PdfPage pdfPage,
+          {@required PdfRect rect,
+          @required String content,
+          PdfBorder border}) =>
+      PdfAnnot._create(pdfPage,
+          subtype: "/Text", srcRect: rect, content: content, border: border);
 
 
   /// Creates a link annotation
   /// Creates a link annotation
   /// @param srcRect coordinates
   /// @param srcRect coordinates
   /// @param dest Destination for this link. The page will fit the display.
   /// @param dest Destination for this link. The page will fit the display.
   /// @param destRect Rectangle describing what part of the page to be displayed
   /// @param destRect Rectangle describing what part of the page to be displayed
   /// (must be in User Coordinates)
   /// (must be in User Coordinates)
-  factory PdfAnnot.link(PdfPage pdfPage, PdfRect srcRect, PdfObject dest,
-          [PdfRect destRect]) =>
-      PdfAnnot(pdfPage,
-          type: "/Link", srcRect: srcRect, dest: dest, destRect: destRect);
-
-  /// Sets the border for the annotation. By default, no border is defined.
-  ///
-  /// If the style is dashed, then this method uses Pdf's default dash
-  /// scheme {3}
-  ///
-  /// Important: the annotation must have been added to the document before
-  /// this is used. If the annotation was created using the methods in
-  /// [PdfPage], then the annotation is already in the document.
-  ///
-  /// @param style Border style solid, dashed, beveled, inset or underlined.
-  /// @param width Width of the border
-  /// @param dash Array of lengths, used for drawing the dashes. If this
-  /// is null, then the default of {3} is used.
-  void setBorder(double width,
-      {PdfBorderStyle style = PdfBorderStyle.solid, List<double> dash}) {
-    border = PdfBorder(pdfDocument, width, style: style, dash: dash);
-  }
+  factory PdfAnnot.link(PdfPage pdfPage,
+          {@required PdfRect srcRect,
+          @required PdfPage dest,
+          PdfRect destRect,
+          PdfBorder border}) =>
+      PdfAnnot._create(pdfPage,
+          subtype: "/Link",
+          srcRect: srcRect,
+          dest: dest,
+          destRect: destRect,
+          border: border);
 
 
   /// Output the annotation
   /// Output the annotation
   ///
   ///
@@ -109,7 +97,7 @@ class PdfAnnot extends PdfObject {
 
 
     // Now the annotation subtypes
     // Now the annotation subtypes
     if (subtype == "/Text") {
     if (subtype == "/Text") {
-      params["/Contents"] = PdfStream.string(s);
+      params["/Contents"] = PdfStream.text(content);
     } else if (subtype == "/Link") {
     } else if (subtype == "/Link") {
       var dests = List<PdfStream>();
       var dests = List<PdfStream>();
       dests.add(dest.ref());
       dests.add(dest.ref());

@@ -40,9 +40,9 @@ class PDFAnnot extends PdfAnnot {
       double fb,
       double fb,
       double fr,
       double fr,
       double ft})
       double ft})
-      : super(pdfPage,
+      : super._create(pdfPage,
             type: type,
             type: type,
-            s: s,
+            content: s,
             srcRect: PdfRect.fromLTRB(l, t, r, b),
             srcRect: PdfRect.fromLTRB(l, t, r, b),
             subtype: subtype,
             subtype: subtype,
             dest: dest,
             dest: dest,
@@ -262,8 +262,8 @@ class PDFPage extends PdfPage {
   PdfAnnot addNote(String note, double x, y, w, h) {
   PdfAnnot addNote(String note, double x, y, w, h) {
     var xy1 = cxy(x, y + h);
     var xy1 = cxy(x, y + h);
     var xy2 = cxy(x + w, y);
     var xy2 = cxy(x + w, y);
-    PdfAnnot ob =
-        PdfAnnot.text(this, PdfRect.fromLTRB(xy1.x, xy1.y, xy2.x, xy2.y), note);
+    PdfAnnot ob = PdfAnnot.text(this,
+        rect: PdfRect.fromLTRB(xy1.x, xy1.y, xy2.x, xy2.y), content: note);
     return ob;
     return ob;
   }
   }
 
 
@@ -289,11 +289,10 @@ class PDFPage extends PdfPage {
     var xy2 = cxy(x + w, y);
     var xy2 = cxy(x + w, y);
     var xy3 = cxy(vx, vy + vh);
     var xy3 = cxy(vx, vy + vh);
     var xy4 = cxy(vx + vw, vy);
     var xy4 = cxy(vx + vw, vy);
-    PdfAnnot ob = PdfAnnot.link(
-        this,
-        PdfRect.fromLTRB(xy1.x, xy1.y, xy2.x, xy2.y),
-        dest,
-        PdfRect.fromLTRB(xy3.x, xy3.y, xy4.x, xy4.y));
+    PdfAnnot ob = PdfAnnot.link(this,
+        srcRect: PdfRect.fromLTRB(xy1.x, xy1.y, xy2.x, xy2.y),
+        dest: dest,
+        destRect: PdfRect.fromLTRB(xy3.x, xy3.y, xy4.x, xy4.y));
     return ob;
     return ob;
   }
   }
 
 

 import 'dart:io';
 import 'dart:io';
-import 'dart:math';
-import 'dart:typed_data';
 
 
 import 'package:pdf/pdf.dart';
 import 'package:pdf/pdf.dart';
 import 'package:test/test.dart';
 import 'package:test/test.dart';
-import 'package:vector_math/vector_math_64.dart';
 
 
 void main() {
 void main() {
   test('Pdf', () {
   test('Pdf', () {
     var pdf = PdfDocument();
     var pdf = PdfDocument();
     var page = PdfPage(pdf, pageFormat: const PdfPageFormat(500.0, 300.0));
     var page = PdfPage(pdf, pageFormat: const PdfPageFormat(500.0, 300.0));
+    var page1 = PdfPage(pdf, pageFormat: const PdfPageFormat(500.0, 300.0));
 
 
-    page.annotations.add(PdfAnnot.annotation(page, "Hello", PdfRect(100.0, 100.0, 50.0, 50.0)));
+    var g = page.getGraphics();
+
+    PdfAnnot.text(page,
+        content: "Hello", rect: PdfRect(100.0, 100.0, 50.0, 50.0));
+
+    PdfAnnot.link(page,
+        dest: page1, srcRect: PdfRect(100.0, 150.0, 50.0, 50.0));
+    g.drawRect(100.0, 150.0, 50.0, 50.0);
+    g.strokePath();
 
 
     var file = File('annot.pdf');
     var file = File('annot.pdf');
     file.writeAsBytesSync(pdf.save());
     file.writeAsBytesSync(pdf.save());