Changeset View
Changeset View
Standalone View
Standalone View
files/0001-fix-failing-gradle-build.patch
- This file was added.
| From e1d6707ffd56e705fd68a2c24caf5f4cc44e5dcf Mon Sep 17 00:00:00 2001 | |||||
| From: Beniamin Kalinowski <beniamin.kalinowski@gmail.com> | |||||
| Date: Fri, 22 May 2020 10:49:22 +0200 | |||||
| Subject: [PATCH] fix failing gradle build (#160) | |||||
| --- | |||||
| build.gradle | 2 +- | |||||
| .../ui/menubuilders/menu/MenuBuildProcessFactoryTest.java | 5 +++++ | |||||
| freeplane_api/src/main/java/org/freeplane/api/Connector.java | 4 ++-- | |||||
| .../src/main/java/org/freeplane/api/ConnectorRO.java | 4 ++-- | |||||
| freeplane_api/src/main/java/org/freeplane/api/Link.java | 4 ++-- | |||||
| 5 files changed, 12 insertions(+), 7 deletions(-) | |||||
| diff --git a/build.gradle b/build.gradle | |||||
| index caef729e8..49146e7dc 100644 | |||||
| --- a/build.gradle | |||||
| +++ b/build.gradle | |||||
| @@ -8,7 +8,7 @@ buildscript { | |||||
| } | |||||
| plugins { | |||||
| - id 'nebula.ospackage' version '8.1.0' | |||||
| + id 'nebula.ospackage' version '8.3.0' | |||||
| id 'com.github.ben-manes.versions' version '0.28.0' | |||||
| id 'org.owasp.dependencycheck' version '5.3.0' apply false | |||||
| } | |||||
| diff --git a/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/MenuBuildProcessFactoryTest.java b/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/MenuBuildProcessFactoryTest.java | |||||
| index 10fab77d7..0bd087951 100644 | |||||
| --- a/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/MenuBuildProcessFactoryTest.java | |||||
| +++ b/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/MenuBuildProcessFactoryTest.java | |||||
| @@ -11,6 +11,7 @@ import javax.swing.JMenu; | |||||
| import org.freeplane.core.ui.IUserInputListenerFactory; | |||||
| import org.freeplane.core.ui.components.FreeplaneMenuBar; | |||||
| +import org.freeplane.core.ui.menubuilders.HeadlessFreeplaneRunner; | |||||
| import org.freeplane.core.ui.menubuilders.XmlEntryStructureBuilder; | |||||
| import org.freeplane.core.ui.menubuilders.action.EntriesForAction; | |||||
| import org.freeplane.core.ui.menubuilders.action.IAcceleratorMap; | |||||
| @@ -29,6 +30,10 @@ public class MenuBuildProcessFactoryTest { | |||||
| private PhaseProcessor phaseProcessor; | |||||
| private FreeplaneActions freeplaneActions; | |||||
| + static { | |||||
| + new HeadlessFreeplaneRunner(); | |||||
| + } | |||||
| + | |||||
| @Before | |||||
| public void setup() { | |||||
| freeplaneActions = mock(FreeplaneActions.class); | |||||
| diff --git a/freeplane_api/src/main/java/org/freeplane/api/Connector.java b/freeplane_api/src/main/java/org/freeplane/api/Connector.java | |||||
| index 14e317de8..f6b5265c0 100644 | |||||
| --- a/freeplane_api/src/main/java/org/freeplane/api/Connector.java | |||||
| +++ b/freeplane_api/src/main/java/org/freeplane/api/Connector.java | |||||
| @@ -42,7 +42,7 @@ public interface Connector extends ConnectorRO { | |||||
| void setDashArray(int[] dashArray); | |||||
| /** | |||||
| - * 0 <= opacity <= 255 | |||||
| + * 0 <= opacity <= 255 | |||||
| * | |||||
| * Since 1.7.10 | |||||
| */ | |||||
| @@ -65,4 +65,4 @@ public interface Connector extends ConnectorRO { | |||||
| void setLabelFontSize(int size); | |||||
| -} | |||||
| \ No newline at end of file | |||||
| +} | |||||
| diff --git a/freeplane_api/src/main/java/org/freeplane/api/ConnectorRO.java b/freeplane_api/src/main/java/org/freeplane/api/ConnectorRO.java | |||||
| index f12cde32b..9808db91c 100644 | |||||
| --- a/freeplane_api/src/main/java/org/freeplane/api/ConnectorRO.java | |||||
| +++ b/freeplane_api/src/main/java/org/freeplane/api/ConnectorRO.java | |||||
| @@ -22,7 +22,7 @@ public interface ConnectorRO { | |||||
| int[] getDashArray(); | |||||
| /** | |||||
| - * 0 <= opacity <= 255 | |||||
| + * 0 <= opacity <= 255 | |||||
| * | |||||
| * Since 1.7.10 | |||||
| */ | |||||
| @@ -71,4 +71,4 @@ public interface ConnectorRO { | |||||
| /** returns a Point. | |||||
| * @since 1.3.3 */ | |||||
| List<Integer> getEndInclination(); | |||||
| -} | |||||
| \ No newline at end of file | |||||
| +} | |||||
| diff --git a/freeplane_api/src/main/java/org/freeplane/api/Link.java b/freeplane_api/src/main/java/org/freeplane/api/Link.java | |||||
| index ba5f681d4..fc7df8a41 100644 | |||||
| --- a/freeplane_api/src/main/java/org/freeplane/api/Link.java | |||||
| +++ b/freeplane_api/src/main/java/org/freeplane/api/Link.java | |||||
| @@ -43,7 +43,7 @@ public interface Link extends LinkRO { | |||||
| boolean set(String target); | |||||
| /** removes the link. Same as <code>node.link.text = null</code>. | |||||
| - * @return <tt>true</tt> if there was a link to remove. | |||||
| + * @return <code>true</code> if there was a link to remove. | |||||
| * @since 1.4 */ | |||||
| boolean remove(); | |||||
| -} | |||||
| \ No newline at end of file | |||||
| +} | |||||
| -- | |||||
| 2.27.0 | |||||
Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.