From: Erik B. <ebe...@us...> - 2006-05-29 11:39:11
|
Update of /cvsroot/jpox/JPOX/Plugins/SpatialOracle/src/java/org/jpox/store/expression In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25430/src/java/org/jpox/store/expression Added Files: JGeometryLiteral.java JGeometryScalarExpression.java Log Message: [CORE-2842] Extends JDOQL to support spatial functions --- NEW FILE: JGeometryScalarExpression.java --- /********************************************************************** Copyright (c) 2006 Erik Bengtson and others. All rights reserved. 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. Contributors: ... **********************************************************************/ package org.jpox.store.expression; import org.jpox.store.mapping.JavaTypeMapping; /** * Representation of an expression with a JGeometry. * * @version $Revision: 1.1 $ **/ public class JGeometryScalarExpression extends ScalarExpression { public JGeometryScalarExpression(QueryExpression qs) { super(qs); } /** * * @param qs the QueryExpression * @param mapping the mapping associated to this expression * @param te the TableExpression where this expression refers to */ public JGeometryScalarExpression(QueryExpression qs, JavaTypeMapping mapping, LogicSetExpression te) { super(qs, mapping, te); } } --- NEW FILE: JGeometryLiteral.java --- /********************************************************************** Copyright (c) 2006 Erik Bengtson and others. All rights reserved. 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. Contributors: ... **********************************************************************/ package org.jpox.store.expression; import javax.jdo.JDOFatalException; import oracle.spatial.geometry.JGeometry; import org.jpox.store.DatastoreAdapter; import org.jpox.store.StatementText; import org.jpox.store.mapping.JavaTypeMapping; /** * Representation of a string literal. * * @version $Revision: 1.1 $ **/ public class JGeometryLiteral extends ScalarExpression implements Literal { private final JGeometry value; /** * Constructor * @param qs The QueryExpression * @param mapping The mapping to the java type. null mapping is accepted * @param value The value */ public JGeometryLiteral(QueryExpression qs, JavaTypeMapping mapping, JGeometry value) { super(qs); this.mapping = mapping; this.value = value; if (mapping==null) { DatastoreAdapter dba = qs.getStoreManager().getDatastoreAdapter(); st.appendParameter(dba.getMapping(JGeometry.class, qs.getStoreManager(), qs.getClassLoaderResolver()), value); } else { st.appendParameter(mapping,value); } } public Object getValue() { return value; } public BooleanExpression eq(ScalarExpression expr) { if (expr instanceof JGeometryLiteral) { return new BooleanLiteral(qs, mapping, value.equals(((JGeometryLiteral)expr).value)); } else { return super.eq(expr); } } public BooleanExpression noteq(ScalarExpression expr) { if (expr instanceof JGeometryLiteral) { return new BooleanLiteral(qs, mapping, !value.equals(((JGeometryLiteral)expr).value)); } else { return super.noteq(expr); } } public StatementText toStatementText(int mode) { if (mode == ScalarExpression.PROJECTION) { throw new JDOFatalException("Literals of JGeometry are not allowed to be projected in queries"); } return st; } } |