Rename packages to reflect the functions
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1164133 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
rfeng
parent
ab1cab2989
commit
30cc7a1752
25 changed files with 188 additions and 47 deletions
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
public final class Constant {
|
||||
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.artifacts;
|
||||
package org.apache.tuscany.sca.diagram.artifacts;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,28 +17,28 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.diagram;
|
||||
package org.apache.tuscany.sca.diagram.generator;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import org.apache.batik.dom.svg.SVGDOMImplementation;
|
||||
import org.apache.tuscany.sca.impl.artifacts.ComponentArtifact;
|
||||
import org.apache.tuscany.sca.impl.artifacts.CompositeArtifact;
|
||||
import org.apache.tuscany.sca.impl.artifacts.Constant;
|
||||
import org.apache.tuscany.sca.impl.artifacts.DashedWire;
|
||||
import org.apache.tuscany.sca.impl.artifacts.Layer;
|
||||
import org.apache.tuscany.sca.impl.artifacts.Link;
|
||||
import org.apache.tuscany.sca.impl.artifacts.NormalWire;
|
||||
import org.apache.tuscany.sca.impl.artifacts.PropertyArtifact;
|
||||
import org.apache.tuscany.sca.impl.artifacts.ReferenceArtifact;
|
||||
import org.apache.tuscany.sca.impl.artifacts.ServiceArtifact;
|
||||
import org.apache.tuscany.sca.impl.artifacts.Text;
|
||||
import org.apache.tuscany.sca.impl.artifacts.WireArtifact;
|
||||
import org.apache.tuscany.sca.impl.layout.ComponentEntity;
|
||||
import org.apache.tuscany.sca.impl.layout.CompositeEntity;
|
||||
import org.apache.tuscany.sca.impl.layout.Entity;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.ComponentArtifact;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.CompositeArtifact;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.Constant;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.DashedWire;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.Layer;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.Link;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.NormalWire;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.PropertyArtifact;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.ReferenceArtifact;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.ServiceArtifact;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.Text;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.WireArtifact;
|
||||
import org.apache.tuscany.sca.diagram.layout.ComponentEntity;
|
||||
import org.apache.tuscany.sca.diagram.layout.CompositeEntity;
|
||||
import org.apache.tuscany.sca.diagram.layout.Entity;
|
||||
import org.w3c.dom.DOMImplementation;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.html;
|
||||
package org.apache.tuscany.sca.diagram.html;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.io;
|
||||
package org.apache.tuscany.sca.diagram.io;
|
||||
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.io;
|
||||
package org.apache.tuscany.sca.diagram.io;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
||||
|
|
@ -17,11 +17,11 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.layout;
|
||||
package org.apache.tuscany.sca.diagram.layout;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.apache.tuscany.sca.impl.artifacts.Constant;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.Constant;
|
||||
|
||||
/**
|
||||
* Represents an unit (a component including its references, services, properties
|
||||
|
|
@ -17,12 +17,12 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.layout;
|
||||
package org.apache.tuscany.sca.diagram.layout;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.apache.tuscany.sca.impl.artifacts.Constant;
|
||||
import org.apache.tuscany.sca.diagram.artifacts.Constant;
|
||||
|
||||
/**
|
||||
* Represents an unit (a component including its references, services, properties
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.tuscany.sca.impl.layout;
|
||||
package org.apache.tuscany.sca.diagram.layout;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.layout;
|
||||
package org.apache.tuscany.sca.diagram.layout;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.layout;
|
||||
package org.apache.tuscany.sca.diagram.layout;
|
||||
|
||||
public class LayoutBuilder {
|
||||
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.impl.layout;
|
||||
package org.apache.tuscany.sca.diagram.layout;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.tuscany.sca.main;
|
||||
package org.apache.tuscany.sca.diagram.main;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.StringWriter;
|
||||
|
|
@ -27,12 +27,12 @@ import javax.xml.transform.TransformerFactory;
|
|||
import javax.xml.transform.dom.DOMSource;
|
||||
import javax.xml.transform.stream.StreamResult;
|
||||
|
||||
import org.apache.tuscany.sca.impl.diagram.DiagramGenerator;
|
||||
import org.apache.tuscany.sca.impl.html.HTMLWrapper;
|
||||
import org.apache.tuscany.sca.impl.io.XMLReader;
|
||||
import org.apache.tuscany.sca.impl.io.XMLWriter;
|
||||
import org.apache.tuscany.sca.impl.layout.CompositeEntity;
|
||||
import org.apache.tuscany.sca.impl.layout.EntityBuilder;
|
||||
import org.apache.tuscany.sca.diagram.generator.DiagramGenerator;
|
||||
import org.apache.tuscany.sca.diagram.html.HTMLWrapper;
|
||||
import org.apache.tuscany.sca.diagram.io.XMLReader;
|
||||
import org.apache.tuscany.sca.diagram.io.XMLWriter;
|
||||
import org.apache.tuscany.sca.diagram.layout.CompositeEntity;
|
||||
import org.apache.tuscany.sca.diagram.layout.EntityBuilder;
|
||||
import org.w3c.dom.Document;
|
||||
|
||||
public class Main {
|
||||
|
|
@ -0,0 +1,141 @@
|
|||
package org.apache.tuscany.sca.diagram.layout;
|
||||
|
||||
import junit.framework.Assert;
|
||||
|
||||
import org.apache.tuscany.sca.diagram.layout.ComponentEntity;
|
||||
import org.apache.tuscany.sca.diagram.layout.CompositeEntity;
|
||||
import org.apache.tuscany.sca.diagram.layout.Entity;
|
||||
import org.apache.tuscany.sca.diagram.layout.LayoutBuilder;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
public class LayoutBuilderTestCase {
|
||||
|
||||
LayoutBuilder lb;
|
||||
Entity[] ents;
|
||||
Entity parent;
|
||||
int[][] conns;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
parent = new CompositeEntity("composite");
|
||||
parent.setX(200);
|
||||
parent.setY(100);
|
||||
|
||||
ents = new Entity[5];
|
||||
for (int i = 0; i < ents.length; i++) {
|
||||
ents[i] = new ComponentEntity();
|
||||
ents[i].setId(i);
|
||||
ents[i].setParent(parent);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPlaceEntities() throws Exception {
|
||||
//setUp();
|
||||
Assert.assertEquals(5, ents.length);
|
||||
Assert.assertEquals(200, ents[0].getStartPosition());
|
||||
|
||||
conns = new int[5][5];
|
||||
for (int i = 0; i < conns.length; i++) {
|
||||
for (int j = 0; j < conns.length; j++) {
|
||||
//int x = Math.getExponent(Math.random());
|
||||
if (i == j - 1)
|
||||
conns[i][j] = 1;
|
||||
else
|
||||
conns[i][j] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
lb = new LayoutBuilder(ents, conns);
|
||||
|
||||
ents = lb.placeEntities();
|
||||
|
||||
Assert.assertEquals(5, ents.length);
|
||||
Assert.assertEquals(0, lb.getStartEnt().getId());
|
||||
|
||||
Assert.assertEquals(0, ents[0].getLevel());
|
||||
Assert.assertEquals(0, ents[1].getLevel());
|
||||
Assert.assertEquals(0, ents[2].getLevel());
|
||||
Assert.assertEquals(0, ents[3].getLevel());
|
||||
Assert.assertEquals(0, ents[4].getLevel());
|
||||
|
||||
Assert.assertEquals(0, ents[0].getLane());
|
||||
Assert.assertEquals(1, ents[1].getLane());
|
||||
Assert.assertEquals(2, ents[2].getLane());
|
||||
Assert.assertEquals(3, ents[3].getLane());
|
||||
Assert.assertEquals(4, ents[4].getLane());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPlaceEntities1() throws Exception {
|
||||
|
||||
conns = new int[5][5];
|
||||
for (int i = 0; i < conns.length; i++) {
|
||||
for (int j = 0; j < conns.length; j++) {
|
||||
//int x = Math.getExponent(Math.random());
|
||||
if (i == j - 1 || i == j - 4)
|
||||
conns[i][j] = 1;
|
||||
else
|
||||
conns[i][j] = 0;
|
||||
}
|
||||
}
|
||||
conns[3][4] = 0;
|
||||
|
||||
lb = new LayoutBuilder(ents, conns);
|
||||
|
||||
ents = lb.placeEntities();
|
||||
|
||||
Assert.assertEquals(5, ents.length);
|
||||
Assert.assertEquals(0, lb.getStartEnt().getId());
|
||||
|
||||
Assert.assertEquals(0, ents[0].getLevel());
|
||||
Assert.assertEquals(0, ents[1].getLevel());
|
||||
Assert.assertEquals(0, ents[2].getLevel());
|
||||
Assert.assertEquals(0, ents[3].getLevel());
|
||||
Assert.assertEquals(1, ents[4].getLevel());
|
||||
|
||||
Assert.assertEquals(0, ents[0].getLane());
|
||||
Assert.assertEquals(1, ents[1].getLane());
|
||||
Assert.assertEquals(2, ents[2].getLane());
|
||||
Assert.assertEquals(3, ents[3].getLane());
|
||||
Assert.assertEquals(1, ents[4].getLane());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPlaceEntities2() throws Exception {
|
||||
|
||||
conns = new int[5][5];
|
||||
for (int i = 0; i < conns.length; i++) {
|
||||
for (int j = 0; j < conns.length; j++) {
|
||||
if (i * j > 2 && i * j <= 6)
|
||||
conns[i][j] = 1;
|
||||
else
|
||||
conns[i][j] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
lb = new LayoutBuilder(ents, conns);
|
||||
|
||||
ents = lb.placeEntities();
|
||||
|
||||
Assert.assertEquals(5, ents.length);
|
||||
Assert.assertEquals(1, lb.getStartEnt().getId());
|
||||
|
||||
Assert.assertEquals(1, ents[0].getLevel());
|
||||
Assert.assertEquals(0, ents[1].getLevel());
|
||||
Assert.assertEquals(0, ents[2].getLevel());
|
||||
Assert.assertEquals(0, ents[3].getLevel());
|
||||
Assert.assertEquals(1, ents[4].getLevel());
|
||||
|
||||
Assert.assertEquals(0, ents[0].getLane());
|
||||
Assert.assertEquals(0, ents[1].getLane());
|
||||
Assert.assertEquals(2, ents[2].getLane());
|
||||
Assert.assertEquals(1, ents[3].getLane());
|
||||
Assert.assertEquals(1, ents[4].getLane());
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue