Xcos: call setDefaultValues after any port instantiation

	Setting the default values is just a hook called at the end of the instanciation.

Change-Id: I81870217928dd4110b669cbdfc71b000381a9208

6 files changed, 12 insertions, 7 deletions

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java
index 50f31bf..cfec779 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java
@@ -511,7 +511,6 @@ public final class SuperBlock extends BasicBlock {
                         while (blockCount > portCount) { // add if required
                                 BasicPort port;
                                         port = block.getReferencedPortClass().newInstance();
-                                        port.setDefaultValues();
                                         addPort(port);
                                         portCount++;
                         }
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java
index 3919425..cce8e95 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java
@@ -465,14 +465,12 @@ public final class RegionToSuperblockAction extends VertexSelectionDependantActi
                 if (link.getOutGoing()) { // OUT_f
                     block = BlockFactory.createBlock("OUT_f");
                     ExplicitInputPort port = new ExplicitInputPort();
-                    port.setDefaultValues();
                     block.addPort(port);
                     link.setPortNumber(maxValues.get(0) + 1);
                     maxValues.set(0, maxValues.get(0) + 1);
                 } else { // IN_f
                     block = BlockFactory.createBlock("IN_f");
                     ExplicitOutputPort port = new ExplicitOutputPort();
-                    port.setDefaultValues();
                     block.addPort(port);
                     link.setPortNumber(maxValues.get(1) + 1);
                     maxValues.set(1, maxValues.get(1) + 1);
@@ -481,14 +479,12 @@ public final class RegionToSuperblockAction extends VertexSelectionDependantActi
                 if (link.getOutGoing()) { // OUTIMPL_f
                     block = BlockFactory.createBlock("OUTIMPL_f");
                     ImplicitInputPort port = new ImplicitInputPort();
-                    port.setDefaultValues();
                     block.addPort(port);
                     link.setPortNumber(maxValues.get(2) + 1);
                     maxValues.set(2, maxValues.get(2) + 1);
                 } else { // INIMPL_f
                     block = BlockFactory.createBlock("INIMPL_f");
                     ImplicitOutputPort port = new ImplicitOutputPort();
-                    port.setDefaultValues();
                     block.addPort(port);
                     link.setPortNumber(maxValues.get(3) + 1);
                     maxValues.set(3, maxValues.get(3) + 1);
@@ -497,14 +493,12 @@ public final class RegionToSuperblockAction extends VertexSelectionDependantActi
                 if (link.getOutGoing()) { // CLKOUTV_f
                     block = BlockFactory.createBlock("CLKOUTV_f");
                     ControlPort port = new ControlPort();
-                    port.setDefaultValues();
                     block.addPort(port);
                     link.setPortNumber(maxValues.get(4) + 1);
                     maxValues.set(4, maxValues.get(4) + 1);
                 } else { // CLKINV_f
                     block = BlockFactory.createBlock("CLKINV_f");
                     CommandPort port = new CommandPort();
-                    port.setDefaultValues();
                     block.addPort(port);
                     link.setPortNumber(maxValues.get(5) + 1);
                     maxValues.set(5, maxValues.get(5) + 1);
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/command/CommandPort.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/command/CommandPort.java
index 6049964..bf6a09d 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/command/CommandPort.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/command/CommandPort.java
@@ -14,6 +14,7 @@ package org.scilab.modules.xcos.port.command;
 
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.Orientation;
+import org.scilab.modules.xcos.port.control.ControlPort;
 
 /**
  * A command port acts generate execution ticks to another block.
@@ -33,6 +34,8 @@ public class CommandPort extends BasicPort {
     public CommandPort() {
         super("CommandPort");
         setOrientation(Orientation.SOUTH);
+        
+        setDefaultValues();
     }
 
     /**
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/control/ControlPort.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/control/ControlPort.java
index 9701fa2..742b48b 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/control/ControlPort.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/control/ControlPort.java
@@ -14,6 +14,7 @@ package org.scilab.modules.xcos.port.control;
 
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.Orientation;
+import org.scilab.modules.xcos.port.command.CommandPort;
 
 /**
  * A control port acts as the execution tick for the block.
@@ -30,6 +31,8 @@ public class ControlPort extends BasicPort {
     public ControlPort() {
         super("ControlPort");
         setOrientation(Orientation.NORTH);
+        
+        setDefaultValues();
     }
 
     /**
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/input/InputPort.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/input/InputPort.java
index 70c37e8..a8eac32 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/input/InputPort.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/input/InputPort.java
@@ -14,6 +14,7 @@ package org.scilab.modules.xcos.port.input;
 
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.Orientation;
+import org.scilab.modules.xcos.port.output.OutputPort;
 
 /**
  * An input port acts as a protection barrier between a link and the internal functions of
@@ -33,5 +34,7 @@ public abstract class InputPort extends BasicPort {
     protected InputPort(String type) {
         super(type);
         setOrientation(Orientation.WEST);
+        
+        setDefaultValues();
     }
 }
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/output/OutputPort.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/output/OutputPort.java
index 20af5c1..42b9da3 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/output/OutputPort.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/output/OutputPort.java
@@ -14,6 +14,7 @@ package org.scilab.modules.xcos.port.output;
 
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.Orientation;
+import org.scilab.modules.xcos.port.input.InputPort;
 
 /**
  * An output port acts as a protection barrier between the internal functions of
@@ -33,5 +34,7 @@ public abstract class OutputPort extends BasicPort {
     public OutputPort(String type) {
         super(type);
         setOrientation(Orientation.EAST);
+        
+        setDefaultValues();
     }
 }