Commits

Anonymous committed bf01013 Draft

fixed dependencies

  • Participants
  • Parent commits e7c33c9

Comments (0)

Files changed (16)

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
+syntax: glob
+.classpath
+.project
+.settings
+target
+doc
+output

File bin/META-INF/declaratron

-org.xmlcml.cml.declaratron.chem.amber.AmberConverters

File bin/log4j.properties

-log4j.rootLogger=DEBUG, A1
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-log4j.logger.uk.ac.cam=DEBUG
-
-log4j.logger.org.xmlcml.cml.converters.marker = INFO

File bin/org/xmlcml/declaratron/graphics/svg/SvgVisitor.class

Binary file removed.

File bin/org/xmlcml/declaratron/graphics/svg/SvgVisitorTest.class

Binary file removed.

File bin/org/xmlcml/declaratron/graphics/svg/array2Test.svg

-<svg xmlns="http://www.w3.org/2000/svg">
-<g>
-<text style=" stroke : none;" x="307.6923076923077" y="-267.8461233961077" font-size="2.0">*</text>
-<text style=" stroke : none;" x="315.38461538461536" y="119.06721536351199" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="307.6923076923077" y1="-267.8461233961077" x2="315.38461538461536" y2="119.06721536351199" />
-<text style=" stroke : none;" x="323.0769230769231" y="304.632568359375" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="315.38461538461536" y1="119.06721536351199" x2="323.0769230769231" y2="304.632568359375" />
-<text style=" stroke : none;" x="330.7692307692308" y="392.20156370686504" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="323.0769230769231" y1="304.632568359375" x2="330.7692307692308" y2="392.20156370686504" />
-<text style=" stroke : none;" x="338.46153846153845" y="431.36127371931536" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="330.7692307692308" y1="392.20156370686504" x2="338.46153846153845" y2="431.36127371931536" />
-<text style=" stroke : none;" x="346.15384615384613" y="446.5391153842039" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="338.46153846153845" y1="431.36127371931536" x2="346.15384615384613" y2="446.5391153842039" />
-<text style=" stroke : none;" x="353.8461538461538" y="450.0" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="346.15384615384613" y1="446.5391153842039" x2="353.8461538461538" y2="450.0" />
-<text style=" stroke : none;" x="361.53846153846155" y="447.97098978378324" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="353.8461538461538" y1="450.0" x2="361.53846153846155" y2="447.97098978378324" />
-<text style=" stroke : none;" x="369.2307692307692" y="443.61844004961006" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="361.53846153846155" y1="447.97098978378324" x2="369.2307692307692" y2="443.61844004961006" />
-<text style=" stroke : none;" x="376.9230769230769" y="438.533546592117" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="369.2307692307692" y1="443.61844004961006" x2="376.9230769230769" y2="438.533546592117" />
-<text style=" stroke : none;" x="384.61538461538464" y="433.4897976680384" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="376.9230769230769" y1="438.533546592117" x2="384.61538461538464" y2="433.4897976680384" />
-<text style=" stroke : none;" x="392.30769230769226" y="428.83584" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="384.61538461538464" y1="433.4897976680384" x2="392.30769230769226" y2="428.83584" />
-<text style=" stroke : none;" x="400.0" y="424.70177900778117" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="392.30769230769226" y1="428.83584" x2="400.0" y2="424.70177900778117" />
-<text style=" stroke : none;" x="407.69230769230774" y="421.10827385223234" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="400.0" y1="424.70177900778117" x2="407.69230769230774" y2="421.10827385223234" />
-<text style=" stroke : none;" x="415.38461538461536" y="418.0242561712017" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="407.69230769230774" y1="421.10827385223234" x2="415.38461538461536" y2="418.0242561712017" />
-<text style=" stroke : none;" x="423.0769230769231" y="415.3972118548714" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="415.38461538461536" y1="418.0242561712017" x2="423.0769230769231" y2="415.3972118548714" />
-<text style=" stroke : none;" x="430.7692307692308" y="413.1687242798354" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="423.0769230769231" y1="415.3972118548714" x2="430.7692307692308" y2="413.1687242798354" />
-<text style=" stroke : none;" x="438.46153846153845" y="411.28209768608997" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="430.7692307692308" y1="413.1687242798354" x2="438.46153846153845" y2="411.28209768608997" />
-<text style=" stroke : none;" x="446.1538461538462" y="409.685754776001" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="438.46153846153845" y1="411.28209768608997" x2="446.1538461538462" y2="409.685754776001" />
-<text style=" stroke : none;" x="453.8461538461538" y="408.33441991749186" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="446.1538461538462" y1="409.685754776001" x2="453.8461538461538" y2="408.33441991749186" />
-<text style=" stroke : none;" x="461.53846153846155" y="407.1891834577337" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="453.8461538461538" y1="408.33441991749186" x2="461.53846153846155" y2="407.1891834577337" />
-<text style=" stroke : none;" x="469.2307692307692" y="406.2170402759783" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="461.53846153846155" y1="407.1891834577337" x2="469.2307692307692" y2="406.2170402759783" />
-<text style=" stroke : none;" x="476.9230769230769" y="405.3902189205073" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="469.2307692307692" y1="406.2170402759783" x2="476.9230769230769" y2="405.3902189205073" />
-<text style=" stroke : none;" x="484.61538461538464" y="404.6854651296617" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="476.9230769230769" y1="405.3902189205073" x2="484.61538461538464" y2="404.6854651296617" />
-<text style=" stroke : none;" x="492.30769230769226" y="404.0833598834698" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="484.61538461538464" y1="404.6854651296617" x2="492.30769230769226" y2="404.0833598834698" />
-<text style=" stroke : none;" x="500.0" y="403.56770683133755" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="492.30769230769226" y1="404.0833598834698" x2="500.0" y2="403.56770683133755" />
-<text style=" stroke : none;" x="507.6923076923077" y="403.125" font-size="2.0">*</text>
-<line style=" stroke : black; stroke-width : 1.0;" x1="500.0" y1="403.56770683133755" x2="507.6923076923077" y2="403.125" />
-</g>
-</svg>

File bin/org/xmlcml/declaratron/graphics/svg/array2Test.xml

-<svgTool xmlns="http://www.xml-cml.org/schema">
-		<array xmlns="http://www.xml-cml.org/schema" dataType="xsd:double" id="x"
-			size="27">0.7 0.75 0.8 0.85 0.90 0.95 1.00 1.05 1.10 1.15 1.20 1.25 1.30
-			1.35 1.4 1.45 1.5 1.55 1.6 1.65 1.7 1.75 1.8 1.85 1.9 1.95 2.0
-		</array>
-		<array xmlns="http://www.xml-cml.org/schema" dataType="xsd:double"  id="y"
-			size="27">13.356922467922153 5.61865569272976 1.9073486328125
-			0.1559687258626994 -0.6272254743863073 -0.930782307684078 -1.0
-			-0.9594197956756645 -0.8723688009922013 -0.7706709318423401
-			-0.6697959533607682 -0.5767168000000003 -0.4940355801556231
-			-0.42216547704464724 -0.3604851234240348 -0.30794423709742796
-			-0.2633744855967078 -0.22564195372179985 -0.19371509552001953
-			-0.16668839834983729 -0.1437836691546741 -0.12434080551956603
-			-0.10780437841014653 -0.09370930259323386 -0.08166719766939626
-			-0.07135413662675144 -0.0625
-		</array>
-</svgTool>

File bin/org/xmlcml/declaratron/graphics/svg/factor0.1.PNG

Removed
Old image

File bin/org/xmlcml/declaratron/graphics/svg/factor0.2.PNG

Removed
Old image

File bin/org/xmlcml/declaratron/graphics/svg/factor0.33.PNG

Removed
Old image
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+ <text x="100.0" y="210.0" style=" fill : blue; stroke : none;" font-size="10.0">0</text>
+ <circle cx="100.0" cy="210.0" r="1.5" style=" fill : green; stroke : black; stroke-width : 0.5;"/>
+ <text x="110.0" y="180.0" style=" fill : blue; stroke : none;" font-size="10.0">1</text>
+ <circle cx="110.0" cy="180.0" r="1.5" style=" fill : green; stroke : black; stroke-width : 0.5;"/>
+ <text x="120.0" y="190.0" style=" fill : blue; stroke : none;" font-size="10.0">2</text>
+ <circle cx="120.0" cy="190.0" r="1.5" style=" fill : green; stroke : black; stroke-width : 0.5;"/>
+ <text x="130.0" y="230.0" style=" fill : blue; stroke : none;" font-size="10.0">3</text>
+ <circle cx="130.0" cy="230.0" r="1.5" style=" fill : green; stroke : black; stroke-width : 0.5;"/>
+ <text x="140.0" y="200.0" style=" fill : blue; stroke : none;" font-size="10.0">4</text>
+ <circle cx="140.0" cy="200.0" r="1.5" style=" fill : green; stroke : black; stroke-width : 0.5;"/>
+ <text x="150.0" y="220.0" style=" fill : blue; stroke : none;" font-size="10.0">5</text>
+ <circle cx="150.0" cy="220.0" r="1.5" style=" fill : green; stroke : black; stroke-width : 0.5;"/>
+ <text x="160.0" y="280.0" style=" fill : blue; stroke : none;" font-size="10.0">6</text>
+ <circle cx="160.0" cy="280.0" r="1.5" style=" fill : green; stroke : black; stroke-width : 0.5;"/>
+ <text x="170.0" y="240.0" style=" fill : blue; stroke : none;" font-size="10.0">7</text>
+ <circle cx="170.0" cy="240.0" r="1.5" style=" fill : green; stroke : black; stroke-width : 0.5;"/>
+ <line x1="100.0" y1="210.0" x2="103.3" y2="200.1" style=" stroke : red; stroke-width : 1.0;"/>
+ <line style=" stroke : black; stroke-width : 1.0;" x1="110.0" y1="180.0" x2="102.6209756742507" y2="187.3790243257493"/>
+ <line x1="110.0" y1="180.0" x2="113.3" y2="176.7" style=" stroke : red; stroke-width : 1.0;"/>
+ <line style=" stroke : black; stroke-width : 1.0;" x1="120.0" y1="190.0" x2="118.26675508625166" y2="185.66688771562914"/>
+ <line x1="120.0" y1="190.0" x2="125.05323385702593" y2="202.63308464256482" style=" stroke : red; stroke-width : 1.0;"/>
+ <line style=" stroke : black; stroke-width : 1.0;" x1="130.0" y1="230.0" x2="117.83020131637339" y2="223.9151006581867"/>
+ <line x1="130.0" y1="230.0" x2="139.33380951166242" y2="234.6669047558312" style=" stroke : red; stroke-width : 1.0;"/>
+ <line style=" stroke : black; stroke-width : 1.0;" x1="140.0" y1="200.0" x2="130.66619048833758" y2="204.6669047558312"/>
+ <line x1="140.0" y1="200.0" x2="146.6" y2="196.7" style=" stroke : red; stroke-width : 1.0;"/>
+ <line style=" stroke : black; stroke-width : 1.0;" x1="150.0" y1="220.0" x2="148.2103237229961" y2="212.84129489198435"/>
+ <line x1="150.0" y1="220.0" x2="154.86844582037043" y2="239.47378328148173" style=" stroke : red; stroke-width : 1.0;"/>
+ <line style=" stroke : black; stroke-width : 1.0;" x1="160.0" y1="280.0" x2="145.80616330937966" y2="265.80616330937966"/>
+ <line x1="160.0" y1="280.0" x2="169.62107062649474" y2="289.62107062649477" style=" stroke : red; stroke-width : 1.0;"/>
+ <line style=" stroke : black; stroke-width : 1.0;" x1="170.0" y1="240.0" x2="166.7" y2="253.2"/>
+ <path style=" fill : none; stroke : black; stroke-width : 0.5;" d="M100.0 210.0 C103.3 200.1 102.62 187.379 110.0 180.0 C113.3 176.7 118.266 185.666 120.0 190.0 C125.053 202.633 117.83 223.915 130.0 230.0 C139.333 234.666 130.666 204.666 140.0 200.0 C146.6 196.7 148.21 212.841 150.0 220.0 C154.868 239.473 145.806 265.806 160.0 280.0 C169.621 289.621 166.7 253.2 170.0 240.0 "/>
+</svg>
 
     <parent>
         <groupId>cml</groupId>
-        <artifactId>declaratron</artifactId>
+        <artifactId>declaratron-top</artifactId>
         <version>0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>declaratron-graphics</artifactId>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
     <name>declaratron-graphics</name>
 
     <properties>
-        <svg.version>0.1</svg.version>
-        <svg.groupId>cml</svg.groupId>
-        <svg.artifactId>cml</svg.artifactId>
+        <svg.version>0.1-SNAPSHOT</svg.version>
+        <svg.groupId>org.xml-cml</svg.groupId>
+        <svg.artifactId>svg</svg.artifactId>
     </properties>
 
-    <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>${jumbo.groupId}</groupId>
                 <artifactId>jumbo</artifactId>
                 <version>${jumbo.version}</version>
             </dependency>
+            <!-- 
             <dependency>
                 <groupId>${svg.groupId}</groupId>
                 <artifactId>${svg.artifactId}</artifactId>
                 <version>${svg.version}</version>
             </dependency>
+            -->
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>1.8.0</version>
             </dependency>
         </dependencies>
-    </dependencyManagement>
 
 
 </project>

File src/main/java/org/xmlcml/declaratron/graphics/svg/SvgVisitor.java

 package org.xmlcml.declaratron.graphics.svg;
 
 import nu.xom.Element;
-
 import nu.xom.Nodes;
 
 import org.apache.log4j.Logger;
+
 import org.xmlcml.cml.base.CMLElement;
 import org.xmlcml.cml.element.CMLArray;
 import org.xmlcml.cml.graphics.SVGG;
 import org.xmlcml.cml.graphics.SVGText;
 import org.xmlcml.euclid.Real2;
 import org.xmlcml.euclid.RealArray;
-import org.xmlcml.semantic.visitors.AbstractElementVisitor;
+import org.xmlcml.declaratron.core.visitors.AbstractElementVisitor;
 
 public class SvgVisitor  extends AbstractElementVisitor {
 

File src/test/java/org/xmlcml/declaratron/graphics/svg/Fixtures.java

+package org.xmlcml.declaratron.graphics.svg;
+
+public class Fixtures {
+	public static final String SVG = "org/xmlcml/declaratron/graphics/svg/";
+
+}

File src/test/java/org/xmlcml/declaratron/graphics/svg/SvgVisitorTest.java

 import org.xmlcml.cml.graphics.SVGSVG;
 import org.xmlcml.cml.graphics.SVGText;
 import org.xmlcml.cml.testutil.JumboTestUtils;
+import org.xmlcml.declaratron.core.NodeUtils;
 import org.xmlcml.euclid.Real2;
 import org.xmlcml.euclid.Real2Array;
 import org.xmlcml.euclid.Vector2;
-import org.xmlcml.semantic.NodeUtils;
 
 public class SvgVisitorTest {
 	private SVGSVG svg;
 	@Test
 	public void testArray2() {
 		
-		Element element = NodeUtils.parseResource("org/xmlcml/svg/array2Test.xml");
+		Element element = NodeUtils.parseResource(Fixtures.SVG+"array2Test.xml");
 		Element svgToolElement = (Element) element.query("//*[local-name()='svgTool']").get(0);
 		SvgVisitor visitor = new SvgVisitor();
 		Element newElement = visitor.visitElement(svgToolElement);
 		JumboTestUtils.assertEqualsIncludingFloat("test compare", 
-				NodeUtils.parseResource("org/xmlcml/svg/array2Test.svg"), 
+				NodeUtils.parseResource(Fixtures.SVG+"array2Test.svg"), 
 				newElement, true, 0.0001);		
 	}