Xcos refactoring: move link classes 87/17487/1
Clément DAVID [Fri, 20 Nov 2015 16:57:22 +0000 (17:57 +0100)]
There is only one class per kind of link ; moving them all to the same
package helps browsing the source code.

Change-Id: Ic677aac0f0160dfccd1d04efd192d35af4a09e3b

scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/model/XcosCellFactory.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/codec/BasicLinkCodec.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/sax/LinkHandler.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/CommandControlLink.java [moved from scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/commandcontrol/CommandControlLink.java with 95% similarity]
scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/ExplicitLink.java [moved from scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/explicit/ExplicitLink.java with 96% similarity]
scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/ImplicitLink.java [moved from scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/implicit/ImplicitLink.java with 96% similarity]
scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/LinkPortMap.java

index e1c9fa9..9ef2bd7 100644 (file)
@@ -77,9 +77,9 @@ import org.scilab.modules.xcos.graph.swing.GraphComponent;
 import org.scilab.modules.xcos.io.XcosFileType;
 import org.scilab.modules.xcos.io.scicos.ScilabDirectHandler;
 import org.scilab.modules.xcos.link.BasicLink;
-import org.scilab.modules.xcos.link.commandcontrol.CommandControlLink;
-import org.scilab.modules.xcos.link.explicit.ExplicitLink;
-import org.scilab.modules.xcos.link.implicit.ImplicitLink;
+import org.scilab.modules.xcos.link.CommandControlLink;
+import org.scilab.modules.xcos.link.ExplicitLink;
+import org.scilab.modules.xcos.link.ImplicitLink;
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.BasicPort.Type;
 import org.scilab.modules.xcos.port.Orientation;
index 78704c9..222d2c9 100644 (file)
@@ -35,9 +35,9 @@ import org.scilab.modules.xcos.XcosView;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.link.BasicLink;
-import org.scilab.modules.xcos.link.commandcontrol.CommandControlLink;
-import org.scilab.modules.xcos.link.explicit.ExplicitLink;
-import org.scilab.modules.xcos.link.implicit.ImplicitLink;
+import org.scilab.modules.xcos.link.CommandControlLink;
+import org.scilab.modules.xcos.link.ExplicitLink;
+import org.scilab.modules.xcos.link.ImplicitLink;
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.command.CommandPort;
 import org.scilab.modules.xcos.port.control.ControlPort;
index f577f10..5f08dcd 100644 (file)
@@ -21,9 +21,9 @@ import org.scilab.modules.xcos.Kind;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.graph.model.XcosCellFactory;
 import org.scilab.modules.xcos.link.BasicLink;
-import org.scilab.modules.xcos.link.commandcontrol.CommandControlLink;
-import org.scilab.modules.xcos.link.explicit.ExplicitLink;
-import org.scilab.modules.xcos.link.implicit.ImplicitLink;
+import org.scilab.modules.xcos.link.CommandControlLink;
+import org.scilab.modules.xcos.link.ExplicitLink;
+import org.scilab.modules.xcos.link.ImplicitLink;
 import org.scilab.modules.xcos.port.BasicPort;
 import org.w3c.dom.Node;
 
index ec7065c..e7bdcf5 100644 (file)
@@ -20,9 +20,9 @@ import org.scilab.modules.xcos.graph.model.ScicosObjectOwner;
 import org.scilab.modules.xcos.io.HandledElement;
 import org.scilab.modules.xcos.io.sax.XcosSAXHandler.UnresolvedReference;
 import org.scilab.modules.xcos.link.BasicLink;
-import org.scilab.modules.xcos.link.commandcontrol.CommandControlLink;
-import org.scilab.modules.xcos.link.explicit.ExplicitLink;
-import org.scilab.modules.xcos.link.implicit.ImplicitLink;
+import org.scilab.modules.xcos.link.CommandControlLink;
+import org.scilab.modules.xcos.link.ExplicitLink;
+import org.scilab.modules.xcos.link.ImplicitLink;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXParseException;
 
index 2c87e59..c4d69a8 100644 (file)
@@ -12,9 +12,6 @@
 
 package org.scilab.modules.xcos.link;
 
-import org.scilab.modules.xcos.link.commandcontrol.CommandControlLink;
-import org.scilab.modules.xcos.link.explicit.ExplicitLink;
-import org.scilab.modules.xcos.link.implicit.ImplicitLink;
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.command.CommandPort;
 import org.scilab.modules.xcos.port.control.ControlPort;