Author: dgeraskov Date: 2011-11-10 08:30:08 -0500 (Thu, 10 Nov 2011) New Revision: 36276 Added: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/CompletionProposalsResult.java Removed: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/CompletionProposalsResult.java Modified: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/ConsoleExtension.java branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor2.java branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLJavaCompletionProposalComputer.java branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF Log: Moved CompletionResult to console plugin Modified: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2011-11-10 13:29:59 UTC (rev 36275) +++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2011-11-10 13:30:08 UTC (rev 36276) @@ -21,8 +21,7 @@ org.eclipse.ui.console, org.eclipse.jface, org.eclipse.jdt.apt.core, - org.eclipse.datatools.connectivity, - org.eclipse.jface.text;bundle-version="3.7.0" + org.eclipse.datatools.connectivity Bundle-ActivationPolicy: lazy Eclipse-BuddyPolicy: registered Bundle-RequiredExecutionEnvironment: J2SE-1.5 Deleted: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/CompletionProposalsResult.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/CompletionProposalsResult.java 2011-11-10 13:29:59 UTC (rev 36275) +++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/CompletionProposalsResult.java 2011-11-10 13:30:08 UTC (rev 36276) @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.hibernate.console.ext; - -import java.util.List; - -import org.eclipse.jface.text.contentassist.ICompletionProposal; - -/** - * @author Dmitry Geraskov - * - */ -public class CompletionProposalsResult { - - private final List<ICompletionProposal> result; - - private final String errorMessage; - - public CompletionProposalsResult(List<ICompletionProposal> result, String errorMessage){ - this.result = result; - this.errorMessage = errorMessage; - } - - public List<ICompletionProposal> getCompletionProposals() { - return result; - } - - public String getErrorMessage() { - return errorMessage; - } - -} Copied: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/CompletionProposalsResult.java (from rev 36160, branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/CompletionProposalsResult.java) =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/CompletionProposalsResult.java (rev 0) +++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/CompletionProposalsResult.java 2011-11-10 13:30:08 UTC (rev 36276) @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.hibernate.eclipse.console.ext; + +import java.util.List; + +import org.eclipse.jface.text.contentassist.ICompletionProposal; + +/** + * @author Dmitry Geraskov + * + */ +public class CompletionProposalsResult { + + private final List<ICompletionProposal> result; + + private final String errorMessage; + + public CompletionProposalsResult(List<ICompletionProposal> result, String errorMessage){ + this.result = result; + this.errorMessage = errorMessage; + } + + public List<ICompletionProposal> getCompletionProposals() { + return result; + } + + public String getErrorMessage() { + return errorMessage; + } + +} Modified: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/ConsoleExtension.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/ConsoleExtension.java 2011-11-10 13:29:59 UTC (rev 36275) +++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/ConsoleExtension.java 2011-11-10 13:30:08 UTC (rev 36276) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.hibernate.eclipse.console.ext; -import org.hibernate.console.ext.CompletionProposalsResult; import org.hibernate.console.ext.HibernateExtension; /** Modified: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor2.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor2.java 2011-11-10 13:29:59 UTC (rev 36275) +++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor2.java 2011-11-10 13:30:08 UTC (rev 36276) @@ -35,10 +35,10 @@ import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.contentassist.IContextInformationValidator; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.ext.CompletionProposalsResult; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.console.QueryEditor; +import org.hibernate.eclipse.console.ext.CompletionProposalsResult; import org.hibernate.eclipse.console.ext.ConsoleExtension; import org.hibernate.eclipse.console.ext.ConsoleExtensionManager; Modified: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLJavaCompletionProposalComputer.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLJavaCompletionProposalComputer.java 2011-11-10 13:29:59 UTC (rev 36275) +++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLJavaCompletionProposalComputer.java 2011-11-10 13:30:08 UTC (rev 36276) @@ -36,8 +36,8 @@ import org.eclipse.jface.text.contentassist.IContextInformation; import org.hibernate.cfg.Configuration; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.ext.CompletionProposalsResult; import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.eclipse.console.ext.CompletionProposalsResult; import org.hibernate.eclipse.console.ext.ConsoleExtension; import org.hibernate.eclipse.console.ext.ConsoleExtensionManager; import org.hibernate.eclipse.hqleditor.HQLCompletionProcessor2;