Kenneth basic edit

.github/workflows/maven.yml

@@ -0,0 +1,33 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: ["develop"]
+  pull_request:
+    branches: ["develop"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: "11"
+          distribution: "temurin"
+          cache: maven
+      - name: Build with Maven
+        run: mvn -s settings.xml -B package --file pom.xml
+        env:
+          USER_NAME: ${{ secrets.USER_NAME }}
+          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}

.gitignore

@@ -5,3 +5,4 @@ nb-configuration.xml
 .idea/*
 *.ftf
 /jhotdraw-samples/jhotdraw-samples-misc/nbproject/
+jhotdraw-samples/jhotdraw-samples-misc/pom.xml

jhotdraw-actions/jhotdraw-actions.iml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="8e696724-8e7a-48a3-b1c3-b940c5807774" />
+  </component>
+</module>

jhotdraw-actions/pom.xml

@@ -24,5 +24,11 @@
             <artifactId>jhotdraw-datatransfer</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>dk.sdu.cbse</groupId>
+            <artifactId>featuretracerlite</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

jhotdraw-actions/src/main/java/org/jhotdraw/action/edit/CopyAction.java

@@ -10,6 +10,8 @@
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+
+import dk.sdu.mmmi.featuretracer.lib.FeatureEntryPoint;
 import org.jhotdraw.datatransfer.ClipboardUtil;
 import org.jhotdraw.util.*;
 
@@ -48,6 +50,7 @@ public CopyAction() {
      * @param target The target of the action. Specify null for the currently
      * focused component.
      */
+@FeatureEntryPoint(value="CopyAction")
     public CopyAction(JComponent target) {
         super(target);
         ResourceBundleUtil labels = ResourceBundleUtil.getBundle("org.jhotdraw.action.Labels");

jhotdraw-actions/src/main/java/org/jhotdraw/action/edit/CutAction.java

@@ -10,6 +10,8 @@
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+
+import dk.sdu.mmmi.featuretracer.lib.FeatureEntryPoint;
 import org.jhotdraw.datatransfer.ClipboardUtil;
 import org.jhotdraw.util.*;
 
@@ -48,6 +50,7 @@ public CutAction() {
      * @param target The target of the action. Specify null for the currently
      * focused component.
      */
+    @FeatureEntryPoint(value="CutAction")
     public CutAction(JComponent target) {
         super(target);
         ResourceBundleUtil labels = ResourceBundleUtil.getBundle("org.jhotdraw.action.Labels");

jhotdraw-actions/src/main/java/org/jhotdraw/action/edit/DeleteAction.java

@@ -13,6 +13,8 @@
 import java.beans.PropertyChangeListener;
 import javax.swing.JComponent;
 import javax.swing.text.*;
+
+import dk.sdu.mmmi.featuretracer.lib.FeatureEntryPoint;
 import org.jhotdraw.api.gui.EditableComponent;
 import org.jhotdraw.beans.WeakPropertyChangeListener;
 import org.jhotdraw.util.*;
@@ -89,6 +91,7 @@ public DeleteAction(JComponent target) {
      * @param target The target of the action. Specify null for the currently
      * focused component.
      */
+    @FeatureEntryPoint(value="DeleteAction")
     protected DeleteAction(JComponent target, String id) {
         super(id);
         this.target = target;

jhotdraw-actions/src/main/java/org/jhotdraw/action/edit/DuplicateAction.java

@@ -10,6 +10,8 @@
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+
+import dk.sdu.mmmi.featuretracer.lib.FeatureEntryPoint;
 import org.jhotdraw.api.gui.EditableComponent;
 import org.jhotdraw.util.*;
 
@@ -63,6 +65,7 @@ public DuplicateAction() {
      * @param target The target of the action. Specify null for the currently
      * focused component.
      */
+    @FeatureEntryPoint(value="DuplicateAction")
     public DuplicateAction(JComponent target) {
         super(target);
         ResourceBundleUtil labels = ResourceBundleUtil.getBundle("org.jhotdraw.action.Labels");

jhotdraw-actions/src/main/java/org/jhotdraw/action/edit/PasteAction.java

@@ -11,6 +11,8 @@
 import java.awt.datatransfer.*;
 import java.awt.event.*;
 import javax.swing.*;
+
+import dk.sdu.mmmi.featuretracer.lib.FeatureEntryPoint;
 import org.jhotdraw.datatransfer.ClipboardUtil;
 import org.jhotdraw.util.*;
 
@@ -49,6 +51,8 @@ public PasteAction() {
      * @param target The target of the action. Specify null for the currently
      * focused component.
      */
+    @FeatureEntryPoint(value="PasteAction")
+
     public PasteAction(JComponent target) {
         super(target);
         ResourceBundleUtil labels = ResourceBundleUtil.getBundle("org.jhotdraw.action.Labels");

jhotdraw-actions/src/main/java/org/jhotdraw/action/edit/RedoAction.java

@@ -10,6 +10,8 @@
 import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
+
+import dk.sdu.mmmi.featuretracer.lib.FeatureEntryPoint;
 import org.jhotdraw.action.AbstractViewAction;
 import org.jhotdraw.api.app.Application;
 import org.jhotdraw.api.app.View;
@@ -52,6 +54,8 @@ public void propertyChange(PropertyChangeEvent evt) {
     /**
      * Creates a new instance.
      */
+
+    @FeatureEntryPoint("RedoAction")
     public RedoAction(Application app, View view) {
         super(app, view);
         labels.configureAction(this, ID);

jhotdraw-actions/src/main/java/org/jhotdraw/action/edit/UndoAction.java

@@ -10,6 +10,8 @@
 import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
+
+import dk.sdu.mmmi.featuretracer.lib.FeatureEntryPoint;
 import org.jhotdraw.action.AbstractViewAction;
 import org.jhotdraw.api.app.Application;
 import org.jhotdraw.api.app.View;
@@ -51,6 +53,8 @@ public void propertyChange(PropertyChangeEvent evt) {
     /**
      * Creates a new instance.
      */
+
+    @FeatureEntryPoint("UndoAction")
     public UndoAction(Application app, View view) {
         super(app, view);
         labels.configureAction(this, ID);

jhotdraw-api/jhotdraw-api.iml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="93b4fd4c-f88d-48af-ba23-e7032d6c9805" />
+  </component>
+</module>

jhotdraw-app/jhotdraw-app.iml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="535a2f5f-b9c2-4139-be85-507ebad6dea6" />
+  </component>
+</module>

jhotdraw-core/jhotdraw-core.iml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="766ee4e4-e3d1-45be-8a93-1d437b01f87c" />
+  </component>
+</module>

jhotdraw-core/src/main/java/org/jhotdraw/draw/io/TextInputFormat.java

@@ -57,10 +57,6 @@ public class TextInputFormat implements InputFormat {
      * File name extension used for the file filter.
      */
     private String fileExtension;
-    /**
-     * Image IO image format name.
-     */
-    private String formatName;
     /**
      * This should be set to true for ImageHolderFigures that can hold multiple
      * lines of text.
@@ -89,7 +85,9 @@ public TextInputFormat(TextHolderFigure prototype) {
     public TextInputFormat(TextHolderFigure prototype, String formatName,
             String description, String fileExtension, boolean isMultiline) {
         this.prototype = prototype;
-        this.formatName = formatName;
+        /**
+         * Image IO image format name.
+         */
         this.description = description;
         this.fileExtension = fileExtension;
         this.isMultiline = isMultiline;
@@ -137,7 +135,7 @@ public void read(InputStream in, Drawing drawing, boolean replace) throws IOExce
         drawing.basicAddAll(0, createTextHolderFigures(in));
     }
 
-    public LinkedList<Figure> createTextHolderFigures(InputStream in) throws IOException {
+    public List<Figure> createTextHolderFigures(InputStream in) throws IOException {
         LinkedList<Figure> list = new LinkedList<>();
         BufferedReader r = new BufferedReader(new InputStreamReader(in, "UTF8"));
         if (isMultiline) {
@@ -169,7 +167,7 @@ public LinkedList<Figure> createTextHolderFigures(InputStream in) throws IOExcep
                 y += s.height;
             }
         }
-        if (list.size() == 0) {
+        if (list.isEmpty()) {
             throw new IOException("No text found");
         }
         return list;

jhotdraw-datatransfer/jhotdraw-datatransfer.iml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="55a64421-5423-4db6-a4bb-f92af18e6e6c" />
+  </component>
+</module>

jhotdraw-gui/jhotdraw-gui.iml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="a6a33639-4f36-469e-9bed-04f4af287d91" />
+  </component>
+</module>

jhotdraw-samples/jhotdraw-samples-mini/jhotdraw-samples-mini.iml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="c439d010-6d6e-4e85-96bd-d1db62a1dcec" />
+  </component>
+</module>

jhotdraw-samples/jhotdraw-samples-misc/jgiven-reports/org.jhotdraw.samples.svg.DeleteDrawingBDDTest.json

@@ -0,0 +1,71 @@
+{
+  "className": "org.jhotdraw.samples.svg.DeleteDrawingBDDTest",
+  "name": "Delete Drawing BDD",
+  "scenarios": [
+    {
+      "className": "org.jhotdraw.samples.svg.DeleteDrawingBDDTest",
+      "testMethodName": "deleteDrawing",
+      "description": "Delete drawing",
+      "tagIds": [],
+      "explicitParameters": [],
+      "derivedParameters": [],
+      "casesAsTable": false,
+      "scenarioCases": [
+        {
+          "caseNr": 1,
+          "steps": [
+            {
+              "name": "empty drawing",
+              "words": [
+                {
+                  "value": "Given",
+                  "isIntroWord": true
+                },
+                {
+                  "value": "empty drawing"
+                }
+              ],
+              "status": "PASSED",
+              "durationInNanos": 135710200
+            },
+            {
+              "name": "deleting the drawing",
+              "words": [
+                {
+                  "value": "When",
+                  "isIntroWord": true
+                },
+                {
+                  "value": "deleting the drawing"
+                }
+              ],
+              "status": "PASSED",
+              "durationInNanos": 446600
+            },
+            {
+              "name": "the drawing is deleted",
+              "words": [
+                {
+                  "value": "Then",
+                  "isIntroWord": true
+                },
+                {
+                  "value": "the drawing is deleted"
+                }
+              ],
+              "status": "PASSED",
+              "durationInNanos": 366700
+            }
+          ],
+          "explicitArguments": [],
+          "derivedArguments": [],
+          "status": "SUCCESS",
+          "durationInNanos": 170965400
+        }
+      ],
+      "durationInNanos": 170965400,
+      "executionStatus": "SUCCESS"
+    }
+  ],
+  "tagMap": {}
+}