Implemented and modified the AbstractTopologyManager and adapted the otherclasses.
Upgradet to jung2 in the graph package
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/molwind-chemical/src/main/java/org/molwind/chemical/view/.#ChemicalTopologyManager.java Thu Oct 15 16:39:48 2009 +0200
1.3 @@ -0,0 +1,1 @@
1.4 +m164320@pluto.bci.merck.de.8411
1.5 \ No newline at end of file
2.1 --- a/molwind-chemical/src/main/java/org/molwind/chemical/view/ChemicalTileGenerator.java Thu Oct 08 10:47:53 2009 +0200
2.2 +++ b/molwind-chemical/src/main/java/org/molwind/chemical/view/ChemicalTileGenerator.java Thu Oct 15 16:39:48 2009 +0200
2.3 @@ -64,6 +64,8 @@
2.4
2.5 private Iterator getVisibleEntities(final LayeredPosition position) {
2.6 TopologyManager topologyManager = world.getTopologyManager();
2.7 + topologyManager.setEntityIterator( world.getEntityIterator() );
2.8 + topologyManager.setRelationshipResolver( world.getRelationshipResolver() );
2.9 return topologyManager.getVisibleEntities(position);
2.10 }
2.11
3.1 --- a/molwind-chemical/src/main/java/org/molwind/chemical/view/ChemicalTopologyManager.java Thu Oct 08 10:47:53 2009 +0200
3.2 +++ b/molwind-chemical/src/main/java/org/molwind/chemical/view/ChemicalTopologyManager.java Thu Oct 15 16:39:48 2009 +0200
3.3 @@ -26,6 +26,7 @@
3.4 import org.molwind.model.RelationshipResolver;
3.5 import org.molwind.util.MolwindLogger;
3.6 import org.molwind.view.TopologyManager;
3.7 +import org.molwind.view.AbstractTopologyManager;
3.8
3.9 /**
3.10 * ChemicalTopologyManager determines and places visible chemical structures.
3.11 @@ -33,7 +34,7 @@
3.12 * @author <a href="mailto:oliver.karch@molwind.org">Oliver Karch</a>
3.13 * @version 1.0
3.14 */
3.15 -public class ChemicalTopologyManager implements TopologyManager {
3.16 +public class ChemicalTopologyManager extends AbstractTopologyManager {
3.17
3.18 private Iterator entityIterator;
3.19 private RelationshipResolver relationshipResolver;
3.20 @@ -43,53 +44,10 @@
3.21 * Creates a new topology manager to place chemical entities.
3.22 */
3.23 public ChemicalTopologyManager() {
3.24 - entityIterator = null;
3.25 - relationshipResolver = null;
3.26 + super();
3.27 entities = null;
3.28 }
3.29
3.30 - /**
3.31 - * Get the EntityIterator value.
3.32 - *
3.33 - * @return
3.34 - * the EntityIterator value
3.35 - */
3.36 - public Iterator getEntityIterator() {
3.37 - return entityIterator;
3.38 - }
3.39 -
3.40 - /**
3.41 - * Set the EntityIterator value.
3.42 - *
3.43 - * @param newEntityIterator
3.44 - * the new EntityIterator value
3.45 - */
3.46 - public void setEntityIterator(final Iterator newEntityIterator) {
3.47 - this.entityIterator = newEntityIterator;
3.48 - }
3.49 -
3.50 - /**
3.51 - * Get the RelationshipResolver value.
3.52 - *
3.53 - * @return
3.54 - * the RelationshipResolver value
3.55 - */
3.56 - public RelationshipResolver getRelationshipResolver() {
3.57 - return relationshipResolver;
3.58 - }
3.59 -
3.60 - /**
3.61 - * Set the RelationshipResolver value.
3.62 - *
3.63 - * @param newRelationshipResolver
3.64 - * the new RelationshipResolver value
3.65 - */
3.66 - public void setRelationshipResolver(
3.67 - final RelationshipResolver newRelationshipResolver) {
3.68 - this.relationshipResolver = newRelationshipResolver;
3.69 - }
3.70 -
3.71 -
3.72 private void calculatePositions() {
3.73 RelationshipResolver resolver = getRelationshipResolver();
3.74 if (resolver == null) {
3.75 @@ -98,6 +56,9 @@
3.76 return;
3.77 }
3.78 EntityGraph graph = resolver.resolve();
3.79 +
3.80 + MolwindLogger.debug( "Entity graph:\n"+graph );
3.81 +
3.82 // TODO Complete method, seems unfinished
3.83 }
3.84
4.1 Binary file molwind-chemical/target/classes/org/molwind/chemical/view/ChemicalTileGenerator.class has changed
5.1 Binary file molwind-chemical/target/classes/org/molwind/chemical/view/ChemicalTopologyManager.class has changed
6.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/src/main/java/org/molwind/webservice/IMolwindWebservice.java Thu Oct 08 10:47:53 2009 +0200
6.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/src/main/java/org/molwind/webservice/IMolwindWebservice.java Thu Oct 15 16:39:48 2009 +0200
6.3 @@ -8,6 +8,8 @@
6.4 import javax.jws.soap.*;
6.5 import javax.jws.soap.SOAPBinding.*;
6.6
6.7 +import java.awt.image.BufferedImage;
6.8 +
6.9
6.10
6.11 /**
6.12 @@ -15,8 +17,14 @@
6.13 **/
6.14 @WebService
6.15 public interface IMolwindWebservice{
6.16 - @WebMethod(action="getWorldNames")
6.17 + @WebMethod(action="getWorldNames")
6.18 public String[] getWorldNames()throws IOException,JDOMException;
6.19 +
6.20 +
6.21 +
6.22 +
6.23 +
6.24 +
6.25
6.26
6.27 }
7.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/src/main/java/org/molwind/webservice/MolwindWebservice.java Thu Oct 08 10:47:53 2009 +0200
7.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/src/main/java/org/molwind/webservice/MolwindWebservice.java Thu Oct 15 16:39:48 2009 +0200
7.3 @@ -24,6 +24,10 @@
7.4 import javax.servlet.ServletOutputStream;
7.5
7.6
7.7 +
7.8 +import java.awt.image.BufferedImage;
7.9 +
7.10 +
7.11 /**
7.12 * MolwindWebService transforms the soap-messages by the client an
7.13 * invokes the target-method
7.14 @@ -81,10 +85,13 @@
7.15
7.16
7.17 }
7.18 +
7.19
7.20 -
7.21
7.22
7.23 +
7.24 +
7.25 +
7.26
7.27
7.28 }
8.1 Binary file molwind-client/molwind-webservice/molwind-endpoint/target/classes/org/molwind/webservice/MolwindWebservice.class has changed
9.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/MolwindWebservice.wsdl Thu Oct 08 10:47:53 2009 +0200
9.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/MolwindWebservice.wsdl Thu Oct 15 16:39:48 2009 +0200
9.3 @@ -1,31 +1,26 @@
9.4 <?xml version="1.0" encoding="UTF-8"?>
9.5 <wsdl:definitions name="MolwindWebserviceService" targetNamespace="http://webservice.molwind.org/" xmlns:tns="http://webservice.molwind.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
9.6 <wsdl:types>
9.7 -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://jaxb.dev.java.net/array" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://jaxb.dev.java.net/array">
9.8 - <xs:complexType final="#all" name="stringArray">
9.9 - <xs:sequence>
9.10 - <xs:element maxOccurs="unbounded" minOccurs="0" name="item" nillable="true" type="xs:string"/>
9.11 - </xs:sequence>
9.12 - </xs:complexType>
9.13 -</xs:schema>
9.14 -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://webservice.molwind.org/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://webservice.molwind.org/">
9.15 - <xs:element name="getWorldNames" type="tns:getWorldNames"/>
9.16 - <xs:element name="getWorldNamesResponse" type="tns:getWorldNamesResponse"/>
9.17 - <xs:complexType name="getWorldNames"/>
9.18 - <xs:complexType name="getWorldNamesResponse">
9.19 - <xs:sequence>
9.20 - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" type="xs:string"/>
9.21 - </xs:sequence>
9.22 - </xs:complexType>
9.23 - <xs:element name="JDOMException" type="tns:JDOMException"/>
9.24 - <xs:complexType name="JDOMException">
9.25 - <xs:sequence/>
9.26 - </xs:complexType>
9.27 - <xs:element name="IOException" type="tns:IOException"/>
9.28 - <xs:complexType name="IOException">
9.29 - <xs:sequence/>
9.30 - </xs:complexType>
9.31 -</xs:schema>
9.32 +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://webservice.molwind.org/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://webservice.molwind.org/">
9.33 + <xsd:element name="JDOMException" type="tns:JDOMException"/>
9.34 + <xsd:complexType name="JDOMException">
9.35 + <xsd:sequence/>
9.36 + </xsd:complexType>
9.37 + <xsd:element name="IOException" type="tns:IOException"/>
9.38 + <xsd:complexType name="IOException">
9.39 + <xsd:sequence/>
9.40 + </xsd:complexType>
9.41 + <xsd:element name="getWorldNames" type="tns:getWorldNames"/>
9.42 + <xsd:complexType name="getWorldNames">
9.43 + <xsd:sequence/>
9.44 + </xsd:complexType>
9.45 + <xsd:element name="getWorldNamesResponse" type="tns:getWorldNamesResponse"/>
9.46 + <xsd:complexType name="getWorldNamesResponse">
9.47 + <xsd:sequence>
9.48 + <xsd:element maxOccurs="unbounded" minOccurs="0" name="return" type="xsd:string"/>
9.49 + </xsd:sequence>
9.50 + </xsd:complexType>
9.51 +</xsd:schema>
9.52 </wsdl:types>
9.53 <wsdl:message name="IOException">
9.54 <wsdl:part name="IOException" element="tns:IOException">
10.1 Binary file molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetImageFile.class has changed
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
11.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetImageFile.java Thu Oct 15 16:39:48 2009 +0200
11.3 @@ -0,0 +1,24 @@
11.4 +
11.5 +package org.molwind.webservice.jaxws;
11.6 +
11.7 +import javax.xml.bind.annotation.XmlAccessType;
11.8 +import javax.xml.bind.annotation.XmlAccessorType;
11.9 +import javax.xml.bind.annotation.XmlRootElement;
11.10 +import javax.xml.bind.annotation.XmlType;
11.11 +
11.12 +/**
11.13 + * This class was generated by the CXF 2.0.9
11.14 + * Thu Oct 15 11:40:41 CEST 2009
11.15 + * Generated source version: 2.0.9
11.16 + *
11.17 + */
11.18 +
11.19 +@XmlRootElement(name = "getImageFile", namespace = "http://webservice.molwind.org/")
11.20 +@XmlAccessorType(XmlAccessType.FIELD)
11.21 +@XmlType(name = "getImageFile", namespace = "http://webservice.molwind.org/")
11.22 +
11.23 +public class GetImageFile {
11.24 +
11.25 +
11.26 +}
11.27 +
12.1 Binary file molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetImageFileResponse.class has changed
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
13.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetImageFileResponse.java Thu Oct 15 16:39:48 2009 +0200
13.3 @@ -0,0 +1,35 @@
13.4 +
13.5 +package org.molwind.webservice.jaxws;
13.6 +
13.7 +import javax.xml.bind.annotation.XmlAccessType;
13.8 +import javax.xml.bind.annotation.XmlAccessorType;
13.9 +import javax.xml.bind.annotation.XmlElement;
13.10 +import javax.xml.bind.annotation.XmlRootElement;
13.11 +import javax.xml.bind.annotation.XmlType;
13.12 +
13.13 +/**
13.14 + * This class was generated by the CXF 2.0.9
13.15 + * Thu Oct 15 11:40:41 CEST 2009
13.16 + * Generated source version: 2.0.9
13.17 + *
13.18 + */
13.19 +
13.20 +@XmlRootElement(name = "getImageFileResponse", namespace = "http://webservice.molwind.org/")
13.21 +@XmlAccessorType(XmlAccessType.FIELD)
13.22 +@XmlType(name = "getImageFileResponse", namespace = "http://webservice.molwind.org/")
13.23 +
13.24 +public class GetImageFileResponse {
13.25 +
13.26 + @XmlElement(name = "return")
13.27 + private java.awt.image.BufferedImage _return;
13.28 +
13.29 + public java.awt.image.BufferedImage get_return() {
13.30 + return this._return;
13.31 + }
13.32 +
13.33 + public void set_return( java.awt.image.BufferedImage new_return ) {
13.34 + this._return = new_return;
13.35 + }
13.36 +
13.37 +}
13.38 +
14.1 Binary file molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetWorldNames.class has changed
15.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetWorldNames.java Thu Oct 08 10:47:53 2009 +0200
15.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetWorldNames.java Thu Oct 15 16:39:48 2009 +0200
15.3 @@ -8,7 +8,7 @@
15.4
15.5 /**
15.6 * This class was generated by the CXF 2.0.9
15.7 - * Fri Sep 18 13:36:39 CEST 2009
15.8 + * Thu Oct 15 16:35:31 CEST 2009
15.9 * Generated source version: 2.0.9
15.10 *
15.11 */
16.1 Binary file molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetWorldNamesResponse.class has changed
17.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetWorldNamesResponse.java Thu Oct 08 10:47:53 2009 +0200
17.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetWorldNamesResponse.java Thu Oct 15 16:39:48 2009 +0200
17.3 @@ -9,7 +9,7 @@
17.4
17.5 /**
17.6 * This class was generated by the CXF 2.0.9
17.7 - * Fri Sep 18 13:36:39 CEST 2009
17.8 + * Thu Oct 15 16:35:31 CEST 2009
17.9 * Generated source version: 2.0.9
17.10 *
17.11 */
18.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/IOExceptionBean.java Thu Oct 08 10:47:53 2009 +0200
18.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/IOExceptionBean.java Thu Oct 15 16:39:48 2009 +0200
18.3 @@ -8,7 +8,7 @@
18.4
18.5 /**
18.6 * This class was generated by the CXF 2.0.9
18.7 - * Thu Oct 08 10:45:06 CEST 2009
18.8 + * Thu Oct 15 16:35:34 CEST 2009
18.9 * Generated source version: 2.0.9
18.10 *
18.11 */
19.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/JDOMExceptionBean.java Thu Oct 08 10:47:53 2009 +0200
19.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/JDOMExceptionBean.java Thu Oct 15 16:39:48 2009 +0200
19.3 @@ -8,7 +8,7 @@
19.4
19.5 /**
19.6 * This class was generated by the CXF 2.0.9
19.7 - * Thu Oct 08 10:45:06 CEST 2009
19.8 + * Thu Oct 15 16:35:34 CEST 2009
19.9 * Generated source version: 2.0.9
19.10 *
19.11 */
20.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/client/WSClient.java Thu Oct 08 10:47:53 2009 +0200
20.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/client/WSClient.java Thu Oct 15 16:39:48 2009 +0200
20.3 @@ -19,6 +19,9 @@
20.4
20.5 import org.molwind.webservice.IMolwindWebservice;
20.6
20.7 +
20.8 +import java.awt.image.BufferedImage;
20.9 +
20.10 /**
20.11 * WSClient is for invoking remote calls using the WSDL-File
20.12 *
20.13 @@ -56,6 +59,7 @@
20.14
20.15
20.16 }
20.17 +
20.18
20.19
20.20
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
21.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/GetImageFile.java Thu Oct 15 16:39:48 2009 +0200
21.3 @@ -0,0 +1,32 @@
21.4 +
21.5 +package org.molwind.webservice;
21.6 +
21.7 +import javax.xml.bind.annotation.XmlAccessType;
21.8 +import javax.xml.bind.annotation.XmlAccessorType;
21.9 +import javax.xml.bind.annotation.XmlType;
21.10 +
21.11 +
21.12 +/**
21.13 + * <p>Java class for getImageFile complex type.
21.14 + *
21.15 + * <p>The following schema fragment specifies the expected content contained within this class.
21.16 + *
21.17 + * <pre>
21.18 + * <complexType name="getImageFile">
21.19 + * <complexContent>
21.20 + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
21.21 + * <sequence>
21.22 + * </sequence>
21.23 + * </restriction>
21.24 + * </complexContent>
21.25 + * </complexType>
21.26 + * </pre>
21.27 + *
21.28 + *
21.29 + */
21.30 +@XmlAccessorType(XmlAccessType.FIELD)
21.31 +@XmlType(name = "getImageFile")
21.32 +public class GetImageFile {
21.33 +
21.34 +
21.35 +}
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
22.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/GetImageFileResponse.java Thu Oct 15 16:39:48 2009 +0200
22.3 @@ -0,0 +1,62 @@
22.4 +
22.5 +package org.molwind.webservice;
22.6 +
22.7 +import javax.xml.bind.annotation.XmlAccessType;
22.8 +import javax.xml.bind.annotation.XmlAccessorType;
22.9 +import javax.xml.bind.annotation.XmlElement;
22.10 +import javax.xml.bind.annotation.XmlType;
22.11 +
22.12 +
22.13 +/**
22.14 + * <p>Java class for getImageFileResponse complex type.
22.15 + *
22.16 + * <p>The following schema fragment specifies the expected content contained within this class.
22.17 + *
22.18 + * <pre>
22.19 + * <complexType name="getImageFileResponse">
22.20 + * <complexContent>
22.21 + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
22.22 + * <sequence>
22.23 + * <element name="return" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
22.24 + * </sequence>
22.25 + * </restriction>
22.26 + * </complexContent>
22.27 + * </complexType>
22.28 + * </pre>
22.29 + *
22.30 + *
22.31 + */
22.32 +@XmlAccessorType(XmlAccessType.FIELD)
22.33 +@XmlType(name = "getImageFileResponse", propOrder = {
22.34 + "_return"
22.35 +})
22.36 +public class GetImageFileResponse {
22.37 +
22.38 + @XmlElement(name = "return")
22.39 + protected Object _return;
22.40 +
22.41 + /**
22.42 + * Gets the value of the return property.
22.43 + *
22.44 + * @return
22.45 + * possible object is
22.46 + * {@link Object }
22.47 + *
22.48 + */
22.49 + public Object getReturn() {
22.50 + return _return;
22.51 + }
22.52 +
22.53 + /**
22.54 + * Sets the value of the return property.
22.55 + *
22.56 + * @param value
22.57 + * allowed object is
22.58 + * {@link Object }
22.59 + *
22.60 + */
22.61 + public void setReturn(Object value) {
22.62 + this._return = value;
22.63 + }
22.64 +
22.65 +}
23.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/GetWorldNames.java Thu Oct 08 10:47:53 2009 +0200
23.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/GetWorldNames.java Thu Oct 15 16:39:48 2009 +0200
23.3 @@ -15,6 +15,8 @@
23.4 * <complexType name="getWorldNames">
23.5 * <complexContent>
23.6 * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
23.7 + * <sequence>
23.8 + * </sequence>
23.9 * </restriction>
23.10 * </complexContent>
23.11 * </complexType>
24.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/IMolwindWebservice.java Thu Oct 08 10:47:53 2009 +0200
24.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/IMolwindWebservice.java Thu Oct 15 16:39:48 2009 +0200
24.3 @@ -8,14 +8,14 @@
24.4 import javax.xml.ws.ResponseWrapper;
24.5
24.6 /**
24.7 - * This class was generated by Apache CXF 2.2.3
24.8 - * Thu Oct 08 10:45:20 CEST 2009
24.9 - * Generated source version: 2.2.3
24.10 + * This class was generated by Apache CXF 2.2.4
24.11 + * Thu Oct 15 16:35:46 CEST 2009
24.12 + * Generated source version: 2.2.4
24.13 *
24.14 */
24.15
24.16 @WebService(targetNamespace = "http://webservice.molwind.org/", name = "IMolwindWebservice")
24.17 -@XmlSeeAlso({net.java.dev.jaxb.array.ObjectFactory.class,ObjectFactory.class})
24.18 +@XmlSeeAlso({ObjectFactory.class})
24.19 public interface IMolwindWebservice {
24.20
24.21 @ResponseWrapper(localName = "getWorldNamesResponse", targetNamespace = "http://webservice.molwind.org/", className = "org.molwind.webservice.GetWorldNamesResponse")
25.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/IOException_Exception.java Thu Oct 08 10:47:53 2009 +0200
25.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/IOException_Exception.java Thu Oct 15 16:39:48 2009 +0200
25.3 @@ -5,15 +5,15 @@
25.4
25.5
25.6 /**
25.7 - * This class was generated by Apache CXF 2.2.3
25.8 - * Thu Oct 08 10:45:20 CEST 2009
25.9 - * Generated source version: 2.2.3
25.10 + * This class was generated by Apache CXF 2.2.4
25.11 + * Thu Oct 15 16:35:46 CEST 2009
25.12 + * Generated source version: 2.2.4
25.13 *
25.14 */
25.15
25.16 @WebFault(name = "IOException", targetNamespace = "http://webservice.molwind.org/")
25.17 public class IOException_Exception extends Exception {
25.18 - public static final long serialVersionUID = 20091008104520L;
25.19 + public static final long serialVersionUID = 20091015163546L;
25.20
25.21 private org.molwind.webservice.IOException ioException;
25.22
26.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/JDOMException_Exception.java Thu Oct 08 10:47:53 2009 +0200
26.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/JDOMException_Exception.java Thu Oct 15 16:39:48 2009 +0200
26.3 @@ -5,15 +5,15 @@
26.4
26.5
26.6 /**
26.7 - * This class was generated by Apache CXF 2.2.3
26.8 - * Thu Oct 08 10:45:20 CEST 2009
26.9 - * Generated source version: 2.2.3
26.10 + * This class was generated by Apache CXF 2.2.4
26.11 + * Thu Oct 15 16:35:46 CEST 2009
26.12 + * Generated source version: 2.2.4
26.13 *
26.14 */
26.15
26.16 @WebFault(name = "JDOMException", targetNamespace = "http://webservice.molwind.org/")
26.17 public class JDOMException_Exception extends Exception {
26.18 - public static final long serialVersionUID = 20091008104520L;
26.19 + public static final long serialVersionUID = 20091015163546L;
26.20
26.21 private org.molwind.webservice.JDOMException jdomException;
26.22
27.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/MolwindWebserviceService.java Thu Oct 08 10:47:53 2009 +0200
27.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/MolwindWebserviceService.java Thu Oct 15 16:39:48 2009 +0200
27.3 @@ -14,15 +14,15 @@
27.4 import javax.xml.ws.Service;
27.5
27.6 /**
27.7 - * This class was generated by Apache CXF 2.2.3
27.8 - * Thu Oct 08 10:45:20 CEST 2009
27.9 - * Generated source version: 2.2.3
27.10 + * This class was generated by Apache CXF 2.2.4
27.11 + * Thu Oct 15 16:35:46 CEST 2009
27.12 + * Generated source version: 2.2.4
27.13 *
27.14 */
27.15
27.16
27.17 @WebServiceClient(name = "MolwindWebserviceService",
27.18 - wsdlLocation = "file:/home/m164320/Desktop/molwind/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/MolwindWebservice.wsdl",
27.19 + wsdlLocation = "file:/home/m164320/Desktop/molwind/molwind1.2/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/MolwindWebservice.wsdl",
27.20 targetNamespace = "http://webservice.molwind.org/")
27.21 public class MolwindWebserviceService extends Service {
27.22
27.23 @@ -32,9 +32,9 @@
27.24 static {
27.25 URL url = null;
27.26 try {
27.27 - url = new URL("file:/home/m164320/Desktop/molwind/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/MolwindWebservice.wsdl");
27.28 + url = new URL("file:/home/m164320/Desktop/molwind/molwind1.2/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/MolwindWebservice.wsdl");
27.29 } catch (MalformedURLException e) {
27.30 - System.err.println("Can not initialize the default wsdl from file:/home/m164320/Desktop/molwind/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/MolwindWebservice.wsdl");
27.31 + System.err.println("Can not initialize the default wsdl from file:/home/m164320/Desktop/molwind/molwind1.2/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/MolwindWebservice.wsdl");
27.32 // e.printStackTrace();
27.33 }
27.34 WSDL_LOCATION = url;
28.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/ObjectFactory.java Thu Oct 08 10:47:53 2009 +0200
28.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/ObjectFactory.java Thu Oct 15 16:39:48 2009 +0200
28.3 @@ -37,22 +37,6 @@
28.4 }
28.5
28.6 /**
28.7 - * Create an instance of {@link GetWorldNamesResponse }
28.8 - *
28.9 - */
28.10 - public GetWorldNamesResponse createGetWorldNamesResponse() {
28.11 - return new GetWorldNamesResponse();
28.12 - }
28.13 -
28.14 - /**
28.15 - * Create an instance of {@link JDOMException }
28.16 - *
28.17 - */
28.18 - public JDOMException createJDOMException() {
28.19 - return new JDOMException();
28.20 - }
28.21 -
28.22 - /**
28.23 * Create an instance of {@link IOException }
28.24 *
28.25 */
28.26 @@ -69,6 +53,22 @@
28.27 }
28.28
28.29 /**
28.30 + * Create an instance of {@link JDOMException }
28.31 + *
28.32 + */
28.33 + public JDOMException createJDOMException() {
28.34 + return new JDOMException();
28.35 + }
28.36 +
28.37 + /**
28.38 + * Create an instance of {@link GetWorldNamesResponse }
28.39 + *
28.40 + */
28.41 + public GetWorldNamesResponse createGetWorldNamesResponse() {
28.42 + return new GetWorldNamesResponse();
28.43 + }
28.44 +
28.45 + /**
28.46 * Create an instance of {@link JAXBElement }{@code <}{@link IOException }{@code >}}
28.47 *
28.48 */
29.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/client/WSClient.class has changed
30.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/GetImageFile.class has changed
31.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/GetImageFileResponse.class has changed
32.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/GetWorldNames.class has changed
33.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/IMolwindWebservice.class has changed
34.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/IOException_Exception.class has changed
35.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/JDOMException_Exception.class has changed
36.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/MolwindWebserviceService.class has changed
37.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/ObjectFactory.class has changed
38.1 --- a/molwind-core/pom.xml Thu Oct 08 10:47:53 2009 +0200
38.2 +++ b/molwind-core/pom.xml Thu Oct 15 16:39:48 2009 +0200
38.3 @@ -40,6 +40,21 @@
38.4 <artifactId>servlet-api</artifactId>
38.5 </dependency>
38.6 <dependency>
38.7 + <groupId>net.sf.jung</groupId>
38.8 + <artifactId>jung-api</artifactId>
38.9 + <version>2.0</version>
38.10 + </dependency>
38.11 + <dependency>
38.12 + <groupId>net.sf.jung</groupId>
38.13 + <artifactId>jung-io</artifactId>
38.14 + <version>2.0</version>
38.15 + </dependency>
38.16 + <dependency>
38.17 + <groupId>net.sf.jung</groupId>
38.18 + <artifactId>jung-graph-impl</artifactId>
38.19 + <version>2.0</version>
38.20 + </dependency>
38.21 + <dependency>
38.22 <groupId>jung</groupId>
38.23 <artifactId>jung</artifactId>
38.24 </dependency>
39.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
39.2 +++ b/molwind-core/src/main/java/org/molwind/graph/#DefaultEntityVertex.java# Thu Oct 15 16:39:48 2009 +0200
39.3 @@ -0,0 +1,88 @@
39.4 +package org.molwind.graph;
39.5 +
39.6 +/*
39.7 + * This file is part of Molwind.
39.8 + *
39.9 + * Molwind is free software: you can redistribute it and/or modify
39.10 + * it under the terms of the GNU General Public License as published by
39.11 + * the Free Software Foundation, either version 3 of the License, or
39.12 + * (at your option) any later version.
39.13 + *
39.14 + * Molwind is distributed in the hope that it will be useful,
39.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
39.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
39.17 + * GNU General Public License for more details.
39.18 + *
39.19 + * You should have received a copy of the GNU General Public License
39.20 + * along with Molwind. If not, see <http://www.gnu.org/licenses/>.
39.21 + */
39.22 +
39.23 +import java.util.UUID;
39.24 +
39.25 +import org.molwind.model.WorldEntity;
39.26 +
39.27 +import edu.uci.ics.jung.graph.
39.28 +.SparseVertex;
39.29 +
39.30 +/**
39.31 + * DefaultEntityVertex represents the default vertex of a DefaultEntityGraph
39.32 + * object.
39.33 + *
39.34 + * @author <a href="mailto:oliver.karch@molwind.org">Oliver Karch</a>
39.35 + * @version 1.0
39.36 + */
39.37 +public class DefaultEntityVertex extends SparseVertex implements EntityVertex {
39.38 +
39.39 + private String id;
39.40 + private WorldEntity entity;
39.41 +
39.42 + /**
39.43 + * DefaultEntityVertex constructor, creates a new vertex.
39.44 + */
39.45 + public DefaultEntityVertex() {
39.46 + super();
39.47 + id = String.valueOf(UUID.randomUUID().toString());
39.48 + entity = null;
39.49 + }
39.50 +
39.51 + /**
39.52 + * Get the Id value.
39.53 + *
39.54 + * @return
39.55 + * the Id value
39.56 + */
39.57 + public String getId() {
39.58 + return id;
39.59 + }
39.60 +
39.61 + /**
39.62 + * Set the Id value.
39.63 + *
39.64 + * @param newId
39.65 + * the new Id value
39.66 + */
39.67 + public void setId(final String newId) {
39.68 + this.id = newId;
39.69 + }
39.70 +
39.71 + /**
39.72 + * Get the Entity value.
39.73 + *
39.74 + * @return
39.75 + * the Entity value
39.76 + */
39.77 + public WorldEntity getEntity() {
39.78 + return entity;
39.79 + }
39.80 +
39.81 + /**
39.82 + * Set the Entity value.
39.83 + *
39.84 + * @param newEntity
39.85 + * the new Entity value
39.86 + */
39.87 + public void setEntity(final WorldEntity newEntity) {
39.88 + this.entity = newEntity;
39.89 + }
39.90 +
39.91 +}
40.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
40.2 +++ b/molwind-core/src/main/java/org/molwind/graph/.#DefaultEntityGraph.java Thu Oct 15 16:39:48 2009 +0200
40.3 @@ -0,0 +1,1 @@
40.4 +m164320@pluto.bci.merck.de.8411
40.5 \ No newline at end of file
41.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
41.2 +++ b/molwind-core/src/main/java/org/molwind/graph/.#DefaultEntityVertex.java Thu Oct 15 16:39:48 2009 +0200
41.3 @@ -0,0 +1,1 @@
41.4 +m164320@pluto.bci.merck.de.8411
41.5 \ No newline at end of file
42.1 --- a/molwind-core/src/main/java/org/molwind/graph/DefaultEntityGraph.java Thu Oct 08 10:47:53 2009 +0200
42.2 +++ b/molwind-core/src/main/java/org/molwind/graph/DefaultEntityGraph.java Thu Oct 15 16:39:48 2009 +0200
42.3 @@ -20,11 +20,16 @@
42.4 import java.util.HashMap;
42.5 import java.util.Iterator;
42.6 import java.util.Map;
42.7 +import java.io.IOException;
42.8 +import java.io.StringWriter;
42.9 +
42.10
42.11 import org.molwind.model.Relationship;
42.12 import org.molwind.model.WorldEntity;
42.13
42.14 import edu.uci.ics.jung.graph.impl.SparseGraph;
42.15 +import edu.uci.ics.jung.io.GraphMLWriter;
42.16 +
42.17
42.18 /**
42.19 * DefaultEntityGraph implements an EntityGraph using the JUNG graph lib.
42.20 @@ -58,7 +63,7 @@
42.21 DefaultEntityVertex vertex =
42.22 (DefaultEntityVertex) entities.get(vertexId);
42.23
42.24 - if (vertex == null) {
42.25 + if (vertex== null) {
42.26 vertex = new DefaultEntityVertex();
42.27 vertex.setId(vertexId);
42.28 entities.put(vertexId, vertex);
42.29 @@ -153,4 +158,20 @@
42.30 return entities.entrySet().iterator();
42.31 }
42.32
42.33 + /**
42.34 + * Writes a graph ml representation of this graph
42.35 + *
42.36 + * @return a human readable string
42.37 + */
42.38 + public String toString() {
42.39 + GraphMLWriter gml = new GraphMLWriter();
42.40 + StringWriter sw = new StringWriter();
42.41 + try {
42.42 + gml.save( graph, sw );
42.43 + }
42.44 + catch( IOException ioe ) {
42.45 + ioe.printStackTrace();
42.46 + }
42.47 + return sw.toString();
42.48 + }
42.49 }
43.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
43.2 +++ b/molwind-core/src/main/java/org/molwind/view/AbstractTopologyManager.java Thu Oct 15 16:39:48 2009 +0200
43.3 @@ -0,0 +1,94 @@
43.4 +package org.molwind.view;
43.5 +
43.6 +/*
43.7 + * This file is part of Molwind.
43.8 + *
43.9 + * Molwind is free software: you can redistribute it and/or modify
43.10 + * it under the terms of the GNU General Public License as published by
43.11 + * the Free Software Foundation, either version 3 of the License, or
43.12 + * (at your option) any later version.
43.13 + *
43.14 + * Molwind is distributed in the hope that it will be useful,
43.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
43.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
43.17 + * GNU General Public License for more details.
43.18 + *
43.19 + * You should have received a copy of the GNU General Public License
43.20 + * along with Molwind. If not, see <http://www.gnu.org/licenses/>.
43.21 + */
43.22 +import java.util.Iterator;
43.23 +
43.24 +import org.molwind.model.LayeredPosition;
43.25 +import org.molwind.model.RelationshipResolver;
43.26 +import org.molwind.view.TopologyManager;
43.27 +
43.28 +/**
43.29 + * AbstractTopologyManager determines and places visible chemical structures.
43.30 + *
43.31 + * @author <a href="mailto:oliver.karch@molwind.org">Oliver Karch</a>
43.32 + * @version 1.0
43.33 + */
43.34 +public abstract class AbstractTopologyManager implements TopologyManager {
43.35 + private Iterator entityIterator;
43.36 + private RelationshipResolver relationshipResolver;
43.37 +
43.38 + /**
43.39 + * Creates a new topology manager to place chemical entities.
43.40 + */
43.41 + protected AbstractTopologyManager() {
43.42 + entityIterator = null;
43.43 + relationshipResolver = null;
43.44 + }
43.45 +
43.46 + /**
43.47 + * Get the EntityIterator value.
43.48 + *
43.49 + * @return
43.50 + * the EntityIterator value
43.51 + */
43.52 + public Iterator getEntityIterator() {
43.53 + return entityIterator;
43.54 + }
43.55 +
43.56 + /**
43.57 + * Set the EntityIterator value.
43.58 + *
43.59 + * @param newEntityIterator
43.60 + * the new EntityIterator value
43.61 + */
43.62 + public void setEntityIterator(final Iterator newEntityIterator) {
43.63 + this.entityIterator = newEntityIterator;
43.64 + }
43.65 +
43.66 + /**
43.67 + * Get the RelationshipResolver value.
43.68 + *
43.69 + * @return
43.70 + * the RelationshipResolver value
43.71 + */
43.72 + public RelationshipResolver getRelationshipResolver() {
43.73 + return relationshipResolver;
43.74 + }
43.75 +
43.76 + /**
43.77 + * Set the RelationshipResolver value.
43.78 + *
43.79 + * @param newRelationshipResolver
43.80 + * the new RelationshipResolver value
43.81 + */
43.82 + public void setRelationshipResolver(
43.83 + final RelationshipResolver newRelationshipResolver) {
43.84 + this.relationshipResolver = newRelationshipResolver;
43.85 + }
43.86 +
43.87 + /**
43.88 + * Determines the visible entities for the given position.
43.89 + *
43.90 + * @param position
43.91 + * the position (longitude/latitude/level)
43.92 + * @return
43.93 + * an (possibly empty) iterator of entities
43.94 + */
43.95 + public abstract Iterator getVisibleEntities(final LayeredPosition position);
43.96 +
43.97 +}
44.1 --- a/molwind-core/src/main/java/org/molwind/view/TopologyManager.java Thu Oct 08 10:47:53 2009 +0200
44.2 +++ b/molwind-core/src/main/java/org/molwind/view/TopologyManager.java Thu Oct 15 16:39:48 2009 +0200
44.3 @@ -20,6 +20,7 @@
44.4 import java.util.Iterator;
44.5
44.6 import org.molwind.model.LayeredPosition;
44.7 +import org.molwind.model.RelationshipResolver;
44.8
44.9 /**
44.10 * TopologyManager determines visible entities.
44.11 @@ -27,6 +28,7 @@
44.12 * @author <a href="mailto:oliver.karch@molwind.org">Oliver Karch</a>
44.13 * @version 1.0
44.14 */
44.15 +
44.16 public interface TopologyManager {
44.17
44.18 /**
44.19 @@ -39,4 +41,20 @@
44.20 */
44.21 Iterator getVisibleEntities(LayeredPosition position);
44.22
44.23 + /**
44.24 + * Set the EntityIterator value.
44.25 + *
44.26 + * @param newEntityIterator
44.27 + * the new EntityIterator value
44.28 + */
44.29 + public void setEntityIterator( Iterator newEntityIterator );
44.30 +
44.31 + /**
44.32 + * Set the RelationshipResolver value.
44.33 + *
44.34 + * @param newRelationshipResolver
44.35 + * the new RelationshipResolver value
44.36 + */
44.37 + public void setRelationshipResolver( RelationshipResolver newRelationshipResolver);
44.38 +
44.39 }
45.1 Binary file molwind-core/target/classes/org/molwind/graph/DefaultEntityGraph.class has changed
46.1 Binary file molwind-core/target/classes/org/molwind/view/AbstractTopologyManager.class has changed
47.1 Binary file molwind-core/target/classes/org/molwind/view/TopologyManager.class has changed
48.1 --- a/molwind-server/src/main/java/org/molwind/servlet/GetImageCommand.java Thu Oct 08 10:47:53 2009 +0200
48.2 +++ b/molwind-server/src/main/java/org/molwind/servlet/GetImageCommand.java Thu Oct 15 16:39:48 2009 +0200
48.3 @@ -179,8 +179,7 @@
48.4 response.setContentType("image/jpg");
48.5 MolwindLogger.debug("Writing tile of " + position);
48.6 OutputStream out = response.getOutputStream();
48.7 - String[] result ={"Jetzt aber"};
48.8 - writeXML(out,result);
48.9 +
48.10
48.11 tiles.writeTile(position,out);
48.12 }catch(IOException ioe){
49.1 Binary file molwind-server/target/classes/org/molwind/servlet/GetImageCommand.class has changed