Menu
▾
▴
[Jsbml-svn] SF.net SVN: jsbml:[1273] trunk
|
From: <and...@us...> - 2012-05-23 10:17:47
|
Revision: 1273
http://jsbml.svn.sourceforge.net/jsbml/?rev=1273&view=rev
Author: andreas-draeger
Date: 2012-05-23 10:17:36 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Removed override tags where these caused compilation problems with 1.5.
Modified Paths:
--------------
trunk/core/src/org/sbml/jsbml/xml/XMLNode.java
trunk/core/src/org/sbml/jsbml/xml/XMLToken.java
trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Position.java
trunk/extensions/qual/src/org/sbml/jsbml/xml/parsers/QualParser.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/AbstractRenderPlugin.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/ColorDefinition.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/FontFamily.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/FontRenderStyle.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/GlobalRenderInformation.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientStop.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/LocalRenderInformation.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/Point3D.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/Rectangle.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderCubicBezier.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderInformationBase.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderLayoutPlugin.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderModelPlugin.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderPoint.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/Style.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/Text.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/TextAnchor.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/Transformation.java
trunk/extensions/render/src/org/sbml/jsbml/ext/render/VTextAnchor.java
trunk/modules/libSBMLio/test/org/sbml/jsbml/libsbmlio/SimpleApplication.java
trunk/modules/libSBMLio/test/org/sbml/jsbml/test/LibSBMLioTest.java
Property Changed:
----------------
trunk/modules/libSBMLio/test/org/sbml/jsbml/libsbmlio/SimpleApplication.java
trunk/modules/libSBMLio/test/org/sbml/jsbml/test/LibSBMLioTest.java
Modified: trunk/core/src/org/sbml/jsbml/xml/XMLNode.java
===================================================================
--- trunk/core/src/org/sbml/jsbml/xml/XMLNode.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/core/src/org/sbml/jsbml/xml/XMLNode.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -262,7 +262,7 @@
* @param orig the {@link XMLNode} instance to copy.
*/
public XMLNode(XMLNode orig) {
- super((XMLToken) orig);
+ super(orig);
if (orig.childrenElements.size() > 0) {
for (XMLNode origchildren : orig.childrenElements) {
@@ -454,8 +454,7 @@
return OPERATION_SUCCESS;
}
- /*
- * (non-Javadoc)
+ /* (non-Javadoc)
* @see org.sbml.jsbml.xml.XMLToken#clone()
*/
public XMLNode clone() {
Modified: trunk/core/src/org/sbml/jsbml/xml/XMLToken.java
===================================================================
--- trunk/core/src/org/sbml/jsbml/xml/XMLToken.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/core/src/org/sbml/jsbml/xml/XMLToken.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -30,7 +30,7 @@
* Representation of a token in an XML stream.
* <p>
* <em style='color: #555'>
- * This class of objects is defined by jsbml only and has no direct
+ * This class of objects is defined by JSBML only and has no direct
* equivalent in terms of SBML components. This class is not prescribed by
* the SBML specifications, although it is used to implement features
* defined in SBML.
@@ -542,16 +542,14 @@
}
- /*
- * (non-Javadoc)
+ /* (non-Javadoc)
* @see java.lang.Object#clone()
*/
@Override
public abstract XMLToken clone();
- /*
- * (non-Javadoc)
+ /* (non-Javadoc)
* @see org.sbml.jsbml.AbstractTreeNode#equals(java.lang.Object)
*/
@Override
@@ -1524,8 +1522,7 @@
}
- /*
- * (non-Javadoc)
+ /* (non-Javadoc)
* @see java.lang.Object#toString()
*/
@Override
Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Position.java
===================================================================
--- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Position.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Position.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -42,9 +42,9 @@
clonePointAttributes(point, this);
}
-@Override
+ @Override
public Position clone() {
- return new Position(this);
+ return new Position(this);
}
}
Modified: trunk/extensions/qual/src/org/sbml/jsbml/xml/parsers/QualParser.java
===================================================================
--- trunk/extensions/qual/src/org/sbml/jsbml/xml/parsers/QualParser.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/qual/src/org/sbml/jsbml/xml/parsers/QualParser.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -273,6 +273,7 @@
/* (non-Javadoc)
* @see org.sbml.jsbml.xml.parsers.AbstractReaderWriter#writeElement(org.sbml.jsbml.xml.stax.SBMLObjectForXML, java.lang.Object)
*/
+ @Override
public void writeElement(SBMLObjectForXML xmlObject,
Object sbmlElementToWrite)
{
@@ -282,7 +283,7 @@
logger.debug("writeElement : " + sbmlElementToWrite.getClass().getSimpleName());
}
- if (sbmlElementToWrite instanceof FunctionTerm &&
+ if ((sbmlElementToWrite instanceof FunctionTerm) &&
((FunctionTerm) sbmlElementToWrite).isDefaultTerm())
{
xmlObject.setName("defaultTerm");
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/AbstractRenderPlugin.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/AbstractRenderPlugin.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/AbstractRenderPlugin.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -116,6 +116,7 @@
versionMinor = 0;
}
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
@@ -249,34 +250,50 @@
return false;
}
- @Override
+ /* (non-Javadoc)
+ * @see org.sbml.jsbml.ext.SBasePlugin#readAttribute(java.lang.String, java.lang.String, java.lang.String)
+ */
+ // @Override
public boolean readAttribute(String attributeName, String prefix,
String value) {
// TODO Auto-generated method stub
return false;
}
- @Override
+ /* (non-Javadoc)
+ * @see org.sbml.jsbml.ext.SBasePlugin#getChildAt(int)
+ */
+ // @Override
public TreeNode getChildAt(int childIndex) {
// TODO Auto-generated method stub
return null;
}
- @Override
+ /* (non-Javadoc)
+ * @see org.sbml.jsbml.ext.SBasePlugin#getChildCount()
+ */
+ // @Override
public int getChildCount() {
// TODO Auto-generated method stub
return 0;
}
- @Override
+ /* (non-Javadoc)
+ * @see org.sbml.jsbml.ext.SBasePlugin#getAllowsChildren()
+ */
+ // @Override
public boolean getAllowsChildren() {
// TODO Auto-generated method stub
return false;
}
- @Override
+ /* (non-Javadoc)
+ * @see org.sbml.jsbml.ext.SBasePlugin#writeXMLAttributes()
+ */
+ // @Override
public Map<String, String> writeXMLAttributes() {
// TODO Auto-generated method stub
return null;
}
+
}
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/ColorDefinition.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/ColorDefinition.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/ColorDefinition.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -162,7 +162,7 @@
return false;
}
-
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/FontFamily.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/FontFamily.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/FontFamily.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -27,6 +27,7 @@
* @since 1.0
* @date 16.05.2012
*/
+//TODO: Set SVN properties.
public enum FontFamily {
serif,
sans_serif,
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/FontRenderStyle.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/FontRenderStyle.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/FontRenderStyle.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -26,6 +26,7 @@
* @since 1.0
* @date 16.05.2012
*/
+//TODO: Set SVN properties.
public interface FontRenderStyle {
/**
@@ -182,4 +183,5 @@
* otherwise <code>false</code>
*/
public abstract boolean unsetVTextAnchor();
+
}
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/GlobalRenderInformation.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/GlobalRenderInformation.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/GlobalRenderInformation.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -108,6 +108,7 @@
/**
* clones this class
*/
+ @Override
public GlobalRenderInformation clone() {
return new GlobalRenderInformation(this);
}
@@ -116,12 +117,14 @@
/**
* Initializes the default values using the namespace.
*/
+ @Override
public void initDefaults() {
addNamespace(RenderConstants.namespaceURI);
// TODO: init default values here if necessary, e.g.:
// bar = null;
}
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientStop.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientStop.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientStop.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -179,6 +179,7 @@
return false;
}
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/LocalRenderInformation.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/LocalRenderInformation.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/LocalRenderInformation.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -235,7 +235,7 @@
/**
*
*/
-
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
}
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/Point3D.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/Point3D.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/Point3D.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -26,6 +26,7 @@
* @since 1.0
* @date 16.05.2012
*/
+//TODO: Set SVN properties.
public interface Point3D {
/**
@@ -182,4 +183,5 @@
* otherwise <code>false</code>
*/
public abstract boolean unsetZ();
+
}
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/Rectangle.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/Rectangle.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/Rectangle.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -746,19 +746,29 @@
ry = 0d;
}
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
+ /* (non-Javadoc)
+ * @see org.sbml.jsbml.ext.render.GraphicalPrimitive1D#getAllowsChildren()
+ */
@Override
public boolean getAllowsChildren() {
return false;
}
+ /* (non-Javadoc)
+ * @see org.sbml.jsbml.ext.render.GraphicalPrimitive1D#getChildCount()
+ */
@Override
public int getChildCount() {
return 0;
}
+ /* (non-Javadoc)
+ * @see org.sbml.jsbml.ext.render.GraphicalPrimitive1D#getChildAt(int)
+ */
@Override
public SBase getChildAt(int childIndex) {
if (childIndex < 0) {
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderCubicBezier.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderCubicBezier.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderCubicBezier.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -36,6 +36,8 @@
* @date 08.05.2012
*/
public class RenderCubicBezier extends RenderPoint {
+
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
/**
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderInformationBase.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderInformationBase.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderInformationBase.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -530,7 +530,7 @@
}
-
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderLayoutPlugin.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderLayoutPlugin.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderLayoutPlugin.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -76,6 +76,7 @@
// bar = null;
}
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderModelPlugin.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderModelPlugin.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderModelPlugin.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -35,6 +35,7 @@
*/
public class RenderModelPlugin extends AbstractRenderPlugin {
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderPoint.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderPoint.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderPoint.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -37,8 +37,11 @@
* @date 08.05.2012
*/
public class RenderPoint extends AbstractSBase implements Point3D {
+
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
+
/**
*
*/
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/Style.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/Style.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/Style.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -122,6 +122,7 @@
this.typeList = null;
}
+ // TODO: Move to RenderConstants
public static final int MIN_SBML_LEVEL = 3;
public static final int MIN_SBML_VERSION = 1;
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/Text.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/Text.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/Text.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -562,4 +562,5 @@
}
return false;
}
+
}
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/TextAnchor.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/TextAnchor.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/TextAnchor.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -30,6 +30,7 @@
* @since 1.0
* @date 16.05.2012
*/
+// TODO: Set SVN properties.
public enum TextAnchor {
start,
middle,
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/Transformation.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/Transformation.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/Transformation.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -33,6 +33,7 @@
* @date 08.05.2012
*/
public class Transformation extends AbstractSBase {
+
protected Double[] transform = new Double[12];
/* (non-Javadoc)
@@ -52,4 +53,5 @@
// TODO Auto-generated method stub
return null;
}
+
}
Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/VTextAnchor.java
===================================================================
--- trunk/extensions/render/src/org/sbml/jsbml/ext/render/VTextAnchor.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/VTextAnchor.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -30,6 +30,7 @@
* @since 1.0
* @date 16.05.2012
*/
+// TODO: Set SVN properties.
public enum VTextAnchor {
top,
middle,
Modified: trunk/modules/libSBMLio/test/org/sbml/jsbml/libsbmlio/SimpleApplication.java
===================================================================
--- trunk/modules/libSBMLio/test/org/sbml/jsbml/libsbmlio/SimpleApplication.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/modules/libSBMLio/test/org/sbml/jsbml/libsbmlio/SimpleApplication.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -1,6 +1,6 @@
/*
- * $Id: FormulaTest.java 102 2009-12-13 19:52:50Z andreas-draeger $
- * $URL: https://jsbml.svn.sourceforge.net/svnroot/jsbml/trunk/src/org/sbml/jsbml/io/FormulaTest.java $
+ * $Id$
+ * $URL$
* ----------------------------------------------------------------------------
* This file is part of JSBML. Please visit <http://sbml.org/Software/JSBML>
* for the latest version of JSBML and more information about SBML.
Property changes on: trunk/modules/libSBMLio/test/org/sbml/jsbml/libsbmlio/SimpleApplication.java
___________________________________________________________________
Added: svn:keywords
+ Id URL Rev
Modified: trunk/modules/libSBMLio/test/org/sbml/jsbml/test/LibSBMLioTest.java
===================================================================
--- trunk/modules/libSBMLio/test/org/sbml/jsbml/test/LibSBMLioTest.java 2012-05-23 10:05:40 UTC (rev 1272)
+++ trunk/modules/libSBMLio/test/org/sbml/jsbml/test/LibSBMLioTest.java 2012-05-23 10:17:36 UTC (rev 1273)
@@ -1,6 +1,6 @@
/*
- * $Id: FormulaTest.java 102 2009-12-13 19:52:50Z andreas-draeger $
- * $URL: https://jsbml.svn.sourceforge.net/svnroot/jsbml/trunk/src/org/sbml/jsbml/io/FormulaTest.java $
+ * $Id$
+ * $URL$
* ----------------------------------------------------------------------------
* This file is part of JSBML. Please visit <http://sbml.org/Software/JSBML>
* for the latest version of JSBML and more information about SBML.
Property changes on: trunk/modules/libSBMLio/test/org/sbml/jsbml/test/LibSBMLioTest.java
___________________________________________________________________
Added: svn:keywords
+ Id URL Rev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
