Index: unk/src/com/drew/metadata/DefaultTagDescriptor.java =================================================================== --- /trunk/src/com/drew/metadata/DefaultTagDescriptor.java (revision 10864) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright 2002-2015 Drew Noakes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * More information about this project is available at: - * - * https://drewnoakes.com/code/exif/ - * https://github.com/drewnoakes/metadata-extractor - */ -package com.drew.metadata; - -import com.drew.lang.annotations.NotNull; - -/** - * A default implementation of the abstract TagDescriptor. As this class is not coded with awareness of any metadata - * tags, it simply reports tag names using the format 'Unknown tag 0x00' (with the corresponding tag number in hex) - * and gives descriptions using the default string representation of the value. - * - * @author Drew Noakes https://drewnoakes.com - */ -public class DefaultTagDescriptor extends TagDescriptor -{ - public DefaultTagDescriptor(@NotNull Directory directory) - { - super(directory); - } - - /** - * Gets a best-effort tag name using the format 'Unknown tag 0x00' (with the corresponding tag type in hex). - * @param tagType the tag type identifier. - * @return a string representation of the tag name. - */ - @NotNull - public String getTagName(int tagType) - { - String hex = Integer.toHexString(tagType).toUpperCase(); - while (hex.length() < 4) hex = "0" + hex; - return "Unknown tag 0x" + hex; - } -} Index: unk/src/com/drew/metadata/MetadataReader.java =================================================================== --- /trunk/src/com/drew/metadata/MetadataReader.java (revision 10864) +++ (revision ) @@ -1,42 +1,0 @@ -/* - * Copyright 2002-2016 Drew Noakes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * More information about this project is available at: - * - * https://drewnoakes.com/code/exif/ - * https://github.com/drewnoakes/metadata-extractor - */ -package com.drew.metadata; - -import com.drew.lang.RandomAccessReader; -import com.drew.lang.annotations.NotNull; - -/** - * Defines an object capable of processing a particular type of metadata from a {@link RandomAccessReader}. - *

- * Instances of this interface must be thread-safe and reusable. - * - * @author Drew Noakes https://drewnoakes.com - */ -public interface MetadataReader -{ - /** - * Extracts metadata from reader and merges it into the specified {@link Metadata} object. - * - * @param reader The {@link RandomAccessReader} from which the metadata should be extracted. - * @param metadata The {@link Metadata} object into which extracted values should be merged. - */ - public void extract(@NotNull final RandomAccessReader reader, @NotNull final Metadata metadata); -} Index: unk/src/com/kitfox/svg/FeDistantLight.java =================================================================== --- /trunk/src/com/kitfox/svg/FeDistantLight.java (revision 10864) +++ (revision ) @@ -1,121 +1,0 @@ -/* - * SVG Salamander - * Copyright (c) 2004, Mark McKay - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Mark McKay can be contacted at mark@kitfox.com. Salamander and other - * projects can be found at http://www.kitfox.com - * - * Created on March 18, 2004, 6:52 AM - */ -package com.kitfox.svg; - -import com.kitfox.svg.xml.StyleAttribute; - -/** - * @author Mark McKay - * @author Mark McKay - */ -public class FeDistantLight extends FeLight -{ - - public static final String TAG_NAME = "fedistantlight"; - float azimuth = 0f; - float elevation = 0f; - - /** - * Creates a new instance of FillElement - */ - public FeDistantLight() - { - } - - public String getTagName() - { - return TAG_NAME; - } - - protected void build() throws SVGException - { - super.build(); - - StyleAttribute sty = new StyleAttribute(); - String strn; - - if (getPres(sty.setName("azimuth"))) - { - azimuth = sty.getFloatValueWithUnits(); - } - - if (getPres(sty.setName("elevation"))) - { - elevation = sty.getFloatValueWithUnits(); - } - } - - public float getAzimuth() - { - return azimuth; - } - - public float getElevation() - { - return elevation; - } - - public boolean updateTime(double curTime) throws SVGException - { -// if (trackManager.getNumTracks() == 0) return false; - - //Get current values for parameters - StyleAttribute sty = new StyleAttribute(); - boolean stateChange = false; - - if (getPres(sty.setName("azimuth"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != azimuth) - { - azimuth = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("elevation"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != elevation) - { - elevation = newVal; - stateChange = true; - } - } - - return stateChange; - } -} Index: unk/src/com/kitfox/svg/FeLight.java =================================================================== --- /trunk/src/com/kitfox/svg/FeLight.java (revision 10864) +++ (revision ) @@ -1,58 +1,0 @@ -/* - * SVG Salamander - * Copyright (c) 2004, Mark McKay - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Mark McKay can be contacted at mark@kitfox.com. Salamander and other - * projects can be found at http://www.kitfox.com - * - * Created on March 18, 2004, 6:52 AM - */ -package com.kitfox.svg; - -/** - * @author Mark McKay - * @author Mark McKay - */ -abstract public class FeLight extends FilterEffects -{ - - public static final String TAG_NAME = "feLight"; - - /** - * Creates a new instance of FillElement - */ - public FeLight() - { - } - - public String getTagName() - { - return TAG_NAME; - } -} Index: unk/src/com/kitfox/svg/FePointLight.java =================================================================== --- /trunk/src/com/kitfox/svg/FePointLight.java (revision 10864) +++ (revision ) @@ -1,142 +1,0 @@ -/* - * SVG Salamander - * Copyright (c) 2004, Mark McKay - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Mark McKay can be contacted at mark@kitfox.com. Salamander and other - * projects can be found at http://www.kitfox.com - * - * Created on March 18, 2004, 6:52 AM - */ -package com.kitfox.svg; - -import com.kitfox.svg.xml.StyleAttribute; - -/** - * @author Mark McKay - * @author Mark McKay - */ -public class FePointLight extends FeLight -{ - - public static final String TAG_NAME = "fepointlight"; - float x = 0f; - float y = 0f; - float z = 0f; - - /** - * Creates a new instance of FillElement - */ - public FePointLight() - { - } - - public String getTagName() - { - return TAG_NAME; - } - - protected void build() throws SVGException - { - super.build(); - - StyleAttribute sty = new StyleAttribute(); - String strn; - - if (getPres(sty.setName("x"))) - { - x = sty.getFloatValueWithUnits(); - } - - if (getPres(sty.setName("y"))) - { - y = sty.getFloatValueWithUnits(); - } - - if (getPres(sty.setName("z"))) - { - z = sty.getFloatValueWithUnits(); - } - } - - public float getX() - { - return x; - } - - public float getY() - { - return y; - } - - public float getZ() - { - return z; - } - - public boolean updateTime(double curTime) throws SVGException - { -// if (trackManager.getNumTracks() == 0) return false; - - //Get current values for parameters - StyleAttribute sty = new StyleAttribute(); - boolean stateChange = false; - - if (getPres(sty.setName("x"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != x) - { - x = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("y"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != y) - { - y = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("z"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != z) - { - z = newVal; - stateChange = true; - } - } - - return stateChange; - } -} Index: unk/src/com/kitfox/svg/FeSpotLight.java =================================================================== --- /trunk/src/com/kitfox/svg/FeSpotLight.java (revision 10864) +++ (revision ) @@ -1,240 +1,0 @@ -/* - * SVG Salamander - * Copyright (c) 2004, Mark McKay - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Mark McKay can be contacted at mark@kitfox.com. Salamander and other - * projects can be found at http://www.kitfox.com - * - * Created on March 18, 2004, 6:52 AM - */ -package com.kitfox.svg; - -import com.kitfox.svg.xml.StyleAttribute; - -/** - * @author Mark McKay - * @author Mark McKay - */ -public class FeSpotLight extends FeLight -{ - - public static final String TAG_NAME = "fespotlight"; - float x = 0f; - float y = 0f; - float z = 0f; - float pointsAtX = 0f; - float pointsAtY = 0f; - float pointsAtZ = 0f; - float specularComponent = 0f; - float limitingConeAngle = 0f; - - /** - * Creates a new instance of FillElement - */ - public FeSpotLight() - { - } - - public String getTagName() - { - return TAG_NAME; - } - - protected void build() throws SVGException - { - super.build(); - - StyleAttribute sty = new StyleAttribute(); - String strn; - - if (getPres(sty.setName("x"))) - { - x = sty.getFloatValueWithUnits(); - } - if (getPres(sty.setName("y"))) - { - y = sty.getFloatValueWithUnits(); - } - if (getPres(sty.setName("z"))) - { - z = sty.getFloatValueWithUnits(); - } - if (getPres(sty.setName("pointsAtX"))) - { - pointsAtX = sty.getFloatValueWithUnits(); - } - if (getPres(sty.setName("pointsAtY"))) - { - pointsAtY = sty.getFloatValueWithUnits(); - } - if (getPres(sty.setName("pointsAtZ"))) - { - pointsAtZ = sty.getFloatValueWithUnits(); - } - if (getPres(sty.setName("specularComponent"))) - { - specularComponent = sty.getFloatValueWithUnits(); - } - if (getPres(sty.setName("limitingConeAngle"))) - { - limitingConeAngle = sty.getFloatValueWithUnits(); - } - } - - public float getX() - { - return x; - } - - public float getY() - { - return y; - } - - public float getZ() - { - return z; - } - - public float getPointsAtX() - { - return pointsAtX; - } - - public float getPointsAtY() - { - return pointsAtY; - } - - public float getPointsAtZ() - { - return pointsAtZ; - } - - public float getSpecularComponent() - { - return specularComponent; - } - - public float getLimitingConeAngle() - { - return limitingConeAngle; - } - - public boolean updateTime(double curTime) throws SVGException - { -// if (trackManager.getNumTracks() == 0) return false; - - //Get current values for parameters - StyleAttribute sty = new StyleAttribute(); - boolean stateChange = false; - - if (getPres(sty.setName("x"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != x) - { - x = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("y"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != y) - { - y = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("z"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != z) - { - z = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("pointsAtX"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != pointsAtX) - { - pointsAtX = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("pointsAtY"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != pointsAtY) - { - pointsAtY = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("pointsAtZ"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != pointsAtZ) - { - pointsAtZ = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("specularComponent"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != specularComponent) - { - specularComponent = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("limitingConeAngle"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != limitingConeAngle) - { - limitingConeAngle = newVal; - stateChange = true; - } - } - - return stateChange; - } -} Index: /trunk/src/com/kitfox/svg/Filter.java =================================================================== --- /trunk/src/com/kitfox/svg/Filter.java (revision 10864) +++ /trunk/src/com/kitfox/svg/Filter.java (revision 10865) @@ -76,18 +76,4 @@ } - /** - * Called after the start element but before the end element to indicate - * each child tag that has been processed - */ - public void loaderAddChild(SVGLoaderHelper helper, SVGElement child) throws SVGElementException - { - super.loaderAddChild(helper, child); - - if (child instanceof FilterEffects) - { - filterEffects.add(child); - } - } - protected void build() throws SVGException { Index: unk/src/com/kitfox/svg/FilterEffects.java =================================================================== --- /trunk/src/com/kitfox/svg/FilterEffects.java (revision 10864) +++ (revision ) @@ -1,252 +1,0 @@ -/* - * SVG Salamander - * Copyright (c) 2004, Mark McKay - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Mark McKay can be contacted at mark@kitfox.com. Salamander and other - * projects can be found at http://www.kitfox.com - * - * Created on March 18, 2004, 6:52 AM - */ -package com.kitfox.svg; - -import com.kitfox.svg.xml.StyleAttribute; -import java.net.URI; -import java.net.URL; - -/** - * @author Mark McKay - * @author Mark McKay - */ -public class FilterEffects extends SVGElement -{ - public static final String TAG_NAME = "filtereffects"; - - public static final int FP_SOURCE_GRAPHIC = 0; - public static final int FP_SOURCE_ALPHA = 1; - public static final int FP_BACKGROUND_IMAGE = 2; - public static final int FP_BACKGROUND_ALPHA = 3; - public static final int FP_FILL_PAINT = 4; - public static final int FP_STROKE_PAINT = 5; - public static final int FP_CUSTOM = 5; - private int filterPrimitiveTypeIn; - private String filterPrimitiveRefIn; - float x = 0f; - float y = 0f; - float width = 1f; - float height = 1f; - String result = "defaultFilterName"; - URL href = null; - - /** - * Creates a new instance of FillElement - */ - public FilterEffects() - { - } - - public String getTagName() - { - return TAG_NAME; - } - - /** - * Called after the start element but before the end element to indicate - * each child tag that has been processed - */ - public void loaderAddChild(SVGLoaderHelper helper, SVGElement child) throws SVGElementException - { - super.loaderAddChild(helper, child); - - if (child instanceof FilterEffects) - { -// filterEffects.add(child); - } - } - - protected void build() throws SVGException - { - super.build(); - - StyleAttribute sty = new StyleAttribute(); - String strn; - /* - if (getPres(sty.setName("filterUnits"))) - { - strn = sty.getStringValue().toLowerCase(); - if (strn.equals("userspaceonuse")) filterUnits = FU_USER_SPACE_ON_USE; - else filterUnits = FU_OBJECT_BOUNDING_BOX; - } - - if (getPres(sty.setName("primitiveUnits"))) - { - strn = sty.getStringValue().toLowerCase(); - if (strn.equals("userspaceonuse")) primitiveUnits = PU_USER_SPACE_ON_USE; - else primitiveUnits = PU_OBJECT_BOUNDING_BOX; - } - - if (getPres(sty.setName("x"))) x = sty.getFloatValue(); - - if (getPres(sty.setName("y"))) y = sty.getFloatValue(); - - if (getPres(sty.setName("width"))) width = sty.getFloatValue(); - - if (getPres(sty.setName("height"))) height = sty.getFloatValue(); - - try { - if (getPres(sty.setName("xlink:href"))) - { - URI src = sty.getURIValue(getXMLBase()); - href = src.toURL(); - } - } - catch (Exception e) - { - throw new SVGException(e); - } - */ - } - - public float getX() - { - return x; - } - - public float getY() - { - return y; - } - - public float getWidth() - { - return width; - } - - public float getHeight() - { - return height; - } - - public boolean updateTime(double curTime) throws SVGException - { -// if (trackManager.getNumTracks() == 0) return false; - - //Get current values for parameters - StyleAttribute sty = new StyleAttribute(); - boolean stateChange = false; - - if (getPres(sty.setName("x"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != x) - { - x = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("y"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != y) - { - y = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("width"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != width) - { - width = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("height"))) - { - float newVal = sty.getFloatValueWithUnits(); - if (newVal != height) - { - height = newVal; - stateChange = true; - } - } - - try - { - if (getPres(sty.setName("xlink:href"))) - { - URI src = sty.getURIValue(getXMLBase()); - URL newVal = src.toURL(); - - if (!newVal.equals(href)) - { - href = newVal; - stateChange = true; - } - } - } catch (Exception e) - { - throw new SVGException(e); - } - - /* - if (getPres(sty.setName("filterUnits"))) - { - int newVal; - String strn = sty.getStringValue().toLowerCase(); - if (strn.equals("userspaceonuse")) newVal = FU_USER_SPACE_ON_USE; - else newVal = FU_OBJECT_BOUNDING_BOX; - if (newVal != filterUnits) - { - filterUnits = newVal; - stateChange = true; - } - } - - if (getPres(sty.setName("primitiveUnits"))) - { - int newVal; - String strn = sty.getStringValue().toLowerCase(); - if (strn.equals("userspaceonuse")) newVal = PU_USER_SPACE_ON_USE; - else newVal = PU_OBJECT_BOUNDING_BOX; - if (newVal != filterUnits) - { - primitiveUnits = newVal; - stateChange = true; - } - } - - */ - - return stateChange; - } -} Index: /trunk/src/com/kitfox/svg/SVGUniverse.java =================================================================== --- /trunk/src/com/kitfox/svg/SVGUniverse.java (revision 10864) +++ /trunk/src/com/kitfox/svg/SVGUniverse.java (revision 10865) @@ -131,32 +131,4 @@ /** - * Returns the current animation time in milliseconds. - */ - public double getCurTime() - { - return curTime; - } - - public void setCurTime(double curTime) - { - double oldTime = this.curTime; - this.curTime = curTime; - changes.firePropertyChange("curTime", new Double(oldTime), new Double(curTime)); - } - - /** - * Updates all time influenced style and presentation attributes in all SVG - * documents in this universe. - */ - public void updateTime() throws SVGException - { - for (Iterator it = loadedDocs.values().iterator(); it.hasNext();) - { - SVGDiagram dia = (SVGDiagram) it.next(); - dia.updateTime(curTime); - } - } - - /** * Called by the Font element to let the universe know that a font has been * loaded and is available. Index: unk/src/com/kitfox/svg/pathcmd/PathUtil.java =================================================================== --- /trunk/src/com/kitfox/svg/pathcmd/PathUtil.java (revision 10864) +++ (revision ) @@ -1,98 +1,0 @@ -/* - * SVG Salamander - * Copyright (c) 2004, Mark McKay - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Mark McKay can be contacted at mark@kitfox.com. Salamander and other - * projects can be found at http://www.kitfox.com - * - * Created on May 10, 2005, 5:56 AM - */ - -package com.kitfox.svg.pathcmd; - -import java.awt.geom.*; - -/** - * - * @author kitfox - */ -public class PathUtil -{ - - /** Creates a new instance of PathUtil */ - public PathUtil() - { - } - - /** - * Converts a GeneralPath into an SVG representation - */ - public static String buildPathString(GeneralPath path) - { - float[] coords = new float[6]; - - StringBuffer sb = new StringBuffer(); - - for (PathIterator pathIt = path.getPathIterator(new AffineTransform()); !pathIt.isDone(); pathIt.next()) - { - int segId = pathIt.currentSegment(coords); - - switch (segId) - { - case PathIterator.SEG_CLOSE: - { - sb.append(" Z"); - break; - } - case PathIterator.SEG_CUBICTO: - { - sb.append(" C " + coords[0] + " " + coords[1] + " " + coords[2] + " " + coords[3] + " " + coords[4] + " " + coords[5]); - break; - } - case PathIterator.SEG_LINETO: - { - sb.append(" L " + coords[0] + " " + coords[1]); - break; - } - case PathIterator.SEG_MOVETO: - { - sb.append(" M " + coords[0] + " " + coords[1]); - break; - } - case PathIterator.SEG_QUADTO: - { - sb.append(" Q " + coords[0] + " " + coords[1] + " " + coords[2] + " " + coords[3]); - break; - } - } - } - - return sb.toString(); - } -} Index: unk/src/com/kitfox/svg/util/TextBuilder.java =================================================================== --- /trunk/src/com/kitfox/svg/util/TextBuilder.java (revision 10864) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * SVG Salamander - * Copyright (c) 2004, Mark McKay - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Mark McKay can be contacted at mark@kitfox.com. Salamander and other - * projects can be found at http://www.kitfox.com - * - * Created on April 24, 2015 - */ -package com.kitfox.svg.util; - -/** - * - * @author kitfox - */ -public class TextBuilder -{ - -}