Merge remote-tracking branch 'origin/release/1-1-1'

Author: remikey

CHANGELOG.md

@@ -6,6 +6,49 @@ This file lists modifications introduced by each version.
 
 * empty
 
+##  [1.1.1] - 2019/09/26
+
+###  Topology class modifications
+
+[[issue 74]][issue: #74]
+
+In order to better match the behavior introduced around `Topology.getOrientation()` in [[issue 49]][issue: #49], the
+following modifications have been applied:
+* `Topology.addConnectivityListener(ConnectivityListener, Orientation)` and 
+`Topology.removeConnectivityListener(ConnectivityListener, Orientation)` have been added 
+* `Topology.addConnectivityListener(ConnectivityListener, boolean)` and 
+`Topology.removeConnectivityListener(ConnectivityListener, boolean)` have been marked **deprecated**
+
+  Please use `Topology.addConnectivityListener(ConnectivityListener, Orientation)` and
+   `Topology.removeConnectivityListener(ConnectivityListener, Orientation)` instead.
+* `Topology.addConnectivityListener(ConnectivityListener)` and 
+`Topology.removeConnectivityListener(ConnectivityListener)`'s behaviors are changed
+
+  They now takes `Topology.getOrientation()` into account when registering/unregistering a listener.
+  Previously, it always worked on undirected events.
+
+[issue: #74]: https://github.com/jbotsim/JBotSim/issues/74
+
+###  PlainTopologySerializer class modifications
+
+**Bug fix in PlainTopologySerializer:**
+
+* `PlainTopologySerializer.importFromString()` does not clear the `Topology` anymore [[issue 72]][issue: #72]
+
+[issue: #72]: https://github.com/jbotsim/JBotSim/issues/72
+
+### New icon in the jbotsim-icons module
+
+`jbotsim-icons`/`io.jbotsim.ui.icons`
+
+* A cross-shaped new icon has been added [[issue 73]][issue: #73] 
+  * `jbotsim-icons`/`io/jbotsim/ui/icons/plus.png` 
+
+  As usual, it's path can be accessed using the corresponding constant `Icons.PLUS`.
+
+[issue: #73]: https://github.com/jbotsim/JBotSim/issues/73
+
+
 ## [1.1.0] - 2019/09/10
 
 ### Topology, Node and Link classes modifications
@@ -764,6 +807,7 @@ have executed their onStart() method before that, you may simply call start()
 on your topology immediately followed by a call to pause().
 (Eventually we will provide an atomic call to this effect.)
 
-[Unreleased]: https://github.com/acasteigts/JBotSim/compare/v1.1.0...develop
-[1.1.0]: https://github.com/acasteigts/JBotSim/compare/v1.0.0...v1.1.0
-[1.0.0]: https://github.com/acasteigts/JBotSim/compare/v1.0.0-beta03...v1.0.0
+[Unreleased]: https://github.com/jbotsim/JBotSim/compare/v1.1.1...develop
+[1.1.1]: https://github.com/jbotsim/JBotSim/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/jbotsim/JBotSim/compare/v1.0.0...v1.1.0
+[1.0.0]: https://github.com/jbotsim/JBotSim/compare/v1.0.0-beta03...v1.0.0

README.md

@@ -1,6 +1,6 @@
 
 [![Build Status](https://travis-ci.org/jbotsim/JBotSim.svg?branch=master)][travis-jbotsim]
-[![Maven Central](https://img.shields.io/badge/maven%20central-1.1.0-informational.svg)][mavencentral-jbotsim-latest]
+[![Maven Central](https://img.shields.io/badge/maven%20central-1.1.1-informational.svg)][mavencentral-jbotsim-latest]
 [![License](https://img.shields.io/badge/license-LGPL%20≥%203.0-informational.svg)][lgpl3]
 
 
@@ -58,7 +58,7 @@ artifact will best suit your project's needs):
     * choose `From Maven ...`.
 
   * In the "Download Library from Maven Repository" popup:
-    * provide the following dependence `io.jbotsim:jbotsim-all:1.1.0`
+    * provide the following dependence `io.jbotsim:jbotsim-all:1.1.1`
     * make sure to tick `JavaDocs`
     * Hit `OK`.
   * Confirm that you want to add it to your (only) module.
@@ -98,7 +98,7 @@ examples.
 ## Current version
 
 
-The latest public version is [`1.1.0`][mavencentral-jbotsim-latest]. 
+The latest public version is [`1.1.1`][mavencentral-jbotsim-latest]. 
 Please see the [CHANGELOG.md](CHANGELOG.md) for previous versions modifications.
 
 
@@ -127,7 +127,7 @@ If your build system uses *Gradle*, you will want to add something like this to
 
 ```
 dependencies {
-    implementation "io.jbotsim:jbotsim-all:1.1.0"
+    implementation "io.jbotsim:jbotsim-all:1.1.1"
 }
 ```
 
@@ -140,15 +140,15 @@ If your build system uses *Maven*, you will want to add something like this to y
 <dependency>
   <groupId>io.jbotsim</groupId>
   <artifactId>jbotsim-all</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
 </dependency>
 ```
 
 ### Using IntelliJ IDEA
 
 If you use a _Java Project_ in _IntelliJ IDEA_, add the following dependency (as explained [here](#declaring-the-dependency)):
  ```
- io.jbotsim:jbotsim-all:1.1.0
+ io.jbotsim:jbotsim-all:1.1.1
  ```
 
 
@@ -206,8 +206,7 @@ gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys DFA48EDB1EDEBA6F
 
 [travis-jbotsim]: https://travis-ci.org/jbotsim/JBotSim
 [github-jbotsim]: https://github.com/jbotsim/JBotSim
-[mavencentral-jbotsim-latest]: https://search.maven.org/search?q=g:io.jbotsim%20AND%20v:1.1.0
-[mavencentral-jbotsim-1-0-0]: https://search.maven.org/search?q=g:io.jbotsim%20AND%20v:1.0.0
+[mavencentral-jbotsim-latest]: https://search.maven.org/search?q=g:io.jbotsim%20AND%20v:1.1.1
 [mavencentral-jbotsim]: https://search.maven.org/search?q=g:io.jbotsim
 [github-jbotsim-issues]: https://github.com/jbotsim/JBotSim/issues
 [lgpl3]: http://www.gnu.org/licenses/lgpl-3.0.html

apps/examples/CreateUserProject.md

@@ -118,7 +118,7 @@ Any JBotSim classes, source code and documentation will automatically be downloa
     * choose `From Maven ...`.
 
   * In the "Download Library from Maven Repository" popup:
-    * provide the following dependency: `io.jbotsim:jbotsim-all:1.1.0`
+    * provide the following dependency: `io.jbotsim:jbotsim-all:1.1.1`
     * make sure to tick `JavaDocs`
     * Hit `OK`.
   * Confirm that you want to add it to your (only) module.
@@ -141,7 +141,7 @@ Simply add the following line to your `build.gradle`:
 
 ```
 dependencies {
-    implementation "io.jbotsim:jbotsim-all:1.1.0"
+    implementation "io.jbotsim:jbotsim-all:1.1.1"
 }
 ```
 
@@ -201,7 +201,7 @@ dependencies {
 
     ```
     dependencies {
-        compile files('mylibs/jbotsim-full-1.1.0.jar')
+        compile files('mylibs/jbotsim-full-1.1.1.jar')
     }
     ``` 
     

apps/examples/README.md

@@ -30,7 +30,7 @@ artifact suits your needs).
 So our `build.gradle` will simply declare the dependency as follows:
 ```
 dependencies {
-    implementation "io.jbotsim:jbotsim-ui-swing:1.1.0"
+    implementation "io.jbotsim:jbotsim-ui-swing:1.1.1"
 }
 ```
 Gradle and Maven will take care of retrieving any required dependencies.

apps/examples/src/main/java/examples/JBackgroundPainterHD.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008 - 2019, Arnaud Casteigts and the JBotSim contributors <contact@jbotsim.io>
+ *
+ *
+ * This file is part of JBotSim.
+ *
+ * JBotSim is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JBotSim is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JBotSim.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package examples;
+
+import io.jbotsim.core.Topology;
+import io.jbotsim.ui.painting.JBackgroundPainter;
+
+import java.awt.*;
+
+public class JBackgroundPainterHD extends JBackgroundPainter {
+    private RenderingHints rh ;
+
+    public JBackgroundPainterHD() {
+        rh =new RenderingHints(
+                RenderingHints.KEY_ANTIALIASING,
+                RenderingHints.VALUE_ANTIALIAS_ON);
+        rh.add(new RenderingHints(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_SPEED));
+    }
+
+    @Override
+    protected void setRenderingHints(Graphics2D g2d, Topology topology) {
+        g2d.setRenderingHints(rh);
+    }
+}

apps/examples/src/main/java/examples/JLinkPainterHD.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008 - 2019, Arnaud Casteigts and the JBotSim contributors <contact@jbotsim.io>
+ *
+ *
+ * This file is part of JBotSim.
+ *
+ * JBotSim is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JBotSim is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JBotSim.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package examples;
+
+import io.jbotsim.core.Link;
+import io.jbotsim.ui.painting.JLinkPainter;
+
+import java.awt.*;
+
+public class JLinkPainterHD extends JLinkPainter {
+    private RenderingHints rh ;
+
+    public JLinkPainterHD() {
+        rh =new RenderingHints(
+                RenderingHints.KEY_ANTIALIASING,
+                RenderingHints.VALUE_ANTIALIAS_ON);
+        rh.add(new RenderingHints(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_SPEED));
+    }
+
+    @Override
+    protected void setRenderingHints(Graphics2D g2d, Link link) {
+        g2d.setRenderingHints(rh);
+    }
+
+}

apps/examples/src/main/java/examples/VideoHelper.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008 - 2019, Arnaud Casteigts and the JBotSim contributors <contact@jbotsim.io>
+ *
+ *
+ * This file is part of JBotSim.
+ *
+ * JBotSim is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JBotSim is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JBotSim.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package examples;
+
+import io.jbotsim.core.Topology;
+
+public class VideoHelper {
+
+    public static Topology generateTopology() {
+        return generateTopology720();
+    }
+    public static Topology generateTopology720() {
+        return new Topology(1280,720);
+    }
+    public static Topology generateTopology480() {
+        return new Topology(854,480);
+    }
+
+    public static String useOpenGL() {
+        return System.setProperty("sun.java2d.opengl", "true");
+    }
+}

apps/examples/src/main/java/examples/basic/icons/MainIcons.java

@@ -11,6 +11,7 @@ public static void main(String[] args) {
         deployAtCenter(topology, MovingNodeBlueOcean.class, nbNodes);
         deployAtCenter(topology, MovingNodeBlue.class, nbNodes);
         deployAtCenter(topology, MovingNodeFormer.class, nbNodes);
+        deployAtCenter(topology, MovingNodePlus.class, nbNodes);
         deployAtCenter(topology, MovingNodeDefault.class, nbNodes);
 
         new JViewer(topology);

apps/examples/src/main/java/examples/basic/icons/MovingNodePlus.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008 - 2019, Arnaud Casteigts and the JBotSim contributors <contact@jbotsim.io>
+ *
+ *
+ * This file is part of JBotSim.
+ *
+ * JBotSim is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JBotSim is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JBotSim.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package examples.basic.icons;
+
+import io.jbotsim.ui.icons.Icons;
+
+public class MovingNodePlus extends RandomMovingNode {
+    @Override
+    public void onStart() {
+        super.onStart();
+        setIcon(Icons.PLUS);
+    }
+
+}

bump-version.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 DIR="."
-previousVersion="1.0.0"
-newVersion="1.1.0"
+previousVersion="1.1.0"
+newVersion="1.1.1"
 
 function replaceInFile () {
   filePath=$1