1 files changed, 0 insertions, 172 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java
deleted file mode 100644
index c1ed3cd15e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.Query;
-import org.eclipse.jpt.core.context.QueryHint;
-import org.eclipse.jpt.core.context.java.JavaQuery;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmQuery;
-import org.eclipse.jpt.core.context.orm.OrmQueryHint;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlQuery;
-import org.eclipse.jpt.core.resource.orm.XmlQueryHint;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-
-public abstract class AbstractOrmQuery<E extends XmlQuery> extends AbstractOrmJpaContextNode 
-	implements OrmQuery
-{
-
-	protected String name;
-
-	protected String query;
-
-	protected final List<OrmQueryHint> hints;
-
-	protected E queryResource;
-	
-	protected AbstractOrmQuery(OrmJpaContextNode parent) {
-		super(parent);
-		this.hints = new ArrayList<OrmQueryHint>();
-	}
-
-	protected E getQueryResource() {
-		return this.queryResource;
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.getQueryResource().setName(newName);
-		firePropertyChanged(Query.NAME_PROPERTY, oldName, newName);
-	}
-
-	public String getQuery() {
-		return this.query;
-	}
-
-	public void setQuery(String newQuery) {
-		String oldQuery = this.query;
-		this.query = newQuery;
-		this.getQueryResource().setQuery(newQuery);
-		firePropertyChanged(Query.QUERY_PROPERTY, oldQuery, newQuery);
-	}
-
-	public ListIterator<OrmQueryHint> hints() {
-		return new CloneListIterator<OrmQueryHint>(this.hints);
-	}
-	
-	public int hintsSize() {
-		return this.hints.size();
-	}
-	
-	public OrmQueryHint addHint(int index) {
-		OrmQueryHint queryHint = getJpaFactory().buildOrmQueryHint(this);
-		this.hints.add(index, queryHint);
-		this.getQueryResource().getHints().add(index, OrmFactory.eINSTANCE.createXmlQueryHint());
-		this.fireItemAdded(Query.HINTS_LIST, index, queryHint);
-		return queryHint;
-	}
-
-	protected void addHint(int index, OrmQueryHint queryHint) {
-		addItemToList(index, queryHint, this.hints, Query.HINTS_LIST);
-	}
-	
-	public void removeHint(QueryHint queryHint) {
-		removeHint(this.hints.indexOf(queryHint));
-	}
-	
-	public void removeHint(int index) {
-		OrmQueryHint queryHint = this.hints.remove(index);
-		this.queryResource.getHints().remove(index);
-		fireItemRemoved(Query.HINTS_LIST, index, queryHint);
-	}
-
-	protected void removeHint_(OrmQueryHint queryHint) {
-		removeItemFromList(queryHint, this.hints, Query.HINTS_LIST);
-	}
-	
-	public void moveHint(int targetIndex, int sourceIndex) {
-		this.queryResource.getHints().move(targetIndex, sourceIndex);
-		moveItemInList(targetIndex, sourceIndex, this.hints, Query.HINTS_LIST);		
-		
-	}
-
-	
-	public void initialize(E queryResource) {
-		this.queryResource = queryResource;
-		this.name = queryResource.getName();
-		this.query = queryResource.getQuery();
-		this.initializeHints(queryResource);
-	}
-	
-	protected void initializeHints(E queryResource) {
-		for (XmlQueryHint queryhint : queryResource.getHints()) {
-			this.hints.add(createHint(queryhint));
-		}
-	}
-
-	protected OrmQueryHint createHint(XmlQueryHint queryHint) {
-		OrmQueryHint ormQueryHint = getJpaFactory().buildOrmQueryHint(this);
-		ormQueryHint.initialize(queryHint);
-		return ormQueryHint;
-	}
-	
-	public void update(E queryResource) {
-		this.queryResource = queryResource;
-		this.setName(queryResource.getName());
-		this.setQuery(queryResource.getQuery());
-		this.updateHints(queryResource);
-	}
-	
-	protected void updateHints(E queryResource) {
-		ListIterator<OrmQueryHint> hints = hints();
-		ListIterator<XmlQueryHint> resourceHints = new CloneListIterator<XmlQueryHint>(queryResource.getHints());//prevent ConcurrentModificiationException
-		
-		while (hints.hasNext()) {
-			OrmQueryHint hint = hints.next();
-			if (resourceHints.hasNext()) {
-				hint.update(resourceHints.next());
-			}
-			else {
-				removeHint_(hint);
-			}
-		}
-		
-		while (resourceHints.hasNext()) {
-			addHint(hintsSize(), createHint(resourceHints.next()));
-		}
-	}
-	
-	public boolean overrides(Query query) {
-		if (getName() == null) {
-			return false;
-		}
-		// this isn't ideal, but it will have to do until we have further adopter input
-		return this.getName().equals(query.getName()) && query instanceof JavaQuery;
-	}
-
-	public TextRange getValidationTextRange() {
-		return this.getQueryResource().getValidationTextRange();
-	}
-	
-	public TextRange getNameTextRange() {
-		return this.getQueryResource().getNameTextRange();
-	}
-}